Fix execstack markings on x86 and fixes by Roberto Teichmann for USE=crypt support #122849.

Package-Manager: portage-2.1_pre6-r2

5 files changed, 92 insertions, 8 deletions

diff --git a/app-arch/zip/ChangeLog b/app-arch/zip/ChangeLog
index ea02baa8a9f1..3a98ae007792 100644
--- a/app-arch/zip/ChangeLog
+++ b/app-arch/zip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/zip
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.37 2005/07/23 23:11:35 kito Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.38 2006/03/14 03:13:45 vapier Exp $
+
+*zip-2.31-r1 (14 Mar 2006)
+
+  14 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/zip-2.31-exec-stack.patch, +zip-2.31-r1.ebuild:
+  Fix execstack markings on x86 and fixes by Roberto Teichmann for USE=crypt
+  support #122849.
 
   23 Jul 2005; Kito <kito@gentoo.org> zip-2.31.ebuild:
   ~ppc-macos keyword
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 1c870952e1cb..6b1746ddfc4c 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,31 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 15384cd46b5f49cc043768e7040f2186 ChangeLog 4184
-RMD160 5245f67dad3cd2e5eea1bf82a9a6d0e5361f45a8 ChangeLog 4184
-SHA256 6fe89b11c3943bc0acade81ee320ffb15fb92f697264b545e20964be852c5666 ChangeLog 4184
+MD5 eca08d17598ad3224bae53f8324e9059 ChangeLog 4418
+RMD160 7e4584cb11ed783c0cf5fdf61fe9c565f0c61502 ChangeLog 4418
+SHA256 64b80b7665dfe1294a504d1f417938624d73d860d4d2ab310313a6c28c18bea2 ChangeLog 4418
 MD5 0fae982a1638aacea39c862dd7ebbea6 files/digest-zip-2.3-r4 113
 RMD160 42f4f4e1ceb7b13c213a9c236dfa94c9aa2096a9 files/digest-zip-2.3-r4 113
 SHA256 7e3a25a2d0809a4115201af278d11a02b0906f99ba90d367e7648ac7fd63b6be files/digest-zip-2.3-r4 113
 MD5 d9c724447892c616f7f5f407c62e0b2b files/digest-zip-2.31 114
 RMD160 0ebc71a6104a2885b7c631d57ff230bf38ed2672 files/digest-zip-2.31 114
 SHA256 f26e376520a2f1a6acbe0485b3c32c14f8a3eb29cd88408abd8b16841a0158e2 files/digest-zip-2.31 114
+MD5 d9c724447892c616f7f5f407c62e0b2b files/digest-zip-2.31-r1 114
+RMD160 0ebc71a6104a2885b7c631d57ff230bf38ed2672 files/digest-zip-2.31-r1 114
+SHA256 f26e376520a2f1a6acbe0485b3c32c14f8a3eb29cd88408abd8b16841a0158e2 files/digest-zip-2.31-r1 114
 MD5 6cf67950f3003a17d048c9a3ce4f243a files/zip-2.3-unix_configure-pic.patch 444
 RMD160 8fd81ff732abe0e6189cd593c98e0055a11dca36 files/zip-2.3-unix_configure-pic.patch 444
 SHA256 3e348be7890f21280fceab6cb2a87f3020b08a31608ab93d1b5a53667760e556 files/zip-2.3-unix_configure-pic.patch 444
+MD5 249bdbaf477c3e08661cd70e3e7aa5fa files/zip-2.31-exec-stack.patch 407
+RMD160 a27f0112dbbda418feef97b66240442190e8b5d7 files/zip-2.31-exec-stack.patch 407
+SHA256 108686d8854096422bd4895690a37202aee66757d0d2b43afa16d9fb914cbb29 files/zip-2.31-exec-stack.patch 407
 MD5 ceb628bca144581dbeff71136122a8e2 files/zip-CAN-2004-1010.patch 673
 RMD160 63050e116d9ce49b7b26654a9f88e90f0332d055 files/zip-CAN-2004-1010.patch 673
 SHA256 92ed24fad3d7dd9567f2771a14bbd4905ed36aaff71b37e89d919b1fcf07e431 files/zip-CAN-2004-1010.patch 673
 MD5 7a2b80d9c775f53e81a1dc80368fd681 zip-2.3-r4.ebuild 1110
 RMD160 6bb71b1c4baa70bf28c2396eb7dae96030eca179 zip-2.3-r4.ebuild 1110
 SHA256 41c7618ea0f0762b970a213a8b73da5f9f03c837edcc3050f79db361c138af7b zip-2.3-r4.ebuild 1110
+MD5 2c11e0b9f8f9da782af1e54db7523fd9 zip-2.31-r1.ebuild 1242
+RMD160 772972ed4388b25f771548295dad1563e5c35170 zip-2.31-r1.ebuild 1242
+SHA256 8af4ca2adc8f46002c22634defde307a37af8d9173dae8eb51a4f3558efb021c zip-2.31-r1.ebuild 1242
 MD5 3e94f5d5f79eafb603ff7445dc991a2e zip-2.31.ebuild 1073
 RMD160 407c7527a7a3b925336ee5a614964eeeb270cb72 zip-2.31.ebuild 1073
 SHA256 80fca6cedd1b092b415d06c7c46f51869627fd44c19febebb3af66a7549cac8e zip-2.31.ebuild 1073
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEFjKK2+ySkm8kpY0RAm1VAJ4mEGfp8SDR/WOasHBrqgInWptl0wCbBn65
-u/8BFmtEHLI6WJU8BT9L4Kk=
-=ZBvi
+iD8DBQFEFjVl2+ySkm8kpY0RAjjsAKDG4wOwsFYYiGLMCH7dEB4CvUMlpgCdE2vT
+p9QBj5Zl8qNI15f7hYxOqG0=
+=/KqG
 -----END PGP SIGNATURE-----
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
diff --git a/app-arch/zip/zip-2.31-r1.ebuild b/app-arch/zip/zip-2.31-r1.ebuild
new file mode 100644
index 000000000000..a37161d517ef
--- /dev/null
+++ b/app-arch/zip/zip-2.31-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.31-r1.ebuild,v 1.1 2006/03/14 03:13:45 vapier Exp $
+
+inherit toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="ftp://ftp.freesoftware.com/pub/infozip/Zip.html"
+SRC_URI="ftp://ftp.info-zip.org/pub/infozip/src/zip${PV//.}.tar.gz"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="crypt"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/zip-2.3-unix_configure-pic.patch
+	epatch "${FILESDIR}"/${P}-exec-stack.patch
+	cd unix
+	use crypt || append-flags -DNO_CRYPT
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile
+}
+
+src_compile() {
+	emake \
+		-f unix/Makefile \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCC) -E" \
+		generic || die
+}
+
+src_install() {
+	dobin zip zipnote zipsplit || die
+	doman man/zip.1
+	dosym zip.1 /usr/share/man/man1/zipnote.1
+	dosym zip.1 /usr/share/man/man1/zipzplit.1
+	if use crypt ; then
+		dobin zipcloak || die
+		dosym zip.1 /usr/share/man/man1/zipcloak.1
+	fi
+	dodoc BUGS CHANGES MANUAL README TODO WHATSNEW WHERE proginfo/*.txt
+}