Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: app-arch/unzip/, app-arch/unzip/files/
Date: Mon, 19 Nov 2018 19:24:32
Message-Id: 1542645510.db0865445d76ed1c2c1704458d1dceed1fde0194.grobian@gentoo
1 commit: db0865445d76ed1c2c1704458d1dceed1fde0194
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 19 16:38:30 2018 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 19 16:38:30 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=db086544
7
8 app-arch/unzip: sync
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11 Package-Manager: Portage-2.3.40.3-prefix, Repoman-2.3.9
12
13 app-arch/unzip/Manifest | 2 +-
14 .../unzip/files/unzip-6.0-format-security.patch | 91 ++++++++++++++++++++++
15 app-arch/unzip/unzip-6.0-r3.ebuild | 82 -------------------
16 ...nzip-6.0_p20.ebuild => unzip-6.0_p21-r2.ebuild} | 20 +++--
17 4 files changed, 101 insertions(+), 94 deletions(-)
18
19 diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
20 index 3b13649240..c338085389 100644
21 --- a/app-arch/unzip/Manifest
22 +++ b/app-arch/unzip/Manifest
23 @@ -1,2 +1,2 @@
24 DIST unzip60.tar.gz 1376845 BLAKE2B 5016d300b4452018a391f4ebc03c6960c068df400a0407c0c60bd7bb5ec5012031f916d8b204a6149ba291c2c35beba40d9b43c76fc093026e79471329ab0e47 SHA512 0694e403ebc57b37218e00ec1a406cae5cc9c5b52b6798e0d4590840b6cdbf9ddc0d9471f67af783e960f8fa2e620394d51384257dca23d06bcd90224a80ce5d
25 -DIST unzip_6.0-20.debian.tar.xz 16680 BLAKE2B 17ce9234ac485eab4e5188b555af31dcb0db577b199e0c58991ba7211c4c80edce52b72e89cc4d82b000b70bed1ac90262c0972507f28f054af2cebd0ca33b48 SHA512 7212cb110291581c2e465dc8ea5130eabffc4e0369d6245e8c26fa9d350bed904847d6e1191afaaa2d3fc23bd05fda7da80439d0c06b88f5331b01c9eff97fbe
26 +DIST unzip_6.0-21.debian.tar.xz 17740 BLAKE2B 098a84e5b05f819f9c8c6a6656fdb2359dfb5b93f63444e55347e0bef9735fa48bf1631a658a2cb6d0c604e7e740e47b57910d251b74e5df7c8b9468acfe55f4 SHA512 f7bce4156ac13c34da3f991df3ae88b0db99b0810c7f8904ea3ac666a4cb2788d7182056f2bbd82d7519d0e0ee31a10af47bee08f360ceb859e5fbfc6e15ef36
27
28 diff --git a/app-arch/unzip/files/unzip-6.0-format-security.patch b/app-arch/unzip/files/unzip-6.0-format-security.patch
29 new file mode 100644
30 index 0000000000..c61c135963
31 --- /dev/null
32 +++ b/app-arch/unzip/files/unzip-6.0-format-security.patch
33 @@ -0,0 +1,91 @@
34 +Fix build with -Werror=format-security
35 +
36 +Origin: http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?h=master-next&id=f7d80257afcfefdc85b6745328f2d12b957a848b
37 +Author: Edwin Plauchu <edwin.plauchu.camacho@×××××.com>
38 +
39 +diff --git a/extract.c b/extract.c
40 +index 7cd9123..25c5a62 100644
41 +--- a/extract.c
42 ++++ b/extract.c
43 +@@ -475,7 +475,7 @@ int extract_or_test_files(__G) /* return PK-type error code */
44 + Info(slide, 0x401, ((char *)slide,
45 + LoadFarString(CentSigMsg), j + blknum*DIR_BLKSIZ + 1));
46 + Info(slide, 0x401, ((char *)slide,
47 +- LoadFarString(ReportMsg)));
48 ++ "%s",LoadFarString(ReportMsg)));
49 + error_in_archive = PK_BADERR;
50 + }
51 + reached_end = TRUE; /* ...so no more left to do */
52 +@@ -754,8 +754,8 @@ int extract_or_test_files(__G) /* return PK-type error code */
53 +
54 + #ifndef SFX
55 + if (no_endsig_found) { /* just to make sure */
56 +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
57 +- Info(slide, 0x401, ((char *)slide, LoadFarString(ReportMsg)));
58 ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
59 ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(ReportMsg)));
60 + if (!error_in_archive) /* don't overwrite stronger error */
61 + error_in_archive = PK_WARN;
62 + }
63 +diff --git a/list.c b/list.c
64 +index 15e0011..0b484f6 100644
65 +--- a/list.c
66 ++++ b/list.c
67 +@@ -181,7 +181,7 @@ int list_files(__G) /* return PK-type error code */
68 + Info(slide, 0x401,
69 + ((char *)slide, LoadFarString(CentSigMsg), j));
70 + Info(slide, 0x401,
71 +- ((char *)slide, LoadFarString(ReportMsg)));
72 ++ ((char *)slide, "%s", LoadFarString(ReportMsg)));
73 + return PK_BADERR; /* sig not found */
74 + }
75 + }
76 +@@ -507,7 +507,7 @@ int list_files(__G) /* return PK-type error code */
77 + && (!G.ecrec.is_zip64_archive)
78 + && (memcmp(G.sig, end_central_sig, 4) != 0)
79 + ) { /* just to make sure again */
80 +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
81 ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
82 + error_in_archive = PK_WARN; /* didn't find sig */
83 + }
84 +
85 +@@ -591,7 +591,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */
86 + Info(slide, 0x401,
87 + ((char *)slide, LoadFarString(CentSigMsg), j));
88 + Info(slide, 0x401,
89 +- ((char *)slide, LoadFarString(ReportMsg)));
90 ++ ((char *)slide, "%s", LoadFarString(ReportMsg)));
91 + return PK_BADERR; /* sig not found */
92 + }
93 + }
94 +@@ -674,7 +674,7 @@ int get_time_stamp(__G__ last_modtime, nmember) /* return PK-type error code */
95 + ---------------------------------------------------------------------------*/
96 +
97 + if (memcmp(G.sig, end_central_sig, 4)) { /* just to make sure again */
98 +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
99 ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
100 + error_in_archive = PK_WARN;
101 + }
102 + if (*nmember == 0L && error_in_archive <= PK_WARN)
103 +diff --git a/zipinfo.c b/zipinfo.c
104 +index 0ac75b3..1e7fa82 100644
105 +--- a/zipinfo.c
106 ++++ b/zipinfo.c
107 +@@ -833,7 +833,7 @@ int zipinfo(__G) /* return PK-type error code */
108 + Info(slide, 0x401,
109 + ((char *)slide, LoadFarString(CentSigMsg), j));
110 + Info(slide, 0x401,
111 +- ((char *)slide, LoadFarString(ReportMsg)));
112 ++ ((char *)slide, "%s", LoadFarString(ReportMsg)));
113 + error_in_archive = PK_BADERR; /* sig not found */
114 + break;
115 + }
116 +@@ -1022,7 +1022,7 @@ int zipinfo(__G) /* return PK-type error code */
117 + && (!G.ecrec.is_zip64_archive)
118 + && (memcmp(G.sig, end_central_sig, 4) != 0)
119 + ) { /* just to make sure again */
120 +- Info(slide, 0x401, ((char *)slide, LoadFarString(EndSigMsg)));
121 ++ Info(slide, 0x401, ((char *)slide, "%s", LoadFarString(EndSigMsg)));
122 + error_in_archive = PK_WARN; /* didn't find sig */
123 + }
124 +
125
126 diff --git a/app-arch/unzip/unzip-6.0-r3.ebuild b/app-arch/unzip/unzip-6.0-r3.ebuild
127 deleted file mode 100644
128 index 5f2c49483f..0000000000
129 --- a/app-arch/unzip/unzip-6.0-r3.ebuild
130 +++ /dev/null
131 @@ -1,82 +0,0 @@
132 -# Copyright 1999-2017 Gentoo Foundation
133 -# Distributed under the terms of the GNU General Public License v2
134 -# $Id$
135 -
136 -EAPI="2"
137 -inherit eutils toolchain-funcs flag-o-matic
138 -
139 -MY_P="${PN}${PV/.}"
140 -
141 -DESCRIPTION="unzipper for pkzip-compressed files"
142 -HOMEPAGE="http://www.info-zip.org/"
143 -SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
144 -
145 -LICENSE="Info-ZIP"
146 -SLOT="0"
147 -KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
148 -IUSE="bzip2 natspec unicode"
149 -
150 -DEPEND="bzip2? ( app-arch/bzip2 )
151 - natspec? ( dev-libs/libnatspec )"
152 -RDEPEND="${DEPEND}"
153 -
154 -S="${WORKDIR}/${MY_P}"
155 -
156 -src_prepare() {
157 - epatch "${FILESDIR}"/${P}-no-exec-stack.patch
158 - use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
159 - epatch "${FILESDIR}"/${P}-irix.patch
160 - sed -i -r \
161 - -e '/^CFLAGS/d' \
162 - -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
163 - -e '/^STRIP/s:=.*:=true:' \
164 - -e "s:\<CC *= *\"?g?cc2?\"?\>:CC=\"$(tc-getCC)\":" \
165 - -e "s:\<LD *= *\"?(g?cc2?|ld)\"?\>:LD=\"$(tc-getCC)\":" \
166 - -e "s:\<AS *= *\"?(g?cc2?|as)\"?\>:AS=\"$(tc-getCC)\":" \
167 - -e 's:LF2 = -s:LF2 = :' \
168 - -e 's:LF = :LF = $(LDFLAGS) :' \
169 - -e 's:SL = :SL = $(LDFLAGS) :' \
170 - -e 's:FL = :FL = $(LDFLAGS) :' \
171 - -e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
172 - -e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
173 - -e "s!CF = \$(CFLAGS) \$(CF_NOOPT)!CF = \$(CFLAGS) \$(CF_NOOPT) \$(CPPFLAGS)!" \
174 - unix/Makefile \
175 - || die "sed unix/Makefile failed"
176 -}
177 -
178 -src_compile() {
179 - local TARGET
180 - case ${CHOST} in
181 - i?86*-*linux*) TARGET=linux_asm ;;
182 - *linux*) TARGET=linux_noasm ;;
183 - i?86*-*bsd* | \
184 - i?86*-dragonfly*) TARGET=freebsd ;; # mislabelled bsd with x86 asm
185 - *bsd* | *dragonfly*) TARGET=bsd ;;
186 - *-darwin*) TARGET=macosx; append-cppflags "-DNO_LCHMOD" ;;
187 - *-solaris*) TARGET=generic ;;
188 - mips-sgi-irix*) TARGET=sgi; append-cppflags "-DNO_LCHMOD" ;;
189 - *-interix3*) TARGET=gcc; append-flags "-DUNIX"; append-cppflags "-DNO_LCHMOD" ;;
190 - *-interix*) TARGET=gcc; append-flags "-DUNIX -DNO_LCHMOD" ;;
191 - *-aix*) TARGET=gcc; append-cppflags "-DNO_LCHMOD"; append-ldflags "-Wl,-blibpath:${EPREFIX}/usr/$(get_libdir)" ;;
192 - *-hpux*) TARGET=gcc; append-ldflags "-Wl,+b,${EPREFIX}/usr/$(get_libdir)" ;;
193 - *-mint*) TARGET=generic ;;
194 - *-cygwin*) TARGET=generic ;;
195 - *) die "Unknown target, you suck" ;;
196 - esac
197 -
198 - [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
199 - use bzip2 && append-cppflags -DUSE_BZIP2
200 - use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
201 - append-cppflags -DLARGE_FILE_SUPPORT #281473
202 -
203 - ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" emake \
204 - -f unix/Makefile \
205 - ${TARGET} || die "emake failed"
206 -}
207 -
208 -src_install() {
209 - dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
210 - dosym unzip /usr/bin/zipinfo || die
211 - doman man/*.1
212 - dodoc BUGS History* README ToDo WHERE
213 -}
214
215 diff --git a/app-arch/unzip/unzip-6.0_p20.ebuild b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
216 similarity index 88%
217 rename from app-arch/unzip/unzip-6.0_p20.ebuild
218 rename to app-arch/unzip/unzip-6.0_p21-r2.ebuild
219 index bb988fe692..0f0cdaa560 100644
220 --- a/app-arch/unzip/unzip-6.0_p20.ebuild
221 +++ b/app-arch/unzip/unzip-6.0_p21-r2.ebuild
222 @@ -1,7 +1,7 @@
223 -# Copyright 1999-2017 Gentoo Foundation
224 +# Copyright 1999-2018 Gentoo Foundation
225 # Distributed under the terms of the GNU General Public License v2
226
227 -EAPI="5"
228 +EAPI="6"
229
230 inherit eutils toolchain-funcs flag-o-matic
231
232 @@ -27,14 +27,12 @@ S="${WORKDIR}/${MY_P}"
233
234 src_prepare() {
235 local deb="${WORKDIR}"/debian/patches
236 - rm \
237 - "${deb}"/series \
238 - "${deb}"/02-branding-patch-this-is-debian-unzip \
239 - || die
240 - epatch "${deb}"/*
241 + rm "${deb}"/02-this-is-debian-unzip.patch || die
242 + eapply "${deb}"/*.patch
243
244 - epatch "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
245 - use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
246 + eapply "${FILESDIR}"/${PN}-6.0-no-exec-stack.patch
247 + eapply "${FILESDIR}"/${PN}-6.0-format-security.patch
248 + use natspec && eapply "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
249 sed -i -r \
250 -e '/^CFLAGS/d' \
251 -e '/CFLAGS/s:-O[0-9]?:$(CFLAGS) $(CPPFLAGS):' \
252 @@ -54,7 +52,7 @@ src_prepare() {
253 # Delete bundled code to make sure we don't use it.
254 rm -r bzip2 || die
255
256 - epatch_user
257 + eapply_user
258 }
259
260 src_configure() {
261 @@ -75,7 +73,7 @@ src_configure() {
262
263 [[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
264 use bzip2 && append-cppflags -DUSE_BZIP2
265 - use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
266 + use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DUSE_ICONV_MAPPING
267 append-cppflags -DLARGE_FILE_SUPPORT #281473
268 }
Report Message
Find on MARC Find on Google Groups