Version bump and use bitlbee user instead of nobody

Package-Manager: portage-2.1.2.12

6 files changed, 230 insertions, 5 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 93677ac47820..95806d591ec7 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.81 2007/09/05 19:07:36 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.82 2007/09/05 21:35:23 cedk Exp $
+
+*bitlbee-1.0.4 (05 Sep 2007)
+
+  05 Sep 2007; Cédric Krier <cedk@gentoo.org> +files/bitlbeed.confd2,
+  +files/bitlbeed.initd, +bitlbee-1.0.4.ebuild:
+  Version bump and use bitlbee user instead of nobody
 
   05 Sep 2007; Cédric Krier <cedk@gentoo.org> metadata.xml:
   Add cedk
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 50d1ab49e55c..cc0eba29a32b 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -30,10 +30,18 @@ AUX bitlbeed.confd 556 RMD160 775492d2db54e176b204cf45a3b1884d0fde363d SHA1 210f
 MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
 RMD160 775492d2db54e176b204cf45a3b1884d0fde363d files/bitlbeed.confd 556
 SHA256 6a01b88182ac4e72499744e0c4909bb2529f2c908d1667dc8c104083c05998c0 files/bitlbeed.confd 556
+AUX bitlbeed.confd2 524 RMD160 13aeb8ebb6b2885a310ba8606d1994aced3c1cb6 SHA1 7ac73948da0ffeb705482cf1d05a6fa93c267f3d SHA256 8f9e258452d62eb15990b465e1f74251e7ceb4d6b2c93a35c42a026d75e96418
+MD5 21368d0a4407156a985f3b02b97aef0d files/bitlbeed.confd2 524
+RMD160 13aeb8ebb6b2885a310ba8606d1994aced3c1cb6 files/bitlbeed.confd2 524
+SHA256 8f9e258452d62eb15990b465e1f74251e7ceb4d6b2c93a35c42a026d75e96418 files/bitlbeed.confd2 524
 AUX bitlbeed.init 724 RMD160 255ac91b8a905b865fc37a5795264b97604ec69d SHA1 9b54dfebaf8d472e1630b222052729e85a1fd31f SHA256 9354a26e47ca354b28e6a135eb6567970bd351a262ddb29202eab8fc2e6faf59
 MD5 ca5844d2edbb81e8ab4c8042e122aeb6 files/bitlbeed.init 724
 RMD160 255ac91b8a905b865fc37a5795264b97604ec69d files/bitlbeed.init 724
 SHA256 9354a26e47ca354b28e6a135eb6567970bd351a262ddb29202eab8fc2e6faf59 files/bitlbeed.init 724
+AUX bitlbeed.initd 619 RMD160 198fad260fc60a44897becca7ff442e3152e185d SHA1 105ec657f49b4be1fec46d8246eba988ea41e341 SHA256 32757768687046e379bf2f57dafcc8ce313b936431af1dcf835bef681d266a84
+MD5 535f4a53c93144d45bbf4040d90fbb00 files/bitlbeed.initd 619
+RMD160 198fad260fc60a44897becca7ff442e3152e185d files/bitlbeed.initd 619
+SHA256 32757768687046e379bf2f57dafcc8ce313b936431af1dcf835bef681d266a84 files/bitlbeed.initd 619
 DIST all.patch 38874 RMD160 ba2b378d0451829001f135b5c4f135bb680d4d6e SHA1 cad55b0cf0d753c88941c9ac7c595f2ee2966546 SHA256 ad326091e786f4365252a7c370b0e12184d1b5b906c041901219d2c3cf2a67e7
 DIST bitlbee-0.92-msn6.akke.patch 86602 RMD160 3cd7044b193a11251fa28cacc6b9fb5a91f9ba8f SHA1 2a1d9d54857a8ea8426b87664605bea3022c39ee SHA256 96065fdb3fbf2438c193c4db59aa506fab85b51f7755c1ee86a58d7aa26cbca7
 DIST bitlbee-0.92.tar.gz 464110 RMD160 a0b9d6bb92915f6cb1674ccc3b5c78f7ce627a01 SHA1 08c6244c1c4d222180c6f28bd666e5c8dc056a66 SHA256 099dc9ec7533fb1cd10d609283533f728039a2e6fac80a97a6c2615514e22e48
