Crashing selftest fixed thanks to patch from Ben Peddell - bug #80044

(Portage version: 2.0.51.22-r1)

5 files changed, 55 insertions, 25 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 17c59491d5db..8f819a1c8e9b 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -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.118 2005/06/24 22:01:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.119 2005/07/02 00:22:34 dragonheart Exp $
+
+  02 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/gnupg-1.4.1-selftest.patch, gnupg-1.4.1.ebuild,
+  gnupg-1.4.1-r1.ebuild:
+  Crashing selftest fixed thanks to patch from Ben Peddell - bug #80044
 
   24 Jun 2005; Aron Griffis <agriffis@gentoo.org> gnupg-1.4.0-r1.ebuild,
   gnupg-1.4.0-r2.ebuild, gnupg-1.4.1.ebuild, gnupg-1.4.1-r1.ebuild,
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index e634b4132770..ecc8ef915f31 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,35 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ba108107faabbe5c2217838eacd569e3 gnupg-1.9.15.ebuild 3233
+MD5 c81adc0f8f459c0ce445892ce5f662eb ChangeLog 18887
+MD5 a366953ff5079326b4743b007b7f506b gnupg-1.9.14.ebuild 3079
 MD5 7cf0ca92817de23e81cb83fbcb6e8754 gnupg-1.2.4.ebuild 4250
 MD5 73e87591d6d3ccdaf39979c0ba9deed2 gnupg-1.2.6.ebuild 3817
-MD5 a366953ff5079326b4743b007b7f506b gnupg-1.9.14.ebuild 3079
-MD5 50304142ba36d0c7d6039d223d83a70b gnupg-1.9.15-r1.ebuild 3076
+MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
+MD5 9bf7a3e840df108bbce5373a532ed293 gnupg-1.4.0-r1.ebuild 4608
 MD5 bc518aeaeb9b0f56c45edb72d7ebb68e gnupg-1.4.0-r2.ebuild 5206
+MD5 b35737362f59af62c1ff168fa46196c2 gnupg-1.4.1.ebuild 6338
+MD5 50304142ba36d0c7d6039d223d83a70b gnupg-1.9.15-r1.ebuild 3076
 MD5 bb16c12599f7951a87b5a300173b50af gnupg-1.9.16.ebuild 3415
 MD5 8cc1a058f089f3550ce6969fe3cd768d gnupg-1.4.1-r1.ebuild 6347
-MD5 fe34c29fa3b8b7f4efc98487d8986c43 gnupg-1.4.1.ebuild 6274
-MD5 c81adc0f8f459c0ce445892ce5f662eb ChangeLog 18887
-MD5 b507ee36c7487372de42cc9dab034370 metadata.xml 481
-MD5 9bf7a3e840df108bbce5373a532ed293 gnupg-1.4.0-r1.ebuild 4608
-MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
+MD5 a614d4d6eb27b31d9b4651c349b31c3e files/digest-gnupg-1.9.14 65
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
-MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
 MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 117
-MD5 9e4bb59ff6cbb14c85cf044408669ccd files/digest-gnupg-1.4.0-r2 190
-MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
+MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
-MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
-MD5 a614d4d6eb27b31d9b4651c349b31c3e files/digest-gnupg-1.9.14 65
 MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15 66
 MD5 8c4a537dc8228a95208b0e227c93ed7d files/digest-gnupg-1.9.16 66
+MD5 9e4bb59ff6cbb14c85cf044408669ccd files/digest-gnupg-1.4.0-r2 190
 MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
 MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCvILPBXaUFmZvwyMRAqemAKCiDDYZ/W5HMgUW8DDO+RuRhkDLRwCgnW3v
-Ql/LvqANMlrnGn/2h2vGzeI=
-=VTOo
------END PGP SIGNATURE-----
+MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1 190
+MD5 e62b7134c5c0c1b3aad6a08bfdf99b48 files/digest-gnupg-1.9.15-r1 66
+MD5 4b92f911e900cfd1a37439bd19412f5d files/digest-gnupg-1.4.1-r1 190
+MD5 494103ac08d870d8a9c1ed0b83c4ae35 files/gnupg-1.4.1-selinux.patch 1180
diff --git a/app-crypt/gnupg/files/gnupg-1.4.1-selftest.patch b/app-crypt/gnupg/files/gnupg-1.4.1-selftest.patch
new file mode 100644
index 000000000000..4ae2d70b8d44
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-1.4.1-selftest.patch
@@ -0,0 +1,28 @@
+--- gnupg-1.4.1/g10/openfile.c.orig	2004-10-14 17:11:56.000000000 +1000
++++ gnupg-1.4.1/g10/openfile.c	2005-06-28 22:27:52.611861217 +1000
+@@ -392,8 +392,10 @@
+      * To cope with HOME, we do compare only the suffix if we see that
+      * the default homedir does start with a tilde.
+      */
++#ifndef ENABLE_SELINUX_HACKS
+     if( opt.dry_run || opt.no_homedir_creation )
+ 	return;
++#endif
+ 
+     if ( ( *defhome == '~'
+            && ( strlen(fname) >= strlen (defhome+1)
+--- gnupg-1.4.1/checks/Makefile.in.orig	2005-03-16 01:52:20.000000000 +1000
++++ gnupg-1.4.1/checks/Makefile.in	2005-06-29 00:04:24.613682330 +1000
+@@ -516,9 +516,11 @@
+ 
+ ./gpg_dearmor:
+ 	echo '#!/bin/sh' >./gpg_dearmor
+-	echo "../g10/gpg --no-options --no-greeting \
++	echo "../g10/gpg --no-options --no-greeting --homedir . \
+              --no-secmem-warning --batch --dearmor" >>./gpg_dearmor
+ 	chmod 755 ./gpg_dearmor
++	if test ! -f ./pubring.gpg; then touch -t 197001020000 ./pubring.gpg; fi
++	if test ! -f ./secring.gpg; then touch -t 197001020000 ./secring.gpg; fi
+ 
+ ./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc ./gpg_dearmor
+ 	./gpg_dearmor > ./pubring.gpg < $(srcdir)/pubring.asc
diff --git a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
index 9352a0d732a5..4b20f5e93e14 100644
--- a/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild
@@ -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.1-r1.ebuild,v 1.2 2005/06/24 22:01:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1-r1.ebuild,v 1.3 2005/07/02 00:22:34 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -63,6 +63,9 @@ src_unpack() {
 		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch || die "ecc patch failed"
 	fi
 
+	# maketest fix
+	epatch ${FILESDIR}/${P}-selftest.patch
+
 	# Fix PIC definitions
 	cd ${S}
 	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
diff --git a/app-crypt/gnupg/gnupg-1.4.1.ebuild b/app-crypt/gnupg/gnupg-1.4.1.ebuild
index 919bf106a5f3..40f1ae127ffe 100644
--- a/app-crypt/gnupg/gnupg-1.4.1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.1.ebuild
@@ -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.1.ebuild,v 1.14 2005/06/24 22:01:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.1.ebuild,v 1.15 2005/07/02 00:22:34 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -62,6 +62,9 @@ src_unpack() {
 		EPATCH_OPTS="-p1 -d ${S}" epatch $eccpatch || die "ecc patch failed"
 	fi
 
+	# maketest fix
+	epatch ${FILESDIR}/${P}-selftest.patch
+
 	# Fix PIC definitions
 	cd ${S}
 	sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c