diff options
| -rw-r--r-- | net-im/bitlbee/ChangeLog | 10 | ||||
| -rw-r--r-- | net-im/bitlbee/Manifest | 3 | ||||
| -rw-r--r-- | net-im/bitlbee/bitlbee-0.84.ebuild | 4 | ||||
| -rw-r--r-- | net-im/bitlbee/bitlbee-0.91-r1.ebuild | 4 | ||||
| -rw-r--r-- | net-im/bitlbee/bitlbee-0.91.ebuild | 4 | ||||
| -rw-r--r-- | net-im/bitlbee/bitlbee-0.92.ebuild | 115 | ||||
| -rw-r--r-- | net-im/bitlbee/files/bitlbee-gentoohack.patch | 32 | ||||
| -rw-r--r-- | net-im/bitlbee/files/digest-bitlbee-0.92 | 1 |
8 files changed, 165 insertions, 8 deletions
diff --git a/net-im/bitlbee/ChangeLog b/net-im/bitlbee/ChangeLog index ec8324820849..4cfd401c511b 100644 --- a/net-im/bitlbee/ChangeLog +++ b/net-im/bitlbee/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-im/bitlbee -# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.48 2004/11/24 15:20:40 weeve Exp $ +# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/ChangeLog,v 1.49 2005/02/27 16:13:11 weeve Exp $ + +*bitlbee-0.92 (27 Feb 2005) + + 27 Feb 2005; Jason Wever <weeve@gentoo.org> + +files/bitlbee-gentoohack.patch, +bitlbee-0.92.ebuild: + Version bump, resolves bug #83401. 24 Nov 2004; Jason Wever <weeve@gentoo.org> bitlbee-0.91-r1.ebuild: Really add the fix in 0.91-r1 :) Thanks to Enrique D. Bosch diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest index c5b76a72efd3..22bfca2c060e 100644 --- a/net-im/bitlbee/Manifest +++ b/net-im/bitlbee/Manifest @@ -1,5 +1,6 @@ MD5 d109ecd49f7672c78bc4c44a7a67e247 ChangeLog 7863 MD5 cbecac8f83e6ee0dd250fc03abc9c132 bitlbee-0.91-r1.ebuild 3210 +MD5 9509ac71f53b7fba0af17e805d39791a bitlbee-0.92.ebuild 3125 MD5 5a91581451ec546905b2ea5ac3ae5d73 bitlbee-0.91.ebuild 3188 MD5 1ea53830f16bd092d99a424877021ed6 bitlbee-0.84.ebuild 2389 MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465 @@ -10,5 +11,7 @@ MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519 MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556 MD5 ca5844d2edbb81e8ab4c8042e122aeb6 files/bitlbeed.init 724 MD5 70d0e8bb8d7639b86e3ee8c0bda16334 files/digest-bitlbee-0.91-r1 64 +MD5 6b480c57366738ceb275d86aece12bc7 files/digest-bitlbee-0.92 64 MD5 70d0e8bb8d7639b86e3ee8c0bda16334 files/digest-bitlbee-0.91 64 MD5 b5361a82a904f5e2bf9c5a6d0717f374 files/digest-bitlbee-0.84 64 +MD5 bb2f200c9009854a3231720cc1e04ed1 files/bitlbee-gentoohack.patch 1015 diff --git a/net-im/bitlbee/bitlbee-0.84.ebuild b/net-im/bitlbee/bitlbee-0.84.ebuild index 1afbb1b8c900..d1e6a4dfe2c6 100644 --- a/net-im/bitlbee/bitlbee-0.84.ebuild +++ b/net-im/bitlbee/bitlbee-0.84.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.84.ebuild,v 1.7 2004/07/01 22:17:14 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.84.ebuild,v 1.8 2005/02/27 16:13:11 weeve Exp $ inherit eutils gcc diff --git a/net-im/bitlbee/bitlbee-0.91-r1.ebuild b/net-im/bitlbee/bitlbee-0.91-r1.ebuild index 2e36a2fcce23..aa1e5b016519 100644 --- a/net-im/bitlbee/bitlbee-0.91-r1.ebuild +++ b/net-im/bitlbee/bitlbee-0.91-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.91-r1.ebuild,v 1.2 2004/11/24 15:20:40 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.91-r1.ebuild,v 1.3 2005/02/27 16:13:11 weeve Exp $ inherit eutils gcc diff --git a/net-im/bitlbee/bitlbee-0.91.ebuild b/net-im/bitlbee/bitlbee-0.91.ebuild index e9638f816fab..25407731505f 100644 --- a/net-im/bitlbee/bitlbee-0.91.ebuild +++ b/net-im/bitlbee/bitlbee-0.91.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.91.ebuild,v 1.5 2004/10/31 23:34:03 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.91.ebuild,v 1.6 2005/02/27 16:13:11 weeve Exp $ inherit eutils gcc diff --git a/net-im/bitlbee/bitlbee-0.92.ebuild b/net-im/bitlbee/bitlbee-0.92.ebuild new file mode 100644 index 000000000000..cb7bfe6d7256 --- /dev/null +++ b/net-im/bitlbee/bitlbee-0.92.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.92.ebuild,v 1.1 2005/02/27 16:13:11 weeve Exp $ + +inherit eutils gcc + +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 flood ssl" + +DEPEND="virtual/libc + >=dev-libs/glib-2.0 + msn? ( net-libs/gnutls ) + jabber? ( ssl? ( net-libs/gnutls ) )" + +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: as of bitlbee-0.82-r1, all protocols are useflags." + einfo " Make sure you've enabled the flags you want." + + 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}-0.80-xinetd.patch + cd ${S} && epatch ${FILESDIR}/${PN}-gentoohack.patch +} + +src_compile() { + # setup useflags + local myconf + use debug && myconf="${myconf} --debug=1" + use msn || myconf="${myconf} --msn=0 " + use jabber || myconf="${myconf} --jabber=0" + use oscar || myconf="${myconf} --oscar=0" + use yahoo || myconf="${myconf} --yahoo=0" + use flood && myconf="${myconf} --flood=1" + + if ( ( use jabber && use ssl ) || use msn ); then + myconf="${myconf} --ssl=gnutls" + else + myconf="${myconf} --ssl=bogus" + fi + + econf --datadir=/usr/share/bitlbee --etcdir=/etc/bitlbee ${myconf} \ + || die "econf failed" + + emake || die "make failed" + + # make bitlbeed forking server + cd utils + $(gcc-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,TODO,user-guide.txt} + dohtml -A sgml doc/*.sgml + dohtml -A xml doc/*.xml + dohtml -A xsl doc/*.xsl + dohtml doc/*.html + + doman doc/bitlbee.8 doc/bitlbee.conf.5 + + dobin utils/bitlbeed + + insinto /etc/xinetd.d + newins doc/bitlbee.xinetd bitlbee + + 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 is no longer provided by bitlbee." +} diff --git a/net-im/bitlbee/files/bitlbee-gentoohack.patch b/net-im/bitlbee/files/bitlbee-gentoohack.patch new file mode 100644 index 000000000000..b39a64922518 --- /dev/null +++ b/net-im/bitlbee/files/bitlbee-gentoohack.patch @@ -0,0 +1,32 @@ +diff -Naur bitlbee-0.91/bitlbee.c bitlbee-0.91-gentoohack/bitlbee.c +--- bitlbee-0.91/bitlbee.c 2004-11-21 15:52:28.000000000 +0100 ++++ bitlbee-0.91-gentoohack/bitlbee.c 2004-12-21 17:15:15.000000000 +0100 +@@ -285,6 +285,7 @@ + account_t *a; + FILE *fp; + char *hash; ++ int retval; + + /*\ + * [SH] Nothing should be saved if no password is set, because the +@@ -344,11 +345,16 @@ + g_snprintf( path, 511, "%s%s%s", global.conf->configdir, irc->nick, ".accounts~" ); + fp = fopen( path, "w" ); + if( !fp ) return( 0 ); +- if( fprintf( fp, "%s", hash ) != strlen( hash ) ) ++ retval = fprintf( fp, "%s", hash ); ++ if( retval != strlen( hash ) ) + { +- irc_usermsg( irc, "fprintf() wrote too little. Disk full?" ); +- fclose( fp ); +- return( 0 ); ++ if( retval == 1) { ++ irc_usermsg( irc, "Enabling writing hack for gentoo. This is dangerous and may corrupt your files."); ++ } else { ++ irc_usermsg( irc, "fprintf() wrote too little. Disk full?" ); ++ fclose( fp ); ++ return( 0 ); ++ } + } + g_free( hash ); + diff --git a/net-im/bitlbee/files/digest-bitlbee-0.92 b/net-im/bitlbee/files/digest-bitlbee-0.92 new file mode 100644 index 000000000000..c8861218390d --- /dev/null +++ b/net-im/bitlbee/files/digest-bitlbee-0.92 @@ -0,0 +1 @@ +MD5 0ffec374b76f376f75b2cab95636a0de bitlbee-0.92.tar.gz 464110 |