nonexecutable stacks hopefully fixed for all platforms (bug #96022)

Package-Manager: portage-2.0.51.22-r2

4 files changed, 541 insertions, 7 deletions

diff --git a/dev-libs/libgcrypt/ChangeLog b/dev-libs/libgcrypt/ChangeLog
index e933f071837f..3f81e17124bc 100644
--- a/dev-libs/libgcrypt/ChangeLog
+++ b/dev-libs/libgcrypt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libgcrypt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.58 2005/08/20 09:05:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/ChangeLog,v 1.59 2005/09/04 15:29:48 dragonheart Exp $
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/libgcrypt-1.2.1-GNU-stack-fix.patch, libgcrypt-1.2.1-r1.ebuild:
+  nonexecutable stacks hopefully fixed for all platforms (bug #96022). Thanks
+  to the Pax Team who I could not of fixed it without
 
 *libgcrypt-1.2.1-r1 (20 Aug 2005)
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 604f7ec46dfb..a9a58ad48806 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,22 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 79dc97c5c62f38e217f4b9dd1830506d ChangeLog 8534
+MD5 8fc118f8babb7ec691aa146c3dd3c17b ChangeLog 8793
 MD5 e04ce4b3ccafdf1cdc3e2069a75ac11c libgcrypt-1.1.12.ebuild 1123
 MD5 4e5086ca6645aed250079bd046fcb78c libgcrypt-1.2.1.ebuild 1032
-MD5 7f3ed20c074c2a068e2e4d9a908d6b89 libgcrypt-1.2.1-r1.ebuild 1063
 MD5 918a1b851dd53568897b4fc7c503912e metadata.xml 276
 MD5 aac9d14d38568a9aab54928cc3e05a5c libgcrypt-1.1.94.ebuild 992
 MD5 dd3b6ee3caf7dc34c0ffa5758993c72a libgcrypt-1.2.0.ebuild 1050
+MD5 713d351bd0021c65c59db7bfd734375e libgcrypt-1.2.1-r1.ebuild 1108
 MD5 9bf9811b5db655640e7f280bb9bab24c files/digest-libgcrypt-1.1.12 68
 MD5 1c871fcf508869ff09d46782655c3ca5 files/digest-libgcrypt-1.2.1 67
 MD5 1c871fcf508869ff09d46782655c3ca5 files/digest-libgcrypt-1.2.1-r1 67
 MD5 9f546283fe69d56096f3707d52a4668a files/digest-libgcrypt-1.1.94 68
 MD5 16b1f5ae3cd2e7678379e1c6be616455 files/digest-libgcrypt-1.2.0 67
+MD5 af5915592167ae4fd16bab42364d3c8a files/libgcrypt-1.2.1-GNU-stack-fix.patch 22394
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDBvKHmdTrptrqvGERAu7wAJ9qfUQngelzNwwERS8tRKYwGT7zIQCfTrpV
-fryi5kI29DAOMJuWUgfB1lc=
-=nfdI
+iD8DBQFDGxMHmdTrptrqvGERAt7lAJ9IONordHINekx85qbrBivrrGys4wCcCVnt
+Bq+RFBaAgOTrbA6ybBzCF9E=
+=KXkC
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.2.1-GNU-stack-fix.patch b/dev-libs/libgcrypt/files/libgcrypt-1.2.1-GNU-stack-fix.patch
new file mode 100644
index 000000000000..5c856ba0307a
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.2.1-GNU-stack-fix.patch
@@ -0,0 +1,527 @@
+diff -ru libgcrypt-1.2.1/mpi/alpha/mpih-add1.S /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-add1.S
+--- libgcrypt-1.2.1/mpi/alpha/mpih-add1.S	2002-05-14 23:11:06.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-add1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -122,3 +122,4 @@
+ 
+ 	.end	_gcry_mpih_add_n
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/alpha/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/alpha/mpih-lshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-lshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -120,3 +120,4 @@
+ 	.end	_gcry_mpih_lshift
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/alpha/mpih-mul1.S /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-mul1.S
+--- libgcrypt-1.2.1/mpi/alpha/mpih-mul1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-mul1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -88,3 +88,4 @@
+ 	.end	_gcry_mpih_mul_1
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/alpha/mpih-mul2.S /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-mul2.S
+--- libgcrypt-1.2.1/mpi/alpha/mpih-mul2.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-mul2.S	2005-09-05 01:06:12.000000000 +1000
+@@ -95,3 +95,4 @@
+ 
+ 	.end	_gcry_mpih_addmul_1
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/alpha/mpih-mul3.S /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-mul3.S
+--- libgcrypt-1.2.1/mpi/alpha/mpih-mul3.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-mul3.S	2005-09-05 01:06:12.000000000 +1000
+@@ -93,3 +93,4 @@
+ 
+ 	.end	_gcry_mpih_submul_1
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/alpha/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/alpha/mpih-rshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-rshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -116,3 +116,4 @@
+ 	ret	$31,($26),1
+ 	.end	_gcry_mpih_rshift
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/alpha/mpih-sub1.S /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-sub1.S
+--- libgcrypt-1.2.1/mpi/alpha/mpih-sub1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/alpha/mpih-sub1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -122,3 +122,4 @@
+ 	.end	_gcry_mpih_sub_n
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/alpha/udiv-qrnnd.S /tmp/libgcrypt-1.2.1/mpi/alpha/udiv-qrnnd.S
+--- libgcrypt-1.2.1/mpi/alpha/udiv-qrnnd.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/alpha/udiv-qrnnd.S	2005-09-05 01:06:12.000000000 +1000
+@@ -157,3 +157,4 @@
+ 	ret	$31,($26),1
+ 
+ 	.end	__udiv_qrnnd
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/hppa/mpih-add1.S /tmp/libgcrypt-1.2.1/mpi/hppa/mpih-add1.S
+--- libgcrypt-1.2.1/mpi/hppa/mpih-add1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/hppa/mpih-add1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -68,3 +68,4 @@
+ 
+ 	.exit
+ 	.procend
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/hppa/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/hppa/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/hppa/mpih-lshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/hppa/mpih-lshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -75,3 +75,4 @@
+ 
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/hppa/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/hppa/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/hppa/mpih-rshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/hppa/mpih-rshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -71,3 +71,4 @@
+ 	.exit
+ 	.procend
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/hppa/mpih-sub1.S /tmp/libgcrypt-1.2.1/mpi/hppa/mpih-sub1.S
+--- libgcrypt-1.2.1/mpi/hppa/mpih-sub1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/hppa/mpih-sub1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -76,3 +76,4 @@
+ 
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/hppa/udiv-qrnnd.S /tmp/libgcrypt-1.2.1/mpi/hppa/udiv-qrnnd.S
+--- libgcrypt-1.2.1/mpi/hppa/udiv-qrnnd.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/hppa/udiv-qrnnd.S	2005-09-05 01:06:12.000000000 +1000
+@@ -295,3 +295,4 @@
+ 
+ 	.exit
+ 	.procend
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul1.S /tmp/libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul1.S
+--- libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -111,3 +111,4 @@
+ 	.procend
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul2.S /tmp/libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul2.S
+--- libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul2.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul2.S	2005-09-05 01:06:12.000000000 +1000
+@@ -113,3 +113,4 @@
+ 	.procend
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul3.S /tmp/libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul3.S
+--- libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul3.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/hppa1.1/mpih-mul3.S	2005-09-05 01:06:12.000000000 +1000
+@@ -123,3 +123,4 @@
+ 	.exit
+ 	.procend
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/hppa1.1/udiv-qrnnd.S /tmp/libgcrypt-1.2.1/mpi/hppa1.1/udiv-qrnnd.S
+--- libgcrypt-1.2.1/mpi/hppa1.1/udiv-qrnnd.S	2005-01-06 00:41:03.000000000 +1100
++++ /tmp/libgcrypt-1.2.1/mpi/hppa1.1/udiv-qrnnd.S	2005-09-05 01:06:12.000000000 +1000
+@@ -88,3 +88,4 @@
+ 	.exit
+ 	.procend
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i386/mpih-add1.S /tmp/libgcrypt-1.2.1/mpi/i386/mpih-add1.S
+--- libgcrypt-1.2.1/mpi/i386/mpih-add1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i386/mpih-add1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -114,3 +114,4 @@
+ 	popl %edi
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i386/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/i386/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/i386/mpih-lshift.S	2003-10-31 16:06:06.000000000 +1100
++++ /tmp/libgcrypt-1.2.1/mpi/i386/mpih-lshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -92,3 +92,4 @@
+ 	popl	%edi
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i386/mpih-mul1.S /tmp/libgcrypt-1.2.1/mpi/i386/mpih-mul1.S
+--- libgcrypt-1.2.1/mpi/i386/mpih-mul1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i386/mpih-mul1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -82,3 +82,4 @@
+ 	INSN1(pop,l	,R(edi))
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i386/mpih-mul2.S /tmp/libgcrypt-1.2.1/mpi/i386/mpih-mul2.S
+--- libgcrypt-1.2.1/mpi/i386/mpih-mul2.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i386/mpih-mul2.S	2005-09-05 01:06:12.000000000 +1000
+@@ -84,3 +84,4 @@
+ 	INSN1(pop,l	,R(edi))
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i386/mpih-mul3.S /tmp/libgcrypt-1.2.1/mpi/i386/mpih-mul3.S
+--- libgcrypt-1.2.1/mpi/i386/mpih-mul3.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i386/mpih-mul3.S	2005-09-05 01:06:12.000000000 +1000
+@@ -84,3 +84,4 @@
+ 	INSN1(pop,l	,R(edi))
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i386/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/i386/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/i386/mpih-rshift.S	2003-10-31 16:06:06.000000000 +1100
++++ /tmp/libgcrypt-1.2.1/mpi/i386/mpih-rshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -95,3 +95,4 @@
+ 	popl	%edi
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i386/mpih-sub1.S /tmp/libgcrypt-1.2.1/mpi/i386/mpih-sub1.S
+--- libgcrypt-1.2.1/mpi/i386/mpih-sub1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i386/mpih-sub1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -115,3 +115,4 @@
+ 	popl %edi
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i586/mpih-add1.S /tmp/libgcrypt-1.2.1/mpi/i586/mpih-add1.S
+--- libgcrypt-1.2.1/mpi/i586/mpih-add1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i586/mpih-add1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -133,3 +133,4 @@
+ 	ret
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i586/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/i586/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/i586/mpih-lshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i586/mpih-lshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -227,3 +227,4 @@
+ 	ret
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i586/mpih-mul1.S /tmp/libgcrypt-1.2.1/mpi/i586/mpih-mul1.S
+--- libgcrypt-1.2.1/mpi/i586/mpih-mul1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i586/mpih-mul1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -87,3 +87,4 @@
+ 	INSN1(pop,l	,R(edi))
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i586/mpih-mul2.S /tmp/libgcrypt-1.2.1/mpi/i586/mpih-mul2.S
+--- libgcrypt-1.2.1/mpi/i586/mpih-mul2.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i586/mpih-mul2.S	2005-09-05 01:06:12.000000000 +1000
+@@ -91,3 +91,4 @@
+ 	INSN1(pop,l	,R(edi))
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i586/mpih-mul3.S /tmp/libgcrypt-1.2.1/mpi/i586/mpih-mul3.S
+--- libgcrypt-1.2.1/mpi/i586/mpih-mul3.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i586/mpih-mul3.S	2005-09-05 01:06:12.000000000 +1000
+@@ -91,3 +91,4 @@
+ 	INSN1(pop,l	,R(edi))
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i586/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/i586/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/i586/mpih-rshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i586/mpih-rshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -226,3 +226,4 @@
+ 	popl	%edi
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/i586/mpih-sub1.S /tmp/libgcrypt-1.2.1/mpi/i586/mpih-sub1.S
+--- libgcrypt-1.2.1/mpi/i586/mpih-sub1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/i586/mpih-sub1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -140,3 +140,4 @@
+ 	popl	%edi
+ 	ret
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul1.S /tmp/libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul1.S
+--- libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -102,3 +102,4 @@
+ EPILOG(_gcry_mpih_mul_1)
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul2.S /tmp/libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul2.S
+--- libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul2.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul2.S	2005-09-05 01:06:12.000000000 +1000
+@@ -92,3 +92,4 @@
+ 	rts
+ EPILOG(_gcry_mpih_addmul_1)
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul3.S /tmp/libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul3.S
+--- libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul3.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/m68k/mc68020/mpih-mul3.S	2005-09-05 01:06:12.000000000 +1000
+@@ -95,3 +95,4 @@
+ EPILOG(_gcry_mpih_submul_1)
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/m68k/mpih-add1.S /tmp/libgcrypt-1.2.1/mpi/m68k/mpih-add1.S
+--- libgcrypt-1.2.1/mpi/m68k/mpih-add1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/m68k/mpih-add1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -90,3 +90,4 @@
+ EPILOG(_gcry_mpih_add_n)
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/m68k/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/m68k/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/m68k/mpih-lshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/m68k/mpih-lshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -162,3 +162,4 @@
+ 
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/m68k/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/m68k/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/m68k/mpih-rshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/m68k/mpih-rshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -160,3 +160,4 @@
+ 
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/m68k/mpih-sub1.S /tmp/libgcrypt-1.2.1/mpi/m68k/mpih-sub1.S
+--- libgcrypt-1.2.1/mpi/m68k/mpih-sub1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/m68k/mpih-sub1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -89,3 +89,4 @@
+ EPILOG(_gcry_mpih_sub_n)
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/mips3/mpih-add1.S /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-add1.S
+--- libgcrypt-1.2.1/mpi/mips3/mpih-add1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-add1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -122,3 +122,4 @@
+ 
+ 	.end	_gcry_mpih_add_n
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/mips3/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/mips3/mpih-lshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-lshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -95,3 +95,4 @@
+ 	j	$31
+ 	sd	$8,-8($4)
+ 	.end	_gcry_mpih_lshift
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/mips3/mpih-mul1.S /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-mul1.S
+--- libgcrypt-1.2.1/mpi/mips3/mpih-mul1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-mul1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -87,3 +87,4 @@
+ 
+ 	.end	_gcry_mpih_mul_1
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/mips3/mpih-mul2.S /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-mul2.S
+--- libgcrypt-1.2.1/mpi/mips3/mpih-mul2.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-mul2.S	2005-09-05 01:06:12.000000000 +1000
+@@ -99,3 +99,4 @@
+ 
+ 	.end	_gcry_mpih_addmul_1
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/mips3/mpih-mul3.S /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-mul3.S
+--- libgcrypt-1.2.1/mpi/mips3/mpih-mul3.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-mul3.S	2005-09-05 01:06:12.000000000 +1000
+@@ -99,3 +99,4 @@
+ 
+ 	.end	_gcry_mpih_submul_1
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/mips3/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/mips3/mpih-rshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-rshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -93,3 +93,4 @@
+ 	sd	$8,0($4)
+ 	.end	_gcry_mpih_rshift
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/mips3/mpih-sub1.S /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-sub1.S
+--- libgcrypt-1.2.1/mpi/mips3/mpih-sub1.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/mips3/mpih-sub1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -123,3 +123,4 @@
+ 
+ 	.end	_gcry_mpih_sub_n
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/pa7100/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/pa7100/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/pa7100/mpih-lshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/pa7100/mpih-lshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -94,3 +94,4 @@
+ 
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/pa7100/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/pa7100/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/pa7100/mpih-rshift.S	2002-05-14 23:11:07.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/pa7100/mpih-rshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -90,3 +90,4 @@
+ 	.procend
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/power/mpih-add1.S /tmp/libgcrypt-1.2.1/mpi/power/mpih-add1.S
+--- libgcrypt-1.2.1/mpi/power/mpih-add1.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/power/mpih-add1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -85,3 +85,4 @@
+ 	aze	3,3		# ... return value register
+ 	br
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/power/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/power/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/power/mpih-lshift.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/power/mpih-lshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -62,3 +62,4 @@
+ 	st	7,-4(9) 	# store it
+ 	br
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/power/mpih-mul1.S /tmp/libgcrypt-1.2.1/mpi/power/mpih-mul1.S
+--- libgcrypt-1.2.1/mpi/power/mpih-mul1.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/power/mpih-mul1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -113,3 +113,4 @@
+ 	aze	3,9
+ 	br
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/power/mpih-mul2.S /tmp/libgcrypt-1.2.1/mpi/power/mpih-mul2.S
+--- libgcrypt-1.2.1/mpi/power/mpih-mul2.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/power/mpih-mul2.S	2005-09-05 01:06:12.000000000 +1000
+@@ -128,3 +128,4 @@
+ 	aze	3,9
+ 	br
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/power/mpih-mul3.S /tmp/libgcrypt-1.2.1/mpi/power/mpih-mul3.S
+--- libgcrypt-1.2.1/mpi/power/mpih-mul3.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/power/mpih-mul3.S	2005-09-05 01:06:12.000000000 +1000
+@@ -133,3 +133,4 @@
+ 	aze	3,9
+ 	br
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/power/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/power/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/power/mpih-rshift.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/power/mpih-rshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -62,3 +62,4 @@
+ 	br
+ 
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/power/mpih-sub1.S /tmp/libgcrypt-1.2.1/mpi/power/mpih-sub1.S
+--- libgcrypt-1.2.1/mpi/power/mpih-sub1.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/power/mpih-sub1.S	2005-09-05 01:06:12.000000000 +1000
+@@ -86,3 +86,4 @@
+ 	sfi	3,3,0		# ... return value register
+ 	br
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/powerpc32/mpih-add1.S /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-add1.S
+--- libgcrypt-1.2.1/mpi/powerpc32/mpih-add1.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-add1.S	2005-09-05 01:11:46.000000000 +1000
+@@ -132,5 +132,6 @@
+ 1:     addze %r3,%r10
+        blr
+ END(_gcry_mpih_add_n)
++.section .note.GNU-stack,"",@progbits
+ #endif
+ 
+Only in /tmp/libgcrypt-1.2.1/mpi/powerpc32: mpih-add1.S~
+diff -ru libgcrypt-1.2.1/mpi/powerpc32/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/powerpc32/mpih-lshift.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-lshift.S	2005-09-05 01:10:44.000000000 +1000
+@@ -195,4 +195,5 @@
+        DO_LSHIFT(31)
+ 
+ END(_gcry_mpih_lshift)
++.section .note.GNU-stack,"",@progbits
+ #endif
+Only in /tmp/libgcrypt-1.2.1/mpi/powerpc32: mpih-lshift.S~
+diff -ru libgcrypt-1.2.1/mpi/powerpc32/mpih-mul1.S /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-mul1.S
+--- libgcrypt-1.2.1/mpi/powerpc32/mpih-mul1.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-mul1.S	2005-09-05 01:11:28.000000000 +1000
+@@ -117,4 +117,5 @@
+        addze   %r3,%r10
+        blr
+ END(_gcry_mpih_mul_1)
++.section .note.GNU-stack,"",@progbits
+ #endif
+Only in /tmp/libgcrypt-1.2.1/mpi/powerpc32: mpih-mul1.S~
+diff -ru libgcrypt-1.2.1/mpi/powerpc32/mpih-mul2.S /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-mul2.S
+--- libgcrypt-1.2.1/mpi/powerpc32/mpih-mul2.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-mul2.S	2005-09-05 01:11:21.000000000 +1000
+@@ -124,4 +124,5 @@
+        addze   %r3,%r10
+        blr
+ END(_gcry_mpih_addmul_1)
++.section .note.GNU-stack,"",@progbits
+ #endif
+Only in /tmp/libgcrypt-1.2.1/mpi/powerpc32: mpih-mul2.S~
+diff -ru libgcrypt-1.2.1/mpi/powerpc32/mpih-mul3.S /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-mul3.S
+--- libgcrypt-1.2.1/mpi/powerpc32/mpih-mul3.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-mul3.S	2005-09-05 01:11:12.000000000 +1000
+@@ -127,4 +127,5 @@
+        addze   %r3,%r10
+        blr
+ END(_gcry_mpih_submul_1)
++.section .note.GNU-stack,"",@progbits
+ #endif
+Only in /tmp/libgcrypt-1.2.1/mpi/powerpc32: mpih-mul3.S~
+diff -ru libgcrypt-1.2.1/mpi/powerpc32/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/powerpc32/mpih-rshift.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-rshift.S	2005-09-05 01:10:56.000000000 +1000
+@@ -128,4 +128,5 @@
+        stw     0,4(7)
+        blr
+ END(_gcry_mpih_rshift)
++.section .note.GNU-stack,"",@progbits
+ #endif
+Only in /tmp/libgcrypt-1.2.1/mpi/powerpc32: mpih-rshift.S~
+diff -ru libgcrypt-1.2.1/mpi/powerpc32/mpih-sub1.S /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-sub1.S
+--- libgcrypt-1.2.1/mpi/powerpc32/mpih-sub1.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/powerpc32/mpih-sub1.S	2005-09-05 01:10:28.000000000 +1000
+@@ -130,4 +130,5 @@
+        neg   %r3,%r3
+        blr
+ END(_gcry_mpih_sub_n)
++.section .note.GNU-stack,"",@progbits
+ #endif
+Only in /tmp/libgcrypt-1.2.1/mpi/powerpc32: mpih-sub1.S~
+diff -ru libgcrypt-1.2.1/mpi/sparc32/mpih-lshift.S /tmp/libgcrypt-1.2.1/mpi/sparc32/mpih-lshift.S
+--- libgcrypt-1.2.1/mpi/sparc32/mpih-lshift.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/sparc32/mpih-lshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -95,3 +95,4 @@
+ 	retl
+ 	ld	[%sp+80],%o0
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/sparc32/mpih-rshift.S /tmp/libgcrypt-1.2.1/mpi/sparc32/mpih-rshift.S
+--- libgcrypt-1.2.1/mpi/sparc32/mpih-rshift.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/sparc32/mpih-rshift.S	2005-09-05 01:06:12.000000000 +1000
+@@ -91,3 +91,4 @@
+ 	retl
+ 	ld	[%sp+80],%o0
+ 
++.section .note.GNU-stack,"",@progbits
+diff -ru libgcrypt-1.2.1/mpi/supersparc/udiv.S /tmp/libgcrypt-1.2.1/mpi/supersparc/udiv.S
+--- libgcrypt-1.2.1/mpi/supersparc/udiv.S	2002-05-14 23:11:08.000000000 +1000
++++ /tmp/libgcrypt-1.2.1/mpi/supersparc/udiv.S	2005-09-05 01:06:23.000000000 +1000
+@@ -116,3 +116,4 @@
+ 	ret
+ 	restore
+ 
++.section .note.GNU-stack,"",@progbits
diff --git a/dev-libs/libgcrypt/libgcrypt-1.2.1-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.2.1-r1.ebuild
index 45c695bd3885..45cba79a57a5 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.2.1-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.2.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/dev-libs/libgcrypt/libgcrypt-1.2.1-r1.ebuild,v 1.1 2005/08/20 09:05:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.2.1-r1.ebuild,v 1.2 2005/09/04 15:29:48 dragonheart Exp $
 
 inherit eutils
 
@@ -20,6 +20,7 @@ RDEPEND="nls? ( sys-devel/gettext )
 src_unpack() {
 	unpack ${A}
 	epunt_cxx
+	epatch ${FILESDIR}/${P}-GNU-stack-fix.patch
 }
 
 src_compile() {