[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: df3f2bc6cce357fa91ae0897cecd2a9bc9f0073a Author: Fabian Groffen gentoo org> AuthorDate: Thu Jul 25 07:10:18 2024 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jul 25 07:12:42 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df3f2bc6 app-arch/unzip-6.0_p27-r1: fix building on Solaris This used to work, but likely due to Clang compiler version force, certain functions, like memcpy aren't detected and bzero assumed. Use linux_noasm for Solaris, and apply a small extra config (BSD4_4) to build, since we mimick Linux env in Gentoo Prefix for a great deal, this works just fine for us. Signed-off-by: Fabian Groffen gentoo.org> app-arch/unzip/unzip-6.0_p27-r1.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p27-r1.ebuild b/app-arch/unzip/unzip-6.0_p27-r1.ebuild index 5b6fb1d1abb9..982d367d9ea4 100644 --- a/app-arch/unzip/unzip-6.0_p27-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p27-r1.ebuild @@ -65,7 +65,7 @@ src_configure() { i?86*-*linux*) TARGET="linux_asm" ;; *linux*) TARGET="linux_noasm" ;; *-darwin*) TARGET="macosx" ;; - *-solaris*) TARGET="generic" ;; + *-solaris*) TARGET="linux_noasm" ;; *) die "Unknown target; please update the ebuild to handle ${CHOST}" ;; esac @@ -73,6 +73,7 @@ src_configure() { append-flags -std=gnu89 [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD + [[ ${CHOST} == *-solaris* ]] && append-cppflags -DNO_LCHMOD -DBSD4_4 use bzip2 && append-cppflags -DUSE_BZIP2 use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 5ed7ef1c1f72418e5e4cd71eb5bcc7c84bd7bd64 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Nov 18 07:23:33 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Nov 18 07:23:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed7ef1c app-arch/unzip: Stabilize 6.0_p27-r1 hppa, #867352 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/unzip/unzip-6.0_p27-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p27-r1.ebuild b/app-arch/unzip/unzip-6.0_p27-r1.ebuild index b6d4f490b4fb..126a4a35e234 100644 --- a/app-arch/unzip/unzip-6.0_p27-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p27-r1.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 637e48874d660a65b2b269daa58952a78e16d92d Author: Sam James gentoo org> AuthorDate: Fri Nov 18 03:18:03 2022 + Commit: Sam James gentoo org> CommitDate: Fri Nov 18 03:18:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=637e4887 app-arch/unzip: add note re gnu89 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p27-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/app-arch/unzip/unzip-6.0_p27-r1.ebuild b/app-arch/unzip/unzip-6.0_p27-r1.ebuild index 478c83240bf7..b6d4f490b4fb 100644 --- a/app-arch/unzip/unzip-6.0_p27-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p27-r1.ebuild @@ -73,6 +73,7 @@ src_configure() { *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; esac + # Needed for Clang 16 append-flags -std=gnu89 [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 7ad5e7def8c886d8af664c12897052a8113bb0e5 Author: Sam James gentoo org> AuthorDate: Fri Nov 18 03:17:47 2022 + Commit: Sam James gentoo org> CommitDate: Fri Nov 18 03:17:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad5e7de app-arch/unzip: update HOMEPAGE Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild| 2 +- app-arch/unzip/unzip-6.0_p27-r1.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index 78e5c99af635..d53d771fa9b0 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -10,7 +10,7 @@ MY_PV="${MY_PV%_p*}" MY_P="${PN}${MY_PV}" DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/; +HOMEPAGE="https://infozip.sourceforge.net/UnZip.html; SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" diff --git a/app-arch/unzip/unzip-6.0_p27-r1.ebuild b/app-arch/unzip/unzip-6.0_p27-r1.ebuild index c466394b30d4..478c83240bf7 100644 --- a/app-arch/unzip/unzip-6.0_p27-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p27-r1.ebuild @@ -10,7 +10,7 @@ MY_PV="${MY_PV%_p*}" MY_P="${PN}${MY_PV}" DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/; +HOMEPAGE="https://infozip.sourceforge.net/UnZip.html; SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz"
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 21b5f65e3130f0a523e8e1d3367e187cfb814f1d Author: Sam James gentoo org> AuthorDate: Fri Nov 4 01:13:37 2022 + Commit: Sam James gentoo org> CommitDate: Fri Nov 4 02:22:15 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b5f65e app-arch/unzip: build with gnu89 Lots of dodgy prototypes. Signed-off-by: Sam James gentoo.org> app-arch/unzip/{unzip-6.0_p27.ebuild => unzip-6.0_p27-r1.ebuild} | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27-r1.ebuild similarity index 99% rename from app-arch/unzip/unzip-6.0_p27.ebuild rename to app-arch/unzip/unzip-6.0_p27-r1.ebuild index a0eef4ef040a..c466394b30d4 100644 --- a/app-arch/unzip/unzip-6.0_p27.ebuild +++ b/app-arch/unzip/unzip-6.0_p27-r1.ebuild @@ -73,6 +73,8 @@ src_configure() { *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; esac + append-flags -std=gnu89 + [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD use bzip2 && append-cppflags -DUSE_BZIP2 use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 6f2805ed30e2ad343b8451d3349a50c3311d2f34 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Aug 30 04:34:49 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Aug 30 04:34:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f2805ed app-arch/unzip: Stabilize 6.0_p27 ppc64, #867352 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/unzip/unzip-6.0_p27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild index dc5d1a979ece..1a417eaf1644 100644 --- a/app-arch/unzip/unzip-6.0_p27.ebuild +++ b/app-arch/unzip/unzip-6.0_p27.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 61c5554abac45ae69690163fdf543b41c8971777 Author: Arthur Zamarin gentoo org> AuthorDate: Tue Aug 30 04:34:50 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Aug 30 04:34:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c5554a app-arch/unzip: Stabilize 6.0_p27 arm, #867352 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/unzip/unzip-6.0_p27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild index a02e4291880d..a0eef4ef040a 100644 --- a/app-arch/unzip/unzip-6.0_p27.ebuild +++ b/app-arch/unzip/unzip-6.0_p27.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: accb4643122734fd592ba0dc8bdd4c8b672fb02a Author: Arthur Zamarin gentoo org> AuthorDate: Tue Aug 30 04:34:47 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Aug 30 04:34:47 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=accb4643 app-arch/unzip: Stabilize 6.0_p27 arm64, #867352 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/unzip/unzip-6.0_p27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild index 332f575d7f5b..61f071077ae8 100644 --- a/app-arch/unzip/unzip-6.0_p27.ebuild +++ b/app-arch/unzip/unzip-6.0_p27.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 892832f6e84b9224eaae965a177eb8d914bd6e3d Author: Arthur Zamarin gentoo org> AuthorDate: Tue Aug 30 04:34:48 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Aug 30 04:34:48 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892832f6 app-arch/unzip: Stabilize 6.0_p27 ppc, #867352 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/unzip/unzip-6.0_p27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild index 61f071077ae8..dc5d1a979ece 100644 --- a/app-arch/unzip/unzip-6.0_p27.ebuild +++ b/app-arch/unzip/unzip-6.0_p27.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 5f8d1ffdc848bd7d29bc3972d625f9413cc9fd7c Author: Arthur Zamarin gentoo org> AuthorDate: Tue Aug 30 04:34:50 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Aug 30 04:34:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f8d1ffd app-arch/unzip: Stabilize 6.0_p27 sparc, #867352 Signed-off-by: Arthur Zamarin gentoo.org> app-arch/unzip/unzip-6.0_p27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild index 1a417eaf1644..a02e4291880d 100644 --- a/app-arch/unzip/unzip-6.0_p27.ebuild +++ b/app-arch/unzip/unzip-6.0_p27.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 22e224f1a89d01e71e98e7c17825c814cd269379 Author: Sam James gentoo org> AuthorDate: Mon Aug 29 22:07:52 2022 + Commit: Sam James gentoo org> CommitDate: Mon Aug 29 22:07:52 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22e224f1 app-arch/unzip: Stabilize 6.0_p27 amd64, #867352 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild index bfa8c139f8c9..65a5cd249bf4 100644 --- a/app-arch/unzip/unzip-6.0_p27.ebuild +++ b/app-arch/unzip/unzip-6.0_p27.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: ed6ad0c3c883fc5994ae935568e139dc5186f390 Author: Sam James gentoo org> AuthorDate: Mon Aug 29 22:08:11 2022 + Commit: Sam James gentoo org> CommitDate: Mon Aug 29 22:08:11 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed6ad0c3 app-arch/unzip: Stabilize 6.0_p27 x86, #867352 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p27.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild index 65a5cd249bf4..332f575d7f5b 100644 --- a/app-arch/unzip/unzip-6.0_p27.ebuild +++ b/app-arch/unzip/unzip-6.0_p27.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz LICENSE="Info-ZIP" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: bff42a923fb9b8ce5af167cc3032420d4a666307 Author: Sam James gentoo org> AuthorDate: Thu Aug 25 02:18:16 2022 + Commit: Sam James gentoo org> CommitDate: Thu Aug 25 02:19:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff42a92 app-arch/unzip: add 6.0_p27 Contains patches for CVE-2022-0529, CVE-2022-0530 (bug 831190) and for a unicode issue which *might* be CVE-2021-4217 (bug 866386). Bug: https://bugs.gentoo.org/866386 Bug: https://bugs.gentoo.org/831190 Signed-off-by: Sam James gentoo.org> app-arch/unzip/Manifest | 1 + app-arch/unzip/unzip-6.0_p27.ebuild | 93 + 2 files changed, 94 insertions(+) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 8f65ff09a28d..a3b8d1ff3cc5 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,2 +1,3 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f +DIST unzip_6.0-27.debian.tar.xz 24980 BLAKE2B e53a96f12af0cf5227600c73a35003484fca5de138cd37991eb1eb25b97b80371c3a566d989feeb04deb1a93acd9444253b091cd7e920b23520c87c5f5a94eeb SHA512 e1e605f023c7b314a6c5b2857a3bd630350df2d7e4bf6bb38ab8594f967336384666b4db8afad931251b85261ee4e2c38d78641c74ac7e5fd02523f26e92ddb2 diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild new file mode 100644 index ..bfa8c139f8c9 --- /dev/null +++ b/app-arch/unzip/unzip-6.0_p27.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic multilib toolchain-funcs + +MY_PV="${PV//.}" +MY_PV="${MY_PV%_p*}" +MY_P="${PN}${MY_PV}" + +DESCRIPTION="unzipper for pkzip-compressed files" +HOMEPAGE="http://www.info-zip.org/; +SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz + mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" + +LICENSE="Info-ZIP" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 natspec unicode" + +DEPEND="bzip2? ( app-arch/bzip2 ) + natspec? ( dev-libs/libnatspec )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${WORKDIR}"/debian/patches + "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch + "${FILESDIR}"/${PN}-6.0-format-security.patch + "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch +) + +src_prepare() { + # bug #275244 + use natspec && PATCHES+=( "${FILESDIR}"/${PN}-6.0-natspec.patch ) + + rm "${WORKDIR}"/debian/patches/02-this-is-debian-unzip.patch || die + + default + + sed -i -r \ + -e '/^CFLAGS/d' \ + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ + -e '/^STRIP/s:=.*:=true:' \ + -e "s:\:CC=\"$(tc-getCC)\":" \ + -e "s:\:LD=\"$(tc-getCC)\":" \ + -e "s:\: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" + + # Delete bundled code to make sure we don't use it. + rm -r bzip2 || die +} + +src_configure() { + 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" ;; + *-solaris*) TARGET="generic" ;; + *-cygwin*) TARGET="generic" ;; + *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + esac + + [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD + use bzip2 && append-cppflags -DUSE_BZIP2 + use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING + +
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: a6910f2a8db91687b9fa9bf6585f67bea544e6c6 Author: Michał Górny gentoo org> AuthorDate: Tue Sep 21 07:57:04 2021 + Commit: Michał Górny gentoo org> CommitDate: Tue Sep 21 07:57:04 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6910f2a app-arch/unzip: Switch to public get_abi_CFLAGS Signed-off-by: Michał Górny gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index 398013305c5..c28b2e38258 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -76,7 +76,7 @@ src_configure() { } src_compile() { - ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ + ASFLAGS="${ASFLAGS} $(get_abi_CFLAGS)" \ emake -f unix/Makefile ${TARGET} }
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 433e5aad289b25310872182c0ac4240249e98abf Author: Michał Górny gentoo org> AuthorDate: Tue Sep 21 07:57:23 2021 + Commit: Michał Górny gentoo org> CommitDate: Tue Sep 21 07:57:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=433e5aad app-arch/unzip: Add missing multilib inherit Signed-off-by: Michał Górny gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index c28b2e38258..b28a3acf9fc 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit toolchain-funcs flag-o-matic +inherit flag-o-matic multilib toolchain-funcs MY_PV="${PV//.}" MY_PV="${MY_PV%_p*}"
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 44d43059187743390c70a5ea09ea35ec2760f1a4 Author: David Seifert gentoo org> AuthorDate: Thu May 13 10:59:33 2021 + Commit: David Seifert gentoo org> CommitDate: Thu May 13 10:59:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d43059 app-arch/unzip: Remove old 6.0_p25-r1 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> app-arch/unzip/Manifest| 1 - app-arch/unzip/unzip-6.0_p25-r1.ebuild | 88 -- 2 files changed, 89 deletions(-) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index c23b209548e..8f65ff09a28 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,3 +1,2 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d -DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21 DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild deleted file mode 100644 index 398013305c5..000 --- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic - -MY_PV="${PV//.}" -MY_PV="${MY_PV%_p*}" -MY_P="${PN}${MY_PV}" - -DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/; -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz - mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" - -LICENSE="Info-ZIP" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 natspec unicode" - -DEPEND="bzip2? ( app-arch/bzip2 ) - natspec? ( dev-libs/libnatspec )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local deb="${WORKDIR}"/debian/patches - rm "${deb}"/02-this-is-debian-unzip.patch || die - eapply "${deb}"/*.patch - - eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch - eapply "${FILESDIR}"/${PN}-6.0-format-security.patch - eapply "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch - use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 - sed -i -r \ - -e '/^CFLAGS/d' \ - -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ - -e '/^STRIP/s:=.*:=true:' \ - -e "s:\:CC=\"$(tc-getCC)\":" \ - -e "s:\:LD=\"$(tc-getCC)\":" \ - -e "s:\: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" - - # Delete bundled code to make sure we don't use it. - rm -r bzip2 || die - - eapply_user -} - -src_configure() { - 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" ;; - *-solaris*) TARGET="generic" ;; - *-cygwin*) TARGET="generic" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; - esac - - [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD - use bzip2 && append-cppflags -DUSE_BZIP2 - use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING - append-cppflags -DLARGE_FILE_SUPPORT #281473 -} - -src_compile() { - ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ -
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: b0e2dfcab6184753c61257ac8f92b60df9250391 Author: Rolf Eike Beer sf-mail de> AuthorDate: Tue May 11 15:28:16 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue May 11 15:44:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0e2dfca app-arch/unzip: stable 6.0_p26 for hppa, bug #788907 Package-Manager: Portage-3.0.18, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index b852ce2ca07..398013305c5 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: c86347c30c70483bcea0eda755fb816a40754795 Author: Sam James gentoo org> AuthorDate: Sat May 8 18:57:58 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 8 18:57:58 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c86347c3 app-arch/unzip: Stabilize 6.0_p26 sparc, #788907 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index 5f172599c2c..b852ce2ca07 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 893da466d19bf480ad96a3cfc672c96b27ef35c1 Author: Sam James gentoo org> AuthorDate: Sat May 8 18:54:12 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 8 18:54:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893da466 app-arch/unzip: Stabilize 6.0_p26 ppc, #788907 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index 98cfe186725..5f172599c2c 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 00d0b756baacdb5cda6b01f333c1612024c8ca7d Author: Sam James gentoo org> AuthorDate: Sat May 8 18:51:59 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 8 18:51:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d0b756 app-arch/unzip: Stabilize 6.0_p26 ppc64, #788907 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index 80f8e8840fe..98cfe186725 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: a5caa582878be76c92b1b356ea3723c676453153 Author: Sam James gentoo org> AuthorDate: Sat May 8 18:49:28 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 8 18:49:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5caa582 app-arch/unzip: Stabilize 6.0_p26 arm, #788907 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index 3f10b56a38c..80f8e8840fe 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 1f7df215c5eb5a77111ed195162903810c145f42 Author: Sam James gentoo org> AuthorDate: Sat May 8 18:48:57 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 8 18:48:57 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7df215 app-arch/unzip: Stabilize 6.0_p26 arm64, #788907 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index fc489a206f4..3f10b56a38c 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 7754e87118b5e170097bef2dd318d7f0ba6b15da Author: Sam James gentoo org> AuthorDate: Sat May 8 18:43:48 2021 + Commit: Sam James gentoo org> CommitDate: Sat May 8 18:43:48 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7754e871 app-arch/unzip: Stabilize 6.0_p26 x86, #788907 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index 2b5a9ec8d8a..fc489a206f4 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: b837fd879f735b87b6c2b92089311bdd54f0f8bd Author: Sam James gentoo org> AuthorDate: Fri May 7 15:07:30 2021 + Commit: Sam James gentoo org> CommitDate: Fri May 7 15:07:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b837fd87 app-arch/unzip: Stabilize 6.0_p26 amd64, #788907 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p26.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild index 636bf3cce0c..2b5a9ec8d8a 100644 --- a/app-arch/unzip/unzip-6.0_p26.ebuild +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 15d7bd9cbfdc51f50817b8d783da1d56127f3af2 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Mar 27 16:13:47 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Mar 27 16:14:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15d7bd9c app-arch/unzip: bump to v6.0p26 Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Thomas Deutschmann gentoo.org> app-arch/unzip/Manifest | 1 + app-arch/unzip/unzip-6.0_p26.ebuild | 88 + 2 files changed, 89 insertions(+) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index dce593202f5..c23b209548e 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,2 +1,3 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21 +DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f diff --git a/app-arch/unzip/unzip-6.0_p26.ebuild b/app-arch/unzip/unzip-6.0_p26.ebuild new file mode 100644 index 000..636bf3cce0c --- /dev/null +++ b/app-arch/unzip/unzip-6.0_p26.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs flag-o-matic + +MY_PV="${PV//.}" +MY_PV="${MY_PV%_p*}" +MY_P="${PN}${MY_PV}" + +DESCRIPTION="unzipper for pkzip-compressed files" +HOMEPAGE="http://www.info-zip.org/; +SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz + mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" + +LICENSE="Info-ZIP" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 natspec unicode" + +DEPEND="bzip2? ( app-arch/bzip2 ) + natspec? ( dev-libs/libnatspec )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + local deb="${WORKDIR}"/debian/patches + rm "${deb}"/02-this-is-debian-unzip.patch || die + eapply "${deb}"/*.patch + + eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch + eapply "${FILESDIR}"/${PN}-6.0-format-security.patch + eapply "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch + use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 + sed -i -r \ + -e '/^CFLAGS/d' \ + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ + -e '/^STRIP/s:=.*:=true:' \ + -e "s:\:CC=\"$(tc-getCC)\":" \ + -e "s:\:LD=\"$(tc-getCC)\":" \ + -e "s:\: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" + + # Delete bundled code to make sure we don't use it. + rm -r bzip2 || die + + eapply_user +} + +src_configure() { + 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" ;; + *-solaris*) TARGET="generic" ;; + *-cygwin*) TARGET="generic" ;; + *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + esac + + [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD + use bzip2 && append-cppflags -DUSE_BZIP2 + use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING + append-cppflags -DLARGE_FILE_SUPPORT #281473 +} + +src_compile() { + ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ +
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 682da3683636d3a4d105f946cab3c64a4230efd5 Author: Sam James gentoo org> AuthorDate: Sat Mar 27 02:58:31 2021 + Commit: Sam James gentoo org> CommitDate: Sat Mar 27 02:58:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682da368 app-arch/unzip: add github remote-id Signed-off-by: Sam James gentoo.org> app-arch/unzip/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app-arch/unzip/metadata.xml b/app-arch/unzip/metadata.xml index ed43f8ee64f..a151503ed28 100644 --- a/app-arch/unzip/metadata.xml +++ b/app-arch/unzip/metadata.xml @@ -10,6 +10,7 @@ cpe:/a:info-zip:unzip + madler/unzip infozip
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 6d6dc9b2d3cc549169e48d61b4936a3afb77fe0e Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 6 12:51:06 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 6 12:51:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d6dc9b2 app-arch/unzip: drop x86-macos Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> app-arch/unzip/unzip-6.0_p25-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild index 686a13f3f85..54bf325de94 100644 --- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p25-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ 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 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: a1e6bfcfc4fe84f4fdbcf1dc9a6cd0c205bc8857 Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 27 09:09:13 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 27 09:11:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e6bfcf app-arch/unzip: drop code for dead/removed targets Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> app-arch/unzip/unzip-6.0_p25-r1.ebuild | 3 --- 1 file changed, 3 deletions(-) diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild index 00eab5316b7..686a13f3f85 100644 --- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p25-r1.ebuild @@ -65,9 +65,6 @@ src_configure() { *bsd* | *dragonfly*) TARGET="bsd" ;; *-darwin*) TARGET="macosx" ;; *-solaris*) TARGET="generic" ;; - *-aix*) TARGET="gcc"; append-cppflags "-DNO_LCHMOD"; append-ldflags "-Wl,-blibpath:${EPREFIX}/usr/$(get_libdir)" ;; - *-hpux*) TARGET="gcc"; append-ldflags "-Wl,+b,${EPREFIX}/usr/$(get_libdir)" ;; - *-mint*) TARGET="generic" ;; *-cygwin*) TARGET="generic" ;; *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; esac
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 438d82ddded6a3664a322d9c0f1a7fb9932244eb Author: Sam James gentoo org> AuthorDate: Sat Dec 26 19:53:16 2020 + Commit: Sam James gentoo org> CommitDate: Sat Dec 26 19:53:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=438d82dd app-arch/unzip: drop dead prefix keywords Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p25-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild index 2fbfb7602a2..00eab5316b7 100644 --- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p25-r1.ebuild @@ -16,7 +16,7 @@ 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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: b094bfc649e74c75851cf6a7c8c15fa0e2093837 Author: Sam James gentoo org> AuthorDate: Sun Dec 13 12:00:06 2020 + Commit: Sam James gentoo org> CommitDate: Sat Dec 26 19:50:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b094bfc6 app-arch/unzip: sync with ::prefix Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> app-arch/unzip/unzip-6.0_p25-r1.ebuild | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild index 14c6c97da95..2fbfb7602a2 100644 --- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p25-r1.ebuild @@ -16,7 +16,7 @@ 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 ~riscv s390 sparc x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 ) @@ -64,7 +64,11 @@ src_configure() { i?86*-dragonfly*)TARGET="freebsd" ;; # mislabelled bsd with x86 asm *bsd* | *dragonfly*) TARGET="bsd" ;; *-darwin*) TARGET="macosx" ;; - *-cygwin*) TARGET="cygwin" ;; + *-solaris*) TARGET="generic" ;; + *-aix*) TARGET="gcc"; append-cppflags "-DNO_LCHMOD"; append-ldflags "-Wl,-blibpath:${EPREFIX}/usr/$(get_libdir)" ;; + *-hpux*) TARGET="gcc"; append-ldflags "-Wl,+b,${EPREFIX}/usr/$(get_libdir)" ;; + *-mint*) TARGET="generic" ;; + *-cygwin*) TARGET="generic" ;; *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; esac
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 3c37adbe2dbe3a23b257d6cb157e88b303c54854 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Mar 26 18:23:28 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Mar 26 18:24:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c37adbe app-arch/unzip: security cleanup (bug #691566) Bug: https://bugs.gentoo.org/691566 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> app-arch/unzip/Manifest| 1 - app-arch/unzip/unzip-6.0_p21-r2.ebuild | 86 -- 2 files changed, 87 deletions(-) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 5f1282b23fc..dce593202f5 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,3 +1,2 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d -DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21 diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild deleted file mode 100644 index 3b19411df25..000 --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils toolchain-funcs flag-o-matic - -MY_PV="${PV//.}" -MY_PV="${MY_PV%_p*}" -MY_P="${PN}${MY_PV}" - -DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/; -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz - mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" - -LICENSE="Info-ZIP" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux" -IUSE="bzip2 natspec unicode" - -DEPEND="bzip2? ( app-arch/bzip2 ) - natspec? ( dev-libs/libnatspec )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local deb="${WORKDIR}"/debian/patches - rm "${deb}"/02-this-is-debian-unzip.patch || die - eapply "${deb}"/*.patch - - eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch - eapply "${FILESDIR}"/${PN}-6.0-format-security.patch - use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 - sed -i -r \ - -e '/^CFLAGS/d' \ - -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ - -e '/^STRIP/s:=.*:=true:' \ - -e "s:\:CC=\"$(tc-getCC)\":" \ - -e "s:\:LD=\"$(tc-getCC)\":" \ - -e "s:\: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" - - # Delete bundled code to make sure we don't use it. - rm -r bzip2 || die - - eapply_user -} - -src_configure() { - 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" ;; - *-cygwin*) TARGET="cygwin" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; - esac - - [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD - use bzip2 && append-cppflags -DUSE_BZIP2 - use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING - append-cppflags -DLARGE_FILE_SUPPORT #281473 -} - -src_compile() { - ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ - emake -f unix/Makefile ${TARGET} -} - -src_install() { - dobin unzip funzip unzipsfx unix/zipgrep - dosym unzip /usr/bin/zipinfo - doman man/*.1 - dodoc BUGS History* README ToDo WHERE -}
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: af08bf9e16e9a2e3e1e6a14d31c70260835882a9 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Mar 26 18:22:34 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Mar 26 18:24:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af08bf9e app-arch/unzip: mark x86 & m68k stable (bug #691566) Bug: https://bugs.gentoo.org/691566 Package-Manager: Portage-2.3.96, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> app-arch/unzip/unzip-6.0_p25-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25-r1.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild index e0c69c8909d..312b3927825 100644 --- a/app-arch/unzip/unzip-6.0_p25-r1.ebuild +++ b/app-arch/unzip/unzip-6.0_p25-r1.ebuild @@ -16,7 +16,7 @@ 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 ~riscv s390 sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/files/, app-arch/unzip/
commit: 26dd0be6dc420c5e4c4067fa60bd465fa23d0571 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Mar 25 19:56:42 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Mar 25 19:58:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26dd0be6 app-arch/unzip: fix false overlapped components detection on 32-bit systems Closes: https://bugs.gentoo.org/698694 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Thomas Deutschmann gentoo.org> ...-false-overlap-detection-on-32bit-systems.patch | 50 ++ ...nzip-6.0_p25.ebuild => unzip-6.0_p25-r1.ebuild} | 1 + 2 files changed, 51 insertions(+) diff --git a/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch b/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch new file mode 100644 index 000..ad6a157c568 --- /dev/null +++ b/app-arch/unzip/files/unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch @@ -0,0 +1,50 @@ +From 13f0260beae851f7d5dd96e9ef757d8d6d7daac1 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Sun, 9 Feb 2020 07:20:13 -0800 +Subject: [PATCH] Fix false overlapped components detection on 32-bit systems. + +32-bit systems with ZIP64_SUPPORT enabled could have different +size types for zoff_t and zusz_t. That resulted in bad parameter +passing to the bound tracking functions, itself due to the lack of +use of C function prototypes in unzip. This commit assures that +parameters are cast properly for those calls. + +This problem occurred only for ill-chosen make options, which give +a 32-bit zoff_t. A proper build will result in a zoff_t of 64 bits, +even on 32-bit systems. +--- + extract.c | 7 --- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/extract.c b/extract.c +index 1b73cb0..d9866f9 100644 +--- a/extract.c b/extract.c +@@ -329,7 +329,7 @@ static ZCONST char Far OverlappedComponents[] = + + + /* A growable list of spans. */ +-typedef zoff_t bound_t; ++typedef zusz_t bound_t; + typedef struct { + bound_t beg;/* start of the span */ + bound_t end;/* one past the end of the span */ +@@ -518,7 +518,8 @@ int extract_or_test_files(__G)/* return PK-type error code */ + return PK_MEM; + } + if ((G.extra_bytes != 0 && +- cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) || ++ cover_add((cover_t *)G.cover, ++ (bound_t)0, (bound_t)G.extra_bytes) != 0) || + (G.ecrec.have_ecr64 && + cover_add((cover_t *)G.cover, G.ecrec.ec64_start, +G.ecrec.ec64_end) != 0) || +@@ -1216,7 +1217,7 @@ static int extract_or_test_entrylist(__G__ numchunk, + + /* seek_zipf(__G__ pInfo->offset); */ + request = G.pInfo->offset + G.extra_bytes; +-if (cover_within((cover_t *)G.cover, request)) { ++if (cover_within((cover_t *)G.cover, (bound_t)request)) { + Info(slide, 0x401, ((char *)slide, + LoadFarString(OverlappedComponents))); + return PK_BOMB; diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25-r1.ebuild similarity index 96% rename from app-arch/unzip/unzip-6.0_p25.ebuild rename to app-arch/unzip/unzip-6.0_p25-r1.ebuild index b0f5ed79c0d..b393dd2445e 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25-r1.ebuild @@ -32,6 +32,7 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch eapply "${FILESDIR}"/${PN}-6.0-format-security.patch + eapply "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 sed -i -r \ -e '/^CFLAGS/d' \
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 8c3a8ce0f53fe9b41da3e702de4960cda6c023da Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Feb 8 11:27:30 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Feb 8 11:27:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3a8ce0 app-arch/unzip: stable 6.0_p25 for ppc, bug #691566 Tested-by: ernsteiswuerfel Package-Manager: Portage-2.3.87, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index 3268759cabd..b0f5ed79c0d 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -16,7 +16,7 @@ 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 ~riscv s390 ~sh sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 624f80e65aeb982e5bb097d27ef08080edee79ae Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jan 18 10:42:27 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jan 18 10:54:43 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=624f80e6 app-arch/unzip: stable 6.0_p25 for ia64, bug #691566 Package-Manager: Portage-2.3.84, Repoman-2.3.20 RepoMan-Options: --include-arches="ia64" Signed-off-by: Sergei Trofimovich gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index 4bd9d56efc0..949b4d05498 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ 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 ~riscv s390 ~sh sparc ~x86 ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 7f3b673344a1ebcfa0ccd3398d205ab2c4419f10 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Dec 1 14:00:30 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Dec 1 14:00:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3b6733 app-arch/unzip: stable 6.0_p25 for ppc64, bug #691566 Package-Manager: Portage-2.3.80, Repoman-2.3.19 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index cbe2fef0006..4bd9d56efc0 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -16,7 +16,7 @@ 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 ~riscv s390 ~sh sparc ~x86 ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: db6e78f0a4ab3631b6f4170a7b1c4211b4f25a91 Author: Rolf Eike Beer sf-mail de> AuthorDate: Mon Nov 11 19:38:20 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Nov 11 19:58:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db6e78f0 app-arch/unzip: stable 6.0_p25 for sparc, bug #691566 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index 64ade3e4fec..cbe2fef0006 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -16,7 +16,7 @@ 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 ~riscv s390 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 4120502209c49b0fd881429f2288973ceb8dc994 Author: Rolf Eike Beer sf-mail de> AuthorDate: Sun Nov 10 21:51:16 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Nov 10 21:56:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41205022 app-arch/unzip: stable 6.0_p25 for hppa, bug #691566 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index 95f32b88ca5..64ade3e4fec 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -16,7 +16,7 @@ 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 ~riscv s390 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: c2900cf47dc43d625e9622587d3f8b5ce4ff3bda Author: Matt Turner gentoo org> AuthorDate: Sat Nov 9 22:55:10 2019 + Commit: Matt Turner gentoo org> CommitDate: Sat Nov 9 22:55:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2900cf4 app-arch/unzip-6.0_p25: alpha stable, bug 691566 Signed-off-by: Matt Turner gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index 1dbc304dea8..95f32b88ca5 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -16,7 +16,7 @@ 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 ~riscv s390 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 87431708034c8515d8f8777a45740f02361d8bd6 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Nov 8 08:34:12 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Nov 8 08:35:14 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87431708 app-arch/unzip: s390 stable wrt bug #691566 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="s390" Signed-off-by: Mikle Kolyada gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index 7bd7c4fdfba..1dbc304dea8 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh ~sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: a87d71fdc7354e53a8b49a3b50824048a49adb0e Author: Aaron Bauman gentoo org> AuthorDate: Wed Nov 6 23:19:58 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Wed Nov 6 23:30:18 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a87d71fd app-arch/unzip: arm64 stable (bug #691566) Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.78, Repoman-2.3.17 app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index a89ad32ce71..7bd7c4fdfba 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 2e05830565dc476c9405d3f1df8c443d2e9ca511 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Nov 1 10:12:04 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Nov 1 10:12:04 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e058305 app-arch/unzip: arm stable wrt bug #691566 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="arm" Signed-off-by: Mikle Kolyada gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index a1baa108aad..a89ad32ce71 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: a551965c8f94ce8441617f3779c9990ba86d0c61 Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Oct 28 07:40:48 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Oct 28 07:40:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a551965c app-arch/unzip: amd64 stable wrt bug #691566 Package-Manager: Portage-2.3.76, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index 544d9c12d31..a1baa108aad 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -16,7 +16,7 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/, app-arch/pdlzip/, app-arch/bsdsfv/, app-arch/arj/, ...
commit: c029e87c7dc748b9b3fcad7e043e1d01d84742fa Author: Michał Górny gentoo org> AuthorDate: Fri Oct 11 15:32:23 2019 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 11 15:32:23 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c029e87c app-arch: Remove *-fbsd KEYWORDS Signed-off-by: Michał Górny gentoo.org> app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild | 2 +- app-arch/arc/arc-5.21p.ebuild | 2 +- app-arch/arj/arj-3.10.22-r7.ebuild | 2 +- app-arch/brotli/brotli-1.0.2.ebuild | 2 +- app-arch/brotli/brotli-1.0.3-r1.ebuild | 2 +- app-arch/brotli/brotli-1.0.3.ebuild | 2 +- app-arch/brotli/brotli-1.0.4.ebuild | 2 +- app-arch/brotli/brotli-1.0.5.ebuild | 2 +- app-arch/brotli/brotli-1.0.6-r1.ebuild | 2 +- app-arch/brotli/brotli-1.0.6.ebuild | 2 +- app-arch/brotli/brotli-1.0.7.ebuild | 2 +- app-arch/brotli/brotli-.ebuild | 2 +- app-arch/bsdsfv/bsdsfv-1.18-r2.ebuild | 2 +- app-arch/bzip2/bzip2-1.0.6-r11.ebuild | 2 +- app-arch/bzip2/bzip2-1.0.7.ebuild | 2 +- app-arch/bzip2/bzip2-1.0.8.ebuild | 2 +- app-arch/bzip2/bzip2-.ebuild| 2 +- app-arch/cabextract/cabextract-1.8.ebuild | 2 +- app-arch/cabextract/cabextract-1.9-r2.ebuild| 2 +- app-arch/cabextract/cabextract-1.9.1.ebuild | 2 +- app-arch/cabextract/cabextract-.ebuild | 2 +- app-arch/cfv/cfv-1.18.3-r1.ebuild | 2 +- app-arch/cksfv/cksfv-1.3.14-r1.ebuild | 2 +- app-arch/cksfv/cksfv-1.3.14.ebuild | 2 +- app-arch/cpio/cpio-2.12-r1.ebuild | 2 +- app-arch/file-roller/file-roller-3.30.1.ebuild | 2 +- app-arch/file-roller/file-roller-3.32.2.ebuild | 2 +- app-arch/gzip/gzip-1.10.ebuild | 2 +- app-arch/gzip/gzip-1.9.ebuild | 2 +- app-arch/lbzip2/lbzip2-2.5_p20181227-r1.ebuild | 2 +- app-arch/lha/lha-114i-r7.ebuild | 2 +- app-arch/lha/lha-114i-r8.ebuild | 2 +- app-arch/lha/lha-114i-r9.ebuild | 2 +- app-arch/libarchive/libarchive-3.3.3.ebuild | 2 +- app-arch/libarchive/libarchive-3.4.0.ebuild | 2 +- app-arch/lrzip/lrzip-0.621.ebuild | 2 +- app-arch/lrzip/lrzip-0.631-r1.ebuild| 2 +- app-arch/lz4/lz4-1.8.3.ebuild | 2 +- app-arch/lz4/lz4-1.9.1.ebuild | 2 +- app-arch/lz4/lz4-1.9.2.ebuild | 2 +- app-arch/lz4/lz4-.ebuild| 2 +- app-arch/lzip/lzip-1.21.ebuild | 2 +- app-arch/lzop/lzop-1.04.ebuild | 2 +- app-arch/mscompress/mscompress-0.3-r1.ebuild| 2 +- app-arch/p7zip/p7zip-16.02-r4.ebuild| 2 +- app-arch/pbzip2/pbzip2-1.1.12-r1.ebuild | 2 +- app-arch/pbzip2/pbzip2-1.1.12.ebuild| 2 +- app-arch/pbzip2/pbzip2-1.1.13.ebuild| 2 +- app-arch/pdlzip/pdlzip-1.10.ebuild | 2 +- app-arch/pdlzip/pdlzip-1.8.ebuild | 2 +- app-arch/rpm2targz/rpm2targz-9.0.0.5g.ebuild| 2 +- app-arch/snappy/snappy-1.1.7.ebuild | 2 +- app-arch/tar/tar-1.32.ebuild| 2 +- app-arch/unarj/unarj-2.65.ebuild| 2 +- app-arch/unrar/unrar-5.7.5.ebuild | 2 +- app-arch/unrar/unrar-5.8.1.ebuild | 2 +- app-arch/unrar/unrar-5.8.2.ebuild | 2 +- app-arch/unzip/unzip-6.0_p21-r2.ebuild | 2 +- app-arch/unzip/unzip-6.0_p25.ebuild | 2 +- app-arch/upx/upx-3.95.ebuild| 2 +- app-arch/xar/xar-1.8-r1.ebuild | 2 +- app-arch/xar/xar-1.8-r2.ebuild | 2 +- app-arch/xarchiver/xarchiver-0.5.4.14.ebuild| 2 +- app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild | 2 +- app-arch/xz-utils/xz-utils-5.2.4-r3.ebuild | 2 +- app-arch/xz-utils/xz-utils-.ebuild | 2 +- app-arch/zip/zip-3.0-r3.ebuild | 2 +- app-arch/zoo/zoo-2.10-r5.ebuild | 2 +- 68 files changed, 68 insertions(+), 68 deletions(-) diff --git a/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild b/app-arch/advancecomp/advancecomp-2.2_pre20190301.ebuild index 08fbb55a520..5eb02005ebb 100644 ---
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: df4702681d78ae576253a6672d7f985a12f38b98 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Aug 10 17:09:34 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Aug 10 17:12:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df470268 app-arch/unzip: bump EAPI Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> app-arch/unzip/unzip-6.0_p25.ebuild | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild index bdbcb3b4e53..dcd460f9f04 100644 --- a/app-arch/unzip/unzip-6.0_p25.ebuild +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -inherit eutils toolchain-funcs flag-o-matic +inherit toolchain-funcs flag-o-matic MY_PV="${PV//.}" MY_PV="${MY_PV%_p*}" @@ -57,14 +57,14 @@ src_prepare() { src_configure() { 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" ;; - *-cygwin*) TARGET="cygwin" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + 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" ;; + *-cygwin*) TARGET="cygwin" ;; + *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; esac [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD @@ -75,7 +75,7 @@ src_configure() { src_compile() { ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ - emake -f unix/Makefile ${TARGET} + emake -f unix/Makefile ${TARGET} } src_install() {
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: fbf679e99554488d9d20c3cecaf4063733f70e6f Author: Aaron Bauman gentoo org> AuthorDate: Sat Aug 10 15:46:38 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Aug 10 17:07:29 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbf679e9 app-arch/unzip: bump to Debian patchset 25 Bug: https://bugs.gentoo.org/647008 Bug: https://bugs.gentoo.org/691566 Signed-off-by: Aaron Bauman gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/12670 Signed-off-by: Thomas Deutschmann gentoo.org> app-arch/unzip/Manifest | 1 + app-arch/unzip/unzip-6.0_p25.ebuild | 86 + 2 files changed, 87 insertions(+) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index c338085389a..5f1282b23fc 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,2 +1,3 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 +DIST unzip_6.0-25.debian.tar.xz 23096 BLAKE2B 09cd89165c0354431fa0eb946bb8f8355fa09ef81cd3e3ea03e53ca7f465b323364204ffe11d8e58eeb5b46e40be598d4f709b621d163bfde09070b6847db2a6 SHA512 13c16db420fa4a34be3090a9acdd79b01320da40ac5aa89a9dfca03e64b914b28eb72aff3882d02a8197457bcb8eeb9473c998cf6920e511883c9289a949fb21 diff --git a/app-arch/unzip/unzip-6.0_p25.ebuild b/app-arch/unzip/unzip-6.0_p25.ebuild new file mode 100644 index 000..bdbcb3b4e53 --- /dev/null +++ b/app-arch/unzip/unzip-6.0_p25.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils toolchain-funcs flag-o-matic + +MY_PV="${PV//.}" +MY_PV="${MY_PV%_p*}" +MY_P="${PN}${MY_PV}" + +DESCRIPTION="unzipper for pkzip-compressed files" +HOMEPAGE="http://www.info-zip.org/; +SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz + mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" + +LICENSE="Info-ZIP" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" +IUSE="bzip2 natspec unicode" + +DEPEND="bzip2? ( app-arch/bzip2 ) + natspec? ( dev-libs/libnatspec )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + local deb="${WORKDIR}"/debian/patches + rm "${deb}"/02-this-is-debian-unzip.patch || die + eapply "${deb}"/*.patch + + eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch + eapply "${FILESDIR}"/${PN}-6.0-format-security.patch + use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 + sed -i -r \ + -e '/^CFLAGS/d' \ + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ + -e '/^STRIP/s:=.*:=true:' \ + -e "s:\:CC=\"$(tc-getCC)\":" \ + -e "s:\:LD=\"$(tc-getCC)\":" \ + -e "s:\: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" + + # Delete bundled code to make sure we don't use it. + rm -r bzip2 || die + + eapply_user +} + +src_configure() { + 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" ;; + *-cygwin*) TARGET="cygwin" ;; + *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + esac + + [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD + use bzip2 && append-cppflags -DUSE_BZIP2 + use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING + append-cppflags -DLARGE_FILE_SUPPORT #281473 +} + +src_compile() { + ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ + emake -f unix/Makefile ${TARGET} +} + +src_install() { + dobin unzip funzip unzipsfx unix/zipgrep + dosym unzip /usr/bin/zipinfo + doman man/*.1 +
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 5d1627f8ef6acd6dab6b419acf80247e035c57bf Author: Aaron Bauman gentoo org> AuthorDate: Sat Aug 10 14:51:42 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Sat Aug 10 14:51:42 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d1627f8 app-arch/unzip: remove vulnerable wrt bug #602048 * maintainer/project timeout Signed-off-by: Aaron Bauman gentoo.org> app-arch/unzip/Manifest | 1 - app-arch/unzip/unzip-6.0_p20.ebuild | 88 - 2 files changed, 89 deletions(-) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 23675a263bc..c338085389a 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,3 +1,2 @@ DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d -DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild deleted file mode 100644 index 65112b3cb15..000 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils toolchain-funcs flag-o-matic - -MY_PV="${PV//.}" -MY_PV="${MY_PV%_p*}" -MY_P="${PN}${MY_PV}" - -DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/; -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz - mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" - -LICENSE="Info-ZIP" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" -IUSE="bzip2 natspec unicode" - -DEPEND="bzip2? ( app-arch/bzip2 ) - natspec? ( dev-libs/libnatspec )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local deb="${WORKDIR}"/debian/patches - rm \ - "${deb}"/series \ - "${deb}"/02-branding-patch-this-is-debian-unzip \ - || die - epatch "${deb}"/* - - epatch "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch - use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 - sed -i -r \ - -e '/^CFLAGS/d' \ - -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ - -e '/^STRIP/s:=.*:=true:' \ - -e "s:\:CC=\"$(tc-getCC)\":" \ - -e "s:\:LD=\"$(tc-getCC)\":" \ - -e "s:\: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" - - # Delete bundled code to make sure we don't use it. - rm -r bzip2 || die - - epatch_user -} - -src_configure() { - 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" ;; - *-cygwin*) TARGET="cygwin" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; - 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 -} - -src_compile() { - ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ - emake -f unix/Makefile ${TARGET} -} - -src_install() { - dobin unzip funzip unzipsfx unix/zipgrep - dosym unzip /usr/bin/zipinfo - doman man/*.1 - dodoc BUGS History* README ToDo WHERE -}
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 7fc61f7ef5a3aa7a0a0999f3a9f43057db7c Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri May 3 23:15:58 2019 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri May 3 23:17:23 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc6 app-arch/unzip: keyword ~riscv Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas K. Hüttel gentoo.org> app-arch/unzip/unzip-6.0_p21-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild index 4548286aabd..a1660471ba5 100644 --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -16,7 +16,7 @@ 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 ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux" IUSE="bzip2 natspec unicode" DEPEND="bzip2? ( app-arch/bzip2 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 9a819cd8416ca80c3782a15aeac1d4a19387b6a8 Author: Mike Frysinger gentoo org> AuthorDate: Sun Jun 3 13:28:44 2018 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Jun 3 13:55:00 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a819cd8 app-arch/unzip: mark 6.0_p21-r2 m68k/s390/sh stable app-arch/unzip/unzip-6.0_p21-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild index 18b5f0bae4c..475c481ec07 100644 --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild @@ -16,7 +16,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 67c877a223a7a621c51fb41872d264c5c3332119 Author: Mikle Kolyada gentoo org> AuthorDate: Sun May 20 10:36:16 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun May 20 10:36:52 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c877a2 app-arch/unzip: Drop old Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-arch/unzip/unzip-6.0_p21.ebuild | 85 - 1 file changed, 85 deletions(-) diff --git a/app-arch/unzip/unzip-6.0_p21.ebuild b/app-arch/unzip/unzip-6.0_p21.ebuild deleted file mode 100644 index f86d5ebbf5b..000 --- a/app-arch/unzip/unzip-6.0_p21.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils toolchain-funcs flag-o-matic - -MY_PV="${PV//.}" -MY_PV="${MY_PV%_p*}" -MY_P="${PN}${MY_PV}" - -DESCRIPTION="unzipper for pkzip-compressed files" -HOMEPAGE="http://www.info-zip.org/; -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz - mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" - -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() { - local deb="${WORKDIR}"/debian/patches - rm "${deb}"/02-this-is-debian-unzip.patch || die - eapply "${deb}"/*.patch - - eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch - use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 - sed -i -r \ - -e '/^CFLAGS/d' \ - -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ - -e '/^STRIP/s:=.*:=true:' \ - -e "s:\:CC=\"$(tc-getCC)\":" \ - -e "s:\:LD=\"$(tc-getCC)\":" \ - -e "s:\: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" - - # Delete bundled code to make sure we don't use it. - rm -r bzip2 || die - - eapply_user -} - -src_configure() { - 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" ;; - *-cygwin*) TARGET="cygwin" ;; - *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; - 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 -} - -src_compile() { - ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ - emake -f unix/Makefile ${TARGET} -} - -src_install() { - dobin unzip funzip unzipsfx unix/zipgrep - dosym unzip /usr/bin/zipinfo - doman man/*.1 - dodoc BUGS History* README ToDo WHERE -}
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 488ea604efead5864ee811a698a8cdc0253e988b Author: Mart Raudsepp gentoo org> AuthorDate: Sat Apr 21 13:25:38 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Sat Apr 21 14:49:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488ea604 app-arch/unzip-6.0_p21-r2: arm64 stable (bug #643018) Package-Manager: Portage-2.3.28, Repoman-2.3.9 app-arch/unzip/unzip-6.0_p21-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild index 3f3860b3db0..18b5f0bae4c 100644 --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild @@ -16,7 +16,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 5414a9cecc39bf31f166b7a77225d1f834231038 Author: Tobias Klausmann gentoo org> AuthorDate: Sat Mar 3 12:17:36 2018 + Commit: Tobias Klausmann gentoo org> CommitDate: Sat Mar 3 13:12:19 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5414a9ce app-arch/unzip-6.0_p21-r2: alpha stable Gentoo-Bug: http://bugs.gentoo.org/643018 app-arch/unzip/unzip-6.0_p21-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild index 333dbc08699..3f3860b3db0 100644 --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild @@ -16,7 +16,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 55e20289a0821d043c53d7e6e869cb800770656c Author: Markus Meier gentoo org> AuthorDate: Wed Jan 10 06:15:17 2018 + Commit: Markus Meier gentoo org> CommitDate: Wed Jan 10 06:17:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55e20289 app-arch/unzip: arm stable, bug #643018 Package-Manager: Portage-2.3.13, Repoman-2.3.3 RepoMan-Options: --include-arches="arm" app-arch/unzip/unzip-6.0_p21-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild index a862413e26d..333dbc08699 100644 --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild @@ -16,7 +16,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 676ca2996c0d7b8f89bd4588e19e6c13c4033292 Author: Mikle Kolyada gentoo org> AuthorDate: Tue Jan 2 23:38:28 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Tue Jan 2 23:38:28 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=676ca299 app-arch/unzip: amd64 stable wrt bug #643018 Package-Manager: Portage-2.3.13, Repoman-2.3.3 app-arch/unzip/unzip-6.0_p21-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild index 94d16b7719a..d384679ae21 100644 --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild @@ -16,7 +16,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 67204880e6b1cf60cb209d995a3b20d01c616cc6 Author: Rolf Eike Beer sf-mail de> AuthorDate: Tue Jan 2 14:09:25 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Jan 2 19:54:19 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67204880 app-arch/unzip: stable 6.0_p21-r2 for sparc, bug #643018 Package-Manager: Portage-2.3.13, Repoman-2.3.3 RepoMan-Options: --include-arches="sparc" app-arch/unzip/unzip-6.0_p21-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild index 9a6c5e1fb7c..94d16b7719a 100644 --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild @@ -16,7 +16,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 8f6b944b94658290b95762d0e049d61d4c2e194e Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Jan 1 22:13:07 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Jan 1 22:14:26 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f6b944b app-arch/unzip: stable 6.0_p21-r2 for hppa/ia64/ppc/ppc64, bug #643018 Package-Manager: Portage-2.3.19, Repoman-2.3.6 RepoMan-Options: --include-arches="hppa ia64 ppc ppc64" app-arch/unzip/unzip-6.0_p21-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-arch/unzip/unzip-6.0_p21-r2.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild index bdc9d03e278..9a6c5e1fb7c 100644 --- a/app-arch/unzip/unzip-6.0_p21-r2.ebuild +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -16,7 +16,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/files/, app-arch/unzip/
commit: 60abede81b5a84ea9a77e560e942a3ef330ec550 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Nov 26 01:37:23 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Nov 26 01:37:41 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60abede8 app-arch/unzip: Rev bump to fix build with format-security Package-Manager: Portage-2.3.16, Repoman-2.3.6 .../unzip/files/unzip-6.0-format-security.patch| 91 ++ ...p-6.0_p21-r1.ebuild => unzip-6.0_p21-r2.ebuild} | 1 + 2 files changed, 92 insertions(+) diff --git a/app-arch/unzip/files/unzip-6.0-format-security.patch b/app-arch/unzip/files/unzip-6.0-format-security.patch new file mode 100644 index 000..c61c1359636 --- /dev/null +++ b/app-arch/unzip/files/unzip-6.0-format-security.patch @@ -0,0 +1,91 @@ +Fix build with -Werror=format-security + +Origin: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=master-next=f7d80257afcfefdc85b6745328f2d12b957a848b +Author: Edwin Plauchu+ +diff --git a/extract.c b/extract.c +index 7cd9123..25c5a62 100644 +--- a/extract.c b/extract.c +@@ -475,7 +475,7 @@ int extract_or_test_files(__G)/* return PK-type error code */ + Info(slide, 0x401, ((char *)slide, + LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1)); + Info(slide, 0x401, ((char *)slide, +- LoadFarString(ReportMsg))); ++ "%s",LoadFarString(ReportMsg))); + error_in_archive = PK_BADERR; + } + reached_end = TRUE; /* ...so no more left to do */ +@@ -754,8 +754,8 @@ int extract_or_test_files(__G)/* return PK-type error code */ + + #ifndef SFX + if (no_endsig_found) { /* just to make sure */ +-Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); +-Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg))); ++Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); ++Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg))); + if (!error_in_archive) /* don't overwrite stronger error */ + error_in_archive = PK_WARN; + } +diff --git a/list.c b/list.c +index 15e0011..0b484f6 100644 +--- a/list.c b/list.c +@@ -181,7 +181,7 @@ int list_files(__G)/* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide, "%s", LoadFarString(ReportMsg))); + return PK_BADERR; /* sig not found */ + } + } +@@ -507,7 +507,7 @@ int list_files(__G)/* return PK-type error code */ + && (!G.ecrec.is_zip64_archive) + && (memcmp(G.sig, end_central_sig, 4) != 0) +) { /* just to make sure again */ +-Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; /* didn't find sig */ + } + +@@ -591,7 +591,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide, "%s", LoadFarString(ReportMsg))); + return PK_BADERR; /* sig not found */ + } + } +@@ -674,7 +674,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */ + ---*/ + + if (memcmp(G.sig, end_central_sig, 4)) {/* just to make sure again */ +-Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg))); ++Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg))); + error_in_archive = PK_WARN; + } + if (*nmember == 0L && error_in_archive <= PK_WARN) +diff --git a/zipinfo.c b/zipinfo.c +index 0ac75b3..1e7fa82 100644 +--- a/zipinfo.c b/zipinfo.c +@@ -833,7 +833,7 @@ int zipinfo(__G) /* return PK-type error code */ + Info(slide, 0x401, + ((char *)slide, LoadFarString(CentSigMsg), j)); + Info(slide, 0x401, +- ((char *)slide, LoadFarString(ReportMsg))); ++ ((char *)slide, "%s", LoadFarString(ReportMsg))); + error_in_archive = PK_BADERR; /* sig not found */ + break; + } +@@ -1022,7 +1022,7 @@ int zipinfo(__G) /* return PK-type error code */ + &&
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 57d39d4794da75dd7469590e964f83336f64acd1 Author: Hector Martin marcan st> AuthorDate: Sun Nov 26 00:51:22 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Nov 26 00:51:45 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d39d47 app-arch/unzip: Rev bump to add -DUSE_ICONV_MAPPING on USE=unicode Closes: https://github.com/gentoo/gentoo/pull/6276 Package-Manager: Portage-2.3.16, Repoman-2.3.6 Signed-off-by: Thomas Deutschmann gentoo.org> app-arch/unzip/Manifest| 6 +-- app-arch/unzip/unzip-6.0_p21-r1.ebuild | 85 ++ 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 8296fa70277..23675a263bc 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,3 +1,3 @@ -DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808 -DIST unzip_6.0-20.debian.tar.xz 16680 SHA256 7ddfafb1a771ae8d6b4e25c5e31f22c717e0fe606b1bafadcdd574c01f671490 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe WHIRLPOOL ea5ebd5d95638ff8cd2e91eb77f5be544e33ac6fd478aa00c04da193cd3fad980c5ac1975dfedb2c242192cee6c4eee8bbaf3581299f6c3fa45faa639f0169fd -DIST unzip_6.0-21.debian.tar.xz 17740 SHA256 8accd9d214630a366476437a3ec1842f2e057fdce16042a7b19ee569c33490a3 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 WHIRLPOOL ce4d74e27ff27183989c680ef022328915c8ade5c1f12b39bcc1ee905dbd2fd3974cbb22da9bed40d8dc7a59de9ba768bfc6bb61d3bdd1b6f571945d06bf19f6 +DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d +DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe +DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 diff --git a/app-arch/unzip/unzip-6.0_p21-r1.ebuild b/app-arch/unzip/unzip-6.0_p21-r1.ebuild new file mode 100644 index 000..59771d0d1a7 --- /dev/null +++ b/app-arch/unzip/unzip-6.0_p21-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils toolchain-funcs flag-o-matic + +MY_PV="${PV//.}" +MY_PV="${MY_PV%_p*}" +MY_P="${PN}${MY_PV}" + +DESCRIPTION="unzipper for pkzip-compressed files" +HOMEPAGE="http://www.info-zip.org/; +SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz + mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" + +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() { + local deb="${WORKDIR}"/debian/patches + rm "${deb}"/02-this-is-debian-unzip.patch || die + eapply "${deb}"/*.patch + + eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch + use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 + sed -i -r \ + -e '/^CFLAGS/d' \ + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ + -e '/^STRIP/s:=.*:=true:' \ + -e "s:\:CC=\"$(tc-getCC)\":" \ + -e "s:\:LD=\"$(tc-getCC)\":" \ + -e "s:\: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" + + # Delete bundled code to make sure we don't
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 6217fe01d52c2cd1eed967bfc5cd13b9880b95e1 Author: Jeroen Roovers gentoo org> AuthorDate: Tue Nov 21 13:51:56 2017 + Commit: Jeroen Roovers gentoo org> CommitDate: Tue Nov 21 13:52:14 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6217fe01 app-arch/unzip: Version bump. Package-Manager: Portage-2.3.14, Repoman-2.3.6 app-arch/unzip/Manifest | 1 + app-arch/unzip/unzip-6.0_p21.ebuild | 85 + 2 files changed, 86 insertions(+) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index f7a457161cb..8296fa70277 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,2 +1,3 @@ DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808 DIST unzip_6.0-20.debian.tar.xz 16680 SHA256 7ddfafb1a771ae8d6b4e25c5e31f22c717e0fe606b1bafadcdd574c01f671490 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe WHIRLPOOL ea5ebd5d95638ff8cd2e91eb77f5be544e33ac6fd478aa00c04da193cd3fad980c5ac1975dfedb2c242192cee6c4eee8bbaf3581299f6c3fa45faa639f0169fd +DIST unzip_6.0-21.debian.tar.xz 17740 SHA256 8accd9d214630a366476437a3ec1842f2e057fdce16042a7b19ee569c33490a3 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36 WHIRLPOOL ce4d74e27ff27183989c680ef022328915c8ade5c1f12b39bcc1ee905dbd2fd3974cbb22da9bed40d8dc7a59de9ba768bfc6bb61d3bdd1b6f571945d06bf19f6 diff --git a/app-arch/unzip/unzip-6.0_p21.ebuild b/app-arch/unzip/unzip-6.0_p21.ebuild new file mode 100644 index 000..f86d5ebbf5b --- /dev/null +++ b/app-arch/unzip/unzip-6.0_p21.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eutils toolchain-funcs flag-o-matic + +MY_PV="${PV//.}" +MY_PV="${MY_PV%_p*}" +MY_P="${PN}${MY_PV}" + +DESCRIPTION="unzipper for pkzip-compressed files" +HOMEPAGE="http://www.info-zip.org/; +SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz + mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" + +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() { + local deb="${WORKDIR}"/debian/patches + rm "${deb}"/02-this-is-debian-unzip.patch || die + eapply "${deb}"/*.patch + + eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch + use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 + sed -i -r \ + -e '/^CFLAGS/d' \ + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ + -e '/^STRIP/s:=.*:=true:' \ + -e "s:\:CC=\"$(tc-getCC)\":" \ + -e "s:\:LD=\"$(tc-getCC)\":" \ + -e "s:\: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" + + # Delete bundled code to make sure we don't use it. + rm -r bzip2 || die + + eapply_user +} + +src_configure() { + 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" ;; + *-cygwin*) TARGET="cygwin" ;; + *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; + 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 +} + +src_compile() { + ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" \ + emake -f unix/Makefile ${TARGET} +} + +src_install() { + dobin unzip funzip unzipsfx unix/zipgrep + dosym unzip /usr/bin/zipinfo + doman man/*.1 + dodoc BUGS History* README
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: ecb683835ac6181fb60bb87273445dc7df8804f8 Author: Mike Frysinger gentoo org> AuthorDate: Sun Jan 22 06:16:42 2017 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Jan 22 06:17:08 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecb68383 app-arch/unzip: mark 6.0_p20 arm64/m68k/s390/sh stable app-arch/unzip/unzip-6.0_p20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index f952bd3..6b611c2 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -17,7 +17,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/, app-arch/unzip/files/
commit: 9801aee5391ae3e2c366107e3f0d21e8d29d95d3 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Jan 14 15:28:04 2017 + Commit: Aaron Bauman gentoo org> CommitDate: Sun Jan 15 07:59:10 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9801aee5 app-arch/unzip: Security cleanup (bug #560416) Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3466 app-arch/unzip/Manifest| 1 - .../unzip/files/unzip-5.52-CVE-2008-0888.patch | 35 --- .../unzip/files/unzip-5.52-no-exec-stack.patch | 13 app-arch/unzip/unzip-5.52-r2.ebuild| 58 - app-arch/unzip/unzip-6.0-r3.ebuild | 73 -- 5 files changed, 180 deletions(-) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 953dc1c..f7a4571 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,3 +1,2 @@ -DIST unzip552.tar.gz 1140291 SHA256 145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9 SHA512 9b852687a7cbce3a6696f8da176f97eded1e99b1f10ae5e4b29bf870df374fea3e4266b3a731d7cdfc28ce5c060a01dd8d3f9c3d8250d1d774273de16d70528b WHIRLPOOL 4148fe091cf9847245be67c7d85fc6fcdcc2a385dad0434757a0c7dea41131085f9bcd5ca6eedc065091a473f27780341921f90ddcae32e73618319da9122d70 DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808 DIST unzip_6.0-20.debian.tar.xz 16680 SHA256 7ddfafb1a771ae8d6b4e25c5e31f22c717e0fe606b1bafadcdd574c01f671490 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe WHIRLPOOL ea5ebd5d95638ff8cd2e91eb77f5be544e33ac6fd478aa00c04da193cd3fad980c5ac1975dfedb2c242192cee6c4eee8bbaf3581299f6c3fa45faa639f0169fd diff --git a/app-arch/unzip/files/unzip-5.52-CVE-2008-0888.patch b/app-arch/unzip/files/unzip-5.52-CVE-2008-0888.patch deleted file mode 100644 index 368b3ee.. --- a/app-arch/unzip/files/unzip-5.52-CVE-2008-0888.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 */ diff --git a/app-arch/unzip/files/unzip-5.52-no-exec-stack.patch b/app-arch/unzip/files/unzip-5.52-no-exec-stack.patch deleted file mode 100644 index e2869bf.. --- a/app-arch/unzip/files/unzip-5.52-no-exec-stack.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 diff --git a/app-arch/unzip/unzip-5.52-r2.ebuild b/app-arch/unzip/unzip-5.52-r2.ebuild deleted file mode 100644 index 9f97ed1.. --- a/app-arch/unzip/unzip-5.52-r2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 4171426d33f787686dde1f6d55247f422fc407a5 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jul 8 12:01:51 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jul 8 12:01:51 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4171426d app-arch/unzip: ia64 stable wrt bug #528082 Package-Manager: portage-2.2.28 RepoMan-Options: --include-arches="ia64" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/unzip/unzip-6.0_p20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index 77c8435..f952bd3 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -17,7 +17,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: dbb8a0e9554b6c22511d1baf33c21d2428f97d36 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jul 8 10:00:17 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jul 8 10:01:45 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb8a0e9 app-arch/unzip: sparc stable wrt bug #528082 Package-Manager: portage-2.2.28 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/unzip/unzip-6.0_p20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index 5d46dbc..77c8435 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -17,7 +17,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: d3ddc4a0b389aec1ca0aa1ac97a4a23584ec222b Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Jul 8 07:51:51 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Jul 8 07:51:51 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3ddc4a0 app-arch/unzip: ppc stable wrt bug #528082 Package-Manager: portage-2.2.28 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/unzip/unzip-6.0_p20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index 85f626a..5d46dbc 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -17,7 +17,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 1c05508f245235130025fab5e80a3f626fc34140 Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Jul 7 21:34:46 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Jul 7 21:37:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c05508f app-arch/unzip: allow user patches Package-Manager: portage-2.3.0 app-arch/unzip/unzip-6.0_p20.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index 73dd263..85f626a 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -54,6 +54,8 @@ src_prepare() { # Delete bundled code to make sure we don't use it. rm -r bzip2 || die + + epatch_user } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 21d815f4e34b52e8c2ec355f430716e5533b9ea5 Author: Matt Turner gentoo org> AuthorDate: Mon May 2 03:45:10 2016 + Commit: Matt Turner gentoo org> CommitDate: Mon May 2 04:03:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d815f4 app-arch/unzip: alpha stable, bug 528082. app-arch/unzip/unzip-6.0_p20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index e0ab247..73dd263 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -17,7 +17,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: f21e53431da80aad04cfa819b439a56d5dfcc669 Author: Markus Meier gentoo org> AuthorDate: Tue Apr 19 15:32:04 2016 + Commit: Markus Meier gentoo org> CommitDate: Tue Apr 19 15:32:25 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f21e5343 app-arch/unzip: arm stable, bug #528082 Package-Manager: portage-2.2.28 RepoMan-Options: --include-arches="arm" app-arch/unzip/unzip-6.0_p20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index 1e03f85..e0ab247 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -17,7 +17,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 57d7ea4facd4c0f72ec599aebdf06f5685df941a Author: Agostino Sarubbo gentoo org> AuthorDate: Mon Apr 11 10:38:24 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Mon Apr 11 10:38:24 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d7ea4f app-arch/unzip: x86 stable wrt bug #528082 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/unzip/unzip-6.0_p20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index 0c9409b..1e03f85 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -17,7 +17,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: cbcf8cfda3ab1d2f932349e890e88b7ddca7bc3b Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Apr 6 12:26:20 2016 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Apr 6 12:26:20 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbcf8cfd app-arch/unzip: amd64 stable wrt bug #528082 Package-Manager: portage-2.2.26 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-arch/unzip/unzip-6.0_p20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index cb6eb1e..0c9409b 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -17,7 +17,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 2743c8255daf0f57feb260294d310bed3bc970cf Author: Jeroen Roovers gentoo org> AuthorDate: Mon Apr 4 02:44:55 2016 + Commit: Jeroen Roovers gentoo org> CommitDate: Mon Apr 4 02:44:55 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2743c825 app-arch/unzip: Stable for HPPA PPC64 (bug #528082). Package-Manager: portage-2.2.28 RepoMan-Options: --ignore-arches app-arch/unzip/unzip-6.0_p20.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild index b0ea922..cb6eb1e 100644 --- a/app-arch/unzip/unzip-6.0_p20.ebuild +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -17,7 +17,7 @@ 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" +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 )
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/, app-arch/unzip/files/
commit: f65df71cdc392f85fd95ad5b8ef1508434e2a239 Author: Mike Frysinger gentoo org> AuthorDate: Sun Apr 3 00:05:21 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Apr 3 00:05:49 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65df71c app-arch/unzip: add Debian patchset to fix various bugs #528082 #533748 #537424 #560416 app-arch/unzip/Manifest | 1 + app-arch/unzip/files/unzip-6.0-natspec.patch | 10 app-arch/unzip/unzip-6.0_p20.ebuild | 87 3 files changed, 88 insertions(+), 10 deletions(-) diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest index 64da7a5..953dc1c 100644 --- a/app-arch/unzip/Manifest +++ b/app-arch/unzip/Manifest @@ -1,2 +1,3 @@ DIST unzip552.tar.gz 1140291 SHA256 145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9 SHA512 9b852687a7cbce3a6696f8da176f97eded1e99b1f10ae5e4b29bf870df374fea3e4266b3a731d7cdfc28ce5c060a01dd8d3f9c3d8250d1d774273de16d70528b WHIRLPOOL 4148fe091cf9847245be67c7d85fc6fcdcc2a385dad0434757a0c7dea41131085f9bcd5ca6eedc065091a473f27780341921f90ddcae32e73618319da9122d70 DIST unzip60.tar.gz 1376845 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d WHIRLPOOL eab32d6d0ab100d302b608658a3ae290d3dad4beddccebaf6cb6527102bb238f751ec6482dea68ae62474005de89f11f9e0cf1b1e12bee2ca5a2336a3c0c9808 +DIST unzip_6.0-20.debian.tar.xz 16680 SHA256 7ddfafb1a771ae8d6b4e25c5e31f22c717e0fe606b1bafadcdd574c01f671490 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe WHIRLPOOL ea5ebd5d95638ff8cd2e91eb77f5be544e33ac6fd478aa00c04da193cd3fad980c5ac1975dfedb2c242192cee6c4eee8bbaf3581299f6c3fa45faa639f0169fd diff --git a/app-arch/unzip/files/unzip-6.0-natspec.patch b/app-arch/unzip/files/unzip-6.0-natspec.patch index a1aa83f..0cf87fd 100644 --- a/app-arch/unzip/files/unzip-6.0-natspec.patch +++ b/app-arch/unzip/files/unzip-6.0-natspec.patch @@ -155,16 +155,6 @@ diff -pur unzip60orig/unzip.c unzip60/unzip.c #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\ diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p20.ebuild new file mode 100644 index 000..b0ea922 --- /dev/null +++ b/app-arch/unzip/unzip-6.0_p20.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils toolchain-funcs flag-o-matic + +MY_PV="${PV//.}" +MY_PV="${MY_PV%_p*}" +MY_P="${PN}${MY_PV}" + +DESCRIPTION="unzipper for pkzip-compressed files" +HOMEPAGE="http://www.info-zip.org/; +SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz + mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" + +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() { + local deb="${WORKDIR}"/debian/patches + rm \ + "${deb}"/series \ + "${deb}"/02-branding-patch-this-is-debian-unzip \ + || die + epatch "${deb}"/* + + epatch "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch + use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244 + sed -i -r \ + -e '/^CFLAGS/d' \ + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ + -e '/^STRIP/s:=.*:=true:' \ + -e "s:\:CC=\"$(tc-getCC)\":" \ + -e "s:\:LD=\"$(tc-getCC)\":" \ + -e "s:\: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' \ +
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 3518102c11a6bfa080f029e7b4f9d4468053f144 Author: Mike Frysinger gentoo org> AuthorDate: Sat Apr 2 23:13:24 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Apr 2 23:15:26 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3518102c app-arch/unzip: add cygwin support #469174 app-arch/unzip/unzip-6.0-r3.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/app-arch/unzip/unzip-6.0-r3.ebuild b/app-arch/unzip/unzip-6.0-r3.ebuild index a1ea761..3a1d001 100644 --- a/app-arch/unzip/unzip-6.0-r3.ebuild +++ b/app-arch/unzip/unzip-6.0-r3.ebuild @@ -51,6 +51,7 @@ src_compile() { i?86*-dragonfly*)TARGET=freebsd ;; # mislabelled bsd with x86 asm *bsd* | *dragonfly*) TARGET=bsd ;; *-darwin*) TARGET=macosx ;; + *-cygwin*) TARGET=cygwin ;; *) die "Unknown target, you suck" ;; esac
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: f30bed50f18566190979cde0412e9919b0934a44 Author: Mike Frysinger gentoo org> AuthorDate: Sun Feb 28 19:15:32 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Sun Feb 28 19:15:42 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f30bed50 app-arch/unzip: expand toolchain sed to cover more cases #575710 app-arch/unzip/unzip-6.0-r3.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app-arch/unzip/unzip-6.0-r3.ebuild b/app-arch/unzip/unzip-6.0-r3.ebuild index 210563b..a1ea761 100644 --- a/app-arch/unzip/unzip-6.0-r3.ebuild +++ b/app-arch/unzip/unzip-6.0-r3.ebuild @@ -25,13 +25,13 @@ 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 \ + sed -i -r \ -e '/^CFLAGS/d' \ - -e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \ + -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ -e '/^STRIP/s:=.*:=true:' \ - -e
[gentoo-commits] repo/gentoo:master commit in: app-arch/unzip/
commit: 9316a916d4f1478b26b8b9b9f2e82940b8b54bf2 Author: Manuel Rüger mrueg AT gentoo DOT org AuthorDate: Fri Aug 28 00:30:29 2015 + Commit: Manuel Rüger mrueg AT gentoo DOT org CommitDate: Fri Aug 28 00:30:29 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9316a916 app-arch/unzip: Remove old Package-Manager: portage-2.2.20.1 app-arch/unzip/unzip-6.0-r1.ebuild | 70 - app-arch/unzip/unzip-6.0-r2.ebuild | 71 -- 2 files changed, 141 deletions(-) diff --git a/app-arch/unzip/unzip-6.0-r1.ebuild b/app-arch/unzip/unzip-6.0-r1.ebuild deleted file mode 100644 index cdb7572..000 --- a/app-arch/unzip/unzip-6.0-r1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 ppc ppc64 s390 sh ~sparc 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-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 -} diff --git a/app-arch/unzip/unzip-6.0-r2.ebuild b/app-arch/unzip/unzip-6.0-r2.ebuild deleted file mode 100644 index 1d350a1..000 --- a/app-arch/unzip/unzip-6.0-r2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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* |