1 |
commit: fdfabd0c138da863d6430b3058e98929535f47c1 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 17 19:22:53 2022 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 17 19:22:53 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfabd0c |
7 |
|
8 |
app-arch/xar: cleanup old/vulnerable |
9 |
|
10 |
Bug: https://bugs.gentoo.org/820641 |
11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
12 |
|
13 |
app-arch/xar/Manifest | 3 -- |
14 |
app-arch/xar/xar-1.8-r2.ebuild | 55 ------------------------ |
15 |
app-arch/xar/xar-1.8-r4.ebuild | 81 ----------------------------------- |
16 |
app-arch/xar/xar-1.8.0.0.452.ebuild | 84 ------------------------------------- |
17 |
4 files changed, 223 deletions(-) |
18 |
|
19 |
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest |
20 |
index 441896afc4b7..e925d356fafd 100644 |
21 |
--- a/app-arch/xar/Manifest |
22 |
+++ b/app-arch/xar/Manifest |
23 |
@@ -1,4 +1 @@ |
24 |
-DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159 |
25 |
-DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762 |
26 |
-DIST xar-452.tar.gz 220690 BLAKE2B 9728c73734a4bcb31e6e72d3d1a6735d5c78e384e15415641c4f40068f2da9498e9808cc36df6eaf7d3addf8be6d9eb90bdfa2900321e4dbe482156075bcdcd7 SHA512 d6ae9e5687020d20ec12579178f84c852fd485c52cff0ad23b7b31d2eabbde8c7fc85ab33e82eb81a5ddb59df4c26b756894be85061195cd191ab32be1f56b10 |
27 |
DIST xar-487.100.1.tar.gz 224108 BLAKE2B 2fa5c44b46a9e37e49be03d05d6d06ab706b5205d857e6d6f24954160dbf5fc91fbec848053cb2d0a11505e5f7c37f8331ac126d65eb91b08e302a28db12acc0 SHA512 a45d1327ac5c6dc6f1cdb359e7e487fd91cea82a446157b65da34f0481cd58bbe03b0e005643087c802962e89316a1c816e2c6b625f1259b10a52bbf902f79e6 |
28 |
|
29 |
diff --git a/app-arch/xar/xar-1.8-r2.ebuild b/app-arch/xar/xar-1.8-r2.ebuild |
30 |
deleted file mode 100644 |
31 |
index 491ef1934f88..000000000000 |
32 |
--- a/app-arch/xar/xar-1.8-r2.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,55 +0,0 @@ |
35 |
-# Copyright 1999-2022 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
-inherit flag-o-matic toolchain-funcs multilib-minimal |
40 |
- |
41 |
-APPLE_PV=400 |
42 |
-DESCRIPTION="An easily extensible archive format" |
43 |
-HOMEPAGE="https://opensource.apple.com/source/xar/" |
44 |
-SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" |
45 |
- |
46 |
-LICENSE="BSD-2" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
49 |
- |
50 |
-RDEPEND=" |
51 |
- elibc_musl? ( sys-libs/fts-standalone ) |
52 |
- !kernel_Darwin? ( |
53 |
- !kernel_SunOS? ( virtual/acl ) |
54 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
55 |
- ) |
56 |
- app-arch/bzip2[${MULTILIB_USEDEP}] |
57 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
58 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
59 |
-" |
60 |
-DEPEND=" |
61 |
- ${RDEPEND} |
62 |
- virtual/pkgconfig |
63 |
-" |
64 |
- |
65 |
-PATCHES=( |
66 |
- "${FILESDIR}"/${PN}-1.6.1-ext2.patch |
67 |
- "${FILESDIR}"/${PN}-1.8-safe_dirname.patch |
68 |
- "${FILESDIR}"/${PN}-1.8-arm-ppc.patch |
69 |
- "${FILESDIR}"/${PN}-1.8-openssl-1.1.patch |
70 |
-) |
71 |
- |
72 |
-S=${WORKDIR}/${PN}-${APPLE_PV}/${PN} |
73 |
- |
74 |
-multilib_src_configure() { |
75 |
- use kernel_Darwin || append-libs $($(tc-getPKG_CONFIG) --libs openssl) |
76 |
- use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone) |
77 |
- ECONF_SOURCE=${S} \ |
78 |
- econf \ |
79 |
- --disable-static |
80 |
- # botched check, fix it up |
81 |
- if use kernel_SunOS ; then |
82 |
- sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die |
83 |
- fi |
84 |
-} |
85 |
- |
86 |
-multilib_src_install() { |
87 |
- default |
88 |
- find "${D}" -name '*.la' -delete || die |
89 |
-} |
90 |
|
91 |
diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild |
92 |
deleted file mode 100644 |
93 |
index f50bad488315..000000000000 |
94 |
--- a/app-arch/xar/xar-1.8-r4.ebuild |
95 |
+++ /dev/null |
96 |
@@ -1,81 +0,0 @@ |
97 |
-# Copyright 1999-2021 Gentoo Authors |
98 |
-# Distributed under the terms of the GNU General Public License v2 |
99 |
- |
100 |
-EAPI=7 |
101 |
-inherit flag-o-matic toolchain-funcs multilib-minimal |
102 |
- |
103 |
-APPLE_PV=417.1 |
104 |
-DESCRIPTION="An easily extensible archive format" |
105 |
-HOMEPAGE="https://opensource.apple.com/source/xar/" |
106 |
-SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" |
107 |
- |
108 |
-LICENSE="BSD-2" |
109 |
-SLOT="0" |
110 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
111 |
- |
112 |
-DEPEND=" |
113 |
- elibc_musl? ( sys-libs/fts-standalone ) |
114 |
- kernel_linux? ( virtual/acl ) |
115 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
116 |
- app-arch/bzip2[${MULTILIB_USEDEP}] |
117 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
118 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
119 |
-" |
120 |
-RDEPEND="${DEPEND}" |
121 |
-BDEPEND="virtual/pkgconfig" |
122 |
- |
123 |
-PATCHES=( |
124 |
- "${FILESDIR}"/${PN}-1.6.1-ext2.patch |
125 |
- "${FILESDIR}"/${PN}-1.8-safe_dirname.patch |
126 |
- "${FILESDIR}"/${PN}-1.8-arm-ppc.patch |
127 |
- "${FILESDIR}"/${PN}-1.8-openssl-1.1.patch |
128 |
-) |
129 |
- |
130 |
-S=${WORKDIR}/${PN}-${APPLE_PV}/${PN} |
131 |
- |
132 |
-src_prepare() { |
133 |
- default |
134 |
- |
135 |
- # make lib headers available (without installing first?) |
136 |
- cd "${S}"/include || die |
137 |
- mv ../lib/*.h . || die |
138 |
- |
139 |
- # strip RPATH pointing to ED |
140 |
- cd "${S}"/src || die |
141 |
- sed -i -e 's/@RPATH@//' Makefile.inc.in || die |
142 |
- |
143 |
- # avoid GNU make (bug?) behaviour of removing xar.o as intermediate |
144 |
- # file, this doesn't happen outside portage, but it does from the |
145 |
- # ebuild env, causing the install phase to re-compile xar.o and link |
146 |
- # the executable |
147 |
- echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die |
148 |
- |
149 |
- # drop Darwin specific reliance on CommonCrypto Framework, for it |
150 |
- # depends on what version of Darwin we're on, and it is much simpler |
151 |
- # to just use openessl instead, which we maintain and control |
152 |
- cd "${S}" || die |
153 |
- sed -i -e 's/__APPLE__/__NO_APPLE__/' \ |
154 |
- include/archive.h \ |
155 |
- lib/hash.c \ |
156 |
- || die |
157 |
- |
158 |
- # fix branding somewhat |
159 |
- sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die |
160 |
-} |
161 |
- |
162 |
-multilib_src_configure() { |
163 |
- append-libs $($(tc-getPKG_CONFIG) --libs openssl) |
164 |
- use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone) |
165 |
- ECONF_SOURCE=${S} \ |
166 |
- econf \ |
167 |
- --disable-static |
168 |
- # botched check, fix it up |
169 |
- if use kernel_SunOS ; then |
170 |
- sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die |
171 |
- fi |
172 |
-} |
173 |
- |
174 |
-multilib_src_install() { |
175 |
- default |
176 |
- find "${D}" -name '*.la' -delete || die |
177 |
-} |
178 |
|
179 |
diff --git a/app-arch/xar/xar-1.8.0.0.452.ebuild b/app-arch/xar/xar-1.8.0.0.452.ebuild |
180 |
deleted file mode 100644 |
181 |
index c10abd3bf2b9..000000000000 |
182 |
--- a/app-arch/xar/xar-1.8.0.0.452.ebuild |
183 |
+++ /dev/null |
184 |
@@ -1,84 +0,0 @@ |
185 |
-# Copyright 1999-2021 Gentoo Authors |
186 |
-# Distributed under the terms of the GNU General Public License v2 |
187 |
- |
188 |
-EAPI=7 |
189 |
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal |
190 |
- |
191 |
-APPLE_PV=$(ver_cut 5) # 452: macOS 11.0.1 and up |
192 |
-DESCRIPTION="An easily extensible archive format" |
193 |
-HOMEPAGE="https://opensource.apple.com/source/xar/" |
194 |
-SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz" |
195 |
- |
196 |
-LICENSE="BSD-2" |
197 |
-SLOT="0" |
198 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
199 |
- |
200 |
-DEPEND=" |
201 |
- elibc_musl? ( sys-libs/fts-standalone ) |
202 |
- kernel_linux? ( virtual/acl ) |
203 |
- dev-libs/openssl:0=[${MULTILIB_USEDEP}] |
204 |
- app-arch/bzip2[${MULTILIB_USEDEP}] |
205 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
206 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
207 |
-" |
208 |
-RDEPEND="${DEPEND}" |
209 |
-BDEPEND="virtual/pkgconfig" |
210 |
- |
211 |
-PATCHES=( |
212 |
- "${FILESDIR}"/${PN}-1.6.1-ext2.patch |
213 |
- "${FILESDIR}"/${PN}-1.8-safe_dirname.patch |
214 |
- "${FILESDIR}"/${PN}-1.8-arm-ppc.patch |
215 |
- "${FILESDIR}"/${PN}-1.8-openssl-1.1.patch |
216 |
- "${FILESDIR}"/${PN}-1.8.0.0.452-linux.patch |
217 |
-) |
218 |
- |
219 |
-S=${WORKDIR}/${PN}-${APPLE_PV}/${PN} |
220 |
- |
221 |
-src_prepare() { |
222 |
- default |
223 |
- |
224 |
- # make lib headers available (without installing first?) |
225 |
- cd "${S}"/include || die |
226 |
- mv ../lib/*.h . || die |
227 |
- |
228 |
- # strip RPATH pointing to ED |
229 |
- cd "${S}"/src || die |
230 |
- sed -i -e 's/@RPATH@//' Makefile.inc.in || die |
231 |
- |
232 |
- # avoid GNU make (bug?) behaviour of removing xar.o as intermediate |
233 |
- # file, this doesn't happen outside portage, but it does from the |
234 |
- # ebuild env, causing the install phase to re-compile xar.o and link |
235 |
- # the executable |
236 |
- echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die |
237 |
- |
238 |
- # drop Darwin specific reliance on CommonCrypto Framework, for it |
239 |
- # depends on what version of Darwin we're on, and it is much simpler |
240 |
- # to just use openessl instead, which we maintain and control |
241 |
- cd "${S}" || die |
242 |
- sed -i -e 's/__APPLE__/__NO_APPLE__/' \ |
243 |
- include/archive.h \ |
244 |
- lib/hash.c \ |
245 |
- || die |
246 |
- |
247 |
- # fix branding somewhat |
248 |
- sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die |
249 |
- |
250 |
- eautoreconf |
251 |
-} |
252 |
- |
253 |
-multilib_src_configure() { |
254 |
- append-libs $($(tc-getPKG_CONFIG) --libs openssl) |
255 |
- use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone) |
256 |
- append-cflags -Wno-unused-result # allow to see real problems |
257 |
- ECONF_SOURCE=${S} \ |
258 |
- econf --disable-static |
259 |
- # botched check, fix it up |
260 |
- if use kernel_SunOS ; then |
261 |
- sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die |
262 |
- fi |
263 |
-} |
264 |
- |
265 |
-multilib_src_install() { |
266 |
- default |
267 |
- find "${D}" -name '*.la' -delete || die |
268 |
-} |