Clean up old version/files. Fix /var/run/minidlna permissions and version bump (thanks Daniel Pielmeier, bug 404571)

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

6 files changed, 36 insertions, 29 deletions

diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index 2160ec875aca..9b45da13cd43 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/minidlna
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.13 2012/03/26 00:06:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.14 2012/03/26 00:23:13 xmw Exp $
+
+*minidlna-1.0.24 (26 Mar 2012)
+
+  26 Mar 2012; Michael Weber <xmw@gentoo.org> -minidlna-1.0.22.ebuild,
+  minidlna-1.0.23-r1.ebuild, +files/minidlna-1.0.23-r1.initd,
+  +minidlna-1.0.24.ebuild, -files/minidlna.confd, -files/minidlna.initd:
+  Clean up old version/files. Fix /var/run/minidlna permissions and version
+  bump (thanks Daniel Pielmeier, bug 404571)
 
 *minidlna-1.0.23-r1 (26 Mar 2012)
 
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 6596e37a830e..2271140d71b3 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -2,21 +2,20 @@
 Hash: SHA256
 
 AUX minidlna-1.0.18-Makefile.patch 452 RMD160 81fad7433ccf2cdbccac8735772705a6a9ebca60 SHA1 431c0d0a49d231f70059d4fd2713b6a8613aa115 SHA256 036047d07f5fa9395104ca16c79d332ee17e2b3b83292ba3de019e97d5cafced
+AUX minidlna-1.0.23-r1.initd 1226 RMD160 cf43515323011d00bde02fe56cf850ef5426a23c SHA1 88745d823146ab9f3ee415f7d7c404b53e977815 SHA256 26ef5686db85f14c0f7b493c693f7da134a95f58553643581d6e186f68c9c05e
 AUX minidlna-1.0.23.confd 310 RMD160 5a3e150d34c59126b45c7f64d84d39e211eeab27 SHA1 be093a5ea697b7292c1f0c312560e93cb1b1e530 SHA256 6c11dee4e893d24900cbe8efcd5f2b0eaf5476d0f3c16b809f48607efe7154a8
 AUX minidlna-1.0.23.initd 1085 RMD160 f46f29417dc47b9b73f67ec92a85c70685939838 SHA1 8a11a512e96d79908b404ff22688f4e76ba810a8 SHA256 7a557a91f0c2944b69b1d659d66cd10913c1bdcf3eca3fd396575c0b1a1dcbe0
-AUX minidlna.confd 225 RMD160 e302ea49816c75298e52ce70f1d064a4b6678448 SHA1 04c337e33dbe9ef31ab7739947edd825081064dd SHA256 f8e274a3e38c842310349bfc2996cc3eb8a9325cc137e30e86b08b8c6eec7257
-AUX minidlna.initd 1020 RMD160 1b8b6e0af904d93d39c19ce574d6d30c611bc817 SHA1 be3592d849f24c330a4a01524f934362bc308e88 SHA256 ad08ad1a2d0dad1a433e089fb9b3a898901b9bb8d4d00145bcd7245d5b99ec88
-DIST minidlna_1.0.22_src.tar.gz 212980 RMD160 fdc7b08217a79e159a74fb308c06e9d2a41bf64f SHA1 21bb1004f2dc22a91cd792827c7ae779de56917c SHA256 688919b23d5891d77045cd772e373314a83f002f79c9e754bcb7e521f3ba4349
 DIST minidlna_1.0.23_src.tar.gz 210175 RMD160 b95b44b112f8531c9028f70c1bccfb91272a5f9a SHA1 354d35ffd43249a7cea6a6ce316ceb2623bf8cde SHA256 efc3a5de564c42782714eb89186254910e343f309b9b78635865a4592cd0c28a
-EBUILD minidlna-1.0.22.ebuild 1029 RMD160 fc4e7f461d4313f2e680695cf05a963adddd2be6 SHA1 403334faac96220be10001a2eaeeb2b13089f72c SHA256 df09f41b94c7f209565db1fba8b0b10719f16b15468e984adfd56d5f35cb40b0
-EBUILD minidlna-1.0.23-r1.ebuild 1185 RMD160 3bb550bab97941d15b344c91ab697cb0f253d48b SHA1 8e9f27095e36604b3fffb74ab470eac68cb40c4c SHA256 7a4e4f733bb0e0c5796f2f1e4be952e994c64d3a33f9b5f41a208548c3f963a1
+DIST minidlna_1.0.24_src.tar.gz 210775 RMD160 dad61a48059678c202b8ef009470f72622d7a38a SHA1 5e7fe50dbac5b5784e3d7a4eb9251fa9b37e97f2 SHA256 840ac2303c23d63066912750391d1ebef7761b5b23493e590624a17670ceb942
+EBUILD minidlna-1.0.23-r1.ebuild 1188 RMD160 dcc1707386e80a68a5cf0b589dbc1c34087ffcfb SHA1 96162cb4195ea725c0e691bac27f1e83991ce03b SHA256 1629a9e83db91a5d631bce49316dc01b3950ceba332bfb81fc353d7d297244c5
 EBUILD minidlna-1.0.23.ebuild 1169 RMD160 6013b5b11a3d339783999df1f3d001f1611d8710 SHA1 a4dcc212f0dab0da79361bb001ad45e2eb50976b SHA256 08cccae5e2e60d1cbbb8529baf9a33e95f5b6051d0bd67d08ef267b0b56bdb1b
