Revision bump for gaim-encryption patch compatible with newer mozilla libraries

author: Don Seiler <rizzo@gentoo.org> 2004-01-02 20:06:39 +0000
committer: Don Seiler <rizzo@gentoo.org> 2004-01-02 20:06:39 +0000
commit: 831736ea8190af3223c2f351d63e508cc24456f2 (patch)
tree: e0ebac5093b075fb80d72dc85a9e351170c43b6c /net-im
parent: Revision bump for gaim-encryption patch compatible with newer mozilla libraries (diff)
download: gentoo-2-831736ea8190af3223c2f351d63e508cc24456f2.tar.gz
gentoo-2-831736ea8190af3223c2f351d63e508cc24456f2.tar.bz2
gentoo-2-831736ea8190af3223c2f351d63e508cc24456f2.zip
5 files changed, 244 insertions, 3 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 1fd3322e0897..5e9c6bba9e00 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.109 2004/01/02 15:44:10 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.110 2004/01/02 20:06:30 rizzo Exp $
+
+*gaim-0.74-r2 (02 Jan 2004)
+
+  02 Jan 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.74-r2.ebuild,
+  files/gaim-encryption-2.18-moz1.6.patch:
+  Revision bump for gaim-encryption patch allowing use with newer mozilla, thanks to Bill Tompkins for the patch.
 
   02 Jan 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.74-r1.ebuild,
   files/gaim-0.74-scs-msg-yahoo.patch:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 0526bb72af0c..20af067ef6c2 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -3,8 +3,8 @@ MD5 5fe791bbf70387b44fd2d1d5e857d5cc gaim-0.67.ebuild 2183
 MD5 b3e470f59582b9b3379db2326e647e77 gaim-0.72-r2.ebuild 3331
 MD5 78be5b331aa107c0ef01b5252eb8c87e gaim-0.72-r1.ebuild 2890
 MD5 cecb719b31af4ea5759fffa397de52be gaim-0.72.ebuild 2508
-MD5 62db50fa89c6827200d75b02b51437a2 gaim-0.74-r2.ebuild 3908
-MD5 6e7973055dd4ce07d70b5d66dc03e3ab ChangeLog 17976
+MD5 9b0c0eb504517576c7d18406c8c52324 gaim-0.74-r2.ebuild 3858
+MD5 57607825a09ddf6d8a44f86f26bb4c3b ChangeLog 18230
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
 MD5 5993641de8d56c2c433f252997c3c39c files/digest-gaim-0.67 135
 MD5 e6a8773cabdf14d7422e573723258437 files/digest-gaim-0.72 135
