openpgp patch from upstream. https://savannah.gnu.org/support/index.php?106543

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-gentoo-r4 x86_64

6 files changed, 31 insertions, 8 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index c546d55589d0..5c360ae2eeba 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.176 2009/01/05 07:44:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.177 2009/01/10 01:33:11 dragonheart Exp $
+
+  10 Jan 2009; Daniel Black <dragonheart@gentoo.org>
+  +files/gnutls-2.6.0-openpgp-selftest.patch, gnutls-2.6.0-r2.ebuild,
+  gnutls-2.6.2.ebuild, gnutls-2.6.3.ebuild:
+  openpgp patch from upstream. https://savannah.gnu.org/support/index.php?106543
 
 *gnutls-2.6.3 (05 Jan 2009)
 
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 1979b850436c..2cee674a73bc 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,7 @@
 AUX gnutls-2.2.5-CVE-2008-4989-V2.patch 650 RMD160 71ef81981ad1a95480c189145dab1ecc278b67b6 SHA1 09e53cac6797767128c745ab147db2b06aa245c6 SHA256 14c531bec64d75b3dedea801cc4f52cd884c335d95bd08c5e9e190f6170ebb5f
 AUX gnutls-2.3.11+gcc-4.3.patch 349 RMD160 192c663f741c6a2b6681b3873c199c64996d0000 SHA1 657ed9b73f7cfcbf348b94cff9f1ab9c2f8c7b59 SHA256 30dc6126ffa85a4765ca4724355759932990545c962ef2239fdb692af631e018
 AUX gnutls-2.6.0-cxx-configure.in.patch 502 RMD160 fdd7f402f2a9122f8d7db9b165670c42d83abeb8 SHA1 748b7a0f0b689169054970993d7b4a6331f52c33 SHA256 c7a3ff932c467d08b27eee7e8b5bd1ce97b200328fc90478dee5ea3a59b18f71
+AUX gnutls-2.6.0-openpgp-selftest.patch 508 RMD160 dcd254a8078c4ab21662377e4f53176a541292e4 SHA1 f73103e1aa5dcccd4449b42123c00b0e782cac67 SHA256 235e0a1e588548eb52627d9fae528c680aeaf260e6cb87afa86a624f134fbd08
 DIST gnutls-2.2.5.tar.bz2 4920322 RMD160 dd48a780849fc81c0a688116984eab8f41ea8ebf SHA1 7620d092c790f0a5ac5486c3563786ca8777083d SHA256 cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57
 DIST gnutls-2.4.1.tar.bz2 4940118 RMD160 4e21a82047add916b8ccce8aa82c36b2c9bcff90 SHA1 7a439542e6344d5ccf11a29431a0600e7fe1c735 SHA256 d91401a6828d7300dc2b1106ff99610479aa35af05d39746cacdab8cdc7be5fd
 DIST gnutls-2.6.0.tar.bz2 5112845 RMD160 1d92662edd64e93e658fc527f1dfbfc99ab3a1da SHA1 bbd9e5f3a77bfcbef5a769c67d1576e7a6e4bda5 SHA256 9270a3eab9a9371839af79be92d50b8b21e7fbe157ebe915edae8e352f4e9fb5
@@ -8,8 +9,8 @@ DIST gnutls-2.6.2.tar.bz2 5113586 RMD160 10a37efe6bd90add75e338ca98eb09cc4ab69dc
 DIST gnutls-2.6.3.tar.bz2 5114214 RMD160 318c91f167988f2dfcde50015491b7dc7d4eea33 SHA1 f9b6a1d6135ef0a57a5cdd9fcb3e82bc62a27dcd SHA256 eddd7ee659dcf995362cf2ce5e9b43cb9ada34e55e10d28ee6273c555a5240e7
 EBUILD gnutls-2.2.5.ebuild 2025 RMD160 af9f9b2cec5ebd1b50a48eb9acae55014d01a464 SHA1 5450b5833019cb6bc809d1ab38dbc40651e8d9b4 SHA256 57732a9022e09682530e3e271b836852f0b9de06aa42fc2b0101df72a862091e
 EBUILD gnutls-2.4.1-r2.ebuild 2095 RMD160 0caf62aa4039dcbbba64daf99769650ef1bfa481 SHA1 3f01def8f034bb1911c2c88e6330b521641ba07a SHA256 482db7b88b4649fd2d21e6a350269ef32c961542c9bf7b86c9db001865a679b5
