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

(Portage version: 2.1_pre6-r2)

4 files changed, 77 insertions, 2 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/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
+}