Version bump. No longer run as root per default (thanks Yuri Karaban, bug 394373)

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

5 files changed, 133 insertions, 6 deletions

diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index 69f578a5cda4..d9d5ba4986af 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/minidlna
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.11 2011/11/14 01:48:33 xmw Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.12 2012/01/29 00:33:26 xmw Exp $
+
+*minidlna-1.0.23 (29 Jan 2012)
+
+  29 Jan 2012; Michael Weber <xmw@gentoo.org> +minidlna-1.0.23.ebuild,
+  +files/minidlna-1.0.23.confd, +files/minidlna-1.0.23.initd:
+  Version bump. No longer run as root per default (thanks Yuri Karaban, bug
+  394373)
 
   14 Nov 2011; Michael Weber <xmw@gentoo.org> minidlna-1.0.22.ebuild:
   remove whitespace
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index e1aee9799644..d228f0aba060 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -2,16 +2,20 @@
 Hash: SHA256
 
 AUX minidlna-1.0.18-Makefile.patch 452 RMD160 81fad7433ccf2cdbccac8735772705a6a9ebca60 SHA1 431c0d0a49d231f70059d4fd2713b6a8613aa115 SHA256 036047d07f5fa9395104ca16c79d332ee17e2b3b83292ba3de019e97d5cafced
+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
-MISC ChangeLog 2003 RMD160 7b44a26d716df82460eb7e573ad3ef0ae162bffe SHA1 77b462f950d41ed46536be5e0078c612dda0abf9 SHA256 011559ab7424cb6b91605f056676b575658624eed6876659681053eb00a336de
+EBUILD minidlna-1.0.23.ebuild 1169 RMD160 6013b5b11a3d339783999df1f3d001f1611d8710 SHA1 a4dcc212f0dab0da79361bb001ad45e2eb50976b SHA256 08cccae5e2e60d1cbbb8529baf9a33e95f5b6051d0bd67d08ef267b0b56bdb1b
+MISC ChangeLog 2255 RMD160 16f21e876edeac3fcea55845b724653abed82f97 SHA1 5654933100940b29543cabea1570e98048acb291 SHA256 7c508d656d231ff0c0b7f4673365eef6e3d6c58c44284b2e6d01387f95e75d30
 MISC metadata.xml 224 RMD160 2a7e22a99ec669c5b961c3d1738a0cda58264318 SHA1 f6fd81fac4df7d7995b1600848b265fceda692f8 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7Ac3UACgkQknrdDGLu8JAikgD+Oq2hqZt193DDzMzF9uK7kyk9
-/v9YggRUFAsALnry0i0A/jhBucpKHYVcgsXI6jSGbQQbSif9kZBNEqXk/db7To4k
-=dcZ0
+iF4EAREIAAYFAk8kk9sACgkQknrdDGLu8JCvrgEAmFx/kU6pAnoWaAK3rDwY1QRe
+orT5NdtCmCSsqEVs10gA/j4EH8fg4XIS59qBMOoAlwg40Bh8rjvpzAwJ06SJ/egW
+=h1Vf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/minidlna/files/minidlna-1.0.23.confd b/net-misc/minidlna/files/minidlna-1.0.23.confd
new file mode 100644
index 000000000000..c98c7ab02e43
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.23.confd
@@ -0,0 +1,14 @@
+# /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"
+
+# Specify the user/group minidlna should run as
+#M_USER="nobody"
+#M_GROUP="nogroup"
+
+# vim: ft=gentoo-conf-d
diff --git a/net-misc/minidlna/files/minidlna-1.0.23.initd b/net-misc/minidlna/files/minidlna-1.0.23.initd
new file mode 100644
index 000000000000..1f08cde3cdb7
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.23.initd
@@ -0,0 +1,49 @@
+#!/sbin/runscript
+# 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-1.0.23.initd,v 1.1 2012/01/29 00:33:27 xmw Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting MiniDLNA"
+	local params=""
+	local stop=0
+
+	if [[ "${RESCAN}" = "true" || "{$RESCAN}" = yes ]]; then
+		params="$params -R"
+	fi
+
+	#set the config file and check if it exists
+	if [ -z "${CONFIG}" ]; then
+		if [ ! -f "/etc/minidlna.conf" ]; then
+			ewarn "You did not set the config file correctly"
+			stop=1
+		fi
+		params="$params -f /etc/minidlna.conf"
+	else
+		if [ ! -f "${CONFIG}" ]; then
+			ewarn "The specified config file does not exist"
+			stop=1
+		fi
+		params="$params -f ${CONFIG}"
+	fi
+
+
+	if [ $stop -eq 1 ]; then
+		eend 1
+	else
+		start-stop-daemon --start \
+			--user ${M_USER:-nobody} --group ${M_GROUP:-nogroup} \
+			--exec /usr/sbin/minidlna -- ${params}
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Stopping MiniDLNA"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/minidlna
+	eend $?
+}
diff --git a/net-misc/minidlna/minidlna-1.0.23.ebuild b/net-misc/minidlna/minidlna-1.0.23.ebuild
new file mode 100644
index 000000000000..eb541bd6ab0d
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.0.23.ebuild
@@ -0,0 +1,53 @@
+# 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.ebuild,v 1.1 2012/01/29 00:33:26 xmw Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="server software with the aim of being fully compliant with DLNA/UPnP-AV clients"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="dev-db/sqlite
+	media-libs/flac
+	media-libs/libexif
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libvorbis
+	virtual/ffmpeg
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.18-Makefile.patch
+}
+
+src_configure() {
+	./genconfig.sh || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/${P}.confd ${PN}
+	newinitd "${FILESDIR}"/${P}.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."
+}