1 |
commit: bff42a923fb9b8ce5af167cc3032420d4a666307 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 25 02:18:16 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 25 02:19:14 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bff42a92 |
7 |
|
8 |
app-arch/unzip: add 6.0_p27 |
9 |
|
10 |
Contains patches for CVE-2022-0529, CVE-2022-0530 (bug 831190) and |
11 |
for a unicode issue which *might* be CVE-2021-4217 (bug 866386). |
12 |
|
13 |
Bug: https://bugs.gentoo.org/866386 |
14 |
Bug: https://bugs.gentoo.org/831190 |
15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
16 |
|
17 |
app-arch/unzip/Manifest | 1 + |
18 |
app-arch/unzip/unzip-6.0_p27.ebuild | 93 +++++++++++++++++++++++++++++++++++++ |
19 |
2 files changed, 94 insertions(+) |
20 |
|
21 |
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest |
22 |
index 8f65ff09a28d..a3b8d1ff3cc5 100644 |
23 |
--- a/app-arch/unzip/Manifest |
24 |
+++ b/app-arch/unzip/Manifest |
25 |
@@ -1,2 +1,3 @@ |
26 |
DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d |
27 |
DIST unzip_6.0-26.debian.tar.xz 23708 BLAKE2B 7655396df2f8c4443bbd37a2fab590f1e66b3b8531871a6d95f281ac702e64a0e602f2412a58ff2addf4ce9cae8d146af650a18b02919d120c9db6c49df480b5 SHA512 9a56e400ad0984f87c7ee0548429349be549e35a3cae4c9acb88a8fb97a1d1fbd116cfa3292622ad8b2c67ffe79ae268861ddec1269993ba98f1a6a411b7611f |
28 |
+DIST unzip_6.0-27.debian.tar.xz 24980 BLAKE2B e53a96f12af0cf5227600c73a35003484fca5de138cd37991eb1eb25b97b80371c3a566d989feeb04deb1a93acd9444253b091cd7e920b23520c87c5f5a94eeb SHA512 e1e605f023c7b314a6c5b2857a3bd630350df2d7e4bf6bb38ab8594f967336384666b4db8afad931251b85261ee4e2c38d78641c74ac7e5fd02523f26e92ddb2 |
29 |
|
30 |
diff --git a/app-arch/unzip/unzip-6.0_p27.ebuild b/app-arch/unzip/unzip-6.0_p27.ebuild |
31 |
new file mode 100644 |
32 |
index 000000000000..bfa8c139f8c9 |
33 |
--- /dev/null |
34 |
+++ b/app-arch/unzip/unzip-6.0_p27.ebuild |
35 |
@@ -0,0 +1,93 @@ |
36 |
+# Copyright 1999-2022 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=8 |
40 |
+ |
41 |
+inherit flag-o-matic multilib toolchain-funcs |
42 |
+ |
43 |
+MY_PV="${PV//.}" |
44 |
+MY_PV="${MY_PV%_p*}" |
45 |
+MY_P="${PN}${MY_PV}" |
46 |
+ |
47 |
+DESCRIPTION="unzipper for pkzip-compressed files" |
48 |
+HOMEPAGE="http://www.info-zip.org/" |
49 |
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz |
50 |
+ mirror://debian/pool/main/u/${PN}/${PN}_${PV/_p/-}.debian.tar.xz" |
51 |
+ |
52 |
+LICENSE="Info-ZIP" |
53 |
+SLOT="0" |
54 |
+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" |
55 |
+IUSE="bzip2 natspec unicode" |
56 |
+ |
57 |
+DEPEND="bzip2? ( app-arch/bzip2 ) |
58 |
+ natspec? ( dev-libs/libnatspec )" |
59 |
+RDEPEND="${DEPEND}" |
60 |
+ |
61 |
+S="${WORKDIR}/${MY_P}" |
62 |
+ |
63 |
+PATCHES=( |
64 |
+ "${WORKDIR}"/debian/patches |
65 |
+ "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch |
66 |
+ "${FILESDIR}"/${PN}-6.0-format-security.patch |
67 |
+ "${FILESDIR}"/${PN}-6.0-fix-false-overlap-detection-on-32bit-systems.patch |
68 |
+) |
69 |
+ |
70 |
+src_prepare() { |
71 |
+ # bug #275244 |
72 |
+ use natspec && PATCHES+=( "${FILESDIR}"/${PN}-6.0-natspec.patch ) |
73 |
+ |
74 |
+ rm "${WORKDIR}"/debian/patches/02-this-is-debian-unzip.patch || die |
75 |
+ |
76 |
+ default |
77 |
+ |
78 |
+ sed -i -r \ |
79 |
+ -e '/^CFLAGS/d' \ |
80 |
+ -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \ |
81 |
+ -e '/^STRIP/s:=.*:=true:' \ |
82 |
+ -e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \ |
83 |
+ -e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \ |
84 |
+ -e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \ |
85 |
+ -e 's:LF2 = -s:LF2 = :' \ |
86 |
+ -e 's:LF = :LF = $(LDFLAGS) :' \ |
87 |
+ -e 's:SL = :SL = $(LDFLAGS) :' \ |
88 |
+ -e 's:FL = :FL = $(LDFLAGS) :' \ |
89 |
+ -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \ |
90 |
+ -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \ |
91 |
+ unix/Makefile \ |
92 |
+ || die "sed unix/Makefile failed" |
93 |
+ |
94 |
+ # Delete bundled code to make sure we don't use it. |
95 |
+ rm -r bzip2 || die |
96 |
+} |
97 |
+ |
98 |
+src_configure() { |
99 |
+ case ${CHOST} in |
100 |
+ i?86*-*linux*) TARGET="linux_asm" ;; |
101 |
+ *linux*) TARGET="linux_noasm" ;; |
102 |
+ i?86*-*bsd* | \ |
103 |
+ i?86*-dragonfly*) TARGET="freebsd" ;; # mislabelled bsd with x86 asm |
104 |
+ *bsd* | *dragonfly*) TARGET="bsd" ;; |
105 |
+ *-darwin*) TARGET="macosx" ;; |
106 |
+ *-solaris*) TARGET="generic" ;; |
107 |
+ *-cygwin*) TARGET="generic" ;; |
108 |
+ *) die "Unknown target; please update the ebuild to handle ${CHOST} " ;; |
109 |
+ esac |
110 |
+ |
111 |
+ [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD |
112 |
+ use bzip2 && append-cppflags -DUSE_BZIP2 |
113 |
+ use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING |
114 |
+ |
115 |
+ # bug #281473 |
116 |
+ append-cppflags -DLARGE_FILE_SUPPORT |
117 |
+} |
118 |
+ |
119 |
+src_compile() { |
120 |
+ ASFLAGS="${ASFLAGS} $(get_abi_CFLAGS)" emake -f unix/Makefile ${TARGET} |
121 |
+} |
122 |
+ |
123 |
+src_install() { |
124 |
+ dobin unzip funzip unzipsfx unix/zipgrep |
125 |
+ dosym unzip /usr/bin/zipinfo |
126 |
+ doman man/*.1 |
127 |
+ dodoc BUGS History* README ToDo WHERE |
128 |
+} |