Hardened fix as per bug #76487.

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 8130ca50b1333935ca181362f02a61334133b086..b3a027bcffead897c0b6d4e316a48fe0fd7a205c 100644 (file)
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,13 @@
 # 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.93 2005/01/03 21:39:33 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.94 2005/01/04 20:55:36 dragonheart Exp $
+
+*gnupg-1.4.0-r1 (05 Jan 2005)
+
+  05 Jan 2005; Daniel Black <dragonheart@gentoo.org> +gnupg-1.4.0-r1.ebuild,
+  -gnupg-1.4.0.ebuild:
+  Hardened fix as per bug #76487. Thanks to Natanael Copa <mlists@tanael.org>
+  and Peter S. Mazinger <ps.m@gmx.net>
 
   04 Jan 2005; Daniel Black <dragonheart@gentoo.org> gnupg-1.4.0.ebuild:
   Removed sparc and hppa keywords until bug #76375 is solved

diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index a9fd3e175c6185ba986925bb9aa67747e1023c10..84505cdaf7c924df2b4629b0914601fc01024a3a 100644 (file)
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fb95ffe7036c7d48122bb1abda725ebd ChangeLog 14166
-MD5 5494ac514b56ee8f13f0a56cef9b3dcb gnupg-1.4.0.ebuild 3140
+MD5 7e87eaf6b3aa4c753df6015adb6f433b ChangeLog 14415
 MD5 edc18da65abb2c4ea780b6f4820c9b1b gnupg-1.2.4.ebuild 4251
 MD5 d4f5b9c4a281906444ecf57321fa16f8 gnupg-1.2.6.ebuild 3677
 MD5 f060c73f6f74e7174b1f7d7c570421fe metadata.xml 572
+MD5 1b329ee5ea43a3f4b611da9a15acbfa0 gnupg-1.4.0-r1.ebuild 3293
 MD5 ee8dfcfec88f977c2a447f99d15967d9 gnupg-1.9.10.ebuild 2859
-MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0 117
 MD5 c3a43a1e5da266ef33222f721e05fd63 files/digest-gnupg-1.2.6 117
+MD5 a8d4b32b219641e9b9df83b581a935ba files/digest-gnupg-1.4.0-r1 117
 MD5 7f0e728ae9c6810cb9c61500fdc39fc9 files/digest-gnupg-1.2.4 117
 MD5 dd317d852aed29e96c5a542f00d0766e files/gnupg-1.2.6-ppc64.patch 454
 MD5 c6114a5a40f10aeca63d07b59fed650f files/gnupg-1.2.4-hppa_unaligned_constant.patch 1213
@@ -17,7 +17,7 @@ MD5 8c88d9fdef69bdda173170c5a8abd59e files/digest-gnupg-1.9.10 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB2bucmdTrptrqvGERAvO+AJ0VFdg4JJjBF9ZDWhJU/Hq/NDaFKgCfVdWj
-mSh2y3Qsbr6JKvydDV1AwH0=
-=MPMd
+iD8DBQFB2wLOmdTrptrqvGERAhe/AJwJpdg3k0C7ErBN+s5y6XRo97wx3wCgkkq3
+74nH7MMJU0VYJjoOkp3K+s4=
+=4jWp
 -----END PGP SIGNATURE-----

diff --git a/app-crypt/gnupg/files/digest-gnupg-1.4.0 b/app-crypt/gnupg/files/digest-gnupg-1.4.0-r1
similarity index 100%
rename from app-crypt/gnupg/files/digest-gnupg-1.4.0
rename to app-crypt/gnupg/files/digest-gnupg-1.4.0-r1

diff --git a/app-crypt/gnupg/gnupg-1.4.0.ebuild b/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
similarity index 91%
rename from app-crypt/gnupg/gnupg-1.4.0.ebuild
rename to app-crypt/gnupg/gnupg-1.4.0-r1.ebuild
index 37f89265523a3a800cb037489f3b50f21bf36125..634e1b220194d5217ea955d517de79806879228a 100644 (file)
--- a/app-crypt/gnupg/gnupg-1.4.0.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.0-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.0.ebuild,v 1.3 2005/01/03 21:39:33 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.0-r1.ebuild,v 1.1 2005/01/04 20:55:36 dragonheart Exp $
 
 inherit eutils flag-o-matic
 
@@ -57,6 +57,9 @@ src_unpack() {
                mv ${WORKDIR}/idea.c ${S}/cipher/idea.c || \
                        ewarn "failed to insert IDEA module"
        fi
+       cd ${S}
+       sed -i -e 's:PIC:__PIC__:' mpi/i386/mpih-{add,sub}1.S intl/relocatable.c
+       sed -i -e 's:if PIC:ifdef __PIC__:' mpi/sparc32v8/mpih-mul{1,2}.S
 }
 
 src_compile() {