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

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 125 insertions, 2 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/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."
+}