Version bump: removed -fstack-protector filtering and updated the patch to solve the variable increment overflow problem.

6 files changed, 137 insertions, 26 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index a9018c1d7954..5b9ed8d798e5 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.127 2004/01/27 22:01:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.128 2004/01/28 19:59:42 plasmaroo Exp $
+
+  28 Jan 2004; <plasmaroo@gentoo.org> gaim-0.75-r7.ebuild,
+  gaim-0.75-r8.ebuild, files/gaim-0.76cvs-yahoo-login-fix.diff:
+  Updated the Yahoo <TM> security patch, removing the variable increment 
+  bug and also removed -fstack-protector filtering.
 
   27 Jan 2004; Aron Griffis <agriffis@gentoo.org> gaim-0.75-r7.ebuild:
-  add ~alpha and ~ia64
+  Added ~alpha and ~ia64.
 
   27 Jan 2004; <plasmaroo@gentoo.org> gaim-0.75-r7.ebuild:
   Stabilized on 'x86' and 'ppc', (->GLSA 200401-04).
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 866067f65f09..57627a4bf1ae 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,29 +1,31 @@
-MD5 cd174f3c205a1e1fba3740d980eb08f7 ChangeLog 21475
-MD5 a86ebd7a5efbcb055904551d3b6d4262 gaim-0.72.ebuild 2502
-MD5 6dd218f20477b66873a258f2eca07afc gaim-0.72-r1.ebuild 2907
-MD5 44dae26df92312a61f4c67abcf8ec157 gaim-0.74-r2.ebuild 3875
+MD5 a94c44aa59cbf9af15751f41529bede6 ChangeLog 21729
+MD5 698eb728b644c7a3cccc26c8f5ba4257 gaim-0.75-r5.ebuild 3317
 MD5 80abd46018d862034a68e35f529b24a7 gaim-0.72-r2.ebuild 3348
+MD5 44dae26df92312a61f4c67abcf8ec157 gaim-0.74-r2.ebuild 3875
+MD5 3e56c8cd7adf0fe1febc2350a35504f3 gaim-0.75-r7.ebuild 3365
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 698eb728b644c7a3cccc26c8f5ba4257 gaim-0.75-r5.ebuild 3317
-MD5 cd00ece1fa15bea82f97bae010288aa0 gaim-0.75-r6.ebuild 3371
+MD5 6dd218f20477b66873a258f2eca07afc gaim-0.72-r1.ebuild 2907
 MD5 3f7bea9735a86a7e6c6a4e13b4cd4eec gaim-0.67.ebuild 2200
-MD5 480bf448f1f5b91364dc0e0f9b00dec1 gaim-0.75-r7.ebuild 3433
-MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
-MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r1 135
+MD5 b00dee06152c23d1ce354dd1b52fd2b9 gaim-0.75-r8.ebuild 3365
+MD5 a86ebd7a5efbcb055904551d3b6d4262 gaim-0.72.ebuild 2502
+MD5 cd00ece1fa15bea82f97bae010288aa0 gaim-0.75-r6.ebuild 3371
+MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
+MD5 e16439188287325963107a14ccddf668 files/gaim-0.75-yahoo-security.diff 3863
+MD5 fd4cd0957e11c11fc6e0c72e10714e07 files/gaim-0.74-log_free.patch 1492
+MD5 e58ee6f06747da85a60cb9c13b91f805 files/gaim-0.76cvs-yahoo-login-fix.diff 4618
 MD5 24bfb2bbc9bef27fcc0f46639504b1c5 files/digest-gaim-0.74-r2 135
-MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r2 135
 MD5 1ade161b6a07868398812aa91ac7115d files/gaim_cjk_gtkconv.patch 1126
-MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
-MD5 4dbb9d0f8bf30e40f8b73215e14442ae files/gaim-0.74-scs-msg-yahoo.patch 776
+MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r7 63
 MD5 8f10c80828d074e32b033b80ca6c9c88 files/gaim-encryption-2.18-moz1.6.patch 3498
+MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
+MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
+MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r1 135
+MD5 4dbb9d0f8bf30e40f8b73215e14442ae files/gaim-0.74-scs-msg-yahoo.patch 776
 MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r5 63
-MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
-MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r6 63
 MD5 3eb868476154d28a1123ee91e41fef95 files/gaim-0.72-msn-fixes.patch 1671
-MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r7 63
-MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
-MD5 e16439188287325963107a14ccddf668 files/gaim-0.75-yahoo-security.diff 3863
-MD5 a4f3b00a7aa80e7fbc1e315b8c9306c8 files/gaim-0.76cvs-signals-varargs.diff 1753
-MD5 92a277b982fdceac85ee76228176660c files/gaim-0.76cvs-yahoo-login-fix.diff 4611
 MD5 53302cc68bb7bef9803723e977010339 files/gaim-0.74_cjk_gtkconv.patch 1128
-MD5 fd4cd0957e11c11fc6e0c72e10714e07 files/gaim-0.74-log_free.patch 1492
+MD5 58f03af2ad906ca7194b3a57c7648cf9 files/digest-gaim-0.72-r2 135
+MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r8 63
+MD5 8b152d59a54ab95627c4c0cd52758d75 files/digest-gaim-0.75-r6 63
+MD5 97fa7a76f6bc96c363844ccc57b2bec4 files/gaim_gtkimcontext_patch.diff 1106
+MD5 4989dc76d941288934c783f52931762d files/gaim-0.75-static-prpls.patch 3710
diff --git a/net-im/gaim/files/digest-gaim-0.75-r8 b/net-im/gaim/files/digest-gaim-0.75-r8
new file mode 100644
index 000000000000..63510235452c
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.75-r8
@@ -0,0 +1 @@
+MD5 9935155985c25dfc9b59183de0da3c30 gaim-0.75.tar.bz2 3370977
diff --git a/net-im/gaim/files/gaim-0.76cvs-yahoo-login-fix.diff b/net-im/gaim/files/gaim-0.76cvs-yahoo-login-fix.diff
index d4e538170902..c87a99f5b70b 100644
--- a/net-im/gaim/files/gaim-0.76cvs-yahoo-login-fix.diff
+++ b/net-im/gaim/files/gaim-0.76cvs-yahoo-login-fix.diff
@@ -10,7 +10,7 @@ diff -u -r1.193 -r1.198
  			if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
  				break;
 +			if (x >= sizeof(key)-1) {
-+				x++;
++				x++; pos++;
 +				continue;
 +			}
  			key[x++] = data[pos++];
