Added non-root changes (with little modifications) submitted by CJ Kucera in bug #97309.

(Portage version: 2.0.51.22-r2)

3 files changed, 25 insertions, 5 deletions

diff --git a/net-misc/siproxd/ChangeLog b/net-misc/siproxd/ChangeLog
index da540ffadba3..57815bfa530b 100644
--- a/net-misc/siproxd/ChangeLog
+++ b/net-misc/siproxd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/siproxd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/ChangeLog,v 1.1 2005/05/07 15:36:23 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/ChangeLog,v 1.2 2005/09/22 23:24:06 stkn Exp $
+
+  23 Sep 2005; Stefan Knoblich <stkn@gentoo.org> files/siproxd.rc6,
+  siproxd-0.5.11.ebuild:
+  Added non-root changes (with little modifications) submitted by CJ Kucera in
+  bug #97309.
 
 *siproxd-0.5.11 (07 May 2005)
 
diff --git a/net-misc/siproxd/files/siproxd.rc6 b/net-misc/siproxd/files/siproxd.rc6
index ddc3075e7a3e..2e1959996441 100755
--- a/net-misc/siproxd/files/siproxd.rc6
+++ b/net-misc/siproxd/files/siproxd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/files/siproxd.rc6,v 1.1 2005/05/07 15:36:23 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/files/siproxd.rc6,v 1.2 2005/09/22 23:24:06 stkn Exp $
 
 depend() {
 	need net
@@ -20,12 +20,12 @@ start() {
 
 	ebegin "Starting siproxd"
 	start-stop-daemon --start --exec /usr/sbin/siproxd -- \
-		-p /var/run/siproxd.pid -c /etc/siproxd.conf
+		-p /var/run/siproxd/siproxd.pid -c /etc/siproxd.conf
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping siproxd"
-	start-stop-daemon --stop --pidfile /var/run/siproxd.pid
+	start-stop-daemon --stop --pidfile /var/run/siproxd/siproxd.pid
 	eend $?
 }
diff --git a/net-misc/siproxd/siproxd-0.5.11.ebuild b/net-misc/siproxd/siproxd-0.5.11.ebuild
index dbf781135e03..3a8328fa3439 100644
--- a/net-misc/siproxd/siproxd-0.5.11.ebuild
+++ b/net-misc/siproxd/siproxd-0.5.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.5.11.ebuild,v 1.1 2005/05/07 15:36:23 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/siproxd/siproxd-0.5.11.ebuild,v 1.2 2005/09/22 23:24:06 stkn Exp $
 
 inherit eutils
 
@@ -26,6 +26,9 @@ src_unpack() {
 	# re-create configure (stolen from dhcpd :)
 	einfo "Re-creating configure..."
 	autoreconf -fi || die "autoreconf failed"
+
+	# Make the daemon run as user 'siproxd' by default
+	sed -i -e "s:nobody:siproxd:" doc/siproxd.conf.example
 }
 
 src_compile() {
@@ -47,4 +50,16 @@ src_install() {
 	newexe ${FILESDIR}/siproxd.rc6 siproxd
 
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO RELNOTES
+
+	# Set up siproxd directories
+	keepdir /var/lib/siproxd
+	keepdir /var/run/siproxd
+}
+
+pkg_postinst() {
+	enewgroup siproxd
+	enewuser siproxd -1 -1 /dev/null siproxd
+
+	fowners siproxd:siproxd /var/lib/siproxd
+	fowners siproxd:siproxd /var/run/siproxd
 }