summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-03-14 03:13:45 +0000
committerMike Frysinger <vapier@gentoo.org>2006-03-14 03:13:45 +0000
commit12262f88f47805e15e3e19cb9116a72518f3ce8a (patch)
treedfd085d637a265281fcb697eff4fea13c5ab4d61 /app-arch/zip/files
parentstabilize (diff)
downloadgentoo-2-12262f88f47805e15e3e19cb9116a72518f3ce8a.tar.gz
gentoo-2-12262f88f47805e15e3e19cb9116a72518f3ce8a.tar.bz2
gentoo-2-12262f88f47805e15e3e19cb9116a72518f3ce8a.zip
Fix execstack markings on x86 and fixes by Roberto Teichmann for USE=crypt support #122849.
(Portage version: 2.1_pre6-r2)
Diffstat (limited to 'app-arch/zip/files')
-rw-r--r--app-arch/zip/files/digest-zip-2.31-r12
-rw-r--r--app-arch/zip/files/zip-2.31-exec-stack.patch20
2 files changed, 22 insertions, 0 deletions
diff --git a/app-arch/zip/files/digest-zip-2.31-r1 b/app-arch/zip/files/digest-zip-2.31-r1
new file mode 100644
index 000000000000..b95b7f59559d
--- /dev/null
+++ b/app-arch/zip/files/digest-zip-2.31-r1
@@ -0,0 +1,2 @@
+MD5 6bfc076664416251d7624ab3538d1cb9 zip231.tar.gz 781641
+MD5 0c969ba1661183b041a142945ed2710e zcrypt29.zip 20248
diff --git a/app-arch/zip/files/zip-2.31-exec-stack.patch b/app-arch/zip/files/zip-2.31-exec-stack.patch
new file mode 100644
index 000000000000..d3efbd902cb1
--- /dev/null
+++ b/app-arch/zip/files/zip-2.31-exec-stack.patch
@@ -0,0 +1,20 @@
+--- zip-2.31/crc_i386.S
++++ zip-2.31/crc_i386.S
+@@ -238,3 +238,7 @@
+ #endif /* i386 || _i386 || _I386 || __i386 */
+
+ #endif /* !USE_ZLIB */
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- zip-2.31/match.S
++++ zip-2.31/match.S
+@@ -405,3 +405,7 @@
+ #endif /* i386 || _I386 || _i386 || __i386 */
+
+ #endif /* !USE_ZLIB */
++
++#ifdef __ELF__
++.section .note.GNU-stack,"",@progbits
++#endif