diff --git a/net-im/gaim/gaim-0.75-r7.ebuild b/net-im/gaim/gaim-0.75-r7.ebuild
index 048eeba214f0..bdb093acac57 100644
--- a/net-im/gaim/gaim-0.75-r7.ebuild
+++ b/net-im/gaim/gaim-0.75-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r7.ebuild,v 1.4 2004/01/27 22:01:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r7.ebuild,v 1.5 2004/01/28 19:59:42 plasmaroo Exp $
 
 inherit flag-o-matic eutils
 
@@ -42,8 +42,6 @@ src_unpack() {
 src_compile() {
 	einfo "Replacing -Os CFLAG with -O2"
 	replace-flags -Os -O2
-	einfo "Filtering -fstack-protector"
-	filter-flags -fstack-protector
 
 	local myconf
 	use perl || myconf="${myconf} --disable-perl"
diff --git a/net-im/gaim/gaim-0.75-r8.ebuild b/net-im/gaim/gaim-0.75-r8.ebuild
new file mode 100644
index 000000000000..8c0e3e510fce
--- /dev/null
+++ b/net-im/gaim/gaim-0.75-r8.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.75-r8.ebuild,v 1.1 2004/01/28 19:59:42 plasmaroo Exp $
+
+inherit flag-o-matic eutils
+
+IUSE="nls perl spell nas mozilla cjk debug ssl"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc ~amd64 ppc ~alpha ~ia64"
+
+DEPEND="=sys-libs/db-1*
+	>=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	nas? ( >=media-libs/nas-1.4.1-r1 )
+	sys-devel/gettext
+	media-libs/libao
+	>=media-libs/audiofile-0.2.0
+	perl? ( >=dev-lang/perl-5.6.1
+		>=sys-apps/sed-4.0.0 )
+	mozilla? ( net-www/mozilla )
+	!mozilla? ( dev-libs/nss )
+	spell? ( >=app-text/gtkspell-2.0.2 )"
+PDEPEND="ssl? ( net-im/gaim-encryption )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2 || die
+	cd ${S}
+	epatch ${FILESDIR}/gaim-0.75-static-prpls.patch
+	epatch ${FILESDIR}/gaim-0.76cvs-signals-varargs.diff
+	epatch ${FILESDIR}/gaim-0.76cvs-yahoo-login-fix.diff
+	epatch ${FILESDIR}/gaim-0.75-yahoo-security.diff
+	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
+}
+
+src_compile() {
+	einfo "Replacing -Os CFLAG with -O2"
+	replace-flags -Os -O2
+
+	local myconf
+	use perl || myconf="${myconf} --disable-perl"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use nls  || myconf="${myconf} --disable-nls"
+	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
+	use debug  && myconf="${myconf} --enable-debug"
+
+	NSS_LIB=/usr/lib
+	NSS_INC=/usr/include
+	use mozilla || {
+		# Only need to specify this if no pkgconfig from mozilla
+		myconf="${myconf} --with-nspr-includes=${NSS_INC}/nspr"
+		myconf="${myconf} --with-nss-includes=${NSS_INC}/nss"
+		myconf="${myconf} --with-nspr-libs=${NSS_LIB}"
+		myconf="${myconf} --with-nss-libs=${NSS_LIB}"
+	}
+
+	econf ${myconf} || die "Configuration failed"
+	use perl && sed -i -e 's:^\(PERL_MM_PARAMS =.*PREFIX=\)\(.*\):\1'${D}'\2:' plugins/perl/Makefile
+
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+}
+
+src_install() {
+	einstall || die "Install failed"
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+
+	# Copy header files for gaim plugin use
+	dodir /usr/include/gaim/src
+	cp config.h ${D}/usr/include/gaim/
+	cd ${S}/src
+	#tar cf - `find . -name \*.h` | (cd ${D}/usr/include/gaim/src ; tar xvf -)
+	tar cf - *.h | (cd ${D}/usr/include/gaim/src ; tar xvf -)
+	assert "Failed to install header files to /usr/include/gaim"
+}
+
+pkg_postinst() {
+	if [ `use cjk` ]; then
+		ewarn
+		ewarn "You have chosen (by selecting 'USE=cjk') to compile with"
+		ewarn "a patch for CJK support.  Please be aware that this patch"
+		ewarn "causes problems with skkinput.  kinput2 works fine.  Details"
+		ewarn "can be found at http://bugs.gentoo.org/show_bug.cgi?id=24657#c23"
+		ewarn
+	fi
+
+	if [ `use ssl` ]; then
+		einfo
+		einfo "The gaim-encryption package is now it's own package in portage"
+		einfo "To install it run:"
+		einfo
+		einfo "emerge gaim-encryption"
+		einfo
+		einfo "All of your existing gaim-encryption settings are still"
+		einfo "in place and will be recognized when gaim-encryption is"
+		einfo "installed.  You may need to re-enable gaim-encryption in"
+		einfo "your gaim preferences."
+		einfo
+	fi
+}