1 |
commit: cae6e3b2949cd42743ab916a3e64d45aadd1a983 |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 2 13:11:57 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 2 13:12:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae6e3b2 |
7 |
|
8 |
app-arch/libarchive: Clean old up |
9 |
|
10 |
app-arch/libarchive/Manifest | 1 - |
11 |
app-arch/libarchive/files/CVE-2017-5601.patch | 24 ----- |
12 |
app-arch/libarchive/libarchive-3.2.2-r1.ebuild | 124 ------------------------- |
13 |
3 files changed, 149 deletions(-) |
14 |
|
15 |
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest |
16 |
index 950a2d7f2cf..1570763e6a1 100644 |
17 |
--- a/app-arch/libarchive/Manifest |
18 |
+++ b/app-arch/libarchive/Manifest |
19 |
@@ -1,3 +1,2 @@ |
20 |
-DIST libarchive-3.2.2.tar.gz 5458241 BLAKE2B 99a3f01e780a3cac1142645887f31fc4d68c9a60a3539c259745274ea612373b41a7e93d95c27739c87c6050a0304ff069a0f1435fdbf0a13d47935209547c20 SHA512 a67920c37d49cf9478032d77fc4fa21827cebb96e9b83d9ecb8466328834052e4ab3d3a9bc4e2edf405d6cb14ffd648c9fa100b578257f6e5842c99bbea558a7 |
21 |
DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164 |
22 |
DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 |
23 |
|
24 |
diff --git a/app-arch/libarchive/files/CVE-2017-5601.patch b/app-arch/libarchive/files/CVE-2017-5601.patch |
25 |
deleted file mode 100644 |
26 |
index 4ba85ff9072..00000000000 |
27 |
--- a/app-arch/libarchive/files/CVE-2017-5601.patch |
28 |
+++ /dev/null |
29 |
@@ -1,24 +0,0 @@ |
30 |
-From 98dcbbf0bf4854bf987557e55e55fff7abbf3ea9 Mon Sep 17 00:00:00 2001 |
31 |
-From: Martin Matuska <martin@×××××××.org> |
32 |
-Date: Thu, 19 Jan 2017 22:00:18 +0100 |
33 |
-Subject: [PATCH] Fail with negative lha->compsize in lha_read_file_header_1() |
34 |
- Fixes a heap buffer overflow reported in Secunia SA74169 |
35 |
- |
36 |
---- |
37 |
- libarchive/archive_read_support_format_lha.c | 3 +++ |
38 |
- 1 file changed, 3 insertions(+) |
39 |
- |
40 |
-diff --git a/libarchive/archive_read_support_format_lha.c b/libarchive/archive_read_support_format_lha.c |
41 |
-index 52a5531..d77a7c2 100644 |
42 |
---- a/libarchive/archive_read_support_format_lha.c |
43 |
-+++ b/libarchive/archive_read_support_format_lha.c |
44 |
-@@ -924,6 +924,9 @@ lha_read_file_header_1(struct archive_read *a, struct lha *lha) |
45 |
- /* Get a real compressed file size. */ |
46 |
- lha->compsize -= extdsize - 2; |
47 |
- |
48 |
-+ if (lha->compsize < 0) |
49 |
-+ goto invalid; /* Invalid compressed file size */ |
50 |
-+ |
51 |
- if (sum_calculated != headersum) { |
52 |
- archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC, |
53 |
- "LHa header sum error"); |
54 |
|
55 |
diff --git a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild b/app-arch/libarchive/libarchive-3.2.2-r1.ebuild |
56 |
deleted file mode 100644 |
57 |
index 34485b16533..00000000000 |
58 |
--- a/app-arch/libarchive/libarchive-3.2.2-r1.ebuild |
59 |
+++ /dev/null |
60 |
@@ -1,124 +0,0 @@ |
61 |
-# Copyright 1999-2017 Gentoo Foundation |
62 |
-# Distributed under the terms of the GNU General Public License v2 |
63 |
- |
64 |
-EAPI=6 |
65 |
-inherit eutils libtool multilib-minimal toolchain-funcs |
66 |
- |
67 |
-DESCRIPTION="BSD tar command" |
68 |
-HOMEPAGE="http://www.libarchive.org/" |
69 |
-SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" |
70 |
- |
71 |
-LICENSE="BSD BSD-2 BSD-4 public-domain" |
72 |
-SLOT="0/13" |
73 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
74 |
-IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib" |
75 |
- |
76 |
-RDEPEND=" |
77 |
- acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
78 |
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
79 |
- expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
80 |
- !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
81 |
- iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
82 |
- kernel_linux? ( |
83 |
- xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
84 |
- ) |
85 |
- !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
86 |
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
87 |
- lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) |
88 |
- lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) |
89 |
- lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
90 |
- nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) |
91 |
- zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
92 |
-DEPEND="${RDEPEND} |
93 |
- kernel_linux? ( |
94 |
- virtual/os-headers |
95 |
- e2fsprogs? ( sys-fs/e2fsprogs ) |
96 |
- )" |
97 |
- |
98 |
-PATCHES=( |
99 |
- "${FILESDIR}"/CVE-2017-5601.patch |
100 |
-) |
101 |
- |
102 |
-src_prepare() { |
103 |
- default |
104 |
- elibtoolize # is required for Solaris sol2_ld linker fix |
105 |
-} |
106 |
- |
107 |
-multilib_src_configure() { |
108 |
- export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
109 |
- |
110 |
- local myconf=() |
111 |
- myconf=( |
112 |
- $(use_enable acl) |
113 |
- $(use_enable static-libs static) |
114 |
- $(use_enable xattr) |
115 |
- $(use_with bzip2 bz2lib) |
116 |
- $(use_with expat) |
117 |
- $(use_with !expat xml2) |
118 |
- $(use_with iconv) |
119 |
- $(use_with lz4) |
120 |
- $(use_with lzma) |
121 |
- $(use_with lzo lzo2) |
122 |
- $(use_with nettle) |
123 |
- $(use_with zlib) |
124 |
- ) |
125 |
- if multilib_is_native_abi ; then myconf+=( |
126 |
- --enable-bsdcat=$(tc-is-static-only && echo static || echo shared) |
127 |
- --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
128 |
- --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
129 |
- ); else myconf+=( |
130 |
- --disable-bsdcat |
131 |
- --disable-bsdcpio |
132 |
- --disable-bsdtar |
133 |
- ); fi |
134 |
- |
135 |
- # We disable lzmadec because we support the newer liblzma from xz-utils |
136 |
- # and not liblzmadec with this version. |
137 |
- myconf+=( |
138 |
- --without-lzmadec |
139 |
- ) |
140 |
- |
141 |
- ECONF_SOURCE="${S}" econf "${myconf[@]}" |
142 |
-} |
143 |
- |
144 |
-multilib_src_compile() { |
145 |
- if multilib_is_native_abi ; then |
146 |
- emake |
147 |
- else |
148 |
- emake libarchive.la |
149 |
- fi |
150 |
-} |
151 |
- |
152 |
-multilib_src_test() { |
153 |
- # Replace the default src_test so that it builds tests in parallel |
154 |
- multilib_is_native_abi && emake check |
155 |
-} |
156 |
- |
157 |
-multilib_src_install() { |
158 |
- if multilib_is_native_abi ; then |
159 |
- emake DESTDIR="${D}" install |
160 |
- |
161 |
- # Create symlinks for FreeBSD |
162 |
- if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
163 |
- # Exclude cat for the time being #589876 |
164 |
- for bin in cpio tar; do |
165 |
- dosym bsd${bin} /usr/bin/${bin} |
166 |
- echo '.so bsd${bin}.1' > "${T}"/${bin}.1 |
167 |
- doman "${T}"/${bin}.1 |
168 |
- done |
169 |
- fi |
170 |
- else |
171 |
- emake DESTDIR="${D}" \ |
172 |
- install-includeHEADERS \ |
173 |
- install-libLTLIBRARIES \ |
174 |
- install-pkgconfigDATA |
175 |
- fi |
176 |
- |
177 |
- # Libs.private: should be used from libarchive.pc instead |
178 |
- prune_libtool_files |
179 |
-} |
180 |
- |
181 |
-multilib_src_install_all() { |
182 |
- cd "${S}" || die |
183 |
- einstalldocs |
184 |
-} |