Revbump adding minidlna user/group, adding /var/lib/minidlna and /var/log/minidlna.log (bug 426726, thanks snowy.mail@gmx.net and BT), adding NEWS (bug 427014, thanks Tanktalus@gmail.com)

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

5 files changed, 159 insertions, 5 deletions

diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index 1638ade7ab0f..cc424c931c7a 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.19 2012/07/16 16:34:03 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.20 2012/07/20 08:08:33 xmw Exp $
+
+*minidlna-1.0.25-r1 (20 Jul 2012)
+
+  20 Jul 2012; Michael Weber <xmw@gentoo.org> +minidlna-1.0.25-r1.ebuild,
+  +files/minidlna-1.0.25.confd, +files/minidlna-1.0.25.initd:
+  Revbump adding minidlna user/group, adding /var/lib/minidlna and
+  /var/log/minidlna.log (bug 426726, thanks snowy.mail@gmx.net and BT), adding
+  NEWS (bug 427014, thanks Tanktalus@gmail.com)
 
 *minidlna-1.0.25 (16 Jul 2012)
 
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index 93983dd5f0ce..dfbc764a3e46 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -4,16 +4,19 @@ Hash: SHA256
 AUX minidlna-1.0.18-Makefile.patch 452 SHA256 036047d07f5fa9395104ca16c79d332ee17e2b3b83292ba3de019e97d5cafced SHA512 c02629524c257a30e41ec512d61f835ef596f99bfd8d1f7fd96334cb5b3e1089f4e23b2c78e2f2d0e877193fc581c8d2a9f1553eba61664a0a9b4b4500c11113 WHIRLPOOL d9e3deacebde02df612f4db8aa77a8fb61ec83c8b41919b420f1c617b32333e39764ae44a1430a78c63a41ea71c0b93eda440948c2f165d1ddf1c0ad17789561
 AUX minidlna-1.0.23-r1.initd 1226 SHA256 26ef5686db85f14c0f7b493c693f7da134a95f58553643581d6e186f68c9c05e SHA512 bf5c68286e3cafd3061bbfb50a074b7c1b66262ade65f54d6dcf9521ef7fbf0c22887381409fa4a0a6a687d5486802ec6989d327cacf1cf999f6cff42f572138 WHIRLPOOL 5694dc14b6f1ae8137420a34dcbe13ec8e355ff0a413caf3031bdece6294087b7c190ad4227e7bfba2ed0127f61a195b87758a96d7cb894756c6e1a1f83b26ba
 AUX minidlna-1.0.23.confd 310 SHA256 6c11dee4e893d24900cbe8efcd5f2b0eaf5476d0f3c16b809f48607efe7154a8 SHA512 a8b630d6149301e56555a3030b50d9533ea6d4de6d58ff98a4f4db653d9dbe647c4c69020947ae49f603e493b495100d87180fdfc01d8074d79821fd02a2f168 WHIRLPOOL 787d0519ae31c9f1dfab6cf2d89ba1889c4d79b96c2152bc1e56ed7ba66b20ed972be9291e8534457d45ccdf5b879377b6ba55a4029a622b0e39af5ef759ff10
