bump(app-arch/unzip): sync with upstream for arm64

Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand 2015-05-20 11:30:38 -07:00
parent 7199759f92
commit 0f8b62f1e1
14 changed files with 1018 additions and 8 deletions

View File

@ -0,0 +1,305 @@
# ChangeLog for app-arch/unzip
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.91 2014/01/18 05:01:26 vapier Exp $
18 Jan 2014; Mike Frysinger <vapier@gentoo.org> unzip-6.0-r3.ebuild:
Add arm64 love.
18 Feb 2013; Zac Medico <zmedico@gentoo.org> unzip-6.0-r3.ebuild:
Add ~arm-linux and ~x86-linux keywords.
16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Cleanup due bug #96436
30 Sep 2012; Raúl Porcel <armin76@gentoo.org> unzip-6.0-r3.ebuild:
alpha/ia64/m68k/s390/sh/sparc stable wrt #420727
28 Sep 2012; Johannes Huber <johu@gentoo.org> unzip-6.0-r3.ebuild:
Stable for x86, wrt bug #420727
22 Sep 2012; Agostino Sarubbo <ago@gentoo.org> unzip-6.0-r3.ebuild:
Stable for amd64, wrt bug #420727
20 Sep 2012; Anthony G. Basile <blueness@gentoo.org> unzip-6.0-r3.ebuild:
stable arm, bug #420727
20 Sep 2012; Anthony G. Basile <blueness@gentoo.org> unzip-6.0-r3.ebuild:
stable ppc ppc64, bug #420727
19 Sep 2012; Jeroen Roovers <jer@gentoo.org> unzip-6.0-r3.ebuild:
Stable for HPPA (bug #420727).
26 Apr 2012; Alexis Ballier <aballier@gentoo.org> unzip-6.0-r3.ebuild:
keyword ~amd64-fbsd
*unzip-6.0-r3 (01 Apr 2012)
01 Apr 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+unzip-6.0-r3.ebuild:
Add support for ASFLAGS and add abi-specific flags argument to AS
18 Dec 2011; Naohiro Aota <naota@gentoo.org> unzip-6.0-r2.ebuild:
Add ~x86-fbsd wrt 349393
12 Mar 2011; Raúl Porcel <armin76@gentoo.org> unzip-6.0-r2.ebuild:
Add ~ia64/~m68k/~s390/~sh/~sparc wrt #349393
07 Mar 2011; Tobias Klausmann <klausman@gentoo.org> unzip-6.0-r2.ebuild:
Keyworded on alpha, bug #349393
13 Jan 2011; Jeroen Roovers <jer@gentoo.org> unzip-6.0-r2.ebuild:
Marked ~hppa (bug #349393).
09 Jan 2011; Brent Baude <ranger@gentoo.org> unzip-6.0-r2.ebuild:
Marking unzip-6.0-r2 ~ppc for bug 349393
02 Jan 2011; Markus Meier <maekke@gentoo.org> unzip-6.0-r2.ebuild:
add ~arm, bug #349393
27 Dec 2010; Brent Baude <ranger@gentoo.org> unzip-6.0-r2.ebuild:
Marking unzip-6.0-r2 ~ppc64 for bug 349393
26 Dec 2010; Matt Turner <mattst88@gentoo.org> unzip-6.0-r2.ebuild:
Added ~mips, bug 349393
*unzip-6.0-r2 (22 Dec 2010)
22 Dec 2010; Peter Volkov <pva@gentoo.org> +unzip-6.0-r2.ebuild,
+files/unzip-6.0-natspec.patch, metadata.xml:
Added patch to use libnatspec to fix interoperability with Windows, bug
#275244.
14 Aug 2010; Harald van Dijk <truedfx@gentoo.org> unzip-6.0-r1.ebuild:
Fix quoting
02 Aug 2010; Jeroen Roovers <jer@gentoo.org> unzip-6.0-r1.ebuild:
Stable for PPC too.
23 Mar 2010; Mike Frysinger <vapier@gentoo.org> unzip-6.0-r1.ebuild:
Tweak by David James for how we set the toolchain to get better coverage
#305679.
10 Jan 2010; Jeroen Roovers <jer@gentoo.org> unzip-6.0-r1.ebuild:
Stable for HPPA too.
16 Oct 2009; Jeroen Roovers <jer@gentoo.org> unzip-6.0-r1.ebuild:
Marked ~hppa (bug #287368).
08 Oct 2009; Raúl Porcel <armin76@gentoo.org> unzip-6.0-r1.ebuild:
Add ~alpha/~ia64/~s390/~sh/~sparc wrt #287368
03 Oct 2009; Brent Baude <ranger@gentoo.org> unzip-6.0-r1.ebuild:
Marking unzip-6.0-r1 ppc64 for bug 287368
03 Oct 2009; Markus Meier <maekke@gentoo.org> unzip-6.0-r1.ebuild:
add ~arm, bug #287368
03 Oct 2009; Markus Meier <maekke@gentoo.org> unzip-6.0-r1.ebuild:
amd64/x86 stable, bug #287368
03 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> unzip-6.0-r1.ebuild:
Marked ~ppc, bug 287368
*unzip-6.0-r1 (16 Aug 2009)
16 Aug 2009; Mike Frysinger <vapier@gentoo.org> +unzip-6.0-r1.ebuild:
Add internal LFS flag to CPPFLAGS #281473 by Rafał Mużyło.
*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.
23 Oct 2008; Diego Pettenò <flameeyes@gentoo.org> unzip-5.52-r2.ebuild:
Also AS needs to e replaced.
29 Mar 2008; Jeroen Roovers <jer@gentoo.org> unzip-5.52-r2.ebuild:
Stable for HPPA (bug #213761).
29 Mar 2008; Raúl Porcel <armin76@gentoo.org> unzip-5.52-r2.ebuild:
alpha/ia64/sparc stable wrt security #213761
29 Mar 2008; Brent Baude <ranger@gentoo.org> unzip-5.52-r2.ebuild:
Marking unzip-5.52-r2 ppc64 and ppc for bug 213761
29 Mar 2008; Christian Faulhammer <opfer@gentoo.org> unzip-5.52-r2.ebuild:
stable x86, security bug 213761
29 Mar 2008; Robert Buchholz <rbu@gentoo.org> unzip-5.52-r2.ebuild:
amd64 stable, bug 213761
*unzip-5.52-r2 (29 Mar 2008)
29 Mar 2008; Mike Frysinger <vapier@gentoo.org>
+files/unzip-5.52-CVE-2008-0888.patch, +unzip-5.52-r2.ebuild:
Fix for CVE-2008-0888 #213761.
08 Feb 2008; Dawid Węgliński <cla@gentoo.org> unzip-5.52-r1.ebuild:
Change SRC_URI as the old url wasn't fetchable
06 Oct 2007; Mike Frysinger <vapier@gentoo.org> unzip-5.52-r1.ebuild:
Fix from Paul Bredbury to make sure we respect CPPFLAGS #194264.
21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
07 Jan 2007; Harald van Dijk <truedfx@gentoo.org> unzip-5.52-r1.ebuild:
Handle NetBSD CHOST and properly check for x86 for other BSDs
24 Oct 2006; Roy Marples <uberlord@gentoo.org> unzip-5.52-r1.ebuild:
Don't assume that freebsd == i386 :)
Added ~sparc-fbsd keyword.
04 Sep 2006; Joshua Kinard <kumba@gentoo.org> unzip-5.52-r1.ebuild:
Marked stable on mips.
18 Aug 2006; Bryan Østergaard <kloeri@gentoo.org> unzip-5.52-r1.ebuild:
Stable on alpha.
16 Aug 2006; Markus Rothe <corsair@gentoo.org> unzip-5.52-r1.ebuild:
Stable on ppc64
09 Aug 2006; Danny van Dyk <kugelfang@gentoo.org> unzip-5.52-r1.ebuild:
Marked stable on amd64.
05 Aug 2006; Michael Hanselmann <hansmi@gentoo.org> unzip-5.52-r1.ebuild:
Stable on ppc.
03 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> unzip-5.52-r1.ebuild:
Stable on hppa
03 Aug 2006; Gustavo Zacarias <gustavoz@gentoo.org> unzip-5.52-r1.ebuild:
Stable on sparc
31 Jul 2006; Andrej Kacian <ticho@gentoo.org> unzip-5.52-r1.ebuild:
Stable on x86. Bug #142149, by Daniel Black <dragonheart at gentoo.org>.
05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> unzip-5.52-r1.ebuild:
Add ~x86-fbsd keyword.
15 Feb 2006; Mike Frysinger <vapier@gentoo.org> unzip-5.52.ebuild,
unzip-5.52-r1.ebuild:
Robert Sebastian Gerus adds support for DragonFly BSD #122843.
*unzip-5.52-r1 (04 Oct 2005)
04 Oct 2005; Mike Frysinger <vapier@gentoo.org>
+files/unzip-5.52-no-exec-stack.patch, +unzip-5.52-r1.ebuild:
Make sure unzip isnt built with an executable stack.
09 Sep 2005; Aron Griffis <agriffis@gentoo.org> unzip-5.52.ebuild:
Mark 5.52 stable on alpha
03 Sep 2005; Markus Rothe <corsair@gentoo.org> unzip-5.52.ebuild:
Stable on ppc64
18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> unzip-5.52.ebuild:
Stable on ppc.
18 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> unzip-5.52.ebuild:
Stable on mips.
16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> unzip-5.52.ebuild:
Stable on sparc
23 Jul 2005; Kito <kito@gentoo.org> unzip-5.52.ebuild:
~ppc-macos keyword
31 May 2005; Sven Wegener <swegener@gentoo.org> unzip-5.50-r2.ebuild,
unzip-5.52.ebuild:
Let portage handle the stripping of binaries.
*unzip-5.52 (13 Mar 2005)
13 Mar 2005; Mike Frysinger <vapier@gentoo.org> +unzip-5.52.ebuild:
Version bump #84914 by Kenyon Ralph.
26 Jun 2004; Seemant Kulleen <seemant@gentoo.org> unzip-5.50-r2.ebuild:
my mistake
26 Jun 2004; Seemant Kulleen <seemant@gentoo.org> unzip-5.50-r2.ebuild:
can not have virtual/libc at all yet actually
11 May 2004; Michael McCabe <randy@gentoo.org> unzip-5.50-r2.ebuild:
Added s390 keywords
16 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> unzip-5.50-r2.ebuild:
tighten DEPEND (bug #44817); sed in src_unpack, not src_compile; use emake
16 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> unzip-5.42-r1.ebuild,
unzip-5.50-r1.ebuild, unzip-5.50.ebuild:
clean old ebuilds
14 Mar 2004; Tom Gall <tgall@gentoo.org> unzip-5.50-r2.ebuild:
ppc64 marked stable
03 Oct 2003; Christian Birchinger <joker@gentoo.org> unzip-5.50-r2.ebuild:
Added sparc stable keyword
29 Sep 2003; Jason Wever <weeve@gentoo.org> unzip-5.50-r2.ebuild:
Added ~sparc keyword.
*unzip-5.50-r2 (11 Jul 2003)
11 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> unzip-5.50-r2.ebuild :
Added patch from RedHat to fix '..' vulnerabilities.
20 May 2003; Tavis Ormandy <taviso@gentoo.org> unzip-5.50-r1.ebuild:
Removing gcc hardcode, and CFLAGS hardcode on non-x86
*unzip-5.50-r1 (21 Oct 2002)
12 Mar 2003; Zach Welch <zwelch@gentoo.org> unzip-5.50-r1.ebuild:
add arm keyword
15 Feb 2003; Jan Seidel <tuxus@gentoo.org> :
Added mips to keywords
10 Feb 2003; Guy Martin <gmsoft@gentoo.org> unzip-5.42-r1.ebuild :
Added hppa to keywords.
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
21 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
Added a symlink for zipinfo per #9425
*unzip-5.50 (01 Oct 2002)
01 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
Security update.
*unzip-5.42-r1 (25 Jul 2002)
05 Sep 2002; Seemant Kulleen <seemant@gentoo.org> unzip-5.42-r1.ebuild :
Per bug #7540 by rob1@rekl.yi.org (robert longhausen), the arch was not
matching. The arch check has been switched to the new format (use x86 &&
|| )
15 Aug 2002; Jack Morgan <jmorgan@gentoo.org> :
Added KEYWORDS sparc64
*unzip-5.42 (18 Feb 2002)
15 Jul 2002; Owen Stampflee <owen@gentoo.org> :
Added KEYWORDS.
18 Feb 2002; F.Meyndert <m0rpheus@gentoo.org> unzip-5.42.ebuild :
Removed patch. Patch broke more things then it fixes. Waiting for new
vendor patch. This is also the fix for bug #650
*unzip-5.42 (1 Feb 2002)
1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
Added initial ChangeLog which should be updated whenever the package is
updated in any way. This changelog is targetted to users. This means that the
comments should well explained and written in clean English. The details about
writing correct changelogs are explained in the skel.ChangeLog file which you
can find in the root directory of the portage repository.

View File

@ -1 +1,32 @@
DIST unzip60.tar.gz 1376845 RMD160 48af66606e9472e45fbb94bc4e285da23d1b89ba SHA1 abf7de8a4018a983590ed6f5cbd990d4740f8a22 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
AUX unzip-5.52-CVE-2008-0888.patch 1075 SHA256 a93b927000ff5923c3e84fc4108a0f19d76a3a057a33556a2f761c18b270f87c SHA512 08014ae7494d990b6bd058fbb993cffa3751c6c08e79cc770ec972002b63d4cbc413cf2a0cc00ff2da2e7040c04b9a5e99e97068c6a04e837d8499e8eaed8e89 WHIRLPOOL 23595e6c5dcfd493b785fdb8e4dfc745b466cee9dc67625a7f950f7ad4a5d1b719a245b1a7269d4aaae1c51095bc396d70e02e1d78b66edadf6539e5093ea0ae
AUX unzip-5.52-no-exec-stack.patch 334 SHA256 8e165db2c138f9729020f3e60e9d8be58d504f4cf8eb7aae18b9432d2d751d4f SHA512 3bb4949cdbbff66da0c874e6945d456441123852d139acf43878432af2314abdf2bb505d484b1f10f6b4268defeaae02cbf09400b6a5edd409e0f726c3a07350 WHIRLPOOL fcfb8438186d3c2753167b89e3a91c66f70d3eeb78db019de5508b96ff8a3d212e00765e7d07d323057499e2d6ed381f004b2771166fe6dd451c34d02eaca740
AUX unzip-6.0-natspec.patch 14746 SHA256 67ab260ae6adf8e7c5eda2d1d7846929b43562943ec4aff629bd7018954058b1 SHA512 5942f734325ed08656e45697893a005b416737f4bab4ba820a6a78513f58c08192d1d3ead599b8c13199f896cb20ab08449f63997fdd8e77a64c80ae727b3284 WHIRLPOOL 4e22fd9694148f6efa2361d08baa2e7554e5b75a87b6769889d8ecb744c729eb20c413a7915205ff52f073d2706691f311c6bb685fb21d8b9a42f7686ba32f59
AUX unzip-6.0-no-exec-stack.patch 381 SHA256 ae62249dcf8bbc3c30468b07944df6c8777b565927d9ed6d1fdf7395899ea7c7 SHA512 a00ba3c805aa64bebeb3194cd75093c1e7c951366d40bba4852837dcb355eedf1ca6a6e648ea007fcb71124e778e54b5168a7b38a7b7268bc3983d87594633a5 WHIRLPOOL e838b3835e9cdcbbe5f47bb1ab92b2ce0fffff1ce77e69ee460a9ff9d5ed4a3c16311d65b0a16f14a3b4e22b2c09db1f3d88b35fa978d40e67ad5307e5a29a39
DIST unzip552.tar.gz 1140291 SHA256 145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9 SHA512 9b852687a7cbce3a6696f8da176f97eded1e99b1f10ae5e4b29bf870df374fea3e4266b3a731d7cdfc28ce5c060a01dd8d3f9c3d8250d1d774273de16d70528b WHIRLPOOL 4148fe091cf9847245be67c7d85fc6fcdcc2a385dad0434757a0c7dea41131085f9bcd5ca6eedc065091a473f27780341921f90ddcae32e73618319da9122d70
DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808
EBUILD unzip-5.52-r2.ebuild 1741 SHA256 939f3df994f9b6b34932dcba358ea9b6f5c93c2fa297e619b97742b4995db539 SHA512 c0b8920db0c20125f6b3ab907079ee4cb7d5140d3d1058e39b9b4e50379df0869b53832453a25444e9fe1879ef72e608a16e25dbe4f1761005bd48e7abdd1cb2 WHIRLPOOL c45d8a462b72b40c551b37a75b417b9489cd2430baa13ee9d3fd5f767b0773bcb1f1f2fbba6e09349a08b097e874415ce03a86a349f60156c8c0fcb977580e40
EBUILD unzip-6.0-r1.ebuild 2011 SHA256 84b38662de06ea85d80c0260b4174f6b5ee2814bb42c4f734ff5b068f1ab7aeb SHA512 02f4f61871a7138857157b8cdc294f0f2425b4661a73fd244be5a96a389c2841481f8e03914dd035560e43a55a9fb6bbe138295ef775cce91676b8b3c1e29a16 WHIRLPOOL f6958f0607d7c3d4813eed6bb4880e1e3388a3f65d1040f0e41b9d7cf03cfcb770dffa81427016b71d4017f88dfc1e984f61013a266ee8ff7be2eb351b1504ac
EBUILD unzip-6.0-r2.ebuild 2130 SHA256 3279a00c93b8c1b088a49a4992ac78a4aeace2b769605500a58d6a1977f8cd49 SHA512 bac1b181a752c9aa3ad4c95c1bee3f5894f25157c4d80b90eeea5fab1d920e9a5864d48c7a204dd43d756fb4109b225dca0781ccd74aa9f07ec97539a6b8298b WHIRLPOOL 8e585773b0b3f8e1581336776b5a519501a47174db0b826ab06129b81d71a3b858e4293c5746915b6fdb905721972c9bcb5d429046f9924a243a55ca1c2f1f12
EBUILD unzip-6.0-r3.ebuild 2241 SHA256 e0ba08c1653f0c491ab440257fbdfc4167ae0ae468be1953f7901874cec29b60 SHA512 9a927e2f169d326614d72f7cf2b70a66c1ed97769561108d6f8914d718cf501d9f6b99e89fcdc59a45f367392041c9d62017f85055f8065674e2212ca3b76a4c WHIRLPOOL 572e4b4a312b6111aac068925f8b2fd956703b512978f488269aba8c6e61f4d2e8f5ab6cffacd7c7a12ec2da6905b29632c1188e2a8dc97b3712ba4ef0ad6552
MISC ChangeLog 10395 SHA256 70d83b987b5213966cc008d975febd71478f0b5755cf44dbfc88a1b2cdd605be SHA512 34aa10278e28ea318cc6ace2fbd0dabb500c6d1ed1f760fcac0160343c898340d38731350ad78c537b307b20ce943cc27217e276e9b8fad4229dc4cec90dd65f WHIRLPOOL 7993ba51044cfc661eef446512dcd69cbbb4d34a6930d44e99da206eb9c27613d74c2100146af5fa9c42437efc895cd77c1a422d313c5a39f43e103efd12a23b
MISC metadata.xml 302 SHA256 f477ea726c939c232384e55506e2c0de1565939d81f372756c1fce35f70b6ebf SHA512 a3ef5146eab00263de9dd9600d04c4b5d2cfceacbb12c0346f98456b0d1195d84e4f48dde02045dea2673167e240e85c06de61315ddca61b40ed548509884832 WHIRLPOOL a359bc6418d3e1b82760d85154153c92e8c65fae4502cf6ddbe4f7c04f8bf877faf3c7109b686cc5b48ea04c5365f1e844004c5bb5a0813380748370f4bb702e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAEBCAAGBQJS2gquAAoJEPGu1DbS6WIAsaUQAIupvXiX3ufS29QGFEB6qPQJ
ZgLVMZC+c4MKEN9ypDDde7l2LidWI/Nhm9yVEpoAiWyBiMGzjGQgwDv8dxJ7MDHU
6fHivTuCHU5yFmMCgklCQKQyYWm+hr/g+o4tVMsfvQgf0wjJXO9hENj/0GXze/eH
1ktviZFYbzjNyy5jkbvFICzwaR/FjS3mnVZnLZuNVC9gN+l33timPTpef5XlyvA9
PUd3nju6xhp4iSlbv3Y1URtkHs2JG+QnkrUrvzvKIQ+mFw008DAtk9t2j4tQm8y8
ZNSr6aejpgxTR+hpn/8E33owkD2mSatT6/Kg9/AEI78AKzRVS6l7Y26jkXOtix0P
328GW1L6rZ7vInnqUe3TfTFhGhZhnhjAMl46DMh+ydAJ35zODFbX5jYPaRKulS6Y
nSzonotYVCvWX5vTLDqkwnrEK9ulbAW2cBQlZXfjcLEcMUXbKmbx554ApvQ/c6dT
JeY2xhEvl1YArAaJXYZ16jXd+YdXI2uAW+xmT886NVY2fCqZlXt+JzdbHUkNtOql
2I1EptwIXXh4QjxKxAM+IB7OQsC1ZVZC7e1joTFibK0JTdmP0U50xCNTPV0F5fuO
C5BULy6hDzEhzTmXTGHMMNXFk3ZUwfru9rOexuU7syrD6NeQQyDRALqdQvp+AA3z
BdA3efWUOxxlvD3uAfPb
=Naw2
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,35 @@
http://bugs.gentoo.org/213761
fix for CVE-2008-0888
--- inflate.c
+++ inflate.c
@@ -983,6 +983,7 @@
unsigned l; /* last length */
unsigned m; /* mask for bit lengths table */
unsigned n; /* number of lengths to get */
+ struct huft *tlp;
struct huft *tl; /* literal/length code table */
struct huft *td; /* distance code table */
unsigned bl; /* lookup bits for tl */
@@ -996,6 +997,8 @@
int retval = 0; /* error code returned: initialized to "no error" */
+ td = tlp = tl = (struct huft *)NULL;
+
/* make local bit buffer */
Trace((stderr, "\ndynamic block"));
b = G.bb;
@@ -1047,9 +1050,9 @@
while (i < n)
{
NEEDBITS(bl)
- j = (td = tl + ((unsigned)b & m))->b;
+ j = (tlp = tl + ((unsigned)b & m))->b;
DUMPBITS(j)
- j = td->v.n;
+ j = tlp->v.n;
if (j < 16) /* length of code in bits (0..15) */
ll[i++] = l = j; /* save last length in l */
else if (j == 16) /* repeat last length 3 to 6 times */

View File

@ -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
@@ -238,3 +238,7 @@
#endif /* i386 || _i386 || _I386 || __i386 */
#endif /* !USE_ZLIB */
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits
+#endif

View File

@ -0,0 +1,382 @@
This patch makes zip use libnatspec to recode file names is national charset.
Initially this patch was written for altlinux:
http://sisyphus.ru/ru/srpm/Sisyphus/zip/patches
Later it was a bit improved and improved version was posted here (in Russian):
http://www.opennet.ru/tips/info/2494.shtml
Gentoo reference:
https://bugs.gentoo.org/show_bug.cgi?id=275244
diff -pur unzip60orig/unix/configure unzip60/unix/configure
--- unzip60orig/unix/configure 2009-04-16 23:25:12.000000000 +0400
+++ unzip60/unix/configure 2010-11-26 19:07:43.000000000 +0300
@@ -17,7 +17,7 @@ CFLAGSR=${CFLAGS}
IZ_BZIP2=${3}
CFLAGS="${CFLAGS} -I. -DUNIX"
LFLAGS1=""
-LFLAGS2="-s"
+LFLAGS2="-l natspec"
LN="ln -s"
CFLAGS_OPT=''
diff -pur unzip60orig/unix/Makefile unzip60/unix/Makefile
--- unzip60orig/unix/Makefile 2009-01-19 01:41:18.000000000 +0300
+++ unzip60/unix/Makefile 2010-11-29 14:25:58.461000001 +0300
@@ -45,14 +45,14 @@
CC = cc# try using "gcc" target rather than changing this (CC and LD
LD = $(CC)# must match, else "unresolved symbol: ___main" is possible)
AS = as
-LOC = $(D_USE_BZ2) $(LOCAL_UNZIP)
+LOC = $(D_USE_BZ2) -DNO_SETLOCALE $(LOCAL_UNZIP)
AF = $(LOC)
CFLAGS = -O
CF_NOOPT = -I. -I$(IZ_BZIP2) -DUNIX $(LOC)
CF = $(CFLAGS) $(CF_NOOPT)
LFLAGS1 =
LF = -o unzip$E $(LFLAGS1)
-LF2 = -s
+LF2 = -l natspec
# UnZipSFX flags
SL = -o unzipsfx$E $(LFLAGS1)
@@ -121,7 +121,7 @@ INSTALL_PROGRAM = $(INSTALL)
INSTALL_D = mkdir -p
# on some systems, manext=l and MANDIR=/usr/man/man$(manext) may be appropriate
manext = 1
-prefix = /usr/local
+prefix = /usr
BINDIR = $(prefix)/bin# where to install executables
MANDIR = $(prefix)/man/man$(manext)# where to install man pages
INSTALLEDBIN = $(BINDIR)/funzip$E $(BINDIR)/unzip$E $(BINDIR)/unzipsfx$E \
diff -pur unzip60orig/unix/unix.c unzip60/unix/unix.c
--- unzip60orig/unix/unix.c 2009-01-24 02:31:26.000000000 +0300
+++ unzip60/unix/unix.c 2010-11-26 16:58:35.000000000 +0300
@@ -30,6 +30,9 @@
#define UNZIP_INTERNAL
#include "unzip.h"
+#include <iconv.h>
+#include <natspec.h>
+
#ifdef SCO_XENIX
# define SYSNDIR
#else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
@@ -1874,3 +1877,44 @@ static void qlfix(__G__ ef_ptr, ef_len)
}
}
#endif /* QLZIP */
+
+
+char OEM_CP[MAX_CP_NAME] = "";
+char ISO_CP[MAX_CP_NAME] = "";
+
+/* Getr the default value of OEM_CP based on the current locale.
+ * ISO_CP is left alone for now. */
+void init_conversion_charsets()
+{
+ /* Make a guess only if OEM_CP not already set. */
+ if(*OEM_CP == '\0') {
+ const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_DOSCS, "");
+ strncpy(OEM_CP, archive_charset, sizeof(OEM_CP));
+ }
+
+ if(*ISO_CP == '\0') {
+ const char * archive_charset = natspec_get_charset_by_locale(NATSPEC_WINCS, "");
+ strncpy(ISO_CP, archive_charset, sizeof(ISO_CP));
+ }
+
+}
+
+/* Convert a string from OEM_CP to the current locale charset. */
+inline void oem_intern(char *string)
+{
+ char *buf = natspec_convert(string, 0, OEM_CP, 0);
+ /* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
+ use FILNAMSIZ as string size */
+ strncpy(string, buf, FILNAMSIZ);
+ free (buf);
+}
+
+/* Convert a string from ISO_CP to the current locale charset. */
+inline void iso_intern(char *string)
+{
+ char *buf = natspec_convert(string, 0, ISO_CP, 0);
+ /* Since Ext_ASCII_TO_Native used only for G.filename[FILNAMESIZE],
+ use FILNAMSIZ as string size */
+ strncpy(string, buf, FILNAMSIZ);
+ free (buf);
+}
diff -pur unzip60orig/unix/unxcfg.h unzip60/unix/unxcfg.h
--- unzip60orig/unix/unxcfg.h 2009-04-16 22:36:12.000000000 +0400
+++ unzip60/unix/unxcfg.h 2010-11-26 16:58:35.000000000 +0300
@@ -227,4 +227,30 @@ typedef struct stat z_stat;
/* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
/* and notfirstcall are used by do_wild(). */
+
+#define MAX_CP_NAME 25
+
+#ifdef SETLOCALE
+# undef SETLOCALE
+#endif
+#define SETLOCALE(category, locale) setlocale(category, locale)
+#include <locale.h>
+
+#ifdef _ISO_INTERN
+# undef _ISO_INTERN
+#endif
+#define _ISO_INTERN(str1) iso_intern(str1)
+
+#ifdef _OEM_INTERN
+# undef _OEM_INTERN
+#endif
+#ifndef IZ_OEM2ISO_ARRAY
+# define IZ_OEM2ISO_ARRAY
+#endif
+#define _OEM_INTERN(str1) oem_intern(str1)
+
+void iso_intern(char *);
+void oem_intern(char *);
+void init_conversion_charsets(void);
+
#endif /* !__unxcfg_h */
diff -pur unzip60orig/unzip.c unzip60/unzip.c
--- unzip60orig/unzip.c 2009-04-16 22:26:52.000000000 +0400
+++ unzip60/unzip.c 2010-11-26 16:58:35.000000000 +0300
@@ -331,7 +331,9 @@ static ZCONST char Far ZipInfoUsageLine3
-h print header line -t print totals for listed files or for all\n\
-z print zipfile comment -T print file times in sortable decimal format\
\n -C be case-insensitive %s\
- -x exclude filenames that follow from listing\n";
+ -x exclude filenames that follow from listing\n\
+ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
+ -I CHARSET specify a character encoding for UNIX and other archives\n";
#ifdef MORE
static ZCONST char Far ZipInfoUsageLine4[] =
" -M page output through built-in \"more\"\n";
@@ -570,8 +572,7 @@ Send bug reports using //www.info-zip.or
#else /* !VMS */
# ifdef COPYRIGHT_CLEAN
static ZCONST char Far UnzipUsageLine1[] = "\
-UnZip %d.%d%d%s of %s, by Info-ZIP. Maintained by C. Spieler. Send\n\
-bug reports using http://www.info-zip.org/zip-bug.html; see README for details.\
+UnZip %d.%d%d%s of %s, by ALT Linux Team. Original by Info-ZIP.\
\n\n";
# else
static ZCONST char Far UnzipUsageLine1[] = "\
@@ -673,7 +674,9 @@ modifiers:\n\
-j junk paths (do not make directories) -aa treat ALL files as text\n\
-U use escapes for all non-ASCII Unicode -UU ignore any Unicode fields\n\
-C match filenames case-insensitively -L make (some) names \
-lowercase\n %-42s -V retain VMS version numbers\n%s";
+lowercase\n %-42s -V retain VMS version numbers\n%s\
+ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
+ -I CHARSET specify a character encoding for UNIX and other archives\n";
#endif /* ?VMS */
#else /* !UNICODE_SUPPORT */
#ifdef VMS
@@ -692,7 +695,9 @@ modifiers:\n\
-o overwrite files WITHOUT prompting -a auto-convert any text files\n\
-j junk paths (do not make directories) -aa treat ALL files as text\n\
-C match filenames case-insensitively -L make (some) names \
-lowercase\n %-42s -V retain VMS version numbers\n%s";
+lowercase\n %-42s -V retain VMS version numbers\n%s\
+ -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives\n\
+ -I CHARSET specify a character encoding for UNIX and other archives\n";
#endif /* ?VMS */
#endif /* ?UNICODE_SUPPORT */
@@ -803,6 +808,10 @@ int unzip(__G__ argc, argv)
#endif /* UNICODE_SUPPORT */
+#ifdef UNIX
+ init_conversion_charsets();
+#endif
+
#if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
extern void DebugMalloc(void);
@@ -1336,6 +1345,11 @@ int uz_opts(__G__ pargc, pargv)
argc = *pargc;
argv = *pargv;
+#ifdef UNIX
+ extern char OEM_CP[MAX_CP_NAME];
+ extern char ISO_CP[MAX_CP_NAME];
+#endif
+
while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {
s = *argv + 1;
while ((c = *s++) != 0) { /* "!= 0": prevent Turbo C warning */
@@ -1517,6 +1531,35 @@ int uz_opts(__G__ pargc, pargv)
}
break;
#endif /* MACOS */
+#ifdef UNIX
+ case ('I'):
+ if (negative) {
+ Info(slide, 0x401, ((char *)slide,
+ "error: encodings can't be negated"));
+ return(PK_PARAM);
+ } else {
+ if(*s) { /* Handle the -Icharset case */
+ /* Assume that charsets can't start with a dash to spot arguments misuse */
+ if(*s == '-') {
+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ strncpy(ISO_CP, s, sizeof(ISO_CP));
+ } else { /* -I charset */
+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ s = *argv;
+ strncpy(ISO_CP, s, sizeof(ISO_CP));
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+ break;
+#endif /* ?UNIX */
case ('j'): /* junk pathnames/directory structure */
if (negative)
uO.jflag = FALSE, negative = 0;
@@ -1592,6 +1635,35 @@ int uz_opts(__G__ pargc, pargv)
} else
++uO.overwrite_all;
break;
+#ifdef UNIX
+ case ('O'):
+ if (negative) {
+ Info(slide, 0x401, ((char *)slide,
+ "error: encodings can't be negated"));
+ return(PK_PARAM);
+ } else {
+ if(*s) { /* Handle the -Ocharset case */
+ /* Assume that charsets can't start with a dash to spot arguments misuse */
+ if(*s == '-') {
+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ strncpy(OEM_CP, s, sizeof(OEM_CP));
+ } else { /* -O charset */
+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -O argument"));
+ return(PK_PARAM);
+ }
+ s = *argv;
+ strncpy(OEM_CP, s, sizeof(OEM_CP));
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+ break;
+#endif /* ?UNIX */
case ('p'): /* pipes: extract to stdout, no messages */
if (negative) {
uO.cflag = FALSE;
diff -pur unzip60orig/unzpriv.h unzip60/unzpriv.h
--- unzip60orig/unzpriv.h 2009-04-20 03:59:26.000000000 +0400
+++ unzip60/unzpriv.h 2010-11-26 16:58:35.000000000 +0300
@@ -3008,7 +3008,7 @@ char *GetLoadPath OF((__GPRO));
!(((islochdr) || (isuxatt)) && \
((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
(hostnum) == FS_HPFS_ || \
- ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \
+ ((hostnum) == FS_NTFS_/* && (hostver) == 50*/)) { \
_OEM_INTERN((string)); \
} else { \
_ISO_INTERN((string)); \
diff -pur unzip60orig/zipinfo.c unzip60/zipinfo.c
--- unzip60orig/zipinfo.c 2009-02-08 20:04:30.000000000 +0300
+++ unzip60/zipinfo.c 2010-11-26 16:58:35.000000000 +0300
@@ -457,6 +457,10 @@ int zi_opts(__G__ pargc, pargv)
int tflag_slm=TRUE, tflag_2v=FALSE;
int explicit_h=FALSE, explicit_t=FALSE;
+#ifdef UNIX
+ extern char OEM_CP[MAX_CP_NAME];
+ extern char ISO_CP[MAX_CP_NAME];
+#endif
#ifdef MACOS
uO.lflag = LFLAG; /* reset default on each call */
@@ -501,6 +505,35 @@ int zi_opts(__G__ pargc, pargv)
uO.lflag = 0;
}
break;
+#ifdef UNIX
+ case ('I'):
+ if (negative) {
+ Info(slide, 0x401, ((char *)slide,
+ "error: encodings can't be negated"));
+ return(PK_PARAM);
+ } else {
+ if(*s) { /* Handle the -Icharset case */
+ /* Assume that charsets can't start with a dash to spot arguments misuse */
+ if(*s == '-') {
+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ strncpy(ISO_CP, s, sizeof(ISO_CP));
+ } else { /* -I charset */
+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ s = *argv;
+ strncpy(ISO_CP, s, sizeof(ISO_CP));
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+ break;
+#endif /* ?UNIX */
case 'l': /* longer form of "ls -l" type listing */
if (negative)
uO.lflag = -2, negative = 0;
@@ -521,6 +554,35 @@ int zi_opts(__G__ pargc, pargv)
G.M_flag = TRUE;
break;
#endif
+#ifdef UNIX
+ case ('O'):
+ if (negative) {
+ Info(slide, 0x401, ((char *)slide,
+ "error: encodings can't be negated"));
+ return(PK_PARAM);
+ } else {
+ if(*s) { /* Handle the -Ocharset case */
+ /* Assume that charsets can't start with a dash to spot arguments misuse */
+ if(*s == '-') {
+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -I argument"));
+ return(PK_PARAM);
+ }
+ strncpy(OEM_CP, s, sizeof(OEM_CP));
+ } else { /* -O charset */
+ ++argv;
+ if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
+ Info(slide, 0x401, ((char *)slide,
+ "error: a valid character encoding should follow the -O argument"));
+ return(PK_PARAM);
+ }
+ s = *argv;
+ strncpy(OEM_CP, s, sizeof(OEM_CP));
+ }
+ while(*(++s)); /* No params straight after charset name */
+ }
+ break;
+#endif /* ?UNIX */
case 's': /* default: shorter "ls -l" type listing */
if (negative)
uO.lflag = -2, negative = 0;

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>base-system</herd>
<use>
<flag name='natspec'>Use <pkg>dev-libs/libnatspec</pkg> to correctly decode non-ascii file names archived in Windows.</flag>
</use>
</pkgmetadata>

View File

@ -0,0 +1,58 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-5.52-r2.ebuild,v 1.8 2008/10/23 02:46:26 flameeyes Exp $
inherit eutils toolchain-funcs flag-o-matic
DESCRIPTION="unzipper for pkzip-compressed files"
HOMEPAGE="http://www.info-zip.org/"
SRC_URI="mirror://gentoo/${PN}${PV/.}.tar.gz"
LICENSE="Info-ZIP"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
IUSE=""
DEPEND=""
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-no-exec-stack.patch
epatch "${FILESDIR}"/${P}-CVE-2008-0888.patch #213761
sed -i \
-e 's:-O3:$(CFLAGS) $(CPPFLAGS):' \
-e 's:-O :$(CFLAGS) $(CPPFLAGS) :' \
-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) :' \
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*-freebsd* | i?86*-dragonfly* | i?86*-openbsd* | i?86*-netbsd*)
TARGET=freebsd ;; # mislabelled bsd with x86 asm
*-freebsd* | *-dragonfly* | *-openbsd* | *-netbsd*)
TARGET=bsd ;;
*-darwin*) TARGET=macosx ;;
*) die "Unknown target, you suck" ;;
esac
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
}

View File

@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0-r1.ebuild,v 1.10 2010/01/10 00:28:54 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0-r1.ebuild,v 1.13 2010/08/14 20:10:09 truedfx Exp $
inherit eutils toolchain-funcs flag-o-matic
@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
LICENSE="Info-ZIP"
SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~ppc ppc64 s390 sh ~sparc x86"
KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ppc ppc64 s390 sh ~sparc x86"
IUSE="bzip2 unicode"
DEPEND="bzip2? ( app-arch/bzip2 )"
@ -28,9 +28,9 @@ src_unpack() {
-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:\<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) :' \

View File

@ -0,0 +1,71 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0-r2.ebuild,v 1.9 2011/12/18 15:24:14 naota Exp $
EAPI="2"
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="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="bzip2 natspec unicode"
DEPEND="bzip2? ( app-arch/bzip2 )
natspec? ( dev-libs/libnatspec )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/${P}-no-exec-stack.patch
use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
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-cppflags -DLARGE_FILE_SUPPORT #281473
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
}

View File

@ -0,0 +1,72 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0-r3.ebuild,v 1.10 2014/01/18 05:01:26 vapier Exp $
EAPI="2"
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="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="bzip2 natspec unicode"
DEPEND="bzip2? ( app-arch/bzip2 )
natspec? ( dev-libs/libnatspec )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}"/${P}-no-exec-stack.patch
use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
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 .)::" \
-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
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-cppflags -DLARGE_FILE_SUPPORT #281473
ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" 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
}

View File

@ -0,0 +1,9 @@
DEFINED_PHASES=compile install unpack
DESCRIPTION=unzipper for pkzip-compressed files
HOMEPAGE=http://www.info-zip.org/
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
LICENSE=Info-ZIP
SLOT=0
SRC_URI=mirror://gentoo/unzip552.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92
_md5_=cc8608305d1e573993a239e6c2eb9e63

View File

@ -3,10 +3,10 @@ DEPEND=bzip2? ( app-arch/bzip2 )
DESCRIPTION=unzipper for pkzip-compressed files
HOMEPAGE=http://www.info-zip.org/
IUSE=bzip2 unicode
KEYWORDS=~alpha amd64 arm hppa ~ia64 m68k ~ppc ppc64 s390 sh ~sparc x86
KEYWORDS=~alpha amd64 arm hppa ~ia64 m68k ppc ppc64 s390 sh ~sparc x86
LICENSE=Info-ZIP
RDEPEND=bzip2? ( app-arch/bzip2 )
SLOT=0
SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92
_md5_=857f3b89bd5ed59207a08ae884bf7020
_md5_=9ca59e7d41fccec4ab2619a65fa55df2

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile install prepare
DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
DESCRIPTION=unzipper for pkzip-compressed files
EAPI=2
HOMEPAGE=http://www.info-zip.org/
IUSE=bzip2 natspec unicode
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
LICENSE=Info-ZIP
RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
SLOT=0
SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92
_md5_=aa319d1915726d37feb525b856ab1e52

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=compile install prepare
DEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
DESCRIPTION=unzipper for pkzip-compressed files
EAPI=2
HOMEPAGE=http://www.info-zip.org/
IUSE=bzip2 natspec unicode
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
LICENSE=Info-ZIP
RDEPEND=bzip2? ( app-arch/bzip2 ) natspec? ( dev-libs/libnatspec )
SLOT=0
SRC_URI=mirror://sourceforge/infozip/unzip60.tar.gz
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92
_md5_=1aecd8baca2c8e27ff990ae6d897be8b