summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <dragonheart@gentoo.org>2005-01-04 20:55:36 +0000
committerDaniel Black <dragonheart@gentoo.org>2005-01-04 20:55:36 +0000
commit8ba93b6c3314990636adb917f2e2f93361321c43 (patch)
tree2fc5da3e7aed984db9b30408f91df4f5b8d36652 /app-crypt
parentMarked x86 (Manifest recommit) (diff)
downloadgentoo-2-8ba93b6c3314990636adb917f2e2f93361321c43.tar.gz
gentoo-2-8ba93b6c3314990636adb917f2e2f93361321c43.tar.bz2
gentoo-2-8ba93b6c3314990636adb917f2e2f93361321c43.zip
Hardened fix as per bug #76487.
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/gnupg/ChangeLog9
-rw-r--r--app-crypt/gnupg/Manifest12
-rw-r--r--app-crypt/gnupg/files/digest-gnupg-1.4.0-r1 (renamed from app-crypt/gnupg/files/digest-gnupg-1.4.0)0
-rw-r--r--app-crypt/gnupg/gnupg-1.4.0-r1.ebuild (renamed from app-crypt/gnupg/gnupg-1.4.0.ebuild)5
4 files changed, 14 insertions, 12 deletions
diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 8130ca50b133..b3a027bcffea 100644
--- 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 a9fd3e175c61..005d75d448b7 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 fb95ffe7036c7d48122bb1abda725ebd ChangeLog 14166
MD5 5494ac514b56ee8f13f0a56cef9b3dcb gnupg-1.4.0.ebuild 3140
MD5 edc18da65abb2c4ea780b6f4820c9b1b gnupg-1.2.4.ebuild 4251
MD5 d4f5b9c4a281906444ecf57321fa16f8 gnupg-1.2.6.ebuild 3677
MD5 f060c73f6f74e7174b1f7d7c570421fe metadata.xml 572
+MD5 558e5f788b66165e73c38e03dbbfeb66 gnupg-1.4.0-r1.ebuild 3290
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
MD5 cdb57d67164c7a63a167c33426c0a7a3 files/gnupg-1.2.4.ppc64.patch 471
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
------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
index d3a4894bee62..d3a4894bee62 100644
--- a/app-crypt/gnupg/files/digest-gnupg-1.4.0
+++ b/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
index 37f89265523a..634e1b220194 100644
--- 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() {