+AUX minidlna-1.0.25.confd 313 SHA256 67603d65c6bd3918255f050cb5cfd6fc1373b024bca1ce728f03491a90d79e19 SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8 WHIRLPOOL f749a75ee70cc63eb5221770a17b5df6deadc87f4258b8cb418478f09e92084fce0c3d815be83ec2205a88ac4c43e9a88df28f92fd7e9b093f42f2a858e2812e
+AUX minidlna-1.0.25.initd 1229 SHA256 3d888eb894c63a4c072503c63d8b7fcee5783ca5715037ea83feb8b0af6906d7 SHA512 a6b67db78307fdd90ce19c49983e09eaf07efb5bc05ebcd38b5885cfa1e9dbd4ad6ca63ecbb6b48813e0e584ab0c54222dac53d6e96a12b30b865284212fa2a7 WHIRLPOOL 0f4924c08e9388db0621238ed94033456127cbf028697422129a346ec54bc9a6b582bb992df274be3183ad156d7a76236c8df5e1eaa6bab0173676cc778185f1
 DIST minidlna_1.0.24_src.tar.gz 210775 SHA256 840ac2303c23d63066912750391d1ebef7761b5b23493e590624a17670ceb942 SHA512 bf1c2e7465ad24ae7c57f4270d40875227e0fb0e3db6c20fee7e286d7f93cfa17935475a8e9dda2da539d88f33fc4ec123a55e8cdf8e6656ae0e37306bb9625e WHIRLPOOL 1f12058862d37d9502680a75a4ff6f18ddc6b47638fece54ae24239e683489f346b09e5715a69ef132162fa8c8860830df8b52c9c748ca04a3c20d98392b014d
 DIST minidlna_1.0.25_src.tar.gz 211756 SHA256 170560fbe042c2bbcba78c5f15b54f4fac321ff770490b23b55789be463f2851 SHA512 91945d787c06d0f6d6fded206b95d678b223e52dab8506c8b4f3ece10909ad5f304be17c9504b509a0c7fe175c8f55c711f38694adebd6ae302266bcb32196ed WHIRLPOOL c6e321d1fcc1a54e5dc528bafc92e87b3e5a7be9392f90bda247456dd4a2e0d9e487c1fa4b360f63443dd55888ce5825e0b3dc53c73ecaf1a0fc76f53a829369
 EBUILD minidlna-1.0.24.ebuild 1204 SHA256 2dabe3dc16701ac34490387f54ed49162af981f2a67d1141303578572a843c9c SHA512 93b432c8992ea2a485222221161bbfcd1fe3daa6f1fb49755151a7060a6d20b194062e081e8220539c0c6ad4d622288cf7d155c5270719fb5e14c438348acb99 WHIRLPOOL bdcaf64f26781dbbf7a851e49b91e246dd5b3c5667b1d7b1f7a13c61d8209bd20daff0368328ced1d13ab674a1355ad07c4cbf72770c2c07f62a4e5cd7a6f94b
+EBUILD minidlna-1.0.25-r1.ebuild 1848 SHA256 f3108e972fd45bb973fccdb749c0b1433cdbaae546c2ea0a09a0064cacd69825 SHA512 f51129918df17855c770185bf3454383019111dd94c3e10bccc54bb3de1a28f6a2b6a5c79cefdcbf1a9ea571f14f41af32890f4fedce39cadaba57595c562c91 WHIRLPOOL 760f82aa1b92ad7ec7ad8b2c13bafee7dd2429a4807c94ff5e6dfcbc13c27a30b3f232e0a41044fa65081386bbe4001fc949d9bb88c854a7070f35d4d680c774
 EBUILD minidlna-1.0.25.ebuild 1200 SHA256 600287b1ca050c23dabad302312a6b44ae70b691380eb82cc40cf7f3d2fc3661 SHA512 f12f5ccb902226e618d08fb15474d951b62f49bfc36b6ee8f3d4c69a201c802ebc0b2d76a80ab2455a40f57d7601ef2f9afe7a565b030f2d83ad93aabe61f6d3 WHIRLPOOL 98364b07d6e674b68d5cb9718e50f6d84555e9a47c186d8da5fa659dfb7663f2d93557f0b0e3fbd192a591fd77a467343def394fe801ecb494885c9b8e18aea6
