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

(Portage version: 2.1.10.49/cvs/Linux x86_64)

5 files changed, 28 insertions, 20 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/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."
+}