-EBUILD gnutls-2.6.0-r2.ebuild 2523 RMD160 3a0915c0216b10b1c186e636470691b1d41ef7e6 SHA1 d1d57a70a3d2aae262c4fb4fe47f30bcfeedc498 SHA256 dda6721362a7f8624e86038c8b75f230bb15b32642004c390b03d7795c3f25d0
-EBUILD gnutls-2.6.2.ebuild 2242 RMD160 760718158a42321cbf75513e77c42ee239c335f2 SHA1 5b85b8b60cb2ebff74bba7c0d89abde6d6a6eae8 SHA256 114cc7cf6903a666766efc64ba06d78daa91494f88f287c07a7d1e1cd6539e89
-EBUILD gnutls-2.6.3.ebuild 2324 RMD160 7e5a35c6dbd1ad985511d1c2d513dba2aa8bb64f SHA1 8bfc06d578622c27d00503e2b5d791fb83a211c1 SHA256 95d3ce73989950eae0d2619227b93fa1435ca06140febdf5cba344fe030ee275
-MISC ChangeLog 26689 RMD160 4046a685f0a40138f87804b11e4c854d6736d4df SHA1 51a15e91c1b159c088b7a13adebcf2abd382b839 SHA256 d0b1839d6804c65b94621f7c7fbf351db3564a34e88dd8b77b748145602a8898
+EBUILD gnutls-2.6.0-r2.ebuild 2573 RMD160 6bdc0ce68978fe6cef4e4c70f99e070b9b875a6a SHA1 d3b4e8879625d8810e65ec9e971dc28043ff2b4f SHA256 dd3ecf974d5773df50e17a4c93bf0791d631aa4ab37a78d348b1450395763f76
+EBUILD gnutls-2.6.2.ebuild 2300 RMD160 77a454af85e7c360445be46847d807bcb9ca95ca SHA1 2b177fb30cdfcbce236d7461d8ffb2097bf1b916 SHA256 8ffe553b15a05361f497bf058dc7c09891336eec73342cf0ad34a83656b88ec3
+EBUILD gnutls-2.6.3.ebuild 2382 RMD160 783d1ac791dc997c48658904f905e82efec74946 SHA1 2683d4299a0878731ee9f2ed452509963e560f9a SHA256 efba9cc985a4f27f1af462cd1c8511ac99ce727b0c1745eda4ff180f8f7fbf65
+MISC ChangeLog 26938 RMD160 99ebba49d05bf1d5c0ee64621e92699c73290e24 SHA1 cf605c415187fc66f8f442e45808ac1af45f40c5 SHA256 05af40c644223261f64ffd102bc69cdbce968c26c827fee994c3045678d53927
 MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
diff --git a/net-libs/gnutls/files/gnutls-2.6.0-openpgp-selftest.patch b/net-libs/gnutls/files/gnutls-2.6.0-openpgp-selftest.patch
new file mode 100644
index 000000000000..661ca87bfffe
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.6.0-openpgp-selftest.patch
@@ -0,0 +1,14 @@
+--- tests/openpgp/Makefile.am.orig	2009-01-10 11:48:55.000000000 +1100
++++ tests/openpgp/Makefile.am	2009-01-10 11:49:13.000000000 +1100
+@@ -30,10 +30,7 @@
+ 
+ AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_builddir)/includes	\
+ 	      -I$(top_srcdir)/tests
+-LDADD = -L$(top_builddir)/libextra -lgnutls-extra	\
+-        -L$(top_builddir)/lib      -lgnutls		\
+-	-L$(top_builddir)/tests    -lutils
+-
++LDADD = ../lib/libgnutls.la ../lib/libgnutls-extra.la ../libutils.la
+ else
+ 
+ EXTRA_DIST = $(openpgp_sources)
diff --git a/net-libs/gnutls/gnutls-2.6.0-r2.ebuild b/net-libs/gnutls/gnutls-2.6.0-r2.ebuild
index 9f3c17190e70..f0438e28bfc2 100644
--- a/net-libs/gnutls/gnutls-2.6.0-r2.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.0-r2.ebuild,v 1.2 2009/01/05 07:44:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.0-r2.ebuild,v 1.3 2009/01/10 01:33:11 dragonheart Exp $
 
 inherit eutils libtool autotools
 
@@ -58,6 +58,7 @@ src_unpack() {
 	find . -name ltmain.sh -exec rm {} \;
 
 	epatch "${FILESDIR}"/${P}-cxx-configure.in.patch
+	epatch "${FILESDIR}"/${P}-openpgp-selftest.patch
 	eautoreconf
 	epatch "${FILESDIR}"/gnutls-2.2.5-CVE-2008-4989-V2.patch
 	elibtoolize # for sane .so versioning on FreeBSD
diff --git a/net-libs/gnutls/gnutls-2.6.2.ebuild b/net-libs/gnutls/gnutls-2.6.2.ebuild
index 4cabda1e3ffa..527fc76d994c 100644
--- a/net-libs/gnutls/gnutls-2.6.2.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.2.ebuild,v 1.3 2009/01/05 07:44:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.2.ebuild,v 1.4 2009/01/10 01:33:11 dragonheart Exp $
 
 EAPI="2"
 inherit eutils libtool autotools
@@ -53,6 +53,7 @@ src_unpack() {
 	find . -name ltmain.sh -exec rm {} \;
 
 	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
+	epatch "${FILESDIR}"/gnutls-2.6.0-openpgp-selftest.patch
 	eautoreconf
 	elibtoolize # for sane .so versioning on FreeBSD
 }
diff --git a/net-libs/gnutls/gnutls-2.6.3.ebuild b/net-libs/gnutls/gnutls-2.6.3.ebuild
index 68e8f42843f4..4e774b04e297 100644
--- a/net-libs/gnutls/gnutls-2.6.3.ebuild
+++ b/net-libs/gnutls/gnutls-2.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.3.ebuild,v 1.1 2009/01/05 07:44:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.6.3.ebuild,v 1.2 2009/01/10 01:33:11 dragonheart Exp $
 
 EAPI="2"
 inherit eutils libtool autotools
@@ -55,6 +55,7 @@ src_unpack() {
 	# the below patch is in 2.7.* as per
 	# https://savannah.gnu.org/support/?106542
 	epatch "${FILESDIR}"/gnutls-2.6.0-cxx-configure.in.patch
+	epatch "${FILESDIR}"/gnutls-2.6.0-openpgp-selftest.patch
 	eautoreconf
 	elibtoolize # for sane .so versioning on FreeBSD
 }