-MISC ChangeLog 3479 SHA256 3406af08e5e3f4534f8aa40c59043b4774a29dd960f4375fe37e3379856b1fa0 SHA512 07bd4dd9fb52ec121ff0aa81b01d9a6d54136e2852d398b7545dc0742230d30bfc2d04694e82ca9eb2b9d10b75f4b2691467ed0e97d6b9ca73a3bad923ca4189 WHIRLPOOL 7c4a79658acadec94b206c8c58e8d625df01e9e52285ea6f1f213f07533f24b8c8259973e923f26edb7fe4a58ff2d6dbe643384ed6427037ade39e3849b69304
+MISC ChangeLog 3845 SHA256 96f7d48419af0d58f243f42908a5576ef5c807ea2ab32d1ac4ab5de09864cd53 SHA512 ed69bd29e50ec1c69ac4a499c0ce4766ddb86cda0bcb8fcd2be231f76ba5cfe70a81a16b0c985198d4776bb0b38df2357594611ce52f3ed1b0ef48a64a13886a WHIRLPOOL 09d8d4805cb143307252d38dd9ed124ce679ad794c1ea44123c3fab2a3a9d381bc606ffbff02eec577a9b505dce00b45606ad579d147a163ca2a0bb2d68f24d8
 MISC metadata.xml 369 SHA256 9842820667d8f6d13c4d3a340ede5b99c0092c5358f2d67cf08f07c669ea98f4 SHA512 6b331b75443101cc8182e11ab0779e55d96ca7b81dd904449f7acfa835a608d65b8503521f5b0f42465d149ed55420de6f16881f3348bcef07cabc147116549e WHIRLPOOL 6a3b290333f7d7d89156a3a0618b11ecc677a6c325948d966a044d070304185f9b38ac13c44829116f5d4ef6e035911e86139d60a8a4d41a5ee4d646c8bd9248
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAEQkcACgkQknrdDGLu8JA+NQEAlpNqwTjehFu94cwdPngqPfm0
-lYJYMMSPMyw7KoIjJRQA/AwKhrTmN7C2wm8FP5PCbVD+TGQl9A66cQPJrasdjZxJ
-=REE6
+iF4EAREIAAYFAlAJEcIACgkQknrdDGLu8JArQwD/cHFEwuaxuEzlX4AsqwajBaWv
+3a2S47QyqCrCzZ23PN0BAJOneyeS/isjzOiUrDhYA9gbtFi/J8Onk1Kzx10B5eGP
+=Xdtz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/minidlna/files/minidlna-1.0.25.confd b/net-misc/minidlna/files/minidlna-1.0.25.confd
new file mode 100644
index 000000000000..97d15b00c391
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.25.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="minidlna"
+#M_GROUP="minidlna"
+
+# vim: ft=gentoo-conf-d
diff --git a/net-misc/minidlna/files/minidlna-1.0.25.initd b/net-misc/minidlna/files/minidlna-1.0.25.initd
new file mode 100644
index 000000000000..13fe3a78602d
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.25.initd
@@ -0,0 +1,53 @@
+#!/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.25.initd,v 1.1 2012/07/20 08:08:33 xmw Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting MiniDLNA"
+	local params=""
+	local stop=0
+
+	checkpath -q -d -m 0755 -o ${M_USER:-minidlna}:${M_GROUP:-minidlna} /var/run/minidlna
+
+	params="$params -P /var/run/minidlna/minidlna.pid"
+
+	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:-minidlna} --group ${M_GROUP:-minidlna} \
+			--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.25-r1.ebuild b/net-misc/minidlna/minidlna-1.0.25-r1.ebuild
new file mode 100644
index 000000000000..03a65cae82c8
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.0.25-r1.ebuild
@@ -0,0 +1,76 @@
+# 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.25-r1.ebuild,v 1.1 2012/07/20 08:08:33 xmw Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+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}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	locale my_is_new=yes
+	[ -e "${EPREFIX}"/var/lib/${PN} ] && my_is_new=""
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	if [ -n ${my_is_new} ] ; then
+		chown ${PN}:${PN} /var/lib/${PN} || die
+		chmod 0750 /var/lib/${PN} || die
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.18-Makefile.patch
+
+	sed -e "/^DB_PATH=/s:\".*\":\"${EPREFIX}/var/lib/${PN}\":" \
+		-e "/^LOG_PATH=/s:\".*\":\"${EPREFIX}/var/log\":" \
+		-i ./genconfig.sh || die
+}
+
+src_configure() {
+	./genconfig.sh || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-conf
+
+	newconfd "${FILESDIR}"/${P}.confd ${PN}
+	newinitd "${FILESDIR}"/${P}.initd ${PN}
+
+	dodir /var/lib/${PN} /var/log
+	echo -n > "${ED}"/var/log/${PN}.log
+	fowners ${PN}:${PN} /var/lib/${PN} /var/log/${PN}.log
+	fperms 0750 /var/lib/${PN}
+	fperms 0640 /var/log/${PN}.log
+
+	dodoc NEWS README TODO
+}
+
+pkg_postinst() {
+	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+	elog "logfile is moved to /var/log/minidlna.log,"
+	elog "cache is moved to /var/lib/minidlna."
+	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}