From 7571a5b9643634c5ac49e0f4359ae3c9ddaa7db4 Mon Sep 17 00:00:00 2001
From: Benjamin Schieder <blindcoder@scavenger.homeip.net>
Date: Mon, 13 Mar 2006 11:43:50 +0000
Subject: [PATCH] Benjamin Schieder: 	updated bitlbee (1.0.1) 	add
 bitlbee user/group 	add postinstall script for adding/removing bitlbee to
 /etc/inetd.conf

[2006030909481710253] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@7132 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 Documentation/Developers/REGISTER       |  5 ++++-
 package/mathieu/bitlbee/bitlbee.conf    | 15 ++++++++++++++-
 package/mathieu/bitlbee/bitlbee.desc    |  4 ++--
 package/mathieu/bitlbee/postinstall.sh  | 20 ++++++++++++++++++++
 package/mathieu/bitlbee/postsysfiles.in |  4 ++++
 5 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 package/mathieu/bitlbee/postinstall.sh
 create mode 100644 package/mathieu/bitlbee/postsysfiles.in

diff --git a/Documentation/Developers/REGISTER b/Documentation/Developers/REGISTER
index 597041bde..df366c9e4 100644
--- a/Documentation/Developers/REGISTER
+++ b/Documentation/Developers/REGISTER
@@ -45,6 +45,9 @@ Reserved User and Group IDs:
   - quagga users:	- quagga groups:
       quagga 27		    quagga 27
 
+  - bitlbee users:	- bitlbee groups:
+      bitlbee 28	    bitlbee 28
+
   - exim users:		- exim groups:
       exim   30		   exim     30
 
@@ -95,7 +98,7 @@ Reserved User and Group IDs:
   - httpd user:		- httpd group:
       http 80		    http 80
 
-  Free IDs:  28-37,45-52,55,57-65,67-69,72-77
+  Free IDs:  29-37,45-52,55,57-65,67-69,72-77
 
 
 Filedescriptor Numbers
diff --git a/package/mathieu/bitlbee/bitlbee.conf b/package/mathieu/bitlbee/bitlbee.conf
index 4c2c94243..0eb476498 100644
--- a/package/mathieu/bitlbee/bitlbee.conf
+++ b/package/mathieu/bitlbee/bitlbee.conf
@@ -23,10 +23,23 @@
 
 bb_pc(){
 	[ "${prefix#opt/}" == "$prefix" ] && sysconfdir="$sysconfdir/$pkg"
-	./configure --prefix=$root/$prefix --etcdir=$sysconfdir
+	if pkginstalled openssl ; then
+		ssl=openssl
+	elif pkginstalled gnutls ; then
+		ssl=gnutls
+	else
+		ssl=auto
+	fi
+	./configure --prefix=$root/$prefix --etcdir=$sysconfdir --ssl=${ssl}
+}
+
+bb_pi(){
+	mkdir -p ${root}/var/lib/bitlbee
+	chown 28.28 ${root}/var/lib/bitlbee
 }
 
 runconf=0
 preconf="bb_pc"
+postinstall="bb_pi"
 
 var_append makeinstopt ' ' 'install-etc'
diff --git a/package/mathieu/bitlbee/bitlbee.desc b/package/mathieu/bitlbee/bitlbee.desc
index 015eb7903..d0553ffb3 100644
--- a/package/mathieu/bitlbee/bitlbee.desc
+++ b/package/mathieu/bitlbee/bitlbee.desc
@@ -39,7 +39,7 @@
 
 [L] GPL
 [S] Stable
-[V] 0.92
+[V] 1.0.1
 [P] X -?---5---9 237.600
 
-[D] 2536146775 bitlbee-0.92.tar.gz http://get.bitlbee.org/src/
+[D] 3615981926 bitlbee-1.0.1.tar.gz http://get.bitlbee.org/src/
diff --git a/package/mathieu/bitlbee/postinstall.sh b/package/mathieu/bitlbee/postinstall.sh
new file mode 100644
index 000000000..8b1077112
--- /dev/null
+++ b/package/mathieu/bitlbee/postinstall.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if any_installed "bitlbee" ; then
+	echo "Adding bitlbee to /etc/inetd.conf"
+	grep -q bitlbee /etc/inetd.conf || cat >>/etc/inetd.conf<<EOF
+#6667 stream tcp nowait bitlbee.bitlbee /usr/sbin/tcpd /usr/sbin/bitlbee # added by ROCK
+EOF
+fi
+
+if any_removed "bitlbee" ; then
+	echo "Removing bitlbee from /etc/inetd.conf"
+	cp /etc/inetd.conf{,.bak.bitlbee.$(date +%Y%m%d%H%M%S)}
+	tmp="`mktemp`"
+	rm -f ${tmp}
+	touch ${tmp}
+	chmod 600 ${tmp}
+	grep -v "bitlbee.*# added by ROCK" /etc/inetd.conf >${tmp}
+	cat ${tmp} > /etc/inetd.conf
+	rm -f ${tmp}
+fi
diff --git a/package/mathieu/bitlbee/postsysfiles.in b/package/mathieu/bitlbee/postsysfiles.in
new file mode 100644
index 000000000..7cf6e00f3
--- /dev/null
+++ b/package/mathieu/bitlbee/postsysfiles.in
@@ -0,0 +1,4 @@
+
+safe_groupadd bitlbee 28
+safe_useradd bitlbee 28 28 "bitlbee" /var/lib/bitlbee /bin/false "*"
+