1 |
commit: 6709a4dd32310b2280e4e90e37c4000fa9c13e27 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 31 21:28:26 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 31 22:38:53 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6709a4dd |
7 |
|
8 |
app-arch/libarchive: Removed old. |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
app-arch/libarchive/Manifest | 1 - |
14 |
.../files/libarchive-3.1.2-CVE-2013-0211.patch | 32 ------ |
15 |
.../files/libarchive-3.1.2-CVE-2016-1541.patch | 67 ----------- |
16 |
.../files/libarchive-3.1.2-outofsource.patch | 29 ----- |
17 |
app-arch/libarchive/libarchive-3.1.2-r1.ebuild | 91 --------------- |
18 |
app-arch/libarchive/libarchive-3.1.2-r2.ebuild | 93 --------------- |
19 |
app-arch/libarchive/libarchive-3.1.2-r3.ebuild | 121 -------------------- |
20 |
app-arch/libarchive/libarchive-3.1.2-r4.ebuild | 121 -------------------- |
21 |
app-arch/libarchive/libarchive-3.1.2-r5.ebuild | 125 --------------------- |
22 |
9 files changed, 680 deletions(-) |
23 |
|
24 |
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest |
25 |
index 258b3dc..778eae3 100644 |
26 |
--- a/app-arch/libarchive/Manifest |
27 |
+++ b/app-arch/libarchive/Manifest |
28 |
@@ -1,3 +1,2 @@ |
29 |
-DIST libarchive-3.1.2.tar.gz 4527540 SHA256 eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e SHA512 1f3c2a675031f93c7d42ae2ed06742b0b1e2236ff57d9117791d62fb8ae77d6cafffbcb5d45b5bd98daa908bd18c576cf82e01a9b1eba699705e23eff3688114 WHIRLPOOL b90f336afb5264be91fb17d7dae3d5697e3f84e24d276af1d5ac076fe15ef6f5756488f09506fabe470473becb5449cd1f34865309dcf8a914e6e83506e8695f |
30 |
DIST libarchive-3.2.1.tar.gz 5448888 SHA256 72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2 SHA512 a5d43cb0bf36b687fabfbc874e7adc1fa94c563e7f073e107db8d4e79e8d0d8146cb985809f8115fbb882fc2d8a2a477d0a7364e93e6df62f292bb5e9865ec5c WHIRLPOOL 1dd79ec3d7cf53be237d6730476c6a47c0722a5a7d0f2adc347aa491ba95ba7c77342a39a9e3d0fbff64111b552bb558cb571aa74dd6c18e6c60987bf0f41d7c |
31 |
DIST libarchive-3.2.2.tar.gz 5458241 SHA256 691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7 WHIRLPOOL 8fdc2e9245db27a7da3cfdeecb6283b170a25fc6ea8201fe5a414b4c1b523ae6b05745246f867f24062d91b7a040780b687b1a44a95503c4e252f9836218ffef |
32 |
|
33 |
diff --git a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2013-0211.patch b/app-arch/libarchive/files/libarchive-3.1.2-CVE-2013-0211.patch |
34 |
deleted file mode 100644 |
35 |
index 78427ce..00000000 |
36 |
--- a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2013-0211.patch |
37 |
+++ /dev/null |
38 |
@@ -1,32 +0,0 @@ |
39 |
-From 22531545514043e04633e1c015c7540b9de9dbe4 Mon Sep 17 00:00:00 2001 |
40 |
-From: Tim Kientzle <kientzle@×××.org> |
41 |
-Date: Fri, 22 Mar 2013 23:48:41 -0700 |
42 |
-Subject: [PATCH] Limit write requests to at most INT_MAX. This prevents a |
43 |
- certain common programming error (passing -1 to write) from leading to other |
44 |
- problems deeper in the library. |
45 |
- |
46 |
---- |
47 |
- libarchive/archive_write.c | 5 +++++ |
48 |
- 1 file changed, 5 insertions(+) |
49 |
- |
50 |
-diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c |
51 |
-index eede5e0..be85621 100644 |
52 |
---- a/libarchive/archive_write.c |
53 |
-+++ b/libarchive/archive_write.c |
54 |
-@@ -673,8 +673,13 @@ static ssize_t |
55 |
- _archive_write_data(struct archive *_a, const void *buff, size_t s) |
56 |
- { |
57 |
- struct archive_write *a = (struct archive_write *)_a; |
58 |
-+ const size_t max_write = INT_MAX; |
59 |
-+ |
60 |
- archive_check_magic(&a->archive, ARCHIVE_WRITE_MAGIC, |
61 |
- ARCHIVE_STATE_DATA, "archive_write_data"); |
62 |
-+ /* In particular, this catches attempts to pass negative values. */ |
63 |
-+ if (s > max_write) |
64 |
-+ s = max_write; |
65 |
- archive_clear_error(&a->archive); |
66 |
- return ((a->format_write_data)(a, buff, s)); |
67 |
- } |
68 |
--- |
69 |
-1.8.1 |
70 |
- |
71 |
|
72 |
diff --git a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2016-1541.patch b/app-arch/libarchive/files/libarchive-3.1.2-CVE-2016-1541.patch |
73 |
deleted file mode 100644 |
74 |
index 63c6a74..00000000 |
75 |
--- a/app-arch/libarchive/files/libarchive-3.1.2-CVE-2016-1541.patch |
76 |
+++ /dev/null |
77 |
@@ -1,67 +0,0 @@ |
78 |
-From d0331e8e5b05b475f20b1f3101fe1ad772d7e7e7 Mon Sep 17 00:00:00 2001 |
79 |
-From: Tim Kientzle <kientzle@×××.org> |
80 |
-Date: Sun, 24 Apr 2016 17:13:45 -0700 |
81 |
-Subject: [PATCH] Issue #656: Fix CVE-2016-1541, VU#862384 |
82 |
- |
83 |
-When reading OS X metadata entries in Zip archives that were stored |
84 |
-without compression, libarchive would use the uncompressed entry size |
85 |
-to allocate a buffer but would use the compressed entry size to limit |
86 |
-the amount of data copied into that buffer. Since the compressed |
87 |
-and uncompressed sizes are provided by data in the archive itself, |
88 |
-an attacker could manipulate these values to write data beyond |
89 |
-the end of the allocated buffer. |
90 |
- |
91 |
-This fix provides three new checks to guard against such |
92 |
-manipulation and to make libarchive generally more robust when |
93 |
-handling this type of entry: |
94 |
- 1. If an OS X metadata entry is stored without compression, |
95 |
- abort the entire archive if the compressed and uncompressed |
96 |
- data sizes do not match. |
97 |
- 2. When sanity-checking the size of an OS X metadata entry, |
98 |
- abort this entry if either the compressed or uncompressed |
99 |
- size is larger than 4MB. |
100 |
- 3. When copying data into the allocated buffer, check the copy |
101 |
- size against both the compressed entry size and uncompressed |
102 |
- entry size. |
103 |
---- |
104 |
- libarchive/archive_read_support_format_zip.c | 13 +++++++++++++ |
105 |
- 1 file changed, 13 insertions(+) |
106 |
- |
107 |
-diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c |
108 |
-index 0f8262c..0a0be96 100644 |
109 |
---- a/libarchive/archive_read_support_format_zip.c |
110 |
-+++ b/libarchive/archive_read_support_format_zip.c |
111 |
-@@ -2778,6 +2778,11 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry, |
112 |
- |
113 |
- switch(rsrc->compression) { |
114 |
- case 0: /* No compression. */ |
115 |
-+ if (rsrc->uncompressed_size != rsrc->compressed_size) { |
116 |
-+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, |
117 |
-+ "Malformed OS X metadata entry: inconsistent size"); |
118 |
-+ return (ARCHIVE_FATAL); |
119 |
-+ } |
120 |
- #ifdef HAVE_ZLIB_H |
121 |
- case 8: /* Deflate compression. */ |
122 |
- #endif |
123 |
-@@ -2798,6 +2803,12 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry, |
124 |
- (intmax_t)rsrc->uncompressed_size); |
125 |
- return (ARCHIVE_WARN); |
126 |
- } |
127 |
-+ if (rsrc->compressed_size > (4 * 1024 * 1024)) { |
128 |
-+ archive_set_error(&a->archive, ARCHIVE_ERRNO_FILE_FORMAT, |
129 |
-+ "Mac metadata is too large: %jd > 4M bytes", |
130 |
-+ (intmax_t)rsrc->compressed_size); |
131 |
-+ return (ARCHIVE_WARN); |
132 |
-+ } |
133 |
- |
134 |
- metadata = malloc((size_t)rsrc->uncompressed_size); |
135 |
- if (metadata == NULL) { |
136 |
-@@ -2836,6 +2847,8 @@ zip_read_mac_metadata(struct archive_read *a, struct archive_entry *entry, |
137 |
- bytes_avail = remaining_bytes; |
138 |
- switch(rsrc->compression) { |
139 |
- case 0: /* No compression. */ |
140 |
-+ if ((size_t)bytes_avail > metadata_bytes) |
141 |
-+ bytes_avail = metadata_bytes; |
142 |
- memcpy(mp, p, bytes_avail); |
143 |
- bytes_used = (size_t)bytes_avail; |
144 |
- metadata_bytes -= bytes_used; |
145 |
|
146 |
diff --git a/app-arch/libarchive/files/libarchive-3.1.2-outofsource.patch b/app-arch/libarchive/files/libarchive-3.1.2-outofsource.patch |
147 |
deleted file mode 100644 |
148 |
index 6545c61..00000000 |
149 |
--- a/app-arch/libarchive/files/libarchive-3.1.2-outofsource.patch |
150 |
+++ /dev/null |
151 |
@@ -1,29 +0,0 @@ |
152 |
---- a/Makefile.am 2013-02-09 12:23:03.000000000 -0500 |
153 |
-+++ b/Makefile.am 2016-01-08 16:43:00.868186895 -0500 |
154 |
-@@ -508,7 +508,7 @@ |
155 |
- # Building it automatically provides a sanity-check on libarchive_test_SOURCES |
156 |
- # above. |
157 |
- libarchive/test/list.h: Makefile |
158 |
-- cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h |
159 |
-+ mkdir -p libarchive/test && cat $(top_srcdir)/libarchive/test/test_*.c | grep DEFINE_TEST > libarchive/test/list.h |
160 |
- |
161 |
- libarchive_TESTS_ENVIRONMENT= LIBARCHIVE_TEST_FILES=`cd $(top_srcdir);/bin/pwd`/libarchive/test LRZIP=NOCONFIG |
162 |
- |
163 |
-@@ -835,7 +835,7 @@ |
164 |
- $(PLATFORMCPPFLAGS) |
165 |
- |
166 |
- tar/test/list.h: Makefile |
167 |
-- cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h |
168 |
-+ mkdir -p tar/test && cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h |
169 |
- |
170 |
- if BUILD_BSDTAR |
171 |
- bsdtar_test_programs= bsdtar_test |
172 |
-@@ -975,7 +975,7 @@ |
173 |
- bsdcpio_test_LDADD=libarchive_fe.la |
174 |
- |
175 |
- cpio/test/list.h: Makefile |
176 |
-- cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h |
177 |
-+ mkdir -p cpio/test && cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h |
178 |
- |
179 |
- if BUILD_BSDCPIO |
180 |
- bsdcpio_test_programs= bsdcpio_test |
181 |
|
182 |
diff --git a/app-arch/libarchive/libarchive-3.1.2-r1.ebuild b/app-arch/libarchive/libarchive-3.1.2-r1.ebuild |
183 |
deleted file mode 100644 |
184 |
index ce57a80..00000000 |
185 |
--- a/app-arch/libarchive/libarchive-3.1.2-r1.ebuild |
186 |
+++ /dev/null |
187 |
@@ -1,91 +0,0 @@ |
188 |
-# Copyright 1999-2014 Gentoo Foundation |
189 |
-# Distributed under the terms of the GNU General Public License v2 |
190 |
-# $Id$ |
191 |
- |
192 |
-EAPI=5 |
193 |
-inherit eutils libtool multilib toolchain-funcs |
194 |
- |
195 |
-DESCRIPTION="BSD tar command" |
196 |
-HOMEPAGE="http://www.libarchive.org/" |
197 |
-SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" |
198 |
- |
199 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
200 |
-SLOT="0/13" |
201 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
202 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux +lzma lzo nettle static-libs xattr +zlib" |
203 |
- |
204 |
-RDEPEND="dev-libs/openssl:0 |
205 |
- acl? ( virtual/acl ) |
206 |
- bzip2? ( app-arch/bzip2 ) |
207 |
- expat? ( dev-libs/expat ) |
208 |
- !expat? ( dev-libs/libxml2 ) |
209 |
- iconv? ( virtual/libiconv ) |
210 |
- kernel_linux? ( |
211 |
- xattr? ( sys-apps/attr ) |
212 |
- ) |
213 |
- lzma? ( app-arch/xz-utils ) |
214 |
- lzo? ( >=dev-libs/lzo-2 ) |
215 |
- nettle? ( dev-libs/nettle ) |
216 |
- zlib? ( sys-libs/zlib )" |
217 |
-DEPEND="${RDEPEND} |
218 |
- kernel_linux? ( |
219 |
- virtual/os-headers |
220 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
221 |
- )" |
222 |
- |
223 |
-DOCS="NEWS README" |
224 |
- |
225 |
-src_prepare() { |
226 |
- epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch |
227 |
- elibtoolize |
228 |
-} |
229 |
- |
230 |
-src_configure() { |
231 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
232 |
- |
233 |
- # We disable lzmadec because we support the newer liblzma from xz-utils |
234 |
- # and not liblzmadec with this version. |
235 |
- econf \ |
236 |
- $(use_enable static-libs static) \ |
237 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) \ |
238 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) \ |
239 |
- $(use_enable xattr) \ |
240 |
- $(use_enable acl) \ |
241 |
- $(use_with zlib) \ |
242 |
- $(use_with bzip2 bz2lib) \ |
243 |
- --without-lzmadec \ |
244 |
- $(use_with iconv) \ |
245 |
- $(use_with lzma) \ |
246 |
- $(use_with lzo lzo2) \ |
247 |
- $(use_with nettle) \ |
248 |
- $(use_with !expat xml2) \ |
249 |
- $(use_with expat) |
250 |
-} |
251 |
- |
252 |
-src_test() { |
253 |
- # Replace the default src_test so that it builds tests in parallel |
254 |
- emake check |
255 |
-} |
256 |
- |
257 |
-src_install() { |
258 |
- default |
259 |
- |
260 |
- # Libs.private: should be used from libarchive.pc instead |
261 |
- prune_libtool_files |
262 |
- |
263 |
- # Create tar symlink for FreeBSD |
264 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
265 |
- dosym bsdtar /usr/bin/tar |
266 |
- echo '.so bsdtar.1' > "${T}"/tar.1 |
267 |
- doman "${T}"/tar.1 |
268 |
- # We may wish to switch to symlink bsdcpio to cpio too one day |
269 |
- fi |
270 |
-} |
271 |
- |
272 |
-pkg_preinst() { |
273 |
- preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 12) |
274 |
-} |
275 |
- |
276 |
-pkg_postinst() { |
277 |
- preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 12) |
278 |
-} |
279 |
|
280 |
diff --git a/app-arch/libarchive/libarchive-3.1.2-r2.ebuild b/app-arch/libarchive/libarchive-3.1.2-r2.ebuild |
281 |
deleted file mode 100644 |
282 |
index 5b56888..00000000 |
283 |
--- a/app-arch/libarchive/libarchive-3.1.2-r2.ebuild |
284 |
+++ /dev/null |
285 |
@@ -1,93 +0,0 @@ |
286 |
-# Copyright 1999-2014 Gentoo Foundation |
287 |
-# Distributed under the terms of the GNU General Public License v2 |
288 |
-# $Id$ |
289 |
- |
290 |
-EAPI=5 |
291 |
-inherit eutils libtool multilib toolchain-funcs |
292 |
- |
293 |
-DESCRIPTION="BSD tar command" |
294 |
-HOMEPAGE="http://www.libarchive.org/" |
295 |
-SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" |
296 |
- |
297 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
298 |
-SLOT="0/13" |
299 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
300 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib" |
301 |
- |
302 |
-RDEPEND=" |
303 |
- !libressl? ( dev-libs/openssl:0= ) |
304 |
- libressl? ( dev-libs/libressl:0= ) |
305 |
- acl? ( virtual/acl ) |
306 |
- bzip2? ( app-arch/bzip2 ) |
307 |
- expat? ( dev-libs/expat ) |
308 |
- !expat? ( dev-libs/libxml2 ) |
309 |
- iconv? ( virtual/libiconv ) |
310 |
- kernel_linux? ( |
311 |
- xattr? ( sys-apps/attr ) |
312 |
- ) |
313 |
- lzma? ( app-arch/xz-utils ) |
314 |
- lzo? ( >=dev-libs/lzo-2 ) |
315 |
- nettle? ( dev-libs/nettle ) |
316 |
- zlib? ( sys-libs/zlib )" |
317 |
-DEPEND="${RDEPEND} |
318 |
- kernel_linux? ( |
319 |
- virtual/os-headers |
320 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
321 |
- )" |
322 |
- |
323 |
-DOCS="NEWS README" |
324 |
- |
325 |
-src_prepare() { |
326 |
- epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch |
327 |
- elibtoolize |
328 |
-} |
329 |
- |
330 |
-src_configure() { |
331 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
332 |
- |
333 |
- # We disable lzmadec because we support the newer liblzma from xz-utils |
334 |
- # and not liblzmadec with this version. |
335 |
- econf \ |
336 |
- $(use_enable static-libs static) \ |
337 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) \ |
338 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) \ |
339 |
- $(use_enable xattr) \ |
340 |
- $(use_enable acl) \ |
341 |
- $(use_with zlib) \ |
342 |
- $(use_with bzip2 bz2lib) \ |
343 |
- --without-lzmadec \ |
344 |
- $(use_with iconv) \ |
345 |
- $(use_with lzma) \ |
346 |
- $(use_with lzo lzo2) \ |
347 |
- $(use_with nettle) \ |
348 |
- $(use_with !expat xml2) \ |
349 |
- $(use_with expat) |
350 |
-} |
351 |
- |
352 |
-src_test() { |
353 |
- # Replace the default src_test so that it builds tests in parallel |
354 |
- emake check |
355 |
-} |
356 |
- |
357 |
-src_install() { |
358 |
- default |
359 |
- |
360 |
- # Libs.private: should be used from libarchive.pc instead |
361 |
- prune_libtool_files |
362 |
- |
363 |
- # Create tar symlink for FreeBSD |
364 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
365 |
- dosym bsdtar /usr/bin/tar |
366 |
- echo '.so bsdtar.1' > "${T}"/tar.1 |
367 |
- doman "${T}"/tar.1 |
368 |
- # We may wish to switch to symlink bsdcpio to cpio too one day |
369 |
- fi |
370 |
-} |
371 |
- |
372 |
-pkg_preinst() { |
373 |
- preserve_old_lib /usr/$(get_libdir)/${PN}$(get_libname 12) |
374 |
-} |
375 |
- |
376 |
-pkg_postinst() { |
377 |
- preserve_old_lib_notify /usr/$(get_libdir)/${PN}$(get_libname 12) |
378 |
-} |
379 |
|
380 |
diff --git a/app-arch/libarchive/libarchive-3.1.2-r3.ebuild b/app-arch/libarchive/libarchive-3.1.2-r3.ebuild |
381 |
deleted file mode 100644 |
382 |
index 53b45fd..00000000 |
383 |
--- a/app-arch/libarchive/libarchive-3.1.2-r3.ebuild |
384 |
+++ /dev/null |
385 |
@@ -1,121 +0,0 @@ |
386 |
-# Copyright 1999-2016 Gentoo Foundation |
387 |
-# Distributed under the terms of the GNU General Public License v2 |
388 |
-# $Id$ |
389 |
- |
390 |
-EAPI=5 |
391 |
-inherit autotools eutils multilib-minimal toolchain-funcs |
392 |
- |
393 |
-DESCRIPTION="BSD tar command" |
394 |
-HOMEPAGE="http://www.libarchive.org/" |
395 |
-SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" |
396 |
- |
397 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
398 |
-SLOT="0/13" |
399 |
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
400 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib" |
401 |
- |
402 |
-RDEPEND=" |
403 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
404 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
405 |
- acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
406 |
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
407 |
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
408 |
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
409 |
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
410 |
- kernel_linux? ( |
411 |
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
412 |
- ) |
413 |
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) |
414 |
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
415 |
- nettle? ( dev-libs/nettle[${MULTILIB_USEDEP}] ) |
416 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
417 |
-DEPEND="${RDEPEND} |
418 |
- kernel_linux? ( |
419 |
- virtual/os-headers |
420 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
421 |
- )" |
422 |
- |
423 |
-DOCS=( NEWS README ) |
424 |
- |
425 |
-src_prepare() { |
426 |
- epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch |
427 |
- epatch "${FILESDIR}"/${P}-outofsource.patch |
428 |
- eautoreconf |
429 |
-} |
430 |
- |
431 |
-multilib_src_configure() { |
432 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
433 |
- |
434 |
- local myconf=() |
435 |
- myconf=( |
436 |
- $(use_enable static-libs static) |
437 |
- $(use_enable xattr) |
438 |
- $(use_enable acl) |
439 |
- $(use_with zlib) |
440 |
- $(use_with bzip2 bz2lib) |
441 |
- $(use_with iconv) |
442 |
- $(use_with lzma) |
443 |
- $(use_with lzo lzo2) |
444 |
- $(use_with nettle) |
445 |
- $(use_with !expat xml2) |
446 |
- $(use_with expat) |
447 |
- ) |
448 |
- if multilib_is_native_abi ; then myconf+=( |
449 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
450 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
451 |
- ); else myconf+=( |
452 |
- --disable-bsdtar |
453 |
- --disable-bsdcpio |
454 |
- ); fi |
455 |
- |
456 |
- # We disable lzmadec because we support the newer liblzma from xz-utils |
457 |
- # and not liblzmadec with this version. |
458 |
- myconf+=( |
459 |
- --without-lzmadec |
460 |
- ) |
461 |
- |
462 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
463 |
-} |
464 |
- |
465 |
-multilib_src_compile() { |
466 |
- if multilib_is_native_abi ; then |
467 |
- emake |
468 |
- else |
469 |
- emake libarchive.la |
470 |
- fi |
471 |
-} |
472 |
- |
473 |
-multilib_src_test() { |
474 |
- # Replace the default src_test so that it builds tests in parallel |
475 |
- multilib_is_native_abi && emake check |
476 |
-} |
477 |
- |
478 |
-multilib_src_install() { |
479 |
- if multilib_is_native_abi ; then |
480 |
- emake DESTDIR="${D}" install |
481 |
- |
482 |
- # Libs.private: should be used from libarchive.pc instead |
483 |
- prune_libtool_files |
484 |
- |
485 |
- # Create tar symlink for FreeBSD |
486 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
487 |
- dosym bsdtar /usr/bin/tar |
488 |
- echo '.so bsdtar.1' > "${T}"/tar.1 |
489 |
- doman "${T}"/tar.1 |
490 |
- # We may wish to switch to symlink bsdcpio to cpio too one day |
491 |
- fi |
492 |
- else |
493 |
- emake DESTDIR="${D}" \ |
494 |
- install-includeHEADERS \ |
495 |
- install-libLTLIBRARIES \ |
496 |
- install-pkgconfigDATA |
497 |
- |
498 |
- # Libs.private: should be used from libarchive.pc instead |
499 |
- prune_libtool_files |
500 |
- fi |
501 |
-} |
502 |
- |
503 |
-multilib_src_install_all() { |
504 |
- cd "${S}" || die |
505 |
- dodoc "${DOCS[@]}" |
506 |
-} |
507 |
|
508 |
diff --git a/app-arch/libarchive/libarchive-3.1.2-r4.ebuild b/app-arch/libarchive/libarchive-3.1.2-r4.ebuild |
509 |
deleted file mode 100644 |
510 |
index 9452b43..00000000 |
511 |
--- a/app-arch/libarchive/libarchive-3.1.2-r4.ebuild |
512 |
+++ /dev/null |
513 |
@@ -1,121 +0,0 @@ |
514 |
-# Copyright 1999-2016 Gentoo Foundation |
515 |
-# Distributed under the terms of the GNU General Public License v2 |
516 |
-# $Id$ |
517 |
- |
518 |
-EAPI=5 |
519 |
-inherit autotools eutils multilib-minimal toolchain-funcs |
520 |
- |
521 |
-DESCRIPTION="BSD tar command" |
522 |
-HOMEPAGE="http://www.libarchive.org/" |
523 |
-SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" |
524 |
- |
525 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
526 |
-SLOT="0/13" |
527 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
528 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib" |
529 |
- |
530 |
-RDEPEND=" |
531 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
532 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
533 |
- acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
534 |
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
535 |
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
536 |
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
537 |
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
538 |
- kernel_linux? ( |
539 |
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
540 |
- ) |
541 |
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) |
542 |
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
543 |
- nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) |
544 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
545 |
-DEPEND="${RDEPEND} |
546 |
- kernel_linux? ( |
547 |
- virtual/os-headers |
548 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
549 |
- )" |
550 |
- |
551 |
-DOCS=( NEWS README ) |
552 |
- |
553 |
-src_prepare() { |
554 |
- epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch |
555 |
- epatch "${FILESDIR}"/${P}-outofsource.patch |
556 |
- eautoreconf |
557 |
-} |
558 |
- |
559 |
-multilib_src_configure() { |
560 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
561 |
- |
562 |
- local myconf=() |
563 |
- myconf=( |
564 |
- $(use_enable static-libs static) |
565 |
- $(use_enable xattr) |
566 |
- $(use_enable acl) |
567 |
- $(use_with zlib) |
568 |
- $(use_with bzip2 bz2lib) |
569 |
- $(use_with iconv) |
570 |
- $(use_with lzma) |
571 |
- $(use_with lzo lzo2) |
572 |
- $(use_with nettle) |
573 |
- $(use_with !expat xml2) |
574 |
- $(use_with expat) |
575 |
- ) |
576 |
- if multilib_is_native_abi ; then myconf+=( |
577 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
578 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
579 |
- ); else myconf+=( |
580 |
- --disable-bsdtar |
581 |
- --disable-bsdcpio |
582 |
- ); fi |
583 |
- |
584 |
- # We disable lzmadec because we support the newer liblzma from xz-utils |
585 |
- # and not liblzmadec with this version. |
586 |
- myconf+=( |
587 |
- --without-lzmadec |
588 |
- ) |
589 |
- |
590 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
591 |
-} |
592 |
- |
593 |
-multilib_src_compile() { |
594 |
- if multilib_is_native_abi ; then |
595 |
- emake |
596 |
- else |
597 |
- emake libarchive.la |
598 |
- fi |
599 |
-} |
600 |
- |
601 |
-multilib_src_test() { |
602 |
- # Replace the default src_test so that it builds tests in parallel |
603 |
- multilib_is_native_abi && emake check |
604 |
-} |
605 |
- |
606 |
-multilib_src_install() { |
607 |
- if multilib_is_native_abi ; then |
608 |
- emake DESTDIR="${D}" install |
609 |
- |
610 |
- # Libs.private: should be used from libarchive.pc instead |
611 |
- prune_libtool_files |
612 |
- |
613 |
- # Create tar symlink for FreeBSD |
614 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
615 |
- dosym bsdtar /usr/bin/tar |
616 |
- echo '.so bsdtar.1' > "${T}"/tar.1 |
617 |
- doman "${T}"/tar.1 |
618 |
- # We may wish to switch to symlink bsdcpio to cpio too one day |
619 |
- fi |
620 |
- else |
621 |
- emake DESTDIR="${D}" \ |
622 |
- install-includeHEADERS \ |
623 |
- install-libLTLIBRARIES \ |
624 |
- install-pkgconfigDATA |
625 |
- |
626 |
- # Libs.private: should be used from libarchive.pc instead |
627 |
- prune_libtool_files |
628 |
- fi |
629 |
-} |
630 |
- |
631 |
-multilib_src_install_all() { |
632 |
- cd "${S}" || die |
633 |
- dodoc "${DOCS[@]}" |
634 |
-} |
635 |
|
636 |
diff --git a/app-arch/libarchive/libarchive-3.1.2-r5.ebuild b/app-arch/libarchive/libarchive-3.1.2-r5.ebuild |
637 |
deleted file mode 100644 |
638 |
index 7d43f90..00000000 |
639 |
--- a/app-arch/libarchive/libarchive-3.1.2-r5.ebuild |
640 |
+++ /dev/null |
641 |
@@ -1,125 +0,0 @@ |
642 |
-# Copyright 1999-2016 Gentoo Foundation |
643 |
-# Distributed under the terms of the GNU General Public License v2 |
644 |
-# $Id$ |
645 |
- |
646 |
-EAPI=5 |
647 |
-inherit autotools eutils multilib-minimal toolchain-funcs |
648 |
- |
649 |
-DESCRIPTION="BSD tar command" |
650 |
-HOMEPAGE="http://www.libarchive.org/" |
651 |
-SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" |
652 |
- |
653 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
654 |
-SLOT="0/13" |
655 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
656 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl +lzma lzo nettle static-libs xattr +zlib" |
657 |
- |
658 |
-RDEPEND=" |
659 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
660 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
661 |
- acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
662 |
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
663 |
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
664 |
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
665 |
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
666 |
- kernel_linux? ( |
667 |
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
668 |
- ) |
669 |
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) |
670 |
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
671 |
- nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) |
672 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
673 |
-DEPEND="${RDEPEND} |
674 |
- kernel_linux? ( |
675 |
- virtual/os-headers |
676 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
677 |
- )" |
678 |
- |
679 |
-DOCS=( NEWS README ) |
680 |
- |
681 |
-src_prepare() { |
682 |
- epatch "${FILESDIR}"/${P}-CVE-2013-0211.patch |
683 |
- epatch "${FILESDIR}"/${P}-outofsource.patch |
684 |
- epatch "${FILESDIR}"/${P}-CVE-2016-1541.patch |
685 |
- eautoreconf |
686 |
-} |
687 |
- |
688 |
-multilib_src_configure() { |
689 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
690 |
- |
691 |
- local myconf=() |
692 |
- # acl: libarchive has tight integration with OSX, disabling acl |
693 |
- # breaks the code for it knows it is there and assumes hence is |
694 |
- # enabled |
695 |
- myconf=( |
696 |
- $(use_enable static-libs static) |
697 |
- $(use_enable xattr) |
698 |
- $([[ ${CHOST} != *-darwin* ]] && use_enable acl) |
699 |
- $(use_with zlib) |
700 |
- $(use_with bzip2 bz2lib) |
701 |
- $(use_with iconv) |
702 |
- $(use_with lzma) |
703 |
- $(use_with lzo lzo2) |
704 |
- $(use_with nettle) |
705 |
- $(use_with !expat xml2) |
706 |
- $(use_with expat) |
707 |
- ) |
708 |
- if multilib_is_native_abi ; then myconf+=( |
709 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
710 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
711 |
- ); else myconf+=( |
712 |
- --disable-bsdtar |
713 |
- --disable-bsdcpio |
714 |
- ); fi |
715 |
- |
716 |
- # We disable lzmadec because we support the newer liblzma from xz-utils |
717 |
- # and not liblzmadec with this version. |
718 |
- myconf+=( |
719 |
- --without-lzmadec |
720 |
- ) |
721 |
- |
722 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
723 |
-} |
724 |
- |
725 |
-multilib_src_compile() { |
726 |
- if multilib_is_native_abi ; then |
727 |
- emake |
728 |
- else |
729 |
- emake libarchive.la |
730 |
- fi |
731 |
-} |
732 |
- |
733 |
-multilib_src_test() { |
734 |
- # Replace the default src_test so that it builds tests in parallel |
735 |
- multilib_is_native_abi && emake check |
736 |
-} |
737 |
- |
738 |
-multilib_src_install() { |
739 |
- if multilib_is_native_abi ; then |
740 |
- emake DESTDIR="${D}" install |
741 |
- |
742 |
- # Libs.private: should be used from libarchive.pc instead |
743 |
- prune_libtool_files |
744 |
- |
745 |
- # Create tar symlink for FreeBSD |
746 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
747 |
- dosym bsdtar /usr/bin/tar |
748 |
- echo '.so bsdtar.1' > "${T}"/tar.1 |
749 |
- doman "${T}"/tar.1 |
750 |
- # We may wish to switch to symlink bsdcpio to cpio too one day |
751 |
- fi |
752 |
- else |
753 |
- emake DESTDIR="${D}" \ |
754 |
- install-includeHEADERS \ |
755 |
- install-libLTLIBRARIES \ |
756 |
- install-pkgconfigDATA |
757 |
- |
758 |
- # Libs.private: should be used from libarchive.pc instead |
759 |
- prune_libtool_files |
760 |
- fi |
761 |
-} |
762 |
- |
763 |
-multilib_src_install_all() { |
764 |
- cd "${S}" || die |
765 |
- dodoc "${DOCS[@]}" |
766 |
-} |