-MISC ChangeLog 2430 RMD160 bb03da2105e882d77c3e90e9a7fbcd28d92eaae4 SHA1 9fca03407a4944e4d079c81dc573334dfef05b23 SHA256 9045514f427091307dd0688a2cfeb8db93a3e3e91dc53cf851e8c66e7ca4d76c
+EBUILD minidlna-1.0.24.ebuild 1201 RMD160 707d8731ac059722c5d43c418cb7b386d2bf9135 SHA1 9ed1d094af78067872275330c9c5293be51717db SHA256 faf120085834d66d38c6a2f0f2f67703a888e5db222abeb6478589fa2402b5f0
+MISC ChangeLog 2790 RMD160 7b24f7be9446e73df6a5b74cb2ecfb1ac79a8ebc SHA1 43ff0daede972f329332a142bd0960d4ffb8b57c SHA256 56c498df08ce20643ae06570f36c111ecc97813978bfab83cf2c7cc0b2f7a0d5
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk9vsyoACgkQknrdDGLu8JAw8wD9FoIt1Uz2XrfTX/qT5/38bRSN
-/H/HtKkGEhEWhVih/KYA/33EP0uFwd64tn3NKlEwnHcUkeQwlU4HXAXEkC8Voy9y
-=qh9c
+iF4EAREIAAYFAk9vtvgACgkQknrdDGLu8JC2NwD+KjNvukptvv/5CYPGoWEf5id+
+ZyP5iR7ZHZw0k+1NWL8A/A6XlxALX2kfiC5q8GdBi2q02INm1mKw56Gx1Ts13YQ1
+=/LAJ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/minidlna/files/minidlna.initd b/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
index bb20626138c4..998bddb583f9 100644
--- a/net-misc/minidlna/files/minidlna.initd
+++ b/net-misc/minidlna/files/minidlna-1.0.23-r1.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/files/minidlna.initd,v 1.1 2010/12/29 16:59:25 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/files/minidlna-1.0.23-r1.initd,v 1.1 2012/03/26 00:23:14 xmw Exp $
 
 depend() {
 	need net
@@ -12,6 +12,10 @@ start() {
 	local params=""
 	local stop=0
 
+	checkpath -q -d -m 0755 -o ${M_USER:-nobody}:${M_GROUP:-nogroup} /var/run/minidlna
+
+	params="$params -P /var/run/minidlna/minidlna.pid"
+
 	if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
 		params="$params -R"
 	fi
@@ -36,6 +40,7 @@ start() {
 		eend 1
 	else
 		start-stop-daemon --start \
+			--user ${M_USER:-nobody} --group ${M_GROUP:-nogroup} \
 			--exec /usr/sbin/minidlna -- ${params}
 		eend $?
 	fi
diff --git a/net-misc/minidlna/files/minidlna.confd b/net-misc/minidlna/files/minidlna.confd
deleted file mode 100644
index 4cc286c2b9a5..000000000000
--- a/net-misc/minidlna/files/minidlna.confd
+++ /dev/null
@@ -1,10 +0,0 @@
-# /etc/conf.d/minidlna
-
-# Should minidlna rescan the entire collection on startup?
-# Warning: This may take a long time!
-RESCAN="false"
-
-# The location of the config file
-#CONFIG="/etc/minidlna.conf"
-
-# vim: ft=gentoo-conf-d
diff --git a/net-misc/minidlna/minidlna-1.0.23-r1.ebuild b/net-misc/minidlna/minidlna-1.0.23-r1.ebuild
index ee71625e7118..a2524f44127b 100644
--- a/net-misc/minidlna/minidlna-1.0.23-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.0.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.23-r1.ebuild,v 1.1 2012/03/26 00:06:59 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.23-r1.ebuild,v 1.2 2012/03/26 00:23:13 xmw Exp $
 
 EAPI=4
 
@@ -42,7 +42,7 @@ src_install() {
 	emake DESTDIR="${D}" install install-conf
 
 	newconfd "${FILESDIR}"/${P}.confd ${PN}
-	newinitd "${FILESDIR}"/${P}.initd ${PN}
+	newinitd "${FILESDIR}"/${P}-r1.initd ${PN}
 
 	dodoc README TODO
 }
diff --git a/net-misc/minidlna/minidlna-1.0.22.ebuild b/net-misc/minidlna/minidlna-1.0.24.ebuild
index 795b5c3622b1..6c3c0d96f260 100644
--- a/net-misc/minidlna/minidlna-1.0.22.ebuild
+++ b/net-misc/minidlna/minidlna-1.0.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.22.ebuild,v 1.3 2011/11/14 01:48:33 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.24.ebuild,v 1.1 2012/03/26 00:23:13 xmw Exp $
 
 EAPI=4
 
@@ -39,10 +39,15 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" install install-conf
 
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}-1.0.23.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-1.0.23-r1.initd ${PN}
 
 	dodoc README TODO
 }
+
+pkg_postinst() {
+	ewarn "minidlna no longer runs as root:root, per bug 394373."
+	ewarn "Please edit /etc/conf.d/${PN} to suit your needs."
+}