Version bump by Vladimir #280434.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 98 insertions, 6 deletions

diff --git a/app-arch/unzip/ChangeLog b/app-arch/unzip/ChangeLog
index abfd43bb3dd4..562922d469f5 100644
--- a/app-arch/unzip/ChangeLog
+++ b/app-arch/unzip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/unzip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.58 2009/05/29 23:50:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.59 2009/08/14 07:20:59 vapier Exp $
+
+*unzip-6.0 (14 Aug 2009)
+
+  14 Aug 2009; Mike Frysinger <vapier@gentoo.org> +unzip-6.0.ebuild,
+  +files/unzip-6.0-no-exec-stack.patch:
+  Version bump by Vladimir #280434.
 
   29 May 2009; Mike Frysinger <vapier@gentoo.org> -unzip-5.52-r1.ebuild:
   Punt old package vuln to GLSA 200804-06 #271725 by Robert Buchholz.
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 1c85f1d073c0..9ec7ff59d130 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -3,14 +3,17 @@ Hash: SHA1
 
 AUX unzip-5.52-CVE-2008-0888.patch 1075 RMD160 03d5ec7845ae9347a197c7d1484bb2d9ab96cb93 SHA1 a72e703048ddd2226d430b7375b531320997b98a SHA256 a93b927000ff5923c3e84fc4108a0f19d76a3a057a33556a2f761c18b270f87c
 AUX unzip-5.52-no-exec-stack.patch 334 RMD160 81d73b5bb66fb54f8f71252c1fe6e2036d488de9 SHA1 0f318fecebd548e9feb2e93a32c56258d5c552b1 SHA256 8e165db2c138f9729020f3e60e9d8be58d504f4cf8eb7aae18b9432d2d751d4f
+AUX unzip-6.0-no-exec-stack.patch 381 RMD160 c45c06fd6a4fc88ce051637b6d7f1f4b0e09fa48 SHA1 d26e9fb76d73d77c2651198a3b27ae8bfb06fb34 SHA256 ae62249dcf8bbc3c30468b07944df6c8777b565927d9ed6d1fdf7395899ea7c7
 DIST unzip552.tar.gz 1140291 RMD160 b749b0923bc4cceaa6f937aef688e9713a84328c SHA1 1831bd59b9e607a69052f83b263384895e2d4a19 SHA256 145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
+DIST unzip60.tar.gz 1376845 RMD160 48af66606e9472e45fbb94bc4e285da23d1b89ba SHA1 abf7de8a4018a983590ed6f5cbd990d4740f8a22 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
 EBUILD unzip-5.52-r2.ebuild 1741 RMD160 3c2526bb8e409cdfa732bf3ede58b634c12969cb SHA1 cbb348d770925e7737bfff4d1832ea6c374184a5 SHA256 939f3df994f9b6b34932dcba358ea9b6f5c93c2fa297e619b97742b4995db539
-MISC ChangeLog 6721 RMD160 d86252b7f5775d9552ca1dc28950d19e98102749 SHA1 c71977633c316a9320ab1331104b6f84d4792440 SHA256 a62023f4fa5d29dff0c67163f82b3c113149a48b15cd954fa29776db5a405f76
+EBUILD unzip-6.0.ebuild 1918 RMD160 5478a022561c774979faf3b4a4c56f03c947a163 SHA1 bff497f2969139a325149829d29495f2e78302a6 SHA256 1c16113f54cdf1d7c2dc11deda699344f9d1706fd614031f97d24bcb4f1fb5e5
+MISC ChangeLog 6893 RMD160 4584269e940786e822dc8c792581c042f6d9f515 SHA1 8a61f3892775206d12a695d0783ea32b84c47de9 SHA256 02f1a23727c48ceaf99557f05a798d2257f033126dce1f27b987215dce62b169
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkogdNYACgkQn/5bYzqsSmEFtACePWbcscRgTuIkD129/JxT5u/s
-ac8AnR1eLpPDMKO8b5tz1eIfHHDd9Dk7
-=UopQ
+iEYEARECAAYFAkqFEGEACgkQlPl3HsVfCDrThwCfdQeHMDSGkklgU4lRNInuEGtR
+6mcAn3cEVTdTUzim48BB7mmbHzbCiZGB
+=NNfh
 -----END PGP SIGNATURE-----
diff --git a/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch b/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
new file mode 100644
index 000000000000..7973378704e1
--- /dev/null
+++ b/app-arch/unzip/files/unzip-6.0-no-exec-stack.patch
@@ -0,0 +1,13 @@
+Make sure that the asm files don't incorrectly trigger an executable
+stack marking in the final shared library.  That's bad, mmmkay.
+
+--- unzip/crc_i386.S
++++ unzip/crc_i386.S
+@@ -302,3 +302,7 @@
+ #endif /* i386 || _i386 || _I386 || __i386 */
+ 
+ #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
diff --git a/app-arch/unzip/unzip-6.0.ebuild b/app-arch/unzip/unzip-6.0.ebuild
new file mode 100644
index 000000000000..57587a096516
--- /dev/null
+++ b/app-arch/unzip/unzip-6.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0.ebuild,v 1.1 2009/08/14 07:20:59 vapier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P="${PN}${PV/.}"
+
+DESCRIPTION="unzipper for pkzip-compressed files"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bzip2 unicode"
+
+DEPEND="bzip2? ( app-arch/bzip2 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-exec-stack.patch
+	sed -i \
+		-e '/^CFLAGS/d' \
+		-e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \
+		-e '/^STRIP/s:=.*:=true:' \
+		-e "s:CC=gcc :CC=$(tc-getCC) :" \
+		-e "s:LD=gcc :LD=$(tc-getCC) :" \
+		-e "s:AS=gcc :AS=$(tc-getCC) :" \
+		-e 's:LF2 = -s:LF2 = :' \
+		-e 's:LF = :LF = $(LDFLAGS) :' \
+		-e 's:SL = :SL = $(LDFLAGS) :' \
+		-e 's:FL = :FL = $(LDFLAGS) :' \
+		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
+		unix/Makefile \
+		|| die "sed unix/Makefile failed"
+}
+
+src_compile() {
+	local TARGET
+	case ${CHOST} in
+		i?86*-*linux*)       TARGET=linux_asm ;;
+		*linux*)             TARGET=linux_noasm ;;
+		i?86*-*bsd* | \
+		i?86*-dragonfly*)    TARGET=freebsd ;; # mislabelled bsd with x86 asm
+		*bsd* | *dragonfly*) TARGET=bsd ;;
+		*-darwin*)           TARGET=macosx ;;
+		*) die "Unknown target, you suck" ;;
+	esac
+
+	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
+	use bzip2 && append-cppflags -DUSE_BZIP2
+	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
+	append-lfs-flags #104315
+
+	emake \
+		-f unix/Makefile \
+		${TARGET} || die "emake failed"
+}
+
+src_install() {
+	dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
+	dosym unzip /usr/bin/zipinfo || die
+	doman man/*.1
+	dodoc BUGS History* README ToDo WHERE
+}