@@ -43,6 +51,7 @@ DIST bitlbee-1.0.1.tar.gz 458676 RMD160 0db0f77dce1de4a3f4a597793a374db8f99c0c96
 DIST bitlbee-1.0.2-msn6-akke.diff 86762 RMD160 b7efb82ea3c4440333de3cf6247122588a0f7d16 SHA1 a5769810c30b360c1945c897b673e53feadd1f2a SHA256 49dcf3927cf497bae64d79c1a7edecf7b589adc9dbb6a0782dc755813025018c
 DIST bitlbee-1.0.2.tar.gz 448459 RMD160 8d33e5e2635474444bca90d4d35d3b63d556f65d SHA1 dd9658bacf921cfecd3bfa0da0dfb3fa06179c4f SHA256 f168d0ff692f27a6d860249c038ebf1c65b704414fa218868869c03d43cb69c7
 DIST bitlbee-1.0.3.tar.gz 455344 RMD160 d27c7a9104528402d4d3e2f78b40eda5f6490d72 SHA1 6e4065d8b576a3c11c2e6bb008ea1bdc7b182cd1 SHA256 1d272c8712ee279ee8ac305562e7b8591e634fae69664a5a2d43301cb1d6277d
+DIST bitlbee-1.0.4.tar.gz 455833 RMD160 f7e44595845aabf987a5112fdf6b9daed04448d0 SHA1 830e8a2b8930a6e5b1978a3cae9d8a16034ab7ff SHA256 6f23f37ea641d67e56c61b70d3ac7d404243929c393302ead4758d4ffe6d5b1c
 DIST bitlbee-1.0.tar.gz 453937 RMD160 0d06c4a3d4c39e65a88f8d8f2178bb4d78dac731 SHA1 0367a41a288979e8de8f8db89a260e54029a79e2 SHA256 90e845c46b953e62a3991b331ad7755131c6701f5fc265212a02392e35bff030
 DIST bitlbee-jabberserver.patch 1996 RMD160 3fececb5dd75046343d92624ac5f4061bd480ad2 SHA1 53a0ff9b10624f14c148ace71ed4d4fb608ee420 SHA256 4f96c522f12d0207048ba85a92b9c266127a2412ed23d198119299b4999ddf16
 EBUILD bitlbee-0.92-r1.ebuild 3409 RMD160 4fff1c82a51083e53d0024b4fbce9f7990e498cb SHA1 7a19b488cf113ebc1bcaf4a46e5bb5f2bcd9fd2f SHA256 d886bc35b8ee593f75854025cc343c4966356bbe2018d25a74884b97393a6a47
@@ -77,14 +86,18 @@ EBUILD bitlbee-1.0.3.ebuild 4561 RMD160 94c5a2607a2f3758d4993311c76c577e4f09e0a5
 MD5 ca0bb4e413bc3339042d69b5a24917cd bitlbee-1.0.3.ebuild 4561
 RMD160 94c5a2607a2f3758d4993311c76c577e4f09e0a5 bitlbee-1.0.3.ebuild 4561
 SHA256 8533105008fefd4927a807bac2823b05481982b5fd357f0f5b65998549d093e6 bitlbee-1.0.3.ebuild 4561
