Fixed the bitlbeed init script to run bitlbeed as user nobody (similarly to how it's run in the xinetd.d config). Resolves bug #30552.

5 files changed, 27 insertions, 10 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 6fdb4d86353f..2a8c07726674 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.16 2003/10/05 21:08:22 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.17 2003/10/16 09:05:22 weeve Exp $
+
+  16 Oct 2003; Jason Wever <weeve@gentoo.org> bitlbee-0.80-r2.ebuild,
+  files/bitlbeed.confd, files/bitlbeed.init:
+  Fixed the bitlbeed init script to run bitlbeed as user nobody (similarly to
+  how it's run in the xinetd.d config). Resolves bug #30552.
 
 *bitlbee-0.80-r2 (05 Oct 2003)
 
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 7fd00d0b37fb..8e74a274c86e 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,17 +1,16 @@
-MD5 2bb8d733c2900cc2ec41b4fca7604339 ChangeLog 2419
+MD5 a55229cfcb7cab2c9f7c2caa25629440 ChangeLog 2674
 MD5 b870fd31387b2c349eca82cb901b870e bitlbee-0.72.ebuild 1089
 MD5 494046f3b577301770f06c6e4bc06c5d bitlbee-0.73-r1.ebuild 1329
 MD5 2436faed029fde54669d7c71fda8dd4d bitlbee-0.73.ebuild 1089
 MD5 c5dcd7f7f902927880a7e10011bc8f66 bitlbee-0.74a.ebuild 1327
 MD5 c4f5a4975c9788e23b9f2590fcebbdaa bitlbee-0.80-r1.ebuild 1450
+MD5 ca1b2315b00eff6e4c1ad5feaa9bb2b8 bitlbee-0.80-r2.ebuild 1569
 MD5 0395435f5921975e399b54e471ea6541 bitlbee-0.80.ebuild 1305
 MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
-MD5 85996dfc72437a4c0c148be20eb18cb4 bitlbee-0.80-r2.ebuild 1489
-MD5 6668146d14da88ef8240b49671db3e9b files/yahoo.diff 25463
 MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
 MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
-MD5 9598dbb2b6ea0a29fc0c88a6e86fe5e3 files/bitlbeed.confd 488
-MD5 7e159f04341474c626136f52d86c8d2d files/bitlbeed.init 579
+MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
+MD5 f30a0b316c8362446df532544d73a93c files/bitlbeed.init 733
 MD5 4b739ca4a0982ccfda988bb664db9b55 files/digest-bitlbee-0.72 201
 MD5 208f8bc3e515b98d70467d031d9d9fc0 files/digest-bitlbee-0.73 64
 MD5 208f8bc3e515b98d70467d031d9d9fc0 files/digest-bitlbee-0.73-r1 64
@@ -19,3 +18,4 @@ MD5 8de9879ddbed4e2fbba0fd6b3e2e898a files/digest-bitlbee-0.74a 65
 MD5 e20daee3dcba62b15424f0f72838bf64 files/digest-bitlbee-0.80 64
 MD5 e20daee3dcba62b15424f0f72838bf64 files/digest-bitlbee-0.80-r1 64
 MD5 e20daee3dcba62b15424f0f72838bf64 files/digest-bitlbee-0.80-r2 64
+MD5 6668146d14da88ef8240b49671db3e9b files/yahoo.diff 25463
diff --git a/net-im/bitlbee/bitlbee-0.80-r2.ebuild b/net-im/bitlbee/bitlbee-0.80-r2.ebuild
index a60af3835350..e1aced288cfc 100644
--- a/net-im/bitlbee/bitlbee-0.80-r2.ebuild
+++ b/net-im/bitlbee/bitlbee-0.80-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.80-r2.ebuild,v 1.1 2003/10/05 21:08:22 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.80-r2.ebuild,v 1.2 2003/10/16 09:05:22 weeve Exp $
 
 inherit eutils
 
@@ -40,6 +40,7 @@ src_compile() {
 src_install() {
 	mkdir -p ${D}/var/lib/bitlbee
 	make install DESTDIR=${D} || die "install failed"
+	keepdir /var/lib/bitlbee
 
 	dodoc COPYING
 	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,TODO}
@@ -56,6 +57,10 @@ src_install() {
 
 	insinto /etc/conf.d
 	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+
+	dodir /var/run/bitlbeed
+	keepdir /var/run/bitlbeed
+
 }
 
 pkg_postinst() {
diff --git a/net-im/bitlbee/files/bitlbeed.confd b/net-im/bitlbee/files/bitlbeed.confd
index cb00d3b6ac89..0d75efd0c017 100644
--- a/net-im/bitlbee/files/bitlbeed.confd
+++ b/net-im/bitlbee/files/bitlbeed.confd
@@ -1,3 +1,6 @@
+# location of bitlbeed executable
+BITLBEED_EXEC=/usr/bin/bitlbeed
+#
 # output from bitlbeed -h
 #
 # Usage: bitlbeed [-i <interface>] [-p <port>] [-n <num>] <command> <args...>
diff --git a/net-im/bitlbee/files/bitlbeed.init b/net-im/bitlbee/files/bitlbeed.init
index 0471d0bdf99f..5cd6546d9099 100644
--- a/net-im/bitlbee/files/bitlbeed.init
+++ b/net-im/bitlbee/files/bitlbeed.init
@@ -2,7 +2,7 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or
 # later
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbeed.init,v 1.1 2003/09/10 00:49:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbeed.init,v 1.2 2003/10/16 09:05:22 weeve Exp $
 
 
 depend() {
@@ -11,13 +11,17 @@ depend() {
 
 start () {
         ebegin "Starting bitlbeed"
-        /usr/bin/bitlbeed ${BITLBEED_OPTIONS} /usr/sbin/bitlbee
+        start-stop-daemon --start --startas ${BITLBEED_EXEC} \
+		-c nobody:nobody  --exec ${BITLBEED_EXEC} -- \
+		${BITLBEED_OPTIONS} /usr/sbin/bitlbee
         eend $? "Failed to start bitlbeed"
 }
 
 stop() {
         ebegin "Stopping bitlbeed"
-        killall -9 bitlbeed &>/dev/null
+        #killall -9 bitlbeed &>/dev/null
+	start-stop-daemon --stop --signal 9 \
+		--exec ${BITLBEED_EXEC}
         eend $? "Failed to stop bitlbeed"
 }