1 |
commit: 69b9261c44146262bd51c7de277e0f3cd98a10f2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Sep 10 09:13:42 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Sep 10 09:40:37 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69b9261c |
7 |
|
8 |
app-arch/libarchive: Bump to version 3.3.3 |
9 |
|
10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
11 |
|
12 |
app-arch/libarchive/Manifest | 1 + |
13 |
.../files/libarchive-3.3.3-libressl.patch | 12 ++ |
14 |
app-arch/libarchive/libarchive-3.3.3.ebuild | 128 +++++++++++++++++++++ |
15 |
3 files changed, 141 insertions(+) |
16 |
|
17 |
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest |
18 |
index 1570763e6a1..a4e6b879695 100644 |
19 |
--- a/app-arch/libarchive/Manifest |
20 |
+++ b/app-arch/libarchive/Manifest |
21 |
@@ -1,2 +1,3 @@ |
22 |
DIST libarchive-3.3.1.tar.gz 6219943 BLAKE2B fc951a613098060d55c000436ccdc6997126be2e1eeb41f348ca20c1ae3e54936ae053404fdd3211de90a2a223b29f5a80c580a937878a37265401d55655fff1 SHA512 90702b393b6f0943f42438e277b257af45eee4fa82420431f6a4f5f48bb846f2a72c8ff084dc3ee9c87bdf8b57f4d8dddf7814870fe2604fe86c55d8d744c164 |
23 |
DIST libarchive-3.3.2.tar.gz 6236562 BLAKE2B da26474b4fd8111561c1e5ac12a6333a8ba8a23cce9e9cdce7b50647ab8dbae08609ea1bffbab60da74c6555ebf0815c456fe69c72129eb6071fb845141d0beb SHA512 1e538cd7d492f54b11c16c56f12c1632ba14302a3737ec0db786272aec0c8020f1e27616a7654d57e26737e5ed9bfc9a62f1fdda61a95c39eb726aa7c2f673e4 |
24 |
+DIST libarchive-3.3.3.tar.gz 6535598 BLAKE2B 627949d24572b8345800e72a24d1e8d95cd0f19bb7fab70e2f36be011fee6f345eecfa9563640068b10888520aafdf30b1e3426b7e2743589cabd3ab5c270a22 SHA512 9d12b47d6976efa9f98e62c25d8b85fd745d4e9ca7b7e6d36bfe095dfe5c4db017d4e785d110f3758f5938dad6f1a1b009267fd7e82cb7212e93e1aea237bab7 |
25 |
|
26 |
diff --git a/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch b/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch |
27 |
new file mode 100644 |
28 |
index 00000000000..4d7c0ec7cf3 |
29 |
--- /dev/null |
30 |
+++ b/app-arch/libarchive/files/libarchive-3.3.3-libressl.patch |
31 |
@@ -0,0 +1,12 @@ |
32 |
+--- a/libarchive/archive_openssl_evp_private.h |
33 |
++++ b/libarchive/archive_openssl_evp_private.h |
34 |
+@@ -28,7 +28,8 @@ |
35 |
+ #include <openssl/evp.h> |
36 |
+ #include <openssl/opensslv.h> |
37 |
+ |
38 |
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L |
39 |
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \ |
40 |
++(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
41 |
+ #include <stdlib.h> /* malloc, free */ |
42 |
+ #include <string.h> /* memset */ |
43 |
+ static inline EVP_MD_CTX *EVP_MD_CTX_new(void) |
44 |
|
45 |
diff --git a/app-arch/libarchive/libarchive-3.3.3.ebuild b/app-arch/libarchive/libarchive-3.3.3.ebuild |
46 |
new file mode 100644 |
47 |
index 00000000000..18f015656af |
48 |
--- /dev/null |
49 |
+++ b/app-arch/libarchive/libarchive-3.3.3.ebuild |
50 |
@@ -0,0 +1,128 @@ |
51 |
+# Copyright 1999-2018 Gentoo Foundation |
52 |
+# Distributed under the terms of the GNU General Public License v2 |
53 |
+ |
54 |
+EAPI=7 |
55 |
+inherit libtool multilib-minimal toolchain-funcs |
56 |
+ |
57 |
+DESCRIPTION="BSD tar command" |
58 |
+HOMEPAGE="http://www.libarchive.org/" |
59 |
+SRC_URI="http://www.libarchive.org/downloads/${P}.tar.gz" |
60 |
+ |
61 |
+LICENSE="BSD BSD-2 BSD-4 public-domain" |
62 |
+SLOT="0/13" |
63 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
64 |
+IUSE="acl +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib" |
65 |
+ |
66 |
+RDEPEND=" |
67 |
+ acl? ( virtual/acl[${MULTILIB_USEDEP}] ) |
68 |
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] ) |
69 |
+ expat? ( dev-libs/expat[${MULTILIB_USEDEP}] ) |
70 |
+ !expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] ) |
71 |
+ iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] ) |
72 |
+ kernel_linux? ( |
73 |
+ xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
74 |
+ ) |
75 |
+ !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) |
76 |
+ libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) |
77 |
+ lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] ) |
78 |
+ lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] ) |
79 |
+ lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) |
80 |
+ nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) |
81 |
+ zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )" |
82 |
+DEPEND="${RDEPEND} |
83 |
+ kernel_linux? ( |
84 |
+ virtual/os-headers |
85 |
+ e2fsprogs? ( sys-fs/e2fsprogs ) |
86 |
+ )" |
87 |
+ |
88 |
+PATCHES=( |
89 |
+ "${FILESDIR}"/${PN}-3.3.3-libressl.patch |
90 |
+) |
91 |
+ |
92 |
+# Various test problems, starting with the fact that sandbox |
93 |
+# explodes on long paths. https://bugs.gentoo.org/598806 |
94 |
+RESTRICT="test" |
95 |
+ |
96 |
+src_prepare() { |
97 |
+ default |
98 |
+ elibtoolize # is required for Solaris sol2_ld linker fix |
99 |
+} |
100 |
+ |
101 |
+multilib_src_configure() { |
102 |
+ export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 |
103 |
+ |
104 |
+ local myconf=() |
105 |
+ myconf=( |
106 |
+ $(use_enable acl) |
107 |
+ $(use_enable static-libs static) |
108 |
+ $(use_enable xattr) |
109 |
+ $(use_with bzip2 bz2lib) |
110 |
+ $(use_with expat) |
111 |
+ $(use_with !expat xml2) |
112 |
+ $(use_with iconv) |
113 |
+ $(use_with lz4) |
114 |
+ $(use_with lzma) |
115 |
+ $(use_with lzo lzo2) |
116 |
+ $(use_with nettle) |
117 |
+ $(use_with zlib) |
118 |
+ ) |
119 |
+ if multilib_is_native_abi ; then |
120 |
+ myconf+=( |
121 |
+ --enable-bsdcat=$(tc-is-static-only && echo static || echo shared) |
122 |
+ --enable-bsdcpio=$(tc-is-static-only && echo static || echo shared) |
123 |
+ --enable-bsdtar=$(tc-is-static-only && echo static || echo shared) |
124 |
+ ) |
125 |
+ else |
126 |
+ myconf+=( |
127 |
+ --disable-bsdcat |
128 |
+ --disable-bsdcpio |
129 |
+ --disable-bsdtar |
130 |
+ ) |
131 |
+ fi |
132 |
+ |
133 |
+ ECONF_SOURCE="${S}" econf "${myconf[@]}" |
134 |
+} |
135 |
+ |
136 |
+multilib_src_compile() { |
137 |
+ if multilib_is_native_abi ; then |
138 |
+ emake |
139 |
+ else |
140 |
+ emake libarchive.la |
141 |
+ fi |
142 |
+} |
143 |
+ |
144 |
+multilib_src_test() { |
145 |
+ # Replace the default src_test so that it builds tests in parallel |
146 |
+ multilib_is_native_abi && emake check |
147 |
+} |
148 |
+ |
149 |
+multilib_src_install() { |
150 |
+ if multilib_is_native_abi ; then |
151 |
+ emake DESTDIR="${D}" install |
152 |
+ |
153 |
+ # Create symlinks for FreeBSD |
154 |
+ if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then |
155 |
+ # Exclude cat for the time being #589876 |
156 |
+ for bin in cpio tar; do |
157 |
+ dosym bsd${bin} /usr/bin/${bin} |
158 |
+ echo '.so bsd${bin}.1' > "${T}"/${bin}.1 |
159 |
+ doman "${T}"/${bin}.1 |
160 |
+ done |
161 |
+ fi |
162 |
+ else |
163 |
+ local install_targets=( |
164 |
+ install-includeHEADERS |
165 |
+ install-libLTLIBRARIES |
166 |
+ install-pkgconfigDATA |
167 |
+ ) |
168 |
+ emake DESTDIR="${D}" "${install_targets[@]}" |
169 |
+ fi |
170 |
+ |
171 |
+ # Libs.private: should be used from libarchive.pc instead |
172 |
+ prune_libtool_files |
173 |
+} |
174 |
+ |
175 |
+multilib_src_install_all() { |
176 |
+ cd "${S}" || die |
177 |
+ einstalldocs |
178 |
+} |