+EBUILD bitlbee-1.0.4.ebuild 4779 RMD160 4bf6482e4451e1ba6e8d7f1a7ea7e9eb43317e27 SHA1 2adbc402b004a7770c876f921c63a893ebf9cc6a SHA256 18528f2df19ac1997809ef031877d4a1be67e6f7939bd93c8923b568d32050c5
+MD5 fefadd449a22d7891642debd4844b516 bitlbee-1.0.4.ebuild 4779
+RMD160 4bf6482e4451e1ba6e8d7f1a7ea7e9eb43317e27 bitlbee-1.0.4.ebuild 4779
+SHA256 18528f2df19ac1997809ef031877d4a1be67e6f7939bd93c8923b568d32050c5 bitlbee-1.0.4.ebuild 4779
 EBUILD bitlbee-1.0.ebuild 3737 RMD160 39635356be01a9b10acfbfafb1e156e269327b31 SHA1 d66721148f215329d2b8f4390bd68463158a7f23 SHA256 13c578fa9ecba04fc01aff0c3cf95f14275fdf2c3a7a6efcca4594f3b813ad64
 MD5 dc4c52e0a4b3cfa252bbe1916a131acc bitlbee-1.0.ebuild 3737
 RMD160 39635356be01a9b10acfbfafb1e156e269327b31 bitlbee-1.0.ebuild 3737
 SHA256 13c578fa9ecba04fc01aff0c3cf95f14275fdf2c3a7a6efcca4594f3b813ad64 bitlbee-1.0.ebuild 3737
-MISC ChangeLog 13259 RMD160 58d9f678dae578a69334a584efb99b6e1ab5cb9f SHA1 214dee7f23593ef7f811e9d6eb6c55c2d60cd5ad SHA256 3a66b88b28f566c46aaf7183e9f5e76bbd0210d2d6b8983d7813d7a8b91d1f14
-MD5 c20dfa331bb1bc3d16da9c63f97c9932 ChangeLog 13259
-RMD160 58d9f678dae578a69334a584efb99b6e1ab5cb9f ChangeLog 13259
-SHA256 3a66b88b28f566c46aaf7183e9f5e76bbd0210d2d6b8983d7813d7a8b91d1f14 ChangeLog 13259
+MISC ChangeLog 13463 RMD160 bf3be80d2dbd5e24fd9337a44c1531806f4dd628 SHA1 51046015377b597e1dbefc2fe873b69c9742a13c SHA256 9a19157039e6ade89237e95ac7b7f69ee0fdcedf8314817b799c73115f80e710
+MD5 b3e1c7439a87ca18a4d3c00cb73e29ca ChangeLog 13463
+RMD160 bf3be80d2dbd5e24fd9337a44c1531806f4dd628 ChangeLog 13463
+SHA256 9a19157039e6ade89237e95ac7b7f69ee0fdcedf8314817b799c73115f80e710 ChangeLog 13463
 MISC metadata.xml 441 RMD160 f440e9e63bc4c6abdcf4b7e23fcfddcd678f961e SHA1 6cca8fafd875ff937fc225a1b0fd1876802ffb42 SHA256 a6dcfed15814498c58a9625f9bb9f742595a253181656d8b7fc69234d3170840
 MD5 9a965cf0ec63031ac941c8eae0121f2b metadata.xml 441
 RMD160 f440e9e63bc4c6abdcf4b7e23fcfddcd678f961e metadata.xml 441
@@ -116,3 +129,6 @@ SHA256 27c909adf51d48e3fb5fd1710dee8a95ddf118560f0498532c84fa6c4c99c921 files/di
 MD5 104dcd38966bc52fc797d4716a034ad9 files/digest-bitlbee-1.0.3 241
 RMD160 0b7024747c3a0fef453778702a8ac36838bdfa7a files/digest-bitlbee-1.0.3 241
 SHA256 c607bdd3fca7ce474b60dcb5baf3eb9dc35fe2ef88a8a20515999a84cfe26d35 files/digest-bitlbee-1.0.3 241
