diff options
Diffstat (limited to 'sys-fs/dd-rescue')
| -rw-r--r-- | sys-fs/dd-rescue/Manifest | 3 | ||||
| -rw-r--r-- | sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild | 86 | ||||
| -rw-r--r-- | sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild | 93 | ||||
| -rw-r--r-- | sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild | 90 | ||||
| -rw-r--r-- | sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild | 104 | ||||
| -rw-r--r-- | sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch | 21 | ||||
| -rw-r--r-- | sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch | 161 | ||||
| -rw-r--r-- | sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch | 90 | ||||
| -rw-r--r-- | sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch | 11 |
9 files changed, 0 insertions, 659 deletions
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 92c2e3407587..fd1c556fc066 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,5 +1,2 @@ DIST dd_rescue-1.46.tar.gz 126790 BLAKE2B 027d509349e77fa020757b826184b4a2206c3f5923c797c294ca8caf210cf6af20afa1d518d826413989612295a4365c480d7aa4293686824ee96394cbbe9851 SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 -DIST dd_rescue-1.99.5.tar.bz2 170712 BLAKE2B f19a91de3acf96759c51361a30262a0c77aad45121fdcaa20e0a38e1b47a3f7a9530d22abed78dd78924cb77e053e19eabc9a6c93ba4a0601f5916468f6ba139 SHA512 a240eb9d50950cefbc65d953c84a8e3782d39282aff4e7fa42364b40cee0eb0a02f61315786a1008cf7ae9c3d758700e9f3a0087b9477b3ffbfcbcef59f07d88 -DIST dd_rescue-1.99.6.tar.bz2 171621 BLAKE2B cee1bfb3014e87fdc083ed956427c91a1329f39215d300171e4dc6a553a81e04dd95c006354e318cf692845becc052db77c1daac54942b019e307bc2ba594b1e SHA512 b91508ebdd5f5a4945fa15a86b530bb03e49e74ffe6d2227c9dac4a5fa1b8e9ccf6f1e68204220b571b4661b78892be3a955005f253fd691a85977f35fc74b5e -DIST dd_rescue-1.99.7.tar.bz2 172414 BLAKE2B 0f9bd9abd3936eeb4ec22f2c3cf59a3dbf2cb1c2e7fe854b7e0b0c5e3b521541595115952b0d840d739bfb2080a0f2920e867551b3598db62df1f41cb15f3121 SHA512 56e1aca8f068110376ba8b3b7ef7ec203a1632cf943d0b47e415699af67ac29984094a22fb685a4237f6a6962d4aa972714f2ac19e283d209ed3e5c193c9d72d DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild deleted file mode 100644 index 6121e84d1aa2..000000000000 --- a/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit toolchain-funcs flag-o-matic multilib autotools - -MY_PN=${PN/-/_} -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Similar to dd but can copy from source with errors" -HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" -SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" - -RDEPEND="lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - epatch "${FILESDIR}/${MY_PN}-1.99-test_fix.patch" - epatch "${FILESDIR}/${MY_PN}-1.99-musl.patch" - - sed -i \ - -e 's:-ldl:$(LDFLAGS) -ldl:' \ - -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ - Makefile - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - # OpenSSL is only used by a random helper tool we don't install. - ac_cv_header_attr_xattr_h=$(usex xattr) \ - ac_cv_header_openssl_evp_h=no \ - ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ - econf -} - -_emake() { - local arch - case ${ARCH} in - x86) arch=i386;; - amd64) arch=x86_64;; - arm) arch=arm;; - arm64) arch=aarch64;; - esac - - local os=$(usex kernel_linux Linux IDK) - - # The Makefile is a mess. Override a few vars rather than patch it. - emake \ - MACH="${arch}" \ - OS="${os}" \ - HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ - HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ - RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ - CFLAGS_OPT='$(CFLAGS)' \ - LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \ - CC="$(tc-getCC)" \ - "$@" -} - -src_compile() { - _emake -} - -src_test() { - _emake check -} - -src_install() { - # easier to install by hand than trying to make sense of the Makefile. - dobin dd_rescue - dodir /usr/$(get_libdir)/${PN} - cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die - dodoc README.dd_rescue - doman dd_rescue.1 - use lzo && doman ddr_lzo.1 -} 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 deleted file mode 100644 index 1d391a112ea3..000000000000 --- a/sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs flag-o-matic multilib autotools - -MY_PN="${PN/-/_}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Similar to dd but can copy from source with errors" -HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" -SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" - -RDEPEND="lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${MY_PN}-1.99-musl-r1.patch - "${FILESDIR}"/${MY_PN}-1.99-disable-hmac-tests.patch -) - -src_prepare() { - default - - sed -i \ - -e 's:-ldl:$(LDFLAGS) -ldl:' \ - -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ - Makefile || die - - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - # OpenSSL is only used by a random helper tool we don't install. - ac_cv_header_attr_xattr_h=$(usex xattr) \ - ac_cv_header_openssl_evp_h=no \ - ac_cv_lib_crypto_EVP_aes_192_ctr=no \ - ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ - ac_cv_header_lzo_lzo1x_h=$(usex lzo) \ - econf -} - -_emake() { - local arch - case ${ARCH} in - x86) arch=i386;; - amd64) arch=x86_64;; - arm) arch=arm;; - arm64) arch=aarch64;; - esac - - local os=$(usex kernel_linux Linux IDK) - - # The Makefile is a mess. Override a few vars rather than patch it. - emake \ - MACH="${arch}" \ - OS="${os}" \ - HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ - HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ - RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ - CFLAGS_OPT='$(CFLAGS)' \ - LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \ - CC="$(tc-getCC)" \ - "$@" -} - -src_compile() { - _emake -} - -src_test() { - _emake check -} - -src_install() { - # easier to install by hand than trying to make sense of the Makefile. - dobin dd_rescue - dodir /usr/$(get_libdir)/${PN} - cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die - dodoc README.dd_rescue - doman dd_rescue.1 - use lzo && doman ddr_lzo.1 -} diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild deleted file mode 100644 index 858a583dbdd7..000000000000 --- a/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic multilib autotools - -MY_PN="${PN/-/_}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Similar to dd but can copy from source with errors" -HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" -SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" - -RDEPEND="lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${MY_PN}-1.99-musl.patch" -) - -src_prepare() { - default - - sed -i \ - -e 's:-ldl:$(LDFLAGS) -ldl:' \ - -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ - Makefile - - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - # OpenSSL is only used by a random helper tool we don't install. - ac_cv_header_attr_xattr_h=$(usex xattr) \ - ac_cv_header_openssl_evp_h=no \ - ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ - econf -} - -_emake() { - local arch - case ${ARCH} in - x86) arch=i386;; - amd64) arch=x86_64;; - arm) arch=arm;; - arm64) arch=aarch64;; - esac - - local os=$(usex kernel_linux Linux IDK) - - # The Makefile is a mess. Override a few vars rather than patch it. - emake \ - MACH="${arch}" \ - OS="${os}" \ - HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ - HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ - RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ - CFLAGS_OPT='$(CFLAGS)' \ - LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \ - CC="$(tc-getCC)" \ - "$@" -} - -src_compile() { - _emake -} - -src_test() { - _emake check -} - -src_install() { - # easier to install by hand than trying to make sense of the Makefile. - dobin dd_rescue - dodir /usr/$(get_libdir)/${PN} - cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die - dodoc README.dd_rescue - doman dd_rescue.1 - use lzo && doman ddr_lzo.1 -} diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild deleted file mode 100644 index 616ff38726c2..000000000000 --- a/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit toolchain-funcs flag-o-matic multilib autotools - -MY_PN="${PN/-/_}" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Similar to dd but can copy from source with errors" -HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" -SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" - -RDEPEND="lzo? ( dev-libs/lzo ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${MY_PN}-1.99-musl-r1.patch -) - -src_prepare() { - default - - sed -i \ - -e 's:-ldl:$(LDFLAGS) -ldl:' \ - -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \ - Makefile || die - - if ! use cpu_flags_x86_sse4_2; then - sed -i \ - -e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \ - configure.in || die - fi - - if ! use cpu_flags_x86_avx2; then - sed -i \ - -e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \ - configure.in || die - fi - - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - # OpenSSL is only used by a random helper tool we don't install. - ac_cv_header_attr_xattr_h=$(usex xattr) \ - ac_cv_header_openssl_evp_h=no \ - ac_cv_lib_crypto_EVP_aes_192_ctr=no \ - ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ - ac_cv_header_lzo_lzo1x_h=$(usex lzo) \ - econf -} - -_emake() { - local arch - case ${ARCH} in - x86) arch=i386;; - amd64) arch=x86_64;; - arm) arch=arm;; - arm64) arch=aarch64;; - esac - - local os=$(usex kernel_linux Linux IDK) - - # The Makefile is a mess. Override a few vars rather than patch it. - emake \ - MACH="${arch}" \ - OS="${os}" \ - HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ - HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ - RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ - CFLAGS_OPT='$(CFLAGS)' \ - LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX%/}/usr/$(get_libdir)/${PN}" \ - CC="$(tc-getCC)" \ - "$@" -} - -src_compile() { - _emake -} - -src_test() { - _emake check -} - -src_install() { - # easier to install by hand than trying to make sense of the Makefile. - dobin dd_rescue - dodir /usr/$(get_libdir)/${PN} - cp -pPR libddr_*.so "${ED%/}"/usr/$(get_libdir)/${PN}/ || die - dodoc README.dd_rescue - doman dd_rescue.1 - use lzo && doman ddr_lzo.1 -} 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 deleted file mode 100644 index 244f43121399..000000000000 --- a/sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://sourceforge.net/p/ddrescue/tickets/3/ - ---- a/Makefile -+++ b/Makefile -@@ -500,11 +500,11 @@ check: $(TARGETS) find_nonzero md5 sha1 sha256 sha512 fmt_no - # Extra xattrs (should be preserved) - #make check_xattr_copy - # Tests with HMAC -- echo -n "what do ya want for nothing?" > TEST -- echo "750c783e6ab0b503eaa86e310a5db738 *TEST" > HMACS.md5 -- $(VG) ./dd_rescue -L ./libddr_hash.so=md5:hmacpwd=Jefe:chknm= TEST /dev/null -- rm -f /tmp/dd_rescue CHECKSUMS.sha512 TEST HMACS.md5 -- 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 -+ #echo -n "what do ya want for nothing?" > TEST -+ #echo "750c783e6ab0b503eaa86e310a5db738 *TEST" > HMACS.md5 -+ #$(VG) ./dd_rescue -L ./libddr_hash.so=md5:hmacpwd=Jefe:chknm= TEST /dev/null -+ #rm -f /tmp/dd_rescue CHECKSUMS.sha512 TEST HMACS.md5 -+ #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 - $(MAKE) check_fault - #$(MAKE) check_aes - $(MAKE) check_crypt 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 deleted file mode 100644 index 6751cf009866..000000000000 --- a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 66e7503f24b9693ddb20a0873ae054f799c3660f Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann <whissi@gentoo.org> -Date: Mon, 30 Oct 2017 20:12:10 +0100 -Subject: [PATCH 49/49] loff_t and __WORDSIZE includes for MUSL - -Rewrite of Justin Keogh's patch [Link 1] to fix build problems -on ARM. - -Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f -Fixes: https://bugs.gentoo.org/616364 ---- - configure.in | 2 +- - ddr_ctrl.h | 3 +++ - ffs.h | 3 +++ - fiemap.h | 4 ++++ - fmt_no.h | 2 ++ - fstrim.h | 3 +++ - libddr_hash.c | 4 ++++ - libddr_lzo.c | 3 +++ - libddr_null.c | 3 +++ - sha512.h | 4 ++++ - 10 files changed, 30 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index f813d4b..c9d28c5 100644 ---- a/configure.in -+++ b/configure.in -@@ -6,7 +6,7 @@ AC_C_INLINE - AC_HEADER_STDC - #AC_PROG_INSTALL - #CFLAGS="$CFLAGS -DHAVE_CONFIG_H" --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]) -+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]) - 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]) - AC_CHECK_LIB(dl,dlsym) - AC_CHECK_LIB(fallocate,linux_fallocate64) -diff --git a/ddr_ctrl.h b/ddr_ctrl.h -index ac71e4f..58cffd5 100644 ---- a/ddr_ctrl.h -+++ b/ddr_ctrl.h -@@ -7,6 +7,9 @@ - * License: GNU GPLv2 or v3 - */ - -+#define _GNU_SOURCE -+#include <fcntl.h> -+ - #ifndef _DDR_CTRL_H - #define _DDR_CTRL_H - -diff --git a/ffs.h b/ffs.h -index 2215080..c1f3444 100644 ---- a/ffs.h -+++ b/ffs.h -@@ -28,6 +28,9 @@ - #include <endian.h> - #endif - -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif - - #ifdef HAVE_FFS - # define myffs(x) ffs(x) -diff --git a/fiemap.h b/fiemap.h -index df1ba95..31cde3b 100644 ---- a/fiemap.h -+++ b/fiemap.h -@@ -29,5 +29,9 @@ - - #endif /* HAVE_LINUX_FS_H */ - -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif -+ - #endif /* _FIEMAPH */ - -diff --git a/fmt_no.h b/fmt_no.h -index 329f997..16eda5c 100644 ---- a/fmt_no.h -+++ b/fmt_no.h -@@ -1,4 +1,6 @@ - /** Decl for int to str conversion with highlighting */ -+#define _GNU_SOURCE -+#include <fcntl.h> - - #ifndef _FMT_NO_H - #define _FMT_NO_H -diff --git a/fstrim.h b/fstrim.h -index 7447061..b9cdcbb 100644 ---- a/fstrim.h -+++ b/fstrim.h -@@ -1,3 +1,6 @@ -+#define _GNU_SOURCE -+#include <fcntl.h> -+ - #ifndef _FSTRIM_H - #define _FSTRIM_H - -diff --git a/libddr_hash.c b/libddr_hash.c -index daa806e..264dba1 100644 ---- a/libddr_hash.c -+++ b/libddr_hash.c -@@ -33,6 +33,10 @@ - #include <unistd.h> - #include <fcntl.h> - -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif -+ - #include <netinet/in.h> /* For ntohl/htonl */ - #include <endian.h> - -diff --git a/libddr_lzo.c b/libddr_lzo.c -index 531df11..3220e2a 100644 ---- a/libddr_lzo.c -+++ b/libddr_lzo.c -@@ -26,6 +26,9 @@ - #include <errno.h> - #include <netinet/in.h> - #include <sys/stat.h> -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif - #include <signal.h> - #include <lzo/lzo1x.h> - #include <lzo/lzo1y.h> -diff --git a/libddr_null.c b/libddr_null.c -index 3f0f194..c379961 100644 ---- a/libddr_null.c -+++ b/libddr_null.c -@@ -10,6 +10,9 @@ - #include "ddr_ctrl.h" - #include <string.h> - #include <stdlib.h> -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif - - /* fwd decl */ - extern ddr_plugin_t ddr_plug; -diff --git a/sha512.h b/sha512.h -index 4d08043..f54d371 100644 ---- a/sha512.h -+++ b/sha512.h -@@ -3,6 +3,10 @@ - - #include "hash.h" - -+#ifdef HAVE_SYS_REG_H -+#include <sys/reg.h> -+#endif -+ - void sha512_init(hash_t *ctx); - void sha384_init(hash_t *ctx); - void sha512_128(const uint8_t* msg, hash_t* ctx); --- -2.14.3 - 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 deleted file mode 100644 index 6647e5f687c6..000000000000 --- a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch +++ /dev/null @@ -1,90 +0,0 @@ ---- a/ffs.h 2016-02-09 03:37:14.422639513 +0000 -+++ b/ffs.h 2016-02-09 03:38:59.843641094 +0000 -@@ -27,7 +27,8 @@ - #ifdef HAVE_ENDIAN_H - #include <endian.h> - #endif -- -+/* __WORDSIZE */ -+#include <sys/reg.h> - - #ifdef HAVE_FFS - # define myffs(x) ffs(x) ---- a/fiemap.h 2016-02-09 03:45:05.550646582 +0000 -+++ b/fiemap.h 2016-02-09 03:45:56.683647349 +0000 -@@ -31,3 +31,4 @@ - - #endif /* _FIEMAPH */ - -+#include <sys/reg.h> ---- a/libddr_hash.c 2016-02-09 03:49:16.334650345 +0000 -+++ b/libddr_hash.c 2016-02-09 03:50:01.309651020 +0000 -@@ -32,6 +32,7 @@ - #include <errno.h> - #include <unistd.h> - #include <fcntl.h> -+#include <sys/reg.h> - - #include <netinet/in.h> /* For ntohl/htonl */ - #include <endian.h> ---- a/libddr_lzo.c 2016-02-09 03:52:31.775653278 +0000 -+++ b/libddr_lzo.c 2016-02-09 03:52:53.537653604 +0000 -@@ -26,6 +26,7 @@ - #include <errno.h> - #include <netinet/in.h> - #include <sys/stat.h> -+#include <sys/reg.h> - #include <signal.h> - #include <lzo/lzo1x.h> - #include <lzo/lzo1y.h> ---- a/libddr_null.c 2016-02-09 03:54:04.110654663 +0000 -+++ b/libddr_null.c 2016-02-09 03:54:18.018654872 +0000 -@@ -10,6 +10,7 @@ - #include "ddr_ctrl.h" - #include <string.h> - #include <stdlib.h> -+#include <sys/reg.h> - - /* fwd decl */ - extern ddr_plugin_t ddr_plug; ---- a/sha512.h 2016-02-09 03:55:33.209656000 +0000 -+++ b/sha512.h 2016-02-09 03:56:39.923657001 +0000 -@@ -2,6 +2,8 @@ - #define _SHA512_H - - #include "hash.h" -+/* __WORDSIZE */ -+#include <sys/reg.h> - - void sha512_init(hash_t *ctx); - void sha384_init(hash_t *ctx); ---- a/fmt_no.h 2016-02-09 04:52:13.760707026 +0000 -+++ b/fmt_no.h 2016-02-09 04:52:50.874707583 +0000 -@@ -1,4 +1,6 @@ - /** Decl for int to str conversion with highlighting */ -+#define _GNU_SOURCE -+#include <fcntl.h> - - #ifndef _FMT_NO_H - #define _FMT_NO_H ---- a/fstrim.h 2016-02-09 04:55:43.871710178 +0000 -+++ b/fstrim.h 2016-02-09 04:56:11.270710590 +0000 -@@ -1,3 +1,6 @@ -+#define _GNU_SOURCE -+#include <fcntl.h> -+ - #ifndef _FSTRIM_H - #define _FSTRIM_H - ---- a/ddr_ctrl.h 2016-02-09 04:58:08.442712348 +0000 -+++ b/ddr_ctrl.h 2016-02-09 04:58:50.842712984 +0000 -@@ -7,6 +7,9 @@ - * License: GNU GPLv2 or v3 - */ - -+#define _GNU_SOURCE -+#include <fcntl.h> -+ - #ifndef _DDR_CTRL_H - #define _DDR_CTRL_H - 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 deleted file mode 100644 index 6ddf7116f9fb..000000000000 --- a/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dd_rescue-1.99/test_crypt.sh -+++ dd_rescue-1.99/test_crypt.sh -@@ -97,7 +97,7 @@ - $VG ./dd_rescue -t -m 4096 urandom urandom.new || exit 1 - # Ensure that we don't have 01 or 02 02 or ... at the end, - # which would trip pad=asneeded --echo -n "a" | dd_rescue -S 4095 -m 1 - urandom.new -+echo -n "a" | ./dd_rescue -S 4095 -m 1 - urandom.new - mv urandom.new urandom - enc_dec_compare_keys urandom AES192-CBC "" pad=always "" "-qpt" - enc_dec_compare_keys urandom AES192-CBC "" pad=asneeded "" "-qpt" |