jari patch added as per bug #104059.
authorDaniel Black <dragonheart@gentoo.org>
Wed, 31 Aug 2005 21:02:15 +0000 (21:02 +0000)
committerDaniel Black <dragonheart@gentoo.org>
Wed, 31 Aug 2005 21:02:15 +0000 (21:02 +0000)
Package-Manager: portage-2.0.51.22-r2

app-crypt/gnupg/ChangeLog
app-crypt/gnupg/Manifest
app-crypt/gnupg/files/gnupg-1.4.2-jari.patch [new file with mode: 0644]
app-crypt/gnupg/gnupg-1.4.2-r2.ebuild

index 700620e0fc08301dd214df4143cf541e2a19b688..6db4660a04fe6dbd7316c03cfbd929c8d5ed8ddc 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.128 2005/08/31 11:20:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.129 2005/08/31 21:02:15 dragonheart Exp $
+
+  31 Aug 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/gnupg-1.4.2-jari.patch, gnupg-1.4.2-r2.ebuild:
+  jari patch added as per bug #104059. Thanks for the explaination Venkat
+  Manakkal
 
 *gnupg-1.4.2-r2 (31 Aug 2005)
 
index 08901d1124e3344ec0eb37017a4ad1e92c554703..1bdecf3047a1d086a4045658bcbef9223fac4273 100644 (file)
@@ -2,9 +2,9 @@
 Hash: SHA1
 
 MD5 83679e04da772721130866b531ea0da2 gnupg-1.9.18.ebuild 3211
-MD5 612a476e8bd5a573a1767b9078db7ae4 ChangeLog 21239
+MD5 0bedf7570556909f0d5fc50d04de91b3 ChangeLog 21434
 MD5 1acf1bfff7899ec20b139fbba785e69c gnupg-1.4.2-r1.ebuild 6250
-MD5 8c9b54041f9b981a9acb9db5c19f6181 gnupg-1.4.2-r2.ebuild 6299
+MD5 896521bec32a5589de756e83ecf4481d gnupg-1.4.2-r2.ebuild 6295
 MD5 921f00a83ce6b1d77190396b4456f05f gnupg-1.2.6.ebuild 3800
 MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
 MD5 fb2459cc632ade0377625d0768292e92 gnupg-1.4.1.ebuild 6195
@@ -15,6 +15,7 @@ MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r1 190
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 331553038bdcb95cc843c60b01b73925 files/digest-gnupg-1.4.2-r2 190
 MD5 ee3a4487eadfb9858f32adde3554394c files/gnupg-1.4.2-keyserver.patch 389
+MD5 c23d51ccf048f10b5e8b10b45570c13a files/gnupg-1.4.2-jari.patch 370
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
 MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
 MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selftest.patch 1180
@@ -22,7 +23,7 @@ MD5 552b43a0705ea006efa282b7d5645143 files/gnupg-1.4.2-selftest.patch 1358
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDFZKSmdTrptrqvGERAjJQAKCJ3Jug0J+jvUFC9tqZmCCb9YS3iQCfYE3j
-0QbhMHMjIqf9JQQmLnlpedE=
-=YgOe
+iD8DBQFDFhr1mdTrptrqvGERAmqXAJ4n3Hii9k+bNs0SjoGbl8P7QHgYNQCbBj54
+BXN/lIRqIDntJuMKnYuICgc=
+=6axk
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/gnupg/files/gnupg-1.4.2-jari.patch b/app-crypt/gnupg/files/gnupg-1.4.2-jari.patch
new file mode 100644 (file)
index 0000000..70720d2
--- /dev/null
@@ -0,0 +1,11 @@
+--- gnupg-1.4.1/g10/passphrase.c.old   Tue Feb 15 13:02:31 2005
++++ gnupg-1.4.1/g10/passphrase.c       Wed Mar 16 17:35:20 2005
+@@ -1331,7 +1331,7 @@
+           if( create && !pass ) {
+               randomize_buffer(s2k->salt, 8, 1);
+               if( s2k->mode == 3 )
+-                  s2k->count = 96; /* 65536 iterations */
++                  s2k->count = 208; /* 8388608 byte count */
+           }
+ 
+           if( s2k->mode == 3 ) {
index 091060aaa6e381ecb3c5adae6eb806fac10f5e1e..f3d0e1c993257edebfcb5bdcb105035217e67ed6 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild,v 1.1 2005/08/31 11:20:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.2-r2.ebuild,v 1.2 2005/08/31 21:02:15 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -43,7 +43,7 @@ src_unpack() {
        unpack ${A}
 
        # Jari's patch to boost iterated key setup by factor of 128
-       # EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/gnupg-1.4.1.diff 
+       EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${P}-jari.patch
 
        if use idea; then
                ewarn "Please read http://www.gnupg.org/why-not-idea.html"