+MD5 abf07d76d0c0d0bb8bb278b493010d12 files/digest-bitlbee-1.0.4 241
+RMD160 7767ed2b5f4a69e9b767f85c6559ccb252e21824 files/digest-bitlbee-1.0.4 241
+SHA256 34bf3eddc86ba6157fecc0cd490e4b62c569dbf400299f0ccfe6863701c874f6 files/digest-bitlbee-1.0.4 241
diff --git a/net-im/bitlbee/bitlbee-1.0.4.ebuild b/net-im/bitlbee/bitlbee-1.0.4.ebuild
new file mode 100644
index 000000000000..c348f52d40f6
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-1.0.4.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.0.4.ebuild,v 1.1 2007/09/05 21:35:23 cedk Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="http://www.bitlbee.org/"
+SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="debug jabber msn oscar yahoo gnutls ssl nss xinetd ipv6"
+
+DEPEND=">=dev-libs/glib-2.0
+	msn? ( gnutls? ( net-libs/gnutls )
+		ssl? ( dev-libs/openssl )
+		nss? ( dev-libs/nss ) )
+	jabber? ( gnutls? ( net-libs/gnutls )
+			ssl? ( dev-libs/openssl )
+			nss? ( dev-libs/nss ) )"
+
+no_flags_die() {
+	eerror ""
+	eerror "Please choose a protocol or protocols to use with"
+	eerror "bitlbee by enabling the useflag for the protocol"
+	eerror "desired."
+	eerror ""
+	eerror " Valid useflags are;"
+	eerror " jabber, msn, oscar and yahoo"
+	die "No IM protocols selected!"
+}
+
+pkg_setup() {
+	elog "Note: Support for all IM protocols are controlled by use flags."
+	elog "      Make sure you've enabled the flags you want."
+	elog ""
+
+	# Warn but not die if jabber is enabled but SSL is not
+	if ( use jabber && ( use !ssl && use !gnutls && use !nss ) ); then
+		ewarn ""
+		ewarn "You have enabled support for Jabber but do not have SSL"
+		ewarn "support enabled.  This *will* prevent bitlbee from being"
+		ewarn "able to connect to SSL enabled Jabber servers.  If you need to"
+		ewarn "connect to Jabber over SSL, enable one of the following use"
+		ewarn "flags: gnutls, nss ssl"
+		ewarn ""
+	fi
+
+	# At the request of upstream, die if MSN Messenger support is enabled
+	# but no SSL support has been enabled
+	if  ( use msn && ( use !ssl && use !gnutls && use !nss ) ); then
+		eerror ""
+		eerror "In order to enable support for the MSN Messenger protocol,"
+		eerror "SSL support needs to be enabled.  Please enable the ssl,"
+		eerror "gnutls or nss use flags to provide SSL support".
+		die "MSN support enabled without any SSL support enabled."
+	fi
+
+	use jabber || use msn || use oscar || use yahoo || no_flags_die
+
+	enewgroup bitlbee
+	enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	sed -i \
+		-e "s@/usr/local/sbin/bitlbee@/usr/sbin/bitlbee@" \
+		-e "s/nobody/bitlbee/" \
+		-e "s/}/	disable         = yes\n}/" \
+		doc/bitlbee.xinetd || die "sed failed"
+}
+
+src_compile() {
+	# setup protocol, ipv6 and debug
+	local myconf
+	use debug && myconf="${myconf} --debug=1"
+	use ipv6 || myconf="${myconf} --ipv6=0"
+	use msn || myconf="${myconf} --msn=0 "
+	use jabber || myconf="${myconf} --jabber=0"
+	use oscar || myconf="${myconf} --oscar=0"
+	use yahoo || myconf="${myconf} --yahoo=0"
+
+	# setup ssl use flags
+	use ssl && use gnutls && myconf="${myconf} --ssl=gnutls"
+	use ssl && use nss && myconf="${myconf} --ssl=nss"
+	use ssl && use !gnutls && use !nss && \
+		myconf="${myconf} --ssl=openssl"
+
+	if ( ( use jabber && ( use gnutls || use ssl || use nss ) ) \
+		|| use msn ) &&  use !gnutls && use !ssl && use !nss; then
+		myconf="${myconf} --ssl=bogus"
+	fi
+
+	# NOTE: bitlbee's configure script is not an autotool creation,
+	# so that is why we don't use econf.
+
+	./configure --prefix=/usr --datadir=/usr/share/bitlbee \
+		--etcdir=/etc/bitlbee --strip=0 ${myconf} || die "econf failed"
+
+	sed -i \
+		-e "s/CFLAGS=.*$/CFLAGS=${CFLAGS}/" \
+		Makefile.settings || die "sed failed"
+
+	emake || die "make failed"
+
+	# make bitlbeed forking server
+	cd utils
+	$(tc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed \
+		|| die "bitlbeed failed to compile"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "install failed"
+	make install-etc DESTDIR=${D} || die "install failed"
+	make install-doc DESTDIR=${D} || die "install failed"
+	keepdir /var/lib/bitlbee
+	fperms 700 /var/lib/bitlbee
+	fowners bitlbee:bitlbee /var/lib/bitlbee
+
+	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+	dodoc doc/user-guide/user-guide.txt
+	dohtml -A xml doc/user-guide/*.xml
+	dohtml -A xsl doc/user-guide/*.xsl
+	dohtml doc/user-guide/*.html
+
+	doman doc/bitlbee.8 doc/bitlbee.conf.5
+
+	dobin utils/bitlbeed
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins doc/bitlbee.xinetd bitlbee
+	fi
+
+	newinitd "${FILESDIR}"/bitlbeed.initd bitlbeed || die
+	newconfd "${FILESDIR}"/bitlbeed.confd2 bitlbeed || die
+
+	keepdir /var/run/bitlbeed
+
+	dodir /usr/share/bitlbee
+	insinto /usr/share/bitlbee
+	cd utils
+	doins centericq2bitlbee.sh convert_gnomeicu.txt create_nicksfile.pl
+}
+
+pkg_postinst() {
+	chown -R bitlbee:bitlbee ${ROOT}/var/lib/bitlbee
+
+	elog "The utils included in bitlbee (other than bitlbeed) are now"
+	elog "located in /usr/share/bitlbee"
+	elog
+	elog "NOTE: The IRSSI script is no longer provided by BitlBee."
+}
diff --git a/net-im/bitlbee/files/bitlbeed.confd2 b/net-im/bitlbee/files/bitlbeed.confd2
new file mode 100644
index 000000000000..1e90ae007382
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbeed.confd2
@@ -0,0 +1,15 @@
+# location of bitlbeed executable
+#
+# output from bitlbeed -h
+#
+# Usage: bitlbeed [-i <interface>] [-p <port>] [-n <num>] <command> <args...>
+# A simple inetd-like daemon to have a program listening on a TCP socket without
+# needing root access to the machine
+#
+#   -i  Specify the interface (by IP address) to listen on.
+#       (Default: 0.0.0.0 (any interface))
+#   -p  Port number to listen on. (Default: 6667)
+#   -n  Maximum number of connections. (Default: 0 (unlimited))
+#   -h  This information
+#
+#BITLBEED_OPTS=""
diff --git a/net-im/bitlbee/files/bitlbeed.initd b/net-im/bitlbee/files/bitlbeed.initd
new file mode 100644
index 000000000000..7e0b143d395a
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbeed.initd
@@ -0,0 +1,27 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or
+# later
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/files/bitlbeed.initd,v 1.1 2007/09/05 21:35:23 cedk Exp $
+
+BITLBEED_EXEC=/usr/bin/bitlbeed
+
+depend() {
+	need logger net
+}
+
+start () {
+	ebegin "Starting bitlbeed"
+	start-stop-daemon --start --startas ${BITLBEED_EXEC} \
+		-c bitlbee:bitlbee  --exec ${BITLBEED_EXEC} -- \
+		${BITLBEED_OPTS} /usr/sbin/bitlbee
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping bitlbeed"
+	start-stop-daemon --stop --signal 9 \
+		--exec ${BITLBEED_EXEC}
+	eend $?
+}
+
diff --git a/net-im/bitlbee/files/digest-bitlbee-1.0.4 b/net-im/bitlbee/files/digest-bitlbee-1.0.4
new file mode 100644
index 000000000000..db7c51adc73b
--- /dev/null
+++ b/net-im/bitlbee/files/digest-bitlbee-1.0.4
@@ -0,0 +1,3 @@
+MD5 b92e301930e2322a86b73b1f6c857674 bitlbee-1.0.4.tar.gz 455833
+RMD160 f7e44595845aabf987a5112fdf6b9daed04448d0 bitlbee-1.0.4.tar.gz 455833
+SHA256 6f23f37ea641d67e56c61b70d3ac7d404243929c393302ead4758d4ffe6d5b1c bitlbee-1.0.4.tar.gz 455833