* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2015-09-09 20:58 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2015-09-09 20:58 UTC (permalink / raw
To: gentoo-commits
commit: 643bc0649ae41ad17b3a59cc01b359d2b5ef7b1a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 9 20:56:37 2015 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep 9 20:56:37 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=643bc064
sys-fs/dd-rescue: Bump to version 1.99
Package-Manager: portage-2.2.20.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-fs/dd-rescue/Manifest | 1 +
sys-fs/dd-rescue/dd-rescue-1.99.ebuild | 86 ++++++++++++++++++++++
.../dd-rescue/files/dd_rescue-1.99-test_fix.patch | 11 +++
3 files changed, 98 insertions(+)
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 6c91759..1b0340a 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -4,3 +4,4 @@ DIST dd_rescue-1.40.tar.gz 47107 SHA256 54545ebbe2be00597d8c9ba3d51abcfdd7ba89f1
DIST dd_rescue-1.44.tar.gz 114799 SHA256 744fa857fff7beed6d00644ea5786ce0d2e83df315b04f7578008e0a9b2853a3 SHA512 16e9072aeda04fe898d36e13d1dfc871642c7d1d1ac79b787f3ffd24ced2e13c605b4b36f66334ee4e258d01eee286ef74862e498a5a9ea5f9bd65a66a6ec213 WHIRLPOOL 5f4bfbb4b952552d0418054015fe5940d1a83050a282fad3a42b708caa26501d41ded98024acf9919acb63604e066008ee695ff616a7c9be5abf38613815e5d6
DIST dd_rescue-1.45.tar.gz 121426 SHA256 2626fa2842916f6861b4e1ce72284c81e1b6e7323a842911aad4082bdaa4f663 SHA512 88022f38ad0e1ea171f1db014ba5e3f421fe9c35782f01220e27beb03618998860694df6b5d2e96ea4927640952c57153f2a1633dee9c13a2227e17ddd46b160 WHIRLPOOL cbe7d227e70c1314ab15c90f4b5ba3f451f421769ebbb13589f8e66f8d09ca0986d50c0cfecdcce53fbd5a70c3aa027a5b20ea4f8c56ee05b5fc9c7be895fa18
DIST dd_rescue-1.46.tar.gz 126790 SHA256 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 WHIRLPOOL ac965019d38539962018bcc5a6d32cbf303b4d00d5ed91d643655a820f17bfa1ca81b5123f95220663823e6622d55099a2da08aaacf60cefc37097aa3354c729
+DIST dd_rescue-1.99.tar.bz2 168200 SHA256 5545f54a5e5bee2b9ac69959b1bc81aafae24939393efb8cc581e68ab1b2e47d SHA512 f484f1a86b3bd7c098eb568e193888d98def35b1bec2f553eb3543a5ae22417dbddb562a5c809613a1493ecac3689dcc2a45e26446a3e16036a19e716e38bd11 WHIRLPOOL 94ca6b49636c3f8b0a0901141a3ca16945f0cb5364b97d5d0d759ee1b034f33019ee0bf4f43f7977f0176832d95cecc0aab9cb89e783eabac14290ada4c9f1e1
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.ebuild
new file mode 100644
index 0000000..60021df
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+ 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/files/dd_rescue-1.99-test_fix.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch
new file mode 100644
index 0000000..6ddf711
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd_rescue-1.99-test_fix.patch
@@ -0,0 +1,11 @@
+--- 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"
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2017-12-13 0:09 Sebastian Pipping
0 siblings, 0 replies; 10+ messages in thread
From: Sebastian Pipping @ 2017-12-13 0:09 UTC (permalink / raw
To: gentoo-commits
commit: 00312f382135326dc1f784f9fdda60e1ec9e453b
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 00:08:09 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 00:09:31 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00312f38
sys-fs/dd-rescue: 1.99.8
Package-Manager: Portage-2.3.16, Repoman-2.3.6
sys-fs/dd-rescue/Manifest | 1 +
sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild | 104 +++++++++++++
.../dd-rescue/files/dd_rescue-1.99-musl-r2.patch | 161 +++++++++++++++++++++
3 files changed, 266 insertions(+)
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 7308747532b..92c2e340758 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -2,3 +2,4 @@ DIST dd_rescue-1.46.tar.gz 126790 BLAKE2B 027d509349e77fa020757b826184b4a2206c3f
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.8.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
new file mode 100644
index 00000000000..135b53fec88
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
@@ -0,0 +1,104 @@
+# 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-r2.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-musl-r2.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch
new file mode 100644
index 00000000000..c98ddeca13a
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch
@@ -0,0 +1,161 @@
+From e96b79c9e4cd6c40ba6e5fe495904f07a95fb909 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 13 Dec 2017 01:02:12 +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 eb2e813..355ea84 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 __builtin_cpu_supports])
+ 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 cb0a81b..52ec236 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 7c8cdf8..cdbbd4d 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 8d3983e..8c83c04 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.15.0
+
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2018-02-26 12:29 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2018-02-26 12:29 UTC (permalink / raw
To: gentoo-commits
commit: 7d0e5c540ad8167d761289cbde9dfaf2df0ccb56
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 12:29:37 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 12:29:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d0e5c54
sys-fs/dd-rescue: Fixed compilation with latest sys-apps/attr version.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild | 3 +-
.../dd-rescue/files/dd-rescue-1.99.8-xattr.patch | 300 +++++++++++++++++++++
2 files changed, 302 insertions(+), 1 deletion(-)
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
index 135b53fec88..8f5734a435d 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -25,6 +25,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${MY_PN}-1.99-musl-r2.patch
+ "${FILESDIR}"/${PN}-1.99.8-xattr.patch
)
src_prepare() {
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch
new file mode 100644
index 00000000000..39e719c3386
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch
@@ -0,0 +1,300 @@
+--- dd_rescue-1.99.8/configure.in
++++ dd_rescue-1.99.8/configure.in
+@@ -6,7 +6,7 @@
+ 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 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_HEADERS([fallocate.h dlfcn.h unistd.h sys/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 __builtin_cpu_supports])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+--- dd_rescue-1.99.8/dd_rescue.c
++++ dd_rescue-1.99.8/dd_rescue.c
+@@ -161,8 +161,8 @@
+ #endif
+
+ /* xattrs */
+-#ifdef HAVE_ATTR_XATTR_H
+-# include <attr/xattr.h>
++#ifdef HAVE_SYS_XATTR_H
++# include <sys/xattr.h>
+ #else
+ /* TODO: Could provide the prototypes for the syscalls ourselves ... */
+ # warning No support for copying extended attributes / ACLs
+@@ -1276,7 +1276,7 @@
+
+ /** Copy xattrs */
+ int copyxattr(const char* inm, const char* onm)
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ {
+ char *attrs = NULL;
+ ssize_t aln = listxattr(inm, NULL, 0);
+@@ -2486,7 +2486,7 @@
+ #ifdef FITRIM
+ fprintf(stderr, "fitrim ");
+ #endif
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ fprintf(stderr, "xattr ");
+ #endif
+ #if (defined(__x86_64__) || defined(__i386__)) && !defined(NO_RDRND)
+--- dd_rescue-1.99.8/libddr_crypt.c
++++ dd_rescue-1.99.8/libddr_crypt.c
+@@ -47,8 +47,8 @@
+ #include <endian.h>
+ #include <signal.h>
+
+-#ifdef HAVE_ATTR_XATTR_H
+-#include <attr/xattr.h>
++#ifdef HAVE_SYS_XATTR_H
++#include <sys/xattr.h>
+ #endif
+
+ #if __WORDSIZE == 64
+@@ -90,7 +90,7 @@
+ size_t saltlen;
+ loff_t lastpos;
+ loff_t processed;
+-#if 1 //def HAVE_ATTR_XATTR_H
++#if 1 //def HAVE_SYS_XATTR_H
+ char* salt_xattr_name;
+ char sxattr, sxfallback;
+ char* key_xattr_name;
+@@ -113,13 +113,13 @@
+ " Parameters: [alg[o[rithm]]=]ALG:enc[rypt]:dec[rypt]:engine=STR:pad=STR\n"
+ "\t:keyhex=HEX:keyfd=[x]INT[@INT@INT]:keyfile=NAME[@INT@INT]:keygen:keysfile\n"
+ "\t:ivhex=HEX:ivfd=[x]INT[@INT@INT]:ivfile=NAME[@INT@INT]:ivgen:ivsfile\n"
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ "\t:keyxattr[=xattr_name]:kxfallback:ivxattr[=xattr_name]:ixfallback\n"
+ #endif
+ "\t:pass=STR:passfd=[x]INT[@INT@INT]:passfile=NAME[@INT@INT]\n"
+ "\t:salt=STR:salthex=HEX:saltfd=[x]INT[@INT@INT]:saltfile=NAME[@INT@INT]\n"
+ "\t:saltlen=INT:saltgen:saltsfile"
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ ":saltxattr[=xattr_name]:sxfallback"
+ #endif
+ "\n\t:pbkdf2[=INT]:opbkdf[11]:debug:bench[mark]:skiphole:weakrnd:outkeyiv:ctrbug198\n"
+@@ -346,7 +346,7 @@
+ state->saltlen = ATOL(param+8);
+ else if (!strcmp(param, "saltgen"))
+ state->sgen = 1;
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ else if (!strcmp(param, "saltxattr"))
+ err += set_flag(&state->sxattr, "saltxattr");
+ else if (!memcmp(param, "saltxattr=", 10)) {
+@@ -709,7 +709,7 @@
+ return err;
+ }
+
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ int get_xattr(crypt_state *state, const char* atrnm,
+ unsigned char* data, int dlen,
+ char fb, char* fbf, char* flag)
+@@ -883,7 +883,7 @@
+ sprintf(ivsnm, "IVS.%s", state->alg->name);
+ sprintf(keynm, "KEYS.%s", state->alg->name);
+ sprintf(saltnm, "SALT.%s", state->alg->name);
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if (state->sxattr && !state->salt_xattr_name) {
+ state->salt_xattr_name = malloc(32);
+ snprintf(state->salt_xattr_name, 32, "user.salt.%s", state->alg->name);
+@@ -958,7 +958,7 @@
+ }
+
+ /* 5c */
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ /* Try getting salt from xattr */
+ if (!state->sset && state->sxattr && !get_salt_xattr(state) && !state->enc)
+ state->sxattr = 0;
+@@ -999,7 +999,7 @@
+ if (write_file(state->sec->salt, state->sfnm, 8, 0640))
+ return -1;
+ }
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ /* Write salt to xattr */
+ if (state->sxattr && state->enc && set_salt_xattr(state)) {
+ if (!state->sxfallback)
+@@ -1028,7 +1028,7 @@
+ if (!state->keyf && !state->kxattr)
+ FPLOG(WARN, "Generated key not written anywhere?\n", NULL);
+ else {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ /* Write key to xattr, failure is fatal */
+ if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback)
+ return -1;
+@@ -1066,7 +1066,7 @@
+ FPLOG(FATAL, "Key generation with pass+salt failed!\n", NULL);
+ return -1;
+ }
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ /* Write key to xattr, failure is fatal */
+ if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback)
+ return -1;
+@@ -1077,7 +1077,7 @@
+ return -1;
+
+ } else {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if (state->kxattr)
+ get_key_xattr(state);
+ #endif
+@@ -1100,7 +1100,7 @@
+ }
+ }
+ } else {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if (state->kxattr && set_key_xattr(state) && !state->kxfallback) {
+ FPLOG(FATAL, "Can't save key in xattr");
+ return -1;
+@@ -1123,7 +1123,7 @@
+ if (!state->ivf && !state->ixattr)
+ FPLOG(WARN, "Generated IV not saved?\n", NULL);
+ else {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ /* Write IV to xattr, failure w/o fb is fatal */
+ if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback)
+ return -1;
+@@ -1149,7 +1149,7 @@
+ return -1;
+ }
+ }
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ /* Write IV to xattr, failure w/o fb is fatal */
+ if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback)
+ return -1;
+@@ -1159,7 +1159,7 @@
+ if (write_keyfile(state, ivsnm, encnm, state->sec->nonce1, BLKSZ, 0640, 1, 0))
+ return -1;
+ } else {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if (state->ixattr)
+ get_iv_xattr(state);
+ #endif
+@@ -1180,7 +1180,7 @@
+ }
+ }
+ } else if (state->alg->stream->needs_iv) {
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if (state->ixattr && set_iv_xattr(state) && !state->ixfallback) {
+ FPLOG(FATAL, "Can't save IV in xattr");
+ return -1;
+@@ -1454,7 +1454,7 @@
+ FPLOG(INFO, "%.2fs CPU time, %.1fMiB/s\n",
+ (double)state->cpu/CLOCKS_PER_SEC,
+ state->processed/1024 / (state->cpu/(CLOCKS_PER_SEC/1024.0)));
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if (state->salt_xattr_name)
+ free(state->salt_xattr_name);
+ if (state->key_xattr_name)
+--- dd_rescue-1.99.8/libddr_hash.c
++++ dd_rescue-1.99.8/libddr_hash.c
+@@ -36,8 +36,8 @@
+ #include <netinet/in.h> /* For ntohl/htonl */
+ #include <endian.h>
+
+-#ifdef HAVE_ATTR_XATTR_H
+-#include <attr/xattr.h>
++#ifdef HAVE_SYS_XATTR_H
++#include <sys/xattr.h>
+ #endif
+ // TODO: pass at runtime rather than compile time
+ #define HASH_DEBUG(x) if (state->debug) x
+@@ -75,7 +75,7 @@
+ #endif
+ int hmacpln;
+ char xfallback;
+-#if 1 //def HAVE_ATTR_XATTR_H
++#if 1 //def HAVE_SYS_XATTR_H
+ char chk_xattr, set_xattr, xnmalloc;
+ char* xattr_name;
+ #endif
+@@ -90,7 +90,7 @@
+ ":multipart=size"
+ #endif
+ "\n"
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ "\t:chk_xattr[=xattr_name]:set_xattr[=xattr_name]:fallb[ack][=FILE]\n"
+ #endif
+ " Use algorithm=help to get a list of supported hash algorithms\n";
+@@ -167,7 +167,7 @@
+ state->append = param+7;
+ else if (!memcmp(param, "prepend=", 8))
+ state->prepend = param+8;
+-#if 1 //def HAVE_ATTR_XATTR_H
++#if 1 //def HAVE_SYS_XATTR_H
+ else if (!memcmp(param, "chk_xattr=", 10)) {
+ state->chk_xattr = 1; state->xattr_name = param+10; }
+ else if (!strcmp(param, "chk_xattr"))
+@@ -258,7 +258,7 @@
+ FPLOG(FATAL, "No hash algorithm specified\n");
+ return --err;
+ }
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if ((state->chk_xattr || state->set_xattr) && !state->xattr_name) {
+ state->xattr_name = (char*)malloc(32);
+ state->xnmalloc = 1;
+@@ -269,7 +269,7 @@
+ }
+ #endif
+ if ((!state->chkfnm || !*state->chkfnm) && (state->chkf || state->outf
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ || state->xfallback
+ #endif
+ )) {
+@@ -301,7 +301,7 @@
+ if (!stat || !(*stat))
+ return -1;
+ hash_state *state = (hash_state*)*stat;
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if (state->xnmalloc)
+ free((void*)state->xattr_name);
+ #endif
+@@ -351,7 +351,7 @@
+ strcat(nnm, "->");
+ strcat(nnm, opt->oname);
+ state->fname = nnm;
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if (state->chk_xattr || state->set_xattr) {
+ --err;
+ FPLOG(WARN, "Can't access xattr in the middle of a plugin chain!");
+@@ -607,7 +607,7 @@
+ return err;
+ }
+
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ int check_xattr(hash_state* state, const char* res)
+ {
+ char xatstr[144];
+@@ -734,7 +734,7 @@
+ err += check_chkf(state, res);
+ if (state->outf)
+ err += write_chkf(state, res);
+-#ifdef HAVE_ATTR_XATTR_H
++#ifdef HAVE_SYS_XATTR_H
+ if (state->chk_xattr)
+ err += check_xattr(state, res);
+ if (state->set_xattr)
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2020-05-03 19:52 Thomas Deutschmann
0 siblings, 0 replies; 10+ messages in thread
From: Thomas Deutschmann @ 2020-05-03 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 9bc102eea96b304ee47910df2738c64c1b551e0d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 3 19:48:57 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 3 19:51:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bc102ee
sys-fs/dd-rescue: use sys/random.h for getrandom() decl if present
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
...ue-1.99.8.ebuild => dd-rescue-1.99.8-r1.ebuild} | 2 ++
.../files/dd-rescue-1.99.8-sysrandom.patch | 27 ++++++++++++++++++
.../files/dd-rescue-1.99.8-testhole.patch | 32 ++++++++++++++++++++++
3 files changed, 61 insertions(+)
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
similarity index 96%
rename from sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
rename to sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
index 85a5845b250..d421dc83aa0 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
@@ -26,6 +26,8 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${MY_PN}-1.99-musl-r2.patch
"${FILESDIR}"/${PN}-1.99.8-xattr.patch
+ "${FILESDIR}"/${PN}-1.99.8-sysrandom.patch
+ "${FILESDIR}"/${PN}-1.99.8-testhole.patch
)
src_prepare() {
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch
new file mode 100644
index 00000000000..5ef3da29774
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch
@@ -0,0 +1,27 @@
+Use sys/random.h for getrandom() decl if present.
+
+--- 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 sys/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_HEADERS([fallocate.h dlfcn.h unistd.h sys/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 sys/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 __builtin_cpu_supports])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+--- a/random.c
++++ b/random.c
+@@ -23,6 +23,10 @@ typedef unsigned int __u32;
+ #include <linux/random.h>
+ #endif
+
++#ifdef HAVE_SYS_RANDOM_H
++#include <sys/random.h>
++#endif
++
+ static void msleep(unsigned int msecs)
+ {
+ struct timespec ts1, ts2;
+
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch
new file mode 100644
index 00000000000..444907088b3
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch
@@ -0,0 +1,32 @@
+commit 7f2ff6434586083747bc5d046e0207886025e684
+Author: Kurt Garloff <kurt@garloff.de>
+Date: Sat May 12 09:54:45 2018 +0000
+
+ Fix test case by ensuring there is a hole ...
+
+diff --git a/test_crypt.sh b/test_crypt.sh
+index 47f1fc9..62cf853 100755
+--- a/test_crypt.sh
++++ b/test_crypt.sh
+@@ -52,13 +52,20 @@ rm dd_rescue2
+
+ # Holes (all), skiphole
+ echo "*** Holes ***"
++# Produce file that consists of dd_rescue + hole + dd_rescue
+ ./dd_rescue -qpt dd_rescue dd_rescue3
+ ./dd_rescue -qS 512k dd_rescue dd_rescue3
++# Ensure there is a hole even if dd_rescue is long
++./dd_rescue -qS 384k -m 128k /dev/zero dd_rescue3
++# Test without and with skiphole
+ enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen "" "" "-qpt"
+ enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen skiphole "" "-qpt"
++# Store 384k-512k in cmp3
+ ./dd_rescue -qt -s 384k -m 128k -S 0 dd_rescue3.cmp dd_rescue3.cmp3
++# Should be 128k of zeroes
+ ./dd_rescue -qm 128k /dev/zero dd_rescue3.cmp2
+ cmp dd_rescue3.cmp2 dd_rescue3.cmp3 || exit 4
++# Repeat test with reverse
+ enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen "" "" "-qptr"
+ enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen skiphole "" "-qptr"
+ ./dd_rescue -qt -s 384k -m 128k -S 0 dd_rescue3.cmp dd_rescue3.cmp3
+
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2021-03-01 9:51 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2021-03-01 9:51 UTC (permalink / raw
To: gentoo-commits
commit: 6f785d6f9e50eba6c72cace0157f3e864fdf871d
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 1 09:51:20 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Mar 1 09:51:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f785d6f
sys-fs/dd-rescue: Bump to version 1.99.9
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-fs/dd-rescue/Manifest | 1 +
sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild | 105 +++++++++++++++++++++
.../dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch | 30 ++++++
3 files changed, 136 insertions(+)
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 380ebad15a8..6ee7e5d7144 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1 +1,2 @@
DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
+DIST dd_rescue-1.99.9.tar.bz2 176015 BLAKE2B b0955182eaa9fff967e77278de8a5582b3ad75861f1279cf8aea47a5c50925692f2223408444f6c73a38b67bee9738df0ce2cf60b262e86d5d32c26d59aab97d SHA512 f181f33b80637da09f8c47efe2961b0c272540bb9df932a1e6714d3e3018b1ec251f9bca8473b04bb84673812fe68a4f12fd9cc72d2340b5246a7ac25b7f8238
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild
new file mode 100644
index 00000000000..51fcc2cf92d
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib toolchain-funcs
+
+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}"/${PN}-1.99.9-musl-r2.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() {
+ append-cflags -fcommon # bug 707796
+ _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.9-musl-r2.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch
new file mode 100644
index 00000000000..1089a63f06c
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch
@@ -0,0 +1,30 @@
+From 28818d18cfc7a459675ac388e5cf7b50bdd9ad89 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 13 Dec 2017 01:02:12 +0100
+Subject: [PATCH] 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 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 813accf..5a8246c 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 sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
++AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.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 __builtin_cpu_supports getrlimit])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+--
+2.31.0.rc0
+
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2021-03-12 10:45 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2021-03-12 10:45 UTC (permalink / raw
To: gentoo-commits
commit: 0a9e52505badb5edfe1eabbc927d769b4e7ce23c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 10:42:27 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 10:45:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a9e5250
sys-fs/dd-rescue: Bump to version 1.99.10
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-fs/dd-rescue/Manifest | 1 +
sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild | 105 +++++++++++++++++++++
.../files/dd-rescue-1.99.10-musl-r2.patch | 29 ++++++
3 files changed, 135 insertions(+)
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 6ee7e5d7144..c8efdcb67ef 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,2 +1,3 @@
+DIST dd_rescue-1.99.10.tar.bz2 176603 BLAKE2B 66e9f54274363eb9b66c3fb098d398f7ae6f43812eb1560304c14bbe4b0e8158881f891a80ef2b03a77d205402651c7b9ed8bcdc14b3e6e865f4e713ab9249f4 SHA512 8f7cd4fca09302035f26102ce057a05130dcd808f2e44bd057f776dcd0222f9df6317b9703ab6c3b133a55e4bbbdf0ff58fdcbbbc3f1fc20889b29092b522e06
DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
DIST dd_rescue-1.99.9.tar.bz2 176015 BLAKE2B b0955182eaa9fff967e77278de8a5582b3ad75861f1279cf8aea47a5c50925692f2223408444f6c73a38b67bee9738df0ce2cf60b262e86d5d32c26d59aab97d SHA512 f181f33b80637da09f8c47efe2961b0c272540bb9df932a1e6714d3e3018b1ec251f9bca8473b04bb84673812fe68a4f12fd9cc72d2340b5246a7ac25b7f8238
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild
new file mode 100644
index 00000000000..12cfa7fbbe6
--- /dev/null
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib toolchain-funcs
+
+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}"/${PN}-1.99.10-musl-r2.patch
+)
+
+src_prepare() {
+ default
+
+ if ! use cpu_flags_x86_sse4_2; then
+ sed -i \
+ -e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \
+ configure.ac || die
+ fi
+
+ if ! use cpu_flags_x86_avx2; then
+ sed -i \
+ -e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \
+ configure.ac || die
+ fi
+
+ eautoreconf
+
+ sed -i \
+ -e 's:-ldl:$(LDFLAGS) -ldl:' \
+ -e 's:-shared:$(CFLAGS) $(LDFLAGS) -shared:' \
+ Makefile || die
+}
+
+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() {
+ append-cflags -fcommon # bug 707796
+ _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.10-musl-r2.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.10-musl-r2.patch
new file mode 100644
index 00000000000..ae348eadf5c
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.10-musl-r2.patch
@@ -0,0 +1,29 @@
+From 5429b36d186e73695244cee66f98ff9f61378b67 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 13 Dec 2017 01:02:12 +0100
+Subject: [PATCH] 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.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 454bbcb..ec3fcc7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,7 @@ AC_C_INLINE
+
+ #AC_PROG_INSTALL
+ #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+-AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
++AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.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 __builtin_cpu_supports getrlimit])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+--
+2.31.0.rc2
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2021-04-29 17:59 Lars Wendler
0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2021-04-29 17:59 UTC (permalink / raw
To: gentoo-commits
commit: bdbe8b23eea7839f26228208c46c788e2b6e2a17
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 29 17:55:44 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 29 17:59:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbe8b23
sys-fs/dd-rescue: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-fs/dd-rescue/Manifest | 1 -
sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild | 105 ---------------------
.../dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch | 30 ------
3 files changed, 136 deletions(-)
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index e413d45aa7e..50ff5b318f2 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,4 +1,3 @@
DIST dd_rescue-1.99.10.tar.bz2 176603 BLAKE2B 66e9f54274363eb9b66c3fb098d398f7ae6f43812eb1560304c14bbe4b0e8158881f891a80ef2b03a77d205402651c7b9ed8bcdc14b3e6e865f4e713ab9249f4 SHA512 8f7cd4fca09302035f26102ce057a05130dcd808f2e44bd057f776dcd0222f9df6317b9703ab6c3b133a55e4bbbdf0ff58fdcbbbc3f1fc20889b29092b522e06
DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904
DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
-DIST dd_rescue-1.99.9.tar.bz2 176015 BLAKE2B b0955182eaa9fff967e77278de8a5582b3ad75861f1279cf8aea47a5c50925692f2223408444f6c73a38b67bee9738df0ce2cf60b262e86d5d32c26d59aab97d SHA512 f181f33b80637da09f8c47efe2961b0c272540bb9df932a1e6714d3e3018b1ec251f9bca8473b04bb84673812fe68a4f12fd9cc72d2340b5246a7ac25b7f8238
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild
deleted file mode 100644
index 04a8edd7459..00000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib toolchain-funcs
-
-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}"/${PN}-1.99.9-musl-r2.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() {
- append-cflags -fcommon # bug 707796
- _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.9-musl-r2.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch
deleted file mode 100644
index 1089a63f06c..00000000000
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.9-musl-r2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 28818d18cfc7a459675ac388e5cf7b50bdd9ad89 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 13 Dec 2017 01:02:12 +0100
-Subject: [PATCH] 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 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 813accf..5a8246c 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 sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
-+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.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 __builtin_cpu_supports getrlimit])
- AC_CHECK_LIB(dl,dlsym)
- AC_CHECK_LIB(fallocate,linux_fallocate64)
---
-2.31.0.rc0
-
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2022-10-28 20:09 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-10-28 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 0ee601a96f4c89a77cf65549009c019cc81591d6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 20:05:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 20:09:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee601a9
sys-fs/dd-rescue: drop 1.99.8-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/dd-rescue/Manifest | 1 -
sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild | 108 --------
.../files/dd-rescue-1.99.8-sysrandom.patch | 27 --
.../files/dd-rescue-1.99.8-testhole.patch | 32 ---
.../dd-rescue/files/dd-rescue-1.99.8-xattr.patch | 300 ---------------------
.../dd-rescue/files/dd_rescue-1.99-musl-r2.patch | 161 -----------
6 files changed, 629 deletions(-)
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 269fad7c0926..a2fbbbd2380c 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,3 +1,2 @@
DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904
DIST dd_rescue-1.99.12.tar.bz2 181798 BLAKE2B 547910af7ac5dde360179dbd75bed36e6420dda162a41f9bb60a454f5c6629d6a1be9b15240ce3d0e7b80e09c660a87765e826909614b037a506ad775b71041f SHA512 61f4f09e7e8442049634c5a5659f887cf82b16bc8b768c0aa79774e18feac6e91fbc258e5a6c8c3cac0577fadbdd26206261cf6c99b3980f763a1b584fb46001
-DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
deleted file mode 100644
index d421dc83aa03..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.99.8-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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-r2.patch
- "${FILESDIR}"/${PN}-1.99.8-xattr.patch
- "${FILESDIR}"/${PN}-1.99.8-sysrandom.patch
- "${FILESDIR}"/${PN}-1.99.8-testhole.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() {
- append-cflags -fcommon # bug 707796
- _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.8-sysrandom.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch
deleted file mode 100644
index 5ef3da297747..000000000000
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-sysrandom.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Use sys/random.h for getrandom() decl if present.
-
---- 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 sys/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_HEADERS([fallocate.h dlfcn.h unistd.h sys/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 sys/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 __builtin_cpu_supports])
- AC_CHECK_LIB(dl,dlsym)
- AC_CHECK_LIB(fallocate,linux_fallocate64)
---- a/random.c
-+++ b/random.c
-@@ -23,6 +23,10 @@ typedef unsigned int __u32;
- #include <linux/random.h>
- #endif
-
-+#ifdef HAVE_SYS_RANDOM_H
-+#include <sys/random.h>
-+#endif
-+
- static void msleep(unsigned int msecs)
- {
- struct timespec ts1, ts2;
-
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch
deleted file mode 100644
index 444907088b3b..000000000000
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-testhole.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-commit 7f2ff6434586083747bc5d046e0207886025e684
-Author: Kurt Garloff <kurt@garloff.de>
-Date: Sat May 12 09:54:45 2018 +0000
-
- Fix test case by ensuring there is a hole ...
-
-diff --git a/test_crypt.sh b/test_crypt.sh
-index 47f1fc9..62cf853 100755
---- a/test_crypt.sh
-+++ b/test_crypt.sh
-@@ -52,13 +52,20 @@ rm dd_rescue2
-
- # Holes (all), skiphole
- echo "*** Holes ***"
-+# Produce file that consists of dd_rescue + hole + dd_rescue
- ./dd_rescue -qpt dd_rescue dd_rescue3
- ./dd_rescue -qS 512k dd_rescue dd_rescue3
-+# Ensure there is a hole even if dd_rescue is long
-+./dd_rescue -qS 384k -m 128k /dev/zero dd_rescue3
-+# Test without and with skiphole
- enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen "" "" "-qpt"
- enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen skiphole "" "-qpt"
-+# Store 384k-512k in cmp3
- ./dd_rescue -qt -s 384k -m 128k -S 0 dd_rescue3.cmp dd_rescue3.cmp3
-+# Should be 128k of zeroes
- ./dd_rescue -qm 128k /dev/zero dd_rescue3.cmp2
- cmp dd_rescue3.cmp2 dd_rescue3.cmp3 || exit 4
-+# Repeat test with reverse
- enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen "" "" "-qptr"
- enc_dec_compare_keys dd_rescue3 AES192-CTR keygen:ivgen skiphole "" "-qptr"
- ./dd_rescue -qt -s 384k -m 128k -S 0 dd_rescue3.cmp dd_rescue3.cmp3
-
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch
deleted file mode 100644
index 39e719c33861..000000000000
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.8-xattr.patch
+++ /dev/null
@@ -1,300 +0,0 @@
---- dd_rescue-1.99.8/configure.in
-+++ dd_rescue-1.99.8/configure.in
-@@ -6,7 +6,7 @@
- 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 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_HEADERS([fallocate.h dlfcn.h unistd.h sys/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 __builtin_cpu_supports])
- AC_CHECK_LIB(dl,dlsym)
- AC_CHECK_LIB(fallocate,linux_fallocate64)
---- dd_rescue-1.99.8/dd_rescue.c
-+++ dd_rescue-1.99.8/dd_rescue.c
-@@ -161,8 +161,8 @@
- #endif
-
- /* xattrs */
--#ifdef HAVE_ATTR_XATTR_H
--# include <attr/xattr.h>
-+#ifdef HAVE_SYS_XATTR_H
-+# include <sys/xattr.h>
- #else
- /* TODO: Could provide the prototypes for the syscalls ourselves ... */
- # warning No support for copying extended attributes / ACLs
-@@ -1276,7 +1276,7 @@
-
- /** Copy xattrs */
- int copyxattr(const char* inm, const char* onm)
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- {
- char *attrs = NULL;
- ssize_t aln = listxattr(inm, NULL, 0);
-@@ -2486,7 +2486,7 @@
- #ifdef FITRIM
- fprintf(stderr, "fitrim ");
- #endif
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- fprintf(stderr, "xattr ");
- #endif
- #if (defined(__x86_64__) || defined(__i386__)) && !defined(NO_RDRND)
---- dd_rescue-1.99.8/libddr_crypt.c
-+++ dd_rescue-1.99.8/libddr_crypt.c
-@@ -47,8 +47,8 @@
- #include <endian.h>
- #include <signal.h>
-
--#ifdef HAVE_ATTR_XATTR_H
--#include <attr/xattr.h>
-+#ifdef HAVE_SYS_XATTR_H
-+#include <sys/xattr.h>
- #endif
-
- #if __WORDSIZE == 64
-@@ -90,7 +90,7 @@
- size_t saltlen;
- loff_t lastpos;
- loff_t processed;
--#if 1 //def HAVE_ATTR_XATTR_H
-+#if 1 //def HAVE_SYS_XATTR_H
- char* salt_xattr_name;
- char sxattr, sxfallback;
- char* key_xattr_name;
-@@ -113,13 +113,13 @@
- " Parameters: [alg[o[rithm]]=]ALG:enc[rypt]:dec[rypt]:engine=STR:pad=STR\n"
- "\t:keyhex=HEX:keyfd=[x]INT[@INT@INT]:keyfile=NAME[@INT@INT]:keygen:keysfile\n"
- "\t:ivhex=HEX:ivfd=[x]INT[@INT@INT]:ivfile=NAME[@INT@INT]:ivgen:ivsfile\n"
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- "\t:keyxattr[=xattr_name]:kxfallback:ivxattr[=xattr_name]:ixfallback\n"
- #endif
- "\t:pass=STR:passfd=[x]INT[@INT@INT]:passfile=NAME[@INT@INT]\n"
- "\t:salt=STR:salthex=HEX:saltfd=[x]INT[@INT@INT]:saltfile=NAME[@INT@INT]\n"
- "\t:saltlen=INT:saltgen:saltsfile"
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- ":saltxattr[=xattr_name]:sxfallback"
- #endif
- "\n\t:pbkdf2[=INT]:opbkdf[11]:debug:bench[mark]:skiphole:weakrnd:outkeyiv:ctrbug198\n"
-@@ -346,7 +346,7 @@
- state->saltlen = ATOL(param+8);
- else if (!strcmp(param, "saltgen"))
- state->sgen = 1;
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- else if (!strcmp(param, "saltxattr"))
- err += set_flag(&state->sxattr, "saltxattr");
- else if (!memcmp(param, "saltxattr=", 10)) {
-@@ -709,7 +709,7 @@
- return err;
- }
-
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- int get_xattr(crypt_state *state, const char* atrnm,
- unsigned char* data, int dlen,
- char fb, char* fbf, char* flag)
-@@ -883,7 +883,7 @@
- sprintf(ivsnm, "IVS.%s", state->alg->name);
- sprintf(keynm, "KEYS.%s", state->alg->name);
- sprintf(saltnm, "SALT.%s", state->alg->name);
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if (state->sxattr && !state->salt_xattr_name) {
- state->salt_xattr_name = malloc(32);
- snprintf(state->salt_xattr_name, 32, "user.salt.%s", state->alg->name);
-@@ -958,7 +958,7 @@
- }
-
- /* 5c */
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- /* Try getting salt from xattr */
- if (!state->sset && state->sxattr && !get_salt_xattr(state) && !state->enc)
- state->sxattr = 0;
-@@ -999,7 +999,7 @@
- if (write_file(state->sec->salt, state->sfnm, 8, 0640))
- return -1;
- }
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- /* Write salt to xattr */
- if (state->sxattr && state->enc && set_salt_xattr(state)) {
- if (!state->sxfallback)
-@@ -1028,7 +1028,7 @@
- if (!state->keyf && !state->kxattr)
- FPLOG(WARN, "Generated key not written anywhere?\n", NULL);
- else {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- /* Write key to xattr, failure is fatal */
- if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback)
- return -1;
-@@ -1066,7 +1066,7 @@
- FPLOG(FATAL, "Key generation with pass+salt failed!\n", NULL);
- return -1;
- }
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- /* Write key to xattr, failure is fatal */
- if (state->kxattr && state->enc && set_key_xattr(state) && !state->kxfallback)
- return -1;
-@@ -1077,7 +1077,7 @@
- return -1;
-
- } else {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if (state->kxattr)
- get_key_xattr(state);
- #endif
-@@ -1100,7 +1100,7 @@
- }
- }
- } else {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if (state->kxattr && set_key_xattr(state) && !state->kxfallback) {
- FPLOG(FATAL, "Can't save key in xattr");
- return -1;
-@@ -1123,7 +1123,7 @@
- if (!state->ivf && !state->ixattr)
- FPLOG(WARN, "Generated IV not saved?\n", NULL);
- else {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- /* Write IV to xattr, failure w/o fb is fatal */
- if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback)
- return -1;
-@@ -1149,7 +1149,7 @@
- return -1;
- }
- }
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- /* Write IV to xattr, failure w/o fb is fatal */
- if (state->ixattr && state->enc && set_iv_xattr(state) && !state->ixfallback)
- return -1;
-@@ -1159,7 +1159,7 @@
- if (write_keyfile(state, ivsnm, encnm, state->sec->nonce1, BLKSZ, 0640, 1, 0))
- return -1;
- } else {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if (state->ixattr)
- get_iv_xattr(state);
- #endif
-@@ -1180,7 +1180,7 @@
- }
- }
- } else if (state->alg->stream->needs_iv) {
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if (state->ixattr && set_iv_xattr(state) && !state->ixfallback) {
- FPLOG(FATAL, "Can't save IV in xattr");
- return -1;
-@@ -1454,7 +1454,7 @@
- FPLOG(INFO, "%.2fs CPU time, %.1fMiB/s\n",
- (double)state->cpu/CLOCKS_PER_SEC,
- state->processed/1024 / (state->cpu/(CLOCKS_PER_SEC/1024.0)));
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if (state->salt_xattr_name)
- free(state->salt_xattr_name);
- if (state->key_xattr_name)
---- dd_rescue-1.99.8/libddr_hash.c
-+++ dd_rescue-1.99.8/libddr_hash.c
-@@ -36,8 +36,8 @@
- #include <netinet/in.h> /* For ntohl/htonl */
- #include <endian.h>
-
--#ifdef HAVE_ATTR_XATTR_H
--#include <attr/xattr.h>
-+#ifdef HAVE_SYS_XATTR_H
-+#include <sys/xattr.h>
- #endif
- // TODO: pass at runtime rather than compile time
- #define HASH_DEBUG(x) if (state->debug) x
-@@ -75,7 +75,7 @@
- #endif
- int hmacpln;
- char xfallback;
--#if 1 //def HAVE_ATTR_XATTR_H
-+#if 1 //def HAVE_SYS_XATTR_H
- char chk_xattr, set_xattr, xnmalloc;
- char* xattr_name;
- #endif
-@@ -90,7 +90,7 @@
- ":multipart=size"
- #endif
- "\n"
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- "\t:chk_xattr[=xattr_name]:set_xattr[=xattr_name]:fallb[ack][=FILE]\n"
- #endif
- " Use algorithm=help to get a list of supported hash algorithms\n";
-@@ -167,7 +167,7 @@
- state->append = param+7;
- else if (!memcmp(param, "prepend=", 8))
- state->prepend = param+8;
--#if 1 //def HAVE_ATTR_XATTR_H
-+#if 1 //def HAVE_SYS_XATTR_H
- else if (!memcmp(param, "chk_xattr=", 10)) {
- state->chk_xattr = 1; state->xattr_name = param+10; }
- else if (!strcmp(param, "chk_xattr"))
-@@ -258,7 +258,7 @@
- FPLOG(FATAL, "No hash algorithm specified\n");
- return --err;
- }
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if ((state->chk_xattr || state->set_xattr) && !state->xattr_name) {
- state->xattr_name = (char*)malloc(32);
- state->xnmalloc = 1;
-@@ -269,7 +269,7 @@
- }
- #endif
- if ((!state->chkfnm || !*state->chkfnm) && (state->chkf || state->outf
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- || state->xfallback
- #endif
- )) {
-@@ -301,7 +301,7 @@
- if (!stat || !(*stat))
- return -1;
- hash_state *state = (hash_state*)*stat;
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if (state->xnmalloc)
- free((void*)state->xattr_name);
- #endif
-@@ -351,7 +351,7 @@
- strcat(nnm, "->");
- strcat(nnm, opt->oname);
- state->fname = nnm;
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if (state->chk_xattr || state->set_xattr) {
- --err;
- FPLOG(WARN, "Can't access xattr in the middle of a plugin chain!");
-@@ -607,7 +607,7 @@
- return err;
- }
-
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- int check_xattr(hash_state* state, const char* res)
- {
- char xatstr[144];
-@@ -734,7 +734,7 @@
- err += check_chkf(state, res);
- if (state->outf)
- err += write_chkf(state, res);
--#ifdef HAVE_ATTR_XATTR_H
-+#ifdef HAVE_SYS_XATTR_H
- if (state->chk_xattr)
- err += check_xattr(state, res);
- if (state->set_xattr)
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch
deleted file mode 100644
index c98ddeca13a0..000000000000
--- a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r2.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From e96b79c9e4cd6c40ba6e5fe495904f07a95fb909 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 13 Dec 2017 01:02:12 +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 eb2e813..355ea84 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 __builtin_cpu_supports])
- 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 cb0a81b..52ec236 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 7c8cdf8..cdbbd4d 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 8d3983e..8c83c04 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.15.0
-
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2022-12-26 8:35 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-12-26 8:35 UTC (permalink / raw
To: gentoo-commits
commit: 36a91459098d29de88e6218783d942d868ad869f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 08:29:22 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 08:33:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a91459
sys-fs/dd-rescue: drop 1.99.11
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-fs/dd-rescue/Manifest | 1 -
sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild | 105 ---------------------
.../files/dd-rescue-1.99.11-musl-r2.patch | 30 ------
3 files changed, 136 deletions(-)
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index a2fbbbd2380c..0e9690fb61e1 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,2 +1 @@
-DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904
DIST dd_rescue-1.99.12.tar.bz2 181798 BLAKE2B 547910af7ac5dde360179dbd75bed36e6420dda162a41f9bb60a454f5c6629d6a1be9b15240ce3d0e7b80e09c660a87765e826909614b037a506ad775b71041f SHA512 61f4f09e7e8442049634c5a5659f887cf82b16bc8b768c0aa79774e18feac6e91fbc258e5a6c8c3cac0577fadbdd26206261cf6c99b3980f763a1b584fb46001
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
deleted file mode 100644
index 29ab8a745124..000000000000
--- a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib toolchain-funcs
-
-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 ~ppc64 ~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}"/${PN}-1.99.11-musl-r2.patch
-)
-
-src_prepare() {
- default
-
- if ! use cpu_flags_x86_sse4_2; then
- sed -i \
- -e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \
- configure.ac || die
- fi
-
- if ! use cpu_flags_x86_avx2; then
- sed -i \
- -e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \
- configure.ac || die
- fi
-
- eautoreconf
-
- sed -i \
- -e 's:\(-ldl\):$(LDFLAGS) \1:' \
- -e 's:\(-shared\):$(CFLAGS) $(LDFLAGS) \1:' \
- Makefile || die
-}
-
-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() {
- append-cflags -fcommon # bug 707796
- _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.11-musl-r2.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.11-musl-r2.patch
deleted file mode 100644
index d88649d65eae..000000000000
--- a/sys-fs/dd-rescue/files/dd-rescue-1.99.11-musl-r2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 69c3974670f5a8ee0f2258f10a9228b39025b464 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 13 Dec 2017 01:02:12 +0100
-Subject: [PATCH] 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.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7332da8..ef2016a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,7 +11,7 @@ AC_C_INLINE
-
- #AC_PROG_INSTALL
- #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
--AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h])
-+AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.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 __builtin_cpu_supports getrlimit aligned_alloc])
- AC_CHECK_LIB(dl,dlsym)
- AC_CHECK_LIB(fallocate,linux_fallocate64)
---
-2.31.1
-
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
@ 2023-07-23 1:52 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-07-23 1:52 UTC (permalink / raw
To: gentoo-commits
commit: 3669e5495eeda680246ea087408dcf85e74b9f11
Author: brahmajit das <listout <AT> protonmail <DOT> com>
AuthorDate: Thu Sep 15 07:01:43 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 01:51:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3669e549
sys-fs/dd-rescue: Fix building for musl.
The original patch was written by gentoo developer Thomas Deutschmann
<whissi <AT> gentoo.org>, but the patch needed to be rebased. I've added in
my secmem patch inside it (another musl fix for dd-rescue).
Closes: https://bugs.gentoo.org/829285
Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26455
Signed-off-by: Sam James <sam <AT> gentoo.org>
...-1.99.13.ebuild => dd-rescue-1.99.13-r1.ebuild} | 4 +
sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild | 6 +-
.../dd-rescue/files/dd-rescue-1.99.13-musl.patch | 145 +++++++++++++++++++++
3 files changed, 154 insertions(+), 1 deletion(-)
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild
similarity index 97%
copy from sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild
copy to sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild
index d330001df26d..e36b59fed8a0 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.99.13-musl.patch
+)
+
src_prepare() {
default
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild
index d330001df26d..d0b6a87d18c7 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
RDEPEND="
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.99.13-musl.patch
+)
+
src_prepare() {
default
diff --git a/sys-fs/dd-rescue/files/dd-rescue-1.99.13-musl.patch b/sys-fs/dd-rescue/files/dd-rescue-1.99.13-musl.patch
new file mode 100644
index 000000000000..53d8af201280
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.13-musl.patch
@@ -0,0 +1,145 @@
+# Original patch was created by Thomas Deutschmann <whissi@gentoo.org>, but the
+# patch needed to be rebased. Mainly configure.ac instead of configure.in.
+# The only additional included part is secmem patch.
+#
+# Closes: https://bugs.gentoo.org/829285
+From 69c3974670f5a8ee0f2258f10a9228b39025b464 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Wed, 13 Dec 2017 01:02:12 +0100
+Subject: [PATCH] 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
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,7 @@ AC_C_INLINE
+
+ #AC_PROG_INSTALL
+ #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+-AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h sys/endian.h linux/swab.h])
++AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h sys/xattr.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 sys/random.h malloc.h sched.h sys/statvfs.h sys/resource.h sys/endian.h linux/swab.h])
+ AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htonl htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports getrlimit aligned_alloc])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+--- 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
+
+--- 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)
+
+--- 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 */
+
+--- 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
+
+--- a/fstrim.h
++++ b/fstrim.h
+@@ -1,3 +1,6 @@
++#define _GNU_SOURCE
++#include <fcntl.h>
++
+ #ifndef _FSTRIM_H
+ #define _FSTRIM_H
+
+--- a/libddr_hash.c
++++ b/libddr_hash.c
+@@ -34,6 +34,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>
+
+--- a/libddr_lzo.c
++++ b/libddr_lzo.c
+@@ -16,6 +16,9 @@
+ #include "ddr_plugin.h"
+ #include "ddr_ctrl.h"
+
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <stdint.h>
+
+--- 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;
+
+--- 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);
+
+--- a/secmem.c
++++ b/secmem.c
+@@ -15,6 +15,7 @@
+ #endif
+ #ifdef HAVE_SYS_RESOURCE_H
+ # include <sys/resource.h>
++# include <stddef.h>
+ #endif
+
+ static unsigned char *optr;
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-07-23 1:52 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-28 20:09 [gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-07-23 1:52 Sam James
2022-12-26 8:35 Sam James
2021-04-29 17:59 Lars Wendler
2021-03-12 10:45 Lars Wendler
2021-03-01 9:51 Lars Wendler
2020-05-03 19:52 Thomas Deutschmann
2018-02-26 12:29 Lars Wendler
2017-12-13 0:09 Sebastian Pipping
2015-09-09 20:58 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox