Fix exec name in init.d and service files (thanks BT, bug 469366)

Package-Manager: portage-2.2.0_alpha174/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 163 insertions, 5 deletions

diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index 40389fbcaac2..ac4c5cdf65c4 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/minidlna
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.32 2013/05/09 08:18:30 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.33 2013/05/11 22:19:45 xmw Exp $
+
+*minidlna-1.1.0-r1 (11 May 2013)
+
+  11 May 2013; Michael Weber <xmw@gentoo.org> +files/minidlna-1.1.0.initd,
+  +files/minidlna-1.1.0.service, +minidlna-1.1.0-r1.ebuild:
+  Fix exec name in init.d and service files (thanks BT, bug 469366)
 
   09 May 2013; Michael Weber <xmw@gentoo.org> minidlna-1.1.0.ebuild:
   Add config file
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest
index de05fd1968a4..23a26fd22758 100644
--- a/net-misc/minidlna/Manifest
+++ b/net-misc/minidlna/Manifest
@@ -11,6 +11,8 @@ AUX minidlna-1.0.25.initd 1229 SHA256 3d888eb894c63a4c072503c63d8b7fcee5783ca571
 AUX minidlna-1.0.25.service 341 SHA256 d7bd56f6b8c492c53249bbd2b7f0151d9bb7d393863d57a7b59adab60dac9126 SHA512 227f3753ac856bb9b0e05c61f2e083e60d1e317539d8a28d7ddeba1e8c212bda289717116c09ec50490e7a7f196728cb07cf455dc54597e5a3bd8ec1372d1a83 WHIRLPOOL 063c68bb70532c0cda62796afbddb773dc2af8ff7280b0fbde12b55df6d900df68da0f0120780b2eef661089b5d30f440b9505780c0315923b0c0581b14e1de6
 AUX minidlna-1.0.26-Makefile.patch 627 SHA256 bcb53001004fd5d844de2c6fda4cdf385d464d53aa95672921ad78e29b99d509 SHA512 84d41345a9fa0b16ac39aa97305ea8fcd3fa2adc79c0085923005940ae4c0fa67d506a0c0499bb4c244aa0abff3270d407c924adefc6fb8df8eb9faddfee1c46 WHIRLPOOL b65d69f319b4eb9ba701a422a96951042d590a5f8e3167688a9538cd4e90f1f8c8c8142ae1cd1625ff86af6d5173a775f2b4c2726f3c9fab441cd0138de5271c
 AUX minidlna-1.0.26-locale.patch 290 SHA256 9e69903e0b4e4afe634c6c07d89d2d5f7873932d745313dffe1463f72d2e5fde SHA512 97825f5636d121cd486afaec22f418fb2ac8f6be029a1b00febe8d73d2a0248f4de20695743f7d98d598e9ab139a112d5586b33779d22acdebe631436a241d67 WHIRLPOOL e679bcedbe1b9a4edd0334729114ccda0464210067f761310056a98d7a0758c89d25b7a7b4e858b53c38c54eaad0dbf35518279ed723195b31c62318c301e183
+AUX minidlna-1.1.0.initd 1230 SHA256 1b4572b74fdaf151108bc0874e866bdbb9bed9866b950525b68de3aca3c8821b SHA512 e4864ae4c18f746bcf52edddd5d0920c9cc39ff8555d79449b208d0009c9f0242df541ca9cab9e8046f5c685b6ec80ea7c04d90c8888076d2c3e555cad4114f4 WHIRLPOOL b576bf029d7cb8f21ba0082f31a18a8d51b998127f293f8300a7f86208cc717f1dba20e64b1f3e4d2df7cbe4b4967c34e7da81900c73eb81baf281e54228702f
+AUX minidlna-1.1.0.service 342 SHA256 766735cdcb3b9287fbdabe30e9a72b76fd7471ee38f003a94b6109def3870fb1 SHA512 3d02e9f250ccf7b61126862d871753c0db0dc430c42125cc049770fa6e74e377b59e60ce386d9698d5db2c2c1cfb091d0eee3ebad2d13b5626bfe346b446c35e WHIRLPOOL 2f929eef70d5732ddc56ece067a3b8f57d03db310dac7299d5c389d3eb0d0bf96a8b44e54058a11fa3c3d475e5eef3177f25a62c0486bd441992cd36475841a7
 DIST minidlna-1.0.26.tar.gz 212353 SHA256 8c94dc8bef5602f0dac8d6c9068cf0484200bc1909e62b7e7551eae5af5eee4c SHA512 9e681592cfc637d32244f81d493143a5548f6e607a7c38a909a104492ad39be14831629997095efbc9154e0e087a6181058d4cdeb04b3f6548b99531c65e0631 WHIRLPOOL 29f7571c9e9fba949810c5162f546a6d47f72e7f810a44b56204ee4dd52a9c482da327089ddbaf516c6b718cbb569ff4c2fb0f76add477ff8057d7882d6e30f3
 DIST minidlna-1.1.0.tar.gz 423555 SHA256 c2ef2ebe4311d08a60a87ec0c86fbe5e7f4fd25b947841f1d71b0508c60a90e2 SHA512 9240d857fc3927c06183c04c4d657c1b2b0596f63dbc549f331b52032698349e82244870f2ebf6f8bc8bf0ff5f2ff88df69b53d280f5e5f9b618a5de58ac6f57 WHIRLPOOL 6c59fa9f4e05fcd0ca2a7fb23058edb5f86d32a93fbae6791f9224e18bba742997fe140082fadcd95b993041db3ef8c597e820d6fd21b3c873b6ac9db6f8688e
 DIST minidlna_1.0.24_src.tar.gz 210775 SHA256 840ac2303c23d63066912750391d1ebef7761b5b23493e590624a17670ceb942 SHA512 bf1c2e7465ad24ae7c57f4270d40875227e0fb0e3db6c20fee7e286d7f93cfa17935475a8e9dda2da539d88f33fc4ec123a55e8cdf8e6656ae0e37306bb9625e WHIRLPOOL 1f12058862d37d9502680a75a4ff6f18ddc6b47638fece54ae24239e683489f346b09e5715a69ef132162fa8c8860830df8b52c9c748ca04a3c20d98392b014d
@@ -20,13 +22,14 @@ EBUILD minidlna-1.0.25-r1.ebuild 2208 SHA256 2fc3c8596c2d4a809ce5d6e7554b23c473b
 EBUILD minidlna-1.0.25-r2.ebuild 2298 SHA256 b23213b0dd101b3b667aeda00199fc9c04181481fd80bb4edbf4835b2485f43f SHA512 9e27af1d58a14884c239796d066e01fb16202da39714cfa5a1e6e3b222ca53965dd3742adbfc3c7558f2a08a63abc9d5bf924f25a65a6ef077b3d82bf910f1a1 WHIRLPOOL 3eb950b5fb2bfa5887077849877672a54df3d20d49ec36970f3aa1262723231b595dcc0c7bf577d0d08540365e846573371a5ac96164f56d669e8cec951bb165
 EBUILD minidlna-1.0.25.ebuild 1200 SHA256 600287b1ca050c23dabad302312a6b44ae70b691380eb82cc40cf7f3d2fc3661 SHA512 f12f5ccb902226e618d08fb15474d951b62f49bfc36b6ee8f3d4c69a201c802ebc0b2d76a80ab2455a40f57d7601ef2f9afe7a565b030f2d83ad93aabe61f6d3 WHIRLPOOL 98364b07d6e674b68d5cb9718e50f6d84555e9a47c186d8da5fa659dfb7663f2d93557f0b0e3fbd192a591fd77a467343def394fe801ecb494885c9b8e18aea6
 EBUILD minidlna-1.0.26.ebuild 2271 SHA256 cbb05c6337f230b2d3e165dd9fb4f1f1eeb447909b98a7a125bc45fcf1ac6b03 SHA512 ab710bfa98e84123d5457a945ace0872348ef90d1b35fc8ce3871096b60461aeb7f048bd0ab93dba3fe1fb0f11b6f98f7a8d474c2f1a667c69c2baa6ec98b64a WHIRLPOOL 1659774f849ac64e79a6588f6af94a6add225f6580b906cef534767840c6f6d864fb7028151e641938c060fc9c26f0d85979c8e370f13e2680db775c2c5d02ff
+EBUILD minidlna-1.1.0-r1.ebuild 2135 SHA256 64cb2b1ce7b1b362276dbba805796a4d86038e3333405d1fb06488329bf9f99d SHA512 7c3bd00f5a1428890f0bd2f4d8e8ae1be350a98bafafa0298aa9e6cf754e721d8101c505ab90d02e7b26478a7a0ca902bc75cffeed7263445fec9e26511bb1fe WHIRLPOOL 7e1205d1e9769795ba9a508a70d92fc0279ca9c00f3374743f3c741b240ed07d8e17958b139d4bdd034bec627364cf3a3c94fe09fd4aacd34a48ca326e7de3ef
 EBUILD minidlna-1.1.0.ebuild 2137 SHA256 b8b3ff26978108342d389273511026e5fda3d46a242fcf57fda04d7a978d64ae SHA512 500842b0f7038fa22822c03e3fc7b0a0151abcb8a76261022303f64ad9978ea8be3f311c0f01d231289f64b41023f8349126df1ffe526060d498e225cdde8cee WHIRLPOOL 080ab6b5ffe2481e21e71ec1edd225b22cd46df979875c92b998c872f002acca31e661e007dcd13b083a160df78baa883be5fb1d9db71a78bdddeb7bbf6862bd
-MISC ChangeLog 5781 SHA256 a79e6abb9603c4ed24bb60815a1acd2bcee13afe3ab6dbd7f4954a9c4c7dcda6 SHA512 650417fc10ae90170d2b7812aaf87d203d3e873fd4774a95f637b050d0a1d518508986141e51d28e6735693775dbc19e8debfcd59dba798582b6c67230d751cf WHIRLPOOL 74210c7d1b46fcda024e9b4dec5b8eba7a2b09076b42214788dfdf41524ebcd5c6482e932214a4d9afbe1f3781baaf022875beda58af23d39d7b0f2286e5c1d6
+MISC ChangeLog 6019 SHA256 e773ee3708f32a0b102d62e4069e579d8983b55c26226ef646992361f429673d SHA512 daa7ab2ab89a0fa801a0ed7b809c67a322394b89f202b25c60a86c61c3471b73f8d73047c24e58ed6fdf2f2d9df3aa149c433498dd4157cc66b3dfc668c29b3e WHIRLPOOL f18364351afaa48ff00aedf165faa192b005400504da91cc69d9ac4e24b52af2fa194465eec8e632820c58a5100512907de9140fa92b8ea2d570651e019e4163
 MISC metadata.xml 369 SHA256 9842820667d8f6d13c4d3a340ede5b99c0092c5358f2d67cf08f07c669ea98f4 SHA512 6b331b75443101cc8182e11ab0779e55d96ca7b81dd904449f7acfa835a608d65b8503521f5b0f42465d149ed55420de6f16881f3348bcef07cabc147116549e WHIRLPOOL 6a3b290333f7d7d89156a3a0618b11ecc677a6c325948d966a044d070304185f9b38ac13c44829116f5d4ef6e035911e86139d60a8a4d41a5ee4d646c8bd9248
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGLW/sACgkQknrdDGLu8JCo5wD/VbjjdSap8DKLzv94VrAcvRtX
-xXMRKXjp7Vld1CHvf70A/1TiYTktiQxjF7iszOEV5gFjE9yfacybG9kLML1tb0ue
-=cRzB
+iF4EAREIAAYFAlGOxAcACgkQknrdDGLu8JA/bQEAhUCzeK8JlE1VEVUQpvMD1Qh9
+80CrjT0+Bi4IYAcKvUwA/jSEY2DhSVVRW3uh4zjwqeI4dczQJrnN9E5e3fgOEhDj
+=ltrW
 -----END PGP SIGNATURE-----
diff --git a/net-misc/minidlna/files/minidlna-1.1.0.initd b/net-misc/minidlna/files/minidlna-1.1.0.initd
new file mode 100644
index 000000000000..d820aef67fc2
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.0.initd
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/files/minidlna-1.1.0.initd,v 1.1 2013/05/11 22:19:45 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/minidlnad -- ${params}
+		eend $?
+	fi
+}
+
+stop() {
+	ebegin "Stopping MiniDLNA"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/minidlnad
+	eend $?
+}
diff --git a/net-misc/minidlna/files/minidlna-1.1.0.service b/net-misc/minidlna/files/minidlna-1.1.0.service
new file mode 100644
index 000000000000..908b1d59f45d
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.1.0.service
@@ -0,0 +1,13 @@
+[Unit]

+Description=MiniDLNA is a DLNA/UPnP-AV server software

+After=syslog.target local-fs.target network.target

+

+[Service]

+User=minidlna

+Group=minidlna

+Type=forking

+PIDFile=/var/run/minidlna/minidlna.pid

+ExecStart=/usr/sbin/minidlnad -f /etc/minidlna.conf -P /var/run/minidlna/minidlna.pid

+

+[Install]

+WantedBy=multi-user.target

diff --git a/net-misc/minidlna/minidlna-1.1.0-r1.ebuild b/net-misc/minidlna/minidlna-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..491e52cf3166
--- /dev/null
+++ b/net-misc/minidlna/minidlna-1.1.0-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.1.0-r1.ebuild,v 1.1 2013/05/11 22:19:45 xmw Exp $
+
+EAPI=4
+
+inherit eutils systemd toolchain-funcs user
+
+DESCRIPTION="DLNA/UPnP-AV compliant media server"
+HOMEPAGE="http://minidlna.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS=""
+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() {
+	local my_is_new="yes"
+	[ -d "${EPREFIX}"/var/lib/${PN} ] && my_is_new="no"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+	if [ -d "${EPREFIX}"/var/lib/${PN} ] && [ "${my_is_new}" == "yes" ] ; then
+		# created by above enewuser command w/ wrong group and permissions
+		chown ${PN}:${PN} "${EPREFIX}"/var/lib/${PN} || die
+		chmod 0750 "${EPREFIX}"/var/lib/${PN} || die
+		# if user already exists, but /var/lib/minidlna is missing
+		# rely on ${D}/var/lib/minidlna created in src_install
+	fi
+}
+
+src_prepare() {
+	sed -e "/log_dir/s:/var/log:/var/log/${PN}:" \
+		-i ${PN}.conf || die
+
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--disable-silent-rules \
+		--with-db-path=/var/cache/${PN} \
+		--with-log-path=/var/log/${PN} \
+		--enable-tivo \
+		--enable-netgear \
+		--enable-readynas
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins ${PN}.conf
+
+	newconfd "${FILESDIR}"/${PN}-1.0.25.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-1.1.0.initd ${PN}
+	systemd_newunit "${FILESDIR}"/${PN}-1.1.0.service ${PN}.service
+
+	dodir /var/{lib,log}/${PN}
+	fowners ${PN}:${PN} /var/{lib,log}/${PN}
+	fperms 0750 /var/{lib,log}/${PN}
+
+	dodoc AUTHORS NEWS README TODO
+	doman ${PN}d.8 ${PN}.conf.5
+}
+
+pkg_postinst() {
+	elog "minidlna now runs as minidlna:minidlna (bug 426726),"
+	elog "logfile is moved to /var/log/minidlna/minidlna.log,"
+	elog "cache is moved to /var/lib/minidlna."
+	elog "Please edit /etc/conf.d/${PN} and file ownerships to suit your needs."
+}