1 |
commit: e1e23adc4a99c7daea563abef6e5c92944be2ed4 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 26 10:53:06 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 26 11:00:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e23adc |
7 |
|
8 |
sys-fs/dd-rescue: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
sys-fs/dd-rescue/Manifest | 3 - |
13 |
sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild | 86 ----------- |
14 |
sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild | 93 ------------ |
15 |
sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild | 90 ------------ |
16 |
sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild | 104 ------------- |
17 |
.../files/dd_rescue-1.99-disable-hmac-tests.patch | 21 --- |
18 |
.../dd-rescue/files/dd_rescue-1.99-musl-r1.patch | 161 --------------------- |
19 |
sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch | 90 ------------ |
20 |
.../dd-rescue/files/dd_rescue-1.99-test_fix.patch | 11 -- |
21 |
9 files changed, 659 deletions(-) |
22 |
|
23 |
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest |
24 |
index 92c2e340758..fd1c556fc06 100644 |
25 |
--- a/sys-fs/dd-rescue/Manifest |
26 |
+++ b/sys-fs/dd-rescue/Manifest |
27 |
@@ -1,5 +1,2 @@ |
28 |
DIST dd_rescue-1.46.tar.gz 126790 BLAKE2B 027d509349e77fa020757b826184b4a2206c3f5923c797c294ca8caf210cf6af20afa1d518d826413989612295a4365c480d7aa4293686824ee96394cbbe9851 SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 |
29 |
-DIST dd_rescue-1.99.5.tar.bz2 170712 BLAKE2B f19a91de3acf96759c51361a30262a0c77aad45121fdcaa20e0a38e1b47a3f7a9530d22abed78dd78924cb77e053e19eabc9a6c93ba4a0601f5916468f6ba139 SHA512 a240eb9d50950cefbc65d953c84a8e3782d39282aff4e7fa42364b40cee0eb0a02f61315786a1008cf7ae9c3d758700e9f3a0087b9477b3ffbfcbcef59f07d88 |
30 |
-DIST dd_rescue-1.99.6.tar.bz2 171621 BLAKE2B cee1bfb3014e87fdc083ed956427c91a1329f39215d300171e4dc6a553a81e04dd95c006354e318cf692845becc052db77c1daac54942b019e307bc2ba594b1e SHA512 b91508ebdd5f5a4945fa15a86b530bb03e49e74ffe6d2227c9dac4a5fa1b8e9ccf6f1e68204220b571b4661b78892be3a955005f253fd691a85977f35fc74b5e |
31 |
-DIST dd_rescue-1.99.7.tar.bz2 172414 BLAKE2B 0f9bd9abd3936eeb4ec22f2c3cf59a3dbf2cb1c2e7fe854b7e0b0c5e3b521541595115952b0d840d739bfb2080a0f2920e867551b3598db62df1f41cb15f3121 SHA512 56e1aca8f068110376ba8b3b7ef7ec203a1632cf943d0b47e415699af67ac29984094a22fb685a4237f6a6962d4aa972714f2ac19e283d209ed3e5c193c9d72d |
32 |
DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d |
33 |
|
34 |
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild |
35 |
deleted file mode 100644 |
36 |
index 6121e84d1aa..00000000000 |
37 |
--- a/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,86 +0,0 @@ |
40 |
-# Copyright 1999-2016 Gentoo Foundation |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=5 |
44 |
- |
45 |
-inherit toolchain-funcs flag-o-matic multilib autotools |
46 |
- |
47 |
-MY_PN=${PN/-/_} |
48 |
-MY_P=${MY_PN}-${PV} |
49 |
- |
50 |
-DESCRIPTION="Similar to dd but can copy from source with errors" |
51 |
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" |
52 |
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" |
53 |
- |
54 |
-LICENSE="GPL-2" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
57 |
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" |
58 |
- |
59 |
-RDEPEND="lzo? ( dev-libs/lzo ) |
60 |
- xattr? ( sys-apps/attr )" |
61 |
-DEPEND="${RDEPEND}" |
62 |
- |
63 |
-S="${WORKDIR}/${MY_P}" |
64 |
- |
65 |
-src_prepare() { |
66 |
- epatch "${FILESDIR}/${MY_PN}-1.99-test_fix.patch" |
67 |
- epatch "${FILESDIR}/${MY_PN}-1.99-musl.patch" |
68 |
- |
69 |
- sed -i \ |
70 |
- -e 's:-ldl:$(LDFLAGS) -ldl:' \ |
71 |
- -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ |
72 |
- Makefile |
73 |
- eautoreconf |
74 |
-} |
75 |
- |
76 |
-src_configure() { |
77 |
- use static && append-ldflags -static |
78 |
- # OpenSSL is only used by a random helper tool we don't install. |
79 |
- ac_cv_header_attr_xattr_h=$(usex xattr) \ |
80 |
- ac_cv_header_openssl_evp_h=no \ |
81 |
- ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ |
82 |
- econf |
83 |
-} |
84 |
- |
85 |
-_emake() { |
86 |
- local arch |
87 |
- case ${ARCH} in |
88 |
- x86) arch=i386;; |
89 |
- amd64) arch=x86_64;; |
90 |
- arm) arch=arm;; |
91 |
- arm64) arch=aarch64;; |
92 |
- esac |
93 |
- |
94 |
- local os=$(usex kernel_linux Linux IDK) |
95 |
- |
96 |
- # The Makefile is a mess. Override a few vars rather than patch it. |
97 |
- emake \ |
98 |
- MACH="${arch}" \ |
99 |
- OS="${os}" \ |
100 |
- HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ |
101 |
- HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ |
102 |
- RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ |
103 |
- CFLAGS_OPT='$(CFLAGS)' \ |
104 |
- LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \ |
105 |
- CC="$(tc-getCC)" \ |
106 |
- "$@" |
107 |
-} |
108 |
- |
109 |
-src_compile() { |
110 |
- _emake |
111 |
-} |
112 |
- |
113 |
-src_test() { |
114 |
- _emake check |
115 |
-} |
116 |
- |
117 |
-src_install() { |
118 |
- # easier to install by hand than trying to make sense of the Makefile. |
119 |
- dobin dd_rescue |
120 |
- dodir /usr/$(get_libdir)/${PN} |
121 |
- cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die |
122 |
- dodoc README.dd_rescue |
123 |
- doman dd_rescue.1 |
124 |
- use lzo && doman ddr_lzo.1 |
125 |
-} |
126 |
|
127 |
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild |
128 |
deleted file mode 100644 |
129 |
index 1d391a112ea..00000000000 |
130 |
--- a/sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild |
131 |
+++ /dev/null |
132 |
@@ -1,93 +0,0 @@ |
133 |
-# Copyright 1999-2017 Gentoo Foundation |
134 |
-# Distributed under the terms of the GNU General Public License v2 |
135 |
- |
136 |
-EAPI="6" |
137 |
- |
138 |
-inherit toolchain-funcs flag-o-matic multilib autotools |
139 |
- |
140 |
-MY_PN="${PN/-/_}" |
141 |
-MY_P="${MY_PN}-${PV}" |
142 |
- |
143 |
-DESCRIPTION="Similar to dd but can copy from source with errors" |
144 |
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" |
145 |
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" |
146 |
- |
147 |
-LICENSE="GPL-2" |
148 |
-SLOT="0" |
149 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
150 |
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" |
151 |
- |
152 |
-RDEPEND="lzo? ( dev-libs/lzo ) |
153 |
- xattr? ( sys-apps/attr )" |
154 |
-DEPEND="${RDEPEND}" |
155 |
- |
156 |
-S="${WORKDIR}/${MY_P}" |
157 |
- |
158 |
-PATCHES=( |
159 |
- "${FILESDIR}"/${MY_PN}-1.99-musl-r1.patch |
160 |
- "${FILESDIR}"/${MY_PN}-1.99-disable-hmac-tests.patch |
161 |
-) |
162 |
- |
163 |
-src_prepare() { |
164 |
- default |
165 |
- |
166 |
- sed -i \ |
167 |
- -e 's:-ldl:$(LDFLAGS) -ldl:' \ |
168 |
- -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ |
169 |
- Makefile || die |
170 |
- |
171 |
- eautoreconf |
172 |
-} |
173 |
- |
174 |
-src_configure() { |
175 |
- use static && append-ldflags -static |
176 |
- # OpenSSL is only used by a random helper tool we don't install. |
177 |
- ac_cv_header_attr_xattr_h=$(usex xattr) \ |
178 |
- ac_cv_header_openssl_evp_h=no \ |
179 |
- ac_cv_lib_crypto_EVP_aes_192_ctr=no \ |
180 |
- ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ |
181 |
- ac_cv_header_lzo_lzo1x_h=$(usex lzo) \ |
182 |
- econf |
183 |
-} |
184 |
- |
185 |
-_emake() { |
186 |
- local arch |
187 |
- case ${ARCH} in |
188 |
- x86) arch=i386;; |
189 |
- amd64) arch=x86_64;; |
190 |
- arm) arch=arm;; |
191 |
- arm64) arch=aarch64;; |
192 |
- esac |
193 |
- |
194 |
- local os=$(usex kernel_linux Linux IDK) |
195 |
- |
196 |
- # The Makefile is a mess. Override a few vars rather than patch it. |
197 |
- emake \ |
198 |
- MACH="${arch}" \ |
199 |
- OS="${os}" \ |
200 |
- HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ |
201 |
- HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ |
202 |
- RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ |
203 |
- CFLAGS_OPT='$(CFLAGS)' \ |
204 |
- LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \ |
205 |
- CC="$(tc-getCC)" \ |
206 |
- "$@" |
207 |
-} |
208 |
- |
209 |
-src_compile() { |
210 |
- _emake |
211 |
-} |
212 |
- |
213 |
-src_test() { |
214 |
- _emake check |
215 |
-} |
216 |
- |
217 |
-src_install() { |
218 |
- # easier to install by hand than trying to make sense of the Makefile. |
219 |
- dobin dd_rescue |
220 |
- dodir /usr/$(get_libdir)/${PN} |
221 |
- cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die |
222 |
- dodoc README.dd_rescue |
223 |
- doman dd_rescue.1 |
224 |
- use lzo && doman ddr_lzo.1 |
225 |
-} |
226 |
|
227 |
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild |
228 |
deleted file mode 100644 |
229 |
index 858a583dbdd..00000000000 |
230 |
--- a/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild |
231 |
+++ /dev/null |
232 |
@@ -1,90 +0,0 @@ |
233 |
-# Copyright 1999-2017 Gentoo Foundation |
234 |
-# Distributed under the terms of the GNU General Public License v2 |
235 |
- |
236 |
-EAPI=6 |
237 |
- |
238 |
-inherit toolchain-funcs flag-o-matic multilib autotools |
239 |
- |
240 |
-MY_PN="${PN/-/_}" |
241 |
-MY_P="${MY_PN}-${PV}" |
242 |
- |
243 |
-DESCRIPTION="Similar to dd but can copy from source with errors" |
244 |
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" |
245 |
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" |
246 |
- |
247 |
-LICENSE="GPL-2" |
248 |
-SLOT="0" |
249 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
250 |
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" |
251 |
- |
252 |
-RDEPEND="lzo? ( dev-libs/lzo ) |
253 |
- xattr? ( sys-apps/attr )" |
254 |
-DEPEND="${RDEPEND}" |
255 |
- |
256 |
-S="${WORKDIR}/${MY_P}" |
257 |
- |
258 |
-PATCHES=( |
259 |
- "${FILESDIR}/${MY_PN}-1.99-musl.patch" |
260 |
-) |
261 |
- |
262 |
-src_prepare() { |
263 |
- default |
264 |
- |
265 |
- sed -i \ |
266 |
- -e 's:-ldl:$(LDFLAGS) -ldl:' \ |
267 |
- -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ |
268 |
- Makefile |
269 |
- |
270 |
- eautoreconf |
271 |
-} |
272 |
- |
273 |
-src_configure() { |
274 |
- use static && append-ldflags -static |
275 |
- # OpenSSL is only used by a random helper tool we don't install. |
276 |
- ac_cv_header_attr_xattr_h=$(usex xattr) \ |
277 |
- ac_cv_header_openssl_evp_h=no \ |
278 |
- ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ |
279 |
- econf |
280 |
-} |
281 |
- |
282 |
-_emake() { |
283 |
- local arch |
284 |
- case ${ARCH} in |
285 |
- x86) arch=i386;; |
286 |
- amd64) arch=x86_64;; |
287 |
- arm) arch=arm;; |
288 |
- arm64) arch=aarch64;; |
289 |
- esac |
290 |
- |
291 |
- local os=$(usex kernel_linux Linux IDK) |
292 |
- |
293 |
- # The Makefile is a mess. Override a few vars rather than patch it. |
294 |
- emake \ |
295 |
- MACH="${arch}" \ |
296 |
- OS="${os}" \ |
297 |
- HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ |
298 |
- HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ |
299 |
- RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ |
300 |
- CFLAGS_OPT='$(CFLAGS)' \ |
301 |
- LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \ |
302 |
- CC="$(tc-getCC)" \ |
303 |
- "$@" |
304 |
-} |
305 |
- |
306 |
-src_compile() { |
307 |
- _emake |
308 |
-} |
309 |
- |
310 |
-src_test() { |
311 |
- _emake check |
312 |
-} |
313 |
- |
314 |
-src_install() { |
315 |
- # easier to install by hand than trying to make sense of the Makefile. |
316 |
- dobin dd_rescue |
317 |
- dodir /usr/$(get_libdir)/${PN} |
318 |
- cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die |
319 |
- dodoc README.dd_rescue |
320 |
- doman dd_rescue.1 |
321 |
- use lzo && doman ddr_lzo.1 |
322 |
-} |
323 |
|
324 |
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild |
325 |
deleted file mode 100644 |
326 |
index 616ff38726c..00000000000 |
327 |
--- a/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild |
328 |
+++ /dev/null |
329 |
@@ -1,104 +0,0 @@ |
330 |
-# Copyright 1999-2017 Gentoo Foundation |
331 |
-# Distributed under the terms of the GNU General Public License v2 |
332 |
- |
333 |
-EAPI="6" |
334 |
- |
335 |
-inherit toolchain-funcs flag-o-matic multilib autotools |
336 |
- |
337 |
-MY_PN="${PN/-/_}" |
338 |
-MY_P="${MY_PN}-${PV}" |
339 |
- |
340 |
-DESCRIPTION="Similar to dd but can copy from source with errors" |
341 |
-HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" |
342 |
-SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" |
343 |
- |
344 |
-LICENSE="GPL-2" |
345 |
-SLOT="0" |
346 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
347 |
-IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" |
348 |
- |
349 |
-RDEPEND="lzo? ( dev-libs/lzo ) |
350 |
- xattr? ( sys-apps/attr )" |
351 |
-DEPEND="${RDEPEND}" |
352 |
- |
353 |
-S="${WORKDIR}/${MY_P}" |
354 |
- |
355 |
-PATCHES=( |
356 |
- "${FILESDIR}"/${MY_PN}-1.99-musl-r1.patch |
357 |
-) |
358 |
- |
359 |
-src_prepare() { |
360 |
- default |
361 |
- |
362 |
- sed -i \ |
363 |
- -e 's:-ldl:$(LDFLAGS) -ldl:' \ |
364 |
- -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ |
365 |
- Makefile || die |
366 |
- |
367 |
- if ! use cpu_flags_x86_sse4_2; then |
368 |
- sed -i \ |
369 |
- -e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \ |
370 |
- configure.in || die |
371 |
- fi |
372 |
- |
373 |
- if ! use cpu_flags_x86_avx2; then |
374 |
- sed -i \ |
375 |
- -e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \ |
376 |
- configure.in || die |
377 |
- fi |
378 |
- |
379 |
- eautoreconf |
380 |
-} |
381 |
- |
382 |
-src_configure() { |
383 |
- use static && append-ldflags -static |
384 |
- # OpenSSL is only used by a random helper tool we don't install. |
385 |
- ac_cv_header_attr_xattr_h=$(usex xattr) \ |
386 |
- ac_cv_header_openssl_evp_h=no \ |
387 |
- ac_cv_lib_crypto_EVP_aes_192_ctr=no \ |
388 |
- ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ |
389 |
- ac_cv_header_lzo_lzo1x_h=$(usex lzo) \ |
390 |
- econf |
391 |
-} |
392 |
- |
393 |
-_emake() { |
394 |
- local arch |
395 |
- case ${ARCH} in |
396 |
- x86) arch=i386;; |
397 |
- amd64) arch=x86_64;; |
398 |
- arm) arch=arm;; |
399 |
- arm64) arch=aarch64;; |
400 |
- esac |
401 |
- |
402 |
- local os=$(usex kernel_linux Linux IDK) |
403 |
- |
404 |
- # The Makefile is a mess. Override a few vars rather than patch it. |
405 |
- emake \ |
406 |
- MACH="${arch}" \ |
407 |
- OS="${os}" \ |
408 |
- HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ |
409 |
- HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ |
410 |
- RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ |
411 |
- CFLAGS_OPT='$(CFLAGS)' \ |
412 |
- LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \ |
413 |
- CC="$(tc-getCC)" \ |
414 |
- "$@" |
415 |
-} |
416 |
- |
417 |
-src_compile() { |
418 |
- _emake |
419 |
-} |
420 |
- |
421 |
-src_test() { |
422 |
- _emake check |
423 |
-} |
424 |
- |
425 |
-src_install() { |
426 |
- # easier to install by hand than trying to make sense of the Makefile. |
427 |
- dobin dd_rescue |
428 |
- dodir /usr/$(get_libdir)/${PN} |
429 |
- cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die |
430 |
- dodoc README.dd_rescue |
431 |
- doman dd_rescue.1 |
432 |
- use lzo && doman ddr_lzo.1 |
433 |
-} |
434 |
|
435 |
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch |
436 |
deleted file mode 100644 |
437 |
index 244f4312139..00000000000 |
438 |
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch |
439 |
+++ /dev/null |
440 |
@@ -1,21 +0,0 @@ |
441 |
-https://sourceforge.net/p/ddrescue/tickets/3/ |
442 |
- |
443 |
---- a/Makefile |
444 |
-+++ b/Makefile |
445 |
-@@ -500,11 +500,11 @@ check: $(TARGETS) find_nonzero md5 sha1 sha256 sha512 fmt_no |
446 |
- # Extra xattrs (should be preserved) |
447 |
- #make check_xattr_copy |
448 |
- # Tests with HMAC |
449 |
-- echo -n "what do ya want for nothing?" > TEST |
450 |
-- echo "750c783e6ab0b503eaa86e310a5db738 *TEST" > HMACS.md5 |
451 |
-- $(VG) ./dd_rescue -L ./libddr_hash.so=md5:hmacpwd=Jefe:chknm= TEST /dev/null |
452 |
-- rm -f /tmp/dd_rescue CHECKSUMS.sha512 TEST HMACS.md5 |
453 |
-- if ./calchmac.py sha1 pass dd_rescue; then $(MAKE) check_hmac; else echo "Sorry, no more HMAC test due to missing python-hashlib support"; true; fi |
454 |
-+ #echo -n "what do ya want for nothing?" > TEST |
455 |
-+ #echo "750c783e6ab0b503eaa86e310a5db738 *TEST" > HMACS.md5 |
456 |
-+ #$(VG) ./dd_rescue -L ./libddr_hash.so=md5:hmacpwd=Jefe:chknm= TEST /dev/null |
457 |
-+ #rm -f /tmp/dd_rescue CHECKSUMS.sha512 TEST HMACS.md5 |
458 |
-+ #if ./calchmac.py sha1 pass dd_rescue; then $(MAKE) check_hmac; else echo "Sorry, no more HMAC test due to missing python-hashlib support"; true; fi |
459 |
- $(MAKE) check_fault |
460 |
- #$(MAKE) check_aes |
461 |
- $(MAKE) check_crypt |
462 |
|
463 |
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch |
464 |
deleted file mode 100644 |
465 |
index 6751cf00986..00000000000 |
466 |
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch |
467 |
+++ /dev/null |
468 |
@@ -1,161 +0,0 @@ |
469 |
-From 66e7503f24b9693ddb20a0873ae054f799c3660f Mon Sep 17 00:00:00 2001 |
470 |
-From: Thomas Deutschmann <whissi@g.o> |
471 |
-Date: Mon, 30 Oct 2017 20:12:10 +0100 |
472 |
-Subject: [PATCH 49/49] loff_t and __WORDSIZE includes for MUSL |
473 |
- |
474 |
-Rewrite of Justin Keogh's patch [Link 1] to fix build problems |
475 |
-on ARM. |
476 |
- |
477 |
-Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f |
478 |
-Fixes: https://bugs.gentoo.org/616364 |
479 |
---- |
480 |
- configure.in | 2 +- |
481 |
- ddr_ctrl.h | 3 +++ |
482 |
- ffs.h | 3 +++ |
483 |
- fiemap.h | 4 ++++ |
484 |
- fmt_no.h | 2 ++ |
485 |
- fstrim.h | 3 +++ |
486 |
- libddr_hash.c | 4 ++++ |
487 |
- libddr_lzo.c | 3 +++ |
488 |
- libddr_null.c | 3 +++ |
489 |
- sha512.h | 4 ++++ |
490 |
- 10 files changed, 30 insertions(+), 1 deletion(-) |
491 |
- |
492 |
-diff --git a/configure.in b/configure.in |
493 |
-index f813d4b..c9d28c5 100644 |
494 |
---- a/configure.in |
495 |
-+++ b/configure.in |
496 |
-@@ -6,7 +6,7 @@ AC_C_INLINE |
497 |
- AC_HEADER_STDC |
498 |
- #AC_PROG_INSTALL |
499 |
- #CFLAGS="$CFLAGS -DHAVE_CONFIG_H" |
500 |
--AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h]) |
501 |
-+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h]) |
502 |
- AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs]) |
503 |
- AC_CHECK_LIB(dl,dlsym) |
504 |
- AC_CHECK_LIB(fallocate,linux_fallocate64) |
505 |
-diff --git a/ddr_ctrl.h b/ddr_ctrl.h |
506 |
-index ac71e4f..58cffd5 100644 |
507 |
---- a/ddr_ctrl.h |
508 |
-+++ b/ddr_ctrl.h |
509 |
-@@ -7,6 +7,9 @@ |
510 |
- * License: GNU GPLv2 or v3 |
511 |
- */ |
512 |
- |
513 |
-+#define _GNU_SOURCE |
514 |
-+#include <fcntl.h> |
515 |
-+ |
516 |
- #ifndef _DDR_CTRL_H |
517 |
- #define _DDR_CTRL_H |
518 |
- |
519 |
-diff --git a/ffs.h b/ffs.h |
520 |
-index 2215080..c1f3444 100644 |
521 |
---- a/ffs.h |
522 |
-+++ b/ffs.h |
523 |
-@@ -28,6 +28,9 @@ |
524 |
- #include <endian.h> |
525 |
- #endif |
526 |
- |
527 |
-+#ifdef HAVE_SYS_REG_H |
528 |
-+#include <sys/reg.h> |
529 |
-+#endif |
530 |
- |
531 |
- #ifdef HAVE_FFS |
532 |
- # define myffs(x) ffs(x) |
533 |
-diff --git a/fiemap.h b/fiemap.h |
534 |
-index df1ba95..31cde3b 100644 |
535 |
---- a/fiemap.h |
536 |
-+++ b/fiemap.h |
537 |
-@@ -29,5 +29,9 @@ |
538 |
- |
539 |
- #endif /* HAVE_LINUX_FS_H */ |
540 |
- |
541 |
-+#ifdef HAVE_SYS_REG_H |
542 |
-+#include <sys/reg.h> |
543 |
-+#endif |
544 |
-+ |
545 |
- #endif /* _FIEMAPH */ |
546 |
- |
547 |
-diff --git a/fmt_no.h b/fmt_no.h |
548 |
-index 329f997..16eda5c 100644 |
549 |
---- a/fmt_no.h |
550 |
-+++ b/fmt_no.h |
551 |
-@@ -1,4 +1,6 @@ |
552 |
- /** Decl for int to str conversion with highlighting */ |
553 |
-+#define _GNU_SOURCE |
554 |
-+#include <fcntl.h> |
555 |
- |
556 |
- #ifndef _FMT_NO_H |
557 |
- #define _FMT_NO_H |
558 |
-diff --git a/fstrim.h b/fstrim.h |
559 |
-index 7447061..b9cdcbb 100644 |
560 |
---- a/fstrim.h |
561 |
-+++ b/fstrim.h |
562 |
-@@ -1,3 +1,6 @@ |
563 |
-+#define _GNU_SOURCE |
564 |
-+#include <fcntl.h> |
565 |
-+ |
566 |
- #ifndef _FSTRIM_H |
567 |
- #define _FSTRIM_H |
568 |
- |
569 |
-diff --git a/libddr_hash.c b/libddr_hash.c |
570 |
-index daa806e..264dba1 100644 |
571 |
---- a/libddr_hash.c |
572 |
-+++ b/libddr_hash.c |
573 |
-@@ -33,6 +33,10 @@ |
574 |
- #include <unistd.h> |
575 |
- #include <fcntl.h> |
576 |
- |
577 |
-+#ifdef HAVE_SYS_REG_H |
578 |
-+#include <sys/reg.h> |
579 |
-+#endif |
580 |
-+ |
581 |
- #include <netinet/in.h> /* For ntohl/htonl */ |
582 |
- #include <endian.h> |
583 |
- |
584 |
-diff --git a/libddr_lzo.c b/libddr_lzo.c |
585 |
-index 531df11..3220e2a 100644 |
586 |
---- a/libddr_lzo.c |
587 |
-+++ b/libddr_lzo.c |
588 |
-@@ -26,6 +26,9 @@ |
589 |
- #include <errno.h> |
590 |
- #include <netinet/in.h> |
591 |
- #include <sys/stat.h> |
592 |
-+#ifdef HAVE_SYS_REG_H |
593 |
-+#include <sys/reg.h> |
594 |
-+#endif |
595 |
- #include <signal.h> |
596 |
- #include <lzo/lzo1x.h> |
597 |
- #include <lzo/lzo1y.h> |
598 |
-diff --git a/libddr_null.c b/libddr_null.c |
599 |
-index 3f0f194..c379961 100644 |
600 |
---- a/libddr_null.c |
601 |
-+++ b/libddr_null.c |
602 |
-@@ -10,6 +10,9 @@ |
603 |
- #include "ddr_ctrl.h" |
604 |
- #include <string.h> |
605 |
- #include <stdlib.h> |
606 |
-+#ifdef HAVE_SYS_REG_H |
607 |
-+#include <sys/reg.h> |
608 |
-+#endif |
609 |
- |
610 |
- /* fwd decl */ |
611 |
- extern ddr_plugin_t ddr_plug; |
612 |
-diff --git a/sha512.h b/sha512.h |
613 |
-index 4d08043..f54d371 100644 |
614 |
---- a/sha512.h |
615 |
-+++ b/sha512.h |
616 |
-@@ -3,6 +3,10 @@ |
617 |
- |
618 |
- #include "hash.h" |
619 |
- |
620 |
-+#ifdef HAVE_SYS_REG_H |
621 |
-+#include <sys/reg.h> |
622 |
-+#endif |
623 |
-+ |
624 |
- void sha512_init(hash_t *ctx); |
625 |
- void sha384_init(hash_t *ctx); |
626 |
- void sha512_128(const uint8_t* msg, hash_t* ctx); |
627 |
--- |
628 |
-2.14.3 |
629 |
- |
630 |
|
631 |
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch |
632 |
deleted file mode 100644 |
633 |
index 6647e5f687c..00000000000 |
634 |
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch |
635 |
+++ /dev/null |
636 |
@@ -1,90 +0,0 @@ |
637 |
---- a/ffs.h 2016-02-09 03:37:14.422639513 +0000 |
638 |
-+++ b/ffs.h 2016-02-09 03:38:59.843641094 +0000 |
639 |
-@@ -27,7 +27,8 @@ |
640 |
- #ifdef HAVE_ENDIAN_H |
641 |
- #include <endian.h> |
642 |
- #endif |
643 |
-- |
644 |
-+/* __WORDSIZE */ |
645 |
-+#include <sys/reg.h> |
646 |
- |
647 |
- #ifdef HAVE_FFS |
648 |
- # define myffs(x) ffs(x) |
649 |
---- a/fiemap.h 2016-02-09 03:45:05.550646582 +0000 |
650 |
-+++ b/fiemap.h 2016-02-09 03:45:56.683647349 +0000 |
651 |
-@@ -31,3 +31,4 @@ |
652 |
- |
653 |
- #endif /* _FIEMAPH */ |
654 |
- |
655 |
-+#include <sys/reg.h> |
656 |
---- a/libddr_hash.c 2016-02-09 03:49:16.334650345 +0000 |
657 |
-+++ b/libddr_hash.c 2016-02-09 03:50:01.309651020 +0000 |
658 |
-@@ -32,6 +32,7 @@ |
659 |
- #include <errno.h> |
660 |
- #include <unistd.h> |
661 |
- #include <fcntl.h> |
662 |
-+#include <sys/reg.h> |
663 |
- |
664 |
- #include <netinet/in.h> /* For ntohl/htonl */ |
665 |
- #include <endian.h> |
666 |
---- a/libddr_lzo.c 2016-02-09 03:52:31.775653278 +0000 |
667 |
-+++ b/libddr_lzo.c 2016-02-09 03:52:53.537653604 +0000 |
668 |
-@@ -26,6 +26,7 @@ |
669 |
- #include <errno.h> |
670 |
- #include <netinet/in.h> |
671 |
- #include <sys/stat.h> |
672 |
-+#include <sys/reg.h> |
673 |
- #include <signal.h> |
674 |
- #include <lzo/lzo1x.h> |
675 |
- #include <lzo/lzo1y.h> |
676 |
---- a/libddr_null.c 2016-02-09 03:54:04.110654663 +0000 |
677 |
-+++ b/libddr_null.c 2016-02-09 03:54:18.018654872 +0000 |
678 |
-@@ -10,6 +10,7 @@ |
679 |
- #include "ddr_ctrl.h" |
680 |
- #include <string.h> |
681 |
- #include <stdlib.h> |
682 |
-+#include <sys/reg.h> |
683 |
- |
684 |
- /* fwd decl */ |
685 |
- extern ddr_plugin_t ddr_plug; |
686 |
---- a/sha512.h 2016-02-09 03:55:33.209656000 +0000 |
687 |
-+++ b/sha512.h 2016-02-09 03:56:39.923657001 +0000 |
688 |
-@@ -2,6 +2,8 @@ |
689 |
- #define _SHA512_H |
690 |
- |
691 |
- #include "hash.h" |
692 |
-+/* __WORDSIZE */ |
693 |
-+#include <sys/reg.h> |
694 |
- |
695 |
- void sha512_init(hash_t *ctx); |
696 |
- void sha384_init(hash_t *ctx); |
697 |
---- a/fmt_no.h 2016-02-09 04:52:13.760707026 +0000 |
698 |
-+++ b/fmt_no.h 2016-02-09 04:52:50.874707583 +0000 |
699 |
-@@ -1,4 +1,6 @@ |
700 |
- /** Decl for int to str conversion with highlighting */ |
701 |
-+#define _GNU_SOURCE |
702 |
-+#include <fcntl.h> |
703 |
- |
704 |
- #ifndef _FMT_NO_H |
705 |
- #define _FMT_NO_H |
706 |
---- a/fstrim.h 2016-02-09 04:55:43.871710178 +0000 |
707 |
-+++ b/fstrim.h 2016-02-09 04:56:11.270710590 +0000 |
708 |
-@@ -1,3 +1,6 @@ |
709 |
-+#define _GNU_SOURCE |
710 |
-+#include <fcntl.h> |
711 |
-+ |
712 |
- #ifndef _FSTRIM_H |
713 |
- #define _FSTRIM_H |
714 |
- |
715 |
---- a/ddr_ctrl.h 2016-02-09 04:58:08.442712348 +0000 |
716 |
-+++ b/ddr_ctrl.h 2016-02-09 04:58:50.842712984 +0000 |
717 |
-@@ -7,6 +7,9 @@ |
718 |
- * License: GNU GPLv2 or v3 |
719 |
- */ |
720 |
- |
721 |
-+#define _GNU_SOURCE |
722 |
-+#include <fcntl.h> |
723 |
-+ |
724 |
- #ifndef _DDR_CTRL_H |
725 |
- #define _DDR_CTRL_H |
726 |
- |
727 |
|
728 |
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch |
729 |
deleted file mode 100644 |
730 |
index 6ddf7116f9f..00000000000 |
731 |
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch |
732 |
+++ /dev/null |
733 |
@@ -1,11 +0,0 @@ |
734 |
---- dd_rescue-1.99/test_crypt.sh |
735 |
-+++ dd_rescue-1.99/test_crypt.sh |
736 |
-@@ -97,7 +97,7 @@ |
737 |
- $VG ./dd_rescue -t -m 4096 urandom urandom.new || exit 1 |
738 |
- # Ensure that we don't have 01 or 02 02 or ... at the end, |
739 |
- # which would trip pad=asneeded |
740 |
--echo -n "a" | dd_rescue -S 4095 -m 1 - urandom.new |
741 |
-+echo -n "a" | ./dd_rescue -S 4095 -m 1 - urandom.new |
742 |
- mv urandom.new urandom |
743 |
- enc_dec_compare_keys urandom AES192-CBC "" pad=always "" "-qpt" |
744 |
- enc_dec_compare_keys urandom AES192-CBC "" pad=asneeded "" "-qpt" |