diff --git a/net-im/gaim/files/digest-gaim-0.74-r2 b/net-im/gaim/files/digest-gaim-0.74-r2
new file mode 100644
index 000000000000..4ececc879fff
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.74-r2
@@ -0,0 +1,2 @@
+MD5 9af9287a96acea2b8a8937cfc9122412 gaim-0.74.tar.bz2 3285757
+MD5 89bd43aac89b2358f0445ee8844cf955 gaim-encryption-2.18.tar.gz 320321
diff --git a/net-im/gaim/files/gaim-encryption-2.18-moz1.6.patch b/net-im/gaim/files/gaim-encryption-2.18-moz1.6.patch
new file mode 100644
index 000000000000..951be1f6a755
--- /dev/null
+++ b/net-im/gaim/files/gaim-encryption-2.18-moz1.6.patch
@@ -0,0 +1,110 @@
+Index: nss_oaep.c
+===================================================================
+RCS file: /cvsroot/gaim-encryption/encrypt/nss_oaep.c,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- nss_oaep.c	29 Jun 2003 21:25:28 -0000	1.2
++++ nss_oaep.c	1 Jan 2004 20:46:07 -0000	1.3
+@@ -20,7 +20,6 @@
+  */
+ 
+ #include "pk11func.h"
+-#include "secrng.h"
+ #include "keyhi.h"
+ 
+ /* for g_assert; PORT_Assert seems disabled... */
+Index: nss_pss.c
+===================================================================
+RCS file: /cvsroot/gaim-encryption/encrypt/nss_pss.c,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- nss_pss.c	4 Jul 2003 23:30:29 -0000	1.3
++++ nss_pss.c	1 Jan 2004 20:46:07 -0000	1.4
+@@ -20,7 +20,6 @@
+  */
+ 
+ #include "pk11func.h"
+-#include "secrng.h"
+ #include "keyhi.h"
+ 
+ /* for g_assert; PORT_Assert seems disabled... */
+Index: rsa_nss.c
+===================================================================
+RCS file: /cvsroot/gaim-encryption/encrypt/rsa_nss.c,v
+retrieving revision 1.24
+retrieving revision 1.25
+diff -u -r1.24 -r1.25
+--- rsa_nss.c	20 Dec 2003 14:57:45 -0000	1.24
++++ rsa_nss.c	1 Jan 2004 20:46:07 -0000	1.25
+@@ -29,7 +29,6 @@
+ #include <nspr.h>
+ #include <nss.h>
+ #include <pk11func.h>
+-#include <secrng.h>
+ #include <keyhi.h>
+ #include <nssb64.h>
+ 
+@@ -440,8 +439,9 @@
+    const CK_MECHANISM_TYPE SymEncryptionType = CKM_DES3_CBC_PAD;
+    PK11SlotInfo *symSlot;
+    PK11SymKey *symKey;
++   SECItem *pubKeyValue;
+    SECItem symKeyItem;  /* storage space for binary key import */
+-   unsigned char symKeyData[32] = {0};
++   unsigned char symKeyData[24] = {0};
+    SECItem *iv = 0, *wrappedKey = 0, label;
+    CK_ATTRIBUTE_TYPE attribs[3] = { CKA_SIGN, CKA_DECRYPT, CKA_SIGN_RECOVER };
+    const int NumAttribs = 3;
+@@ -454,6 +454,7 @@
+    /* NNNN is the Base64 encoding of the IV, and                      */
+    /* MMMM is the Base64 encoding of the encrypted private key        */
+ 
++
+    key->proto = rsa_nss_proto;
+    
+    split_key = g_strsplit(key_str, ",", 3);
+@@ -546,6 +547,8 @@
+       return 0;
+    }
+ 
++   pubKeyValue = SECITEM_DupItem(&key->store.rsa_nss.pub->u.rsa.modulus);
++
+    symSlot = PK11_GetBestSlot(SymEncryptionType, NULL);
+    g_assert(symSlot != 0);
+    
+@@ -554,17 +557,30 @@
+    
+    symKey  = PK11_ImportSymKey(symSlot, PK11_GetKeyGen(SymEncryptionType),
+                                PK11_OriginUnwrap, CKA_WRAP, &symKeyItem, NULL);
+-   
++
++   if (!symKey) {
++      gaim_debug(GAIM_DEBUG_ERROR, "gaim-encryption",
++                 "Error creating symmetric key: unable to load private key\n");
++      g_strfreev(split_key);
++
++      SECKEY_DestroyPublicKey(key->store.rsa_nss.pub);
++      SECITEM_FreeItem (pubKeyValue, PR_TRUE);
++      g_free(key);
++      return 0;
++   }
++
+    label.data = NULL; label.len = 0;
+ 
+    key->store.rsa_nss.priv =
+       PK11_UnwrapPrivKey(symSlot, symKey, SymEncryptionType, iv,
+-                         wrappedKey, &label, &(key->store.rsa_nss.pub->u.rsa.modulus),
++                         wrappedKey, &label, pubKeyValue,
+                          PR_FALSE, PR_FALSE, CKK_RSA, attribs, NumAttribs, 0);
+    
++   SECITEM_FreeItem (pubKeyValue, PR_TRUE);
++
+    if (key->store.rsa_nss.priv == 0) {
+       gaim_debug(GAIM_DEBUG_ERROR, "gaim-encryption", 
+-                 "Error decoding RSANSS Public key\n");
++                 "Error decoding RSANSS Private key\n");
+       g_strfreev(split_key);
+ 
+       SECKEY_DestroyPublicKey(key->store.rsa_nss.pub);
diff --git a/net-im/gaim/gaim-0.74-r2.ebuild b/net-im/gaim/gaim-0.74-r2.ebuild
new file mode 100644
index 000000000000..21c823471f1a
--- /dev/null
+++ b/net-im/gaim/gaim-0.74-r2.ebuild
@@ -0,0 +1,123 @@
+# 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.74-r2.ebuild,v 1.1 2004/01/02 20:06:30 rizzo Exp $
+
+IUSE="nls perl spell nas ssl mozilla cjk debug"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+EV=2.18
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2
+	ssl? ( mirror://sourceforge/gaim-encryption/gaim-encryption-${EV}.tar.gz )"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+
+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 )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2 || die
+	cd ${S}
+	epatch ${FILESDIR}/gaim-0.74-log_free.patch
+	epatch ${FILESDIR}/gaim-0.74-scs-msg-yahoo.patch
+	use cjk && epatch ${FILESDIR}/gaim-0.74_cjk_gtkconv.patch
+
+	use ssl && {
+		cd ${S}/plugins
+		unpack gaim-encryption-${EV}.tar.gz
+		cd ${S}/plugins/gaim-encryption-${EV}
+		epatch ${FILESDIR}/gaim-encryption-2.18-moz1.6.patch
+	}
+}
+
+src_compile() {
+
+	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
+
+	einfo "Replacing -Os CFLAG with -O2"
+	replace-flags -Os -O2
+
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+
+	use ssl && {
+		local myencconf
+		cd ${S}/plugins/gaim-encryption-${EV}
+
+		use mozilla || {
+			# Only need to specify this if no pkgconfig from mozilla
+			myencconf="${myencconf} --with-nspr-includes=${NSS_INC}/nspr"
+			myencconf="${myencconf} --with-nss-includes=${NSS_INC}/nss"
+			myencconf="${myencconf} --with-nspr-libs=${NSS_LIB}"
+			myencconf="${myencconf} --with-nss-libs=${NSS_LIB}"
+		}
+		econf ${myencconf} || die "Configuration failed for encryption"
+		emake || die "Make failed for encryption"
+	}
+}
+
+src_install() {
+	einstall || die "Install failed"
+	use ssl && {
+		cd ${S}/plugins/gaim-encryption-${EV}
+		einstall || die "Install failed for encryption"
+		cd ${S}
+	}
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+}
+
+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
+		ewarn
+		ewarn "You have chosen (by selecting 'USE=ssl') to install"
+		ewarn "the gaim-encryption plugin ( http://gaim-encryption.sf.net/ )"
+		ewarn "this plugin is NOT supported by the Gaim project, and if you"
+		ewarn "expierence problems related to it, contact the Gentoo project"
+		ewarn "via http://bugs.gentoo.org/ or the gaim-encryption project."
+		ewarn
+	fi
+
+	einfo
+	einfo "Yahoo! has changed their IM server.  Existing profiles should"
+	einfo "change the server for their Yahoo! IM accounts to scs.msg.yahoo.com"
+	einfo
+}
author	Don Seiler <rizzo@gentoo.org>	2004-01-02 20:06:39 +0000
committer	Don Seiler <rizzo@gentoo.org>	2004-01-02 20:06:39 +0000
commit	831736ea8190af3223c2f351d63e508cc24456f2 (patch)
tree	e0ebac5093b075fb80d72dc85a9e351170c43b6c /net-im
parent	Revision bump for gaim-encryption patch compatible with newer mozilla libraries (diff)
download	gentoo-2-831736ea8190af3223c2f351d63e508cc24456f2.tar.gz gentoo-2-831736ea8190af3223c2f351d63e508cc24456f2.tar.bz2 gentoo-2-831736ea8190af3223c2f351d63e508cc24456f2.zip