Version bump tp 1.0.3. Updated SSL handling to better allow support for openssl, gnutls and nss. Also fixed handling of SSL so that building MSN without SSL support will fail at the request of upstream and users. Addresses bugs #138279, #134202 and #132409.

(Portage version: 2.1.1_pre3)

4 files changed, 178 insertions, 1 deletions

diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog
index 9e20a8cbac80..12596d6afd10 100644
--- a/net-im/bitlbee/ChangeLog
+++ b/net-im/bitlbee/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/bitlbee
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.67 2006/07/13 16:56:36 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.68 2006/07/16 18:18:46 weeve Exp $
+
+*bitlbee-1.0.3 (16 Jul 2006)
+
+  16 Jul 2006; Jason Wever <weeve@gentoo.org>
+  +files/bitlbee-1.0.3-xinetd.patch, +bitlbee-1.0.3.ebuild:
+  Version bump tp 1.0.3. Updated SSL handling to better allow support for
+  openssl, gnutls and nss. Also fixed handling of SSL so that building MSN
+  without SSL support will fail at the request of upstream and users.
+  Addresses bugs #138279, #134202 and #132409.
 
   13 Jul 2006; Aron Griffis <agriffis@gentoo.org> bitlbee-1.0.1.ebuild:
   Mark 1.0.1 stable on ia64
diff --git a/net-im/bitlbee/bitlbee-1.0.3.ebuild b/net-im/bitlbee/bitlbee-1.0.3.ebuild
new file mode 100644
index 000000000000..2b2167073586
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-1.0.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-1.0.3.ebuild,v 1.1 2006/07/16 18:18:46 weeve 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="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+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() {
+	einfo "Note: Support for all IM protocols are controlled by use flags."
+	einfo "      Make sure you've enabled the flags you want."
+	einfo ""
+
+	# 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
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	# Patch the default xinetd file to add/adjust values to Gentoo defaults
+	cd ${S}/doc && epatch ${FILESDIR}/${PN}-1.0.3-xinetd.patch
+	cd ${S} && epatch ${FILESDIR}/${PN}-gentoohack.patch
+}
+
+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 ${myconf} || die "econf 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() {
+	dodir /var/lib/bitlbee
+	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
+
+	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
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bitlbeed.init bitlbeed || die
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/bitlbeed.confd bitlbeed || die
+
+	dodir /var/run/bitlbeed
+	keepdir /var/run/bitlbeed
+
+	dodir /usr/share/bitlbee
+	cp ${S}/utils/* ${D}/usr/share/bitlbee
+	rm ${D}/usr/share/bitlbee/bitlbeed*
+}
+
+pkg_postinst() {
+	chown nobody:nobody ${ROOT}/var/lib/bitlbee
+	chmod 700 ${ROOT}/var/lib/bitlbee
+	einfo "The utils included in bitlbee (other than bitlbeed) are now"
+	einfo "located in /usr/share/bitlbee"
+	einfo
+	einfo "NOTE: The IRSSI script are no longer provided by BitlBee."
+}
diff --git a/net-im/bitlbee/files/bitlbee-1.0.3-xinetd.patch b/net-im/bitlbee/files/bitlbee-1.0.3-xinetd.patch
new file mode 100644
index 000000000000..7abffd48bccc
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee-1.0.3-xinetd.patch
@@ -0,0 +1,17 @@
+--- bitlbee.xinetd.orig	2006-07-16 11:38:25.534054090 -0600
++++ bitlbee.xinetd	2006-07-16 11:39:25.039033992 -0600
+@@ -11,7 +11,7 @@
+ 	
+ 	## You most likely want to change these two
+ 	user            = nobody
+-	server          = /usr/local/sbin/bitlbee
++	server          = /usr/sbin/bitlbee
+ 	
+ 	## You might want to limit access to localhost only:
+ 	# bind            = 127.0.0.1
+@@ -21,4 +21,5 @@
+ 	## /etc/services too.
+ 	type            = UNLISTED
+ 	port            = 6667
++	disable         = yes
+ }
diff --git a/net-im/bitlbee/files/digest-bitlbee-1.0.3 b/net-im/bitlbee/files/digest-bitlbee-1.0.3
new file mode 100644
index 000000000000..9d749a0e6608
--- /dev/null
+++ b/net-im/bitlbee/files/digest-bitlbee-1.0.3
@@ -0,0 +1,3 @@
+MD5 e46682d54cbd6265dd4436b3b6838d63 bitlbee-1.0.3.tar.gz 455344
+RMD160 d27c7a9104528402d4d3e2f78b40eda5f6490d72 bitlbee-1.0.3.tar.gz 455344
+SHA256 1d272c8712ee279ee8ac305562e7b8591e634fae69664a5a2d43301cb1d6277d bitlbee-1.0.3.tar.gz 455344