[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 2dff586ec1e93dae97dd97cfa2e310edbd633515 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Mar 5 16:13:09 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Tue Mar 5 16:13:44 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dff586e sys-fs/dd-rescue: Add nonstandard workaround for musl-1.2.4 See comments in the ebuild... Bug: https://bugs.gentoo.org/920159 Signed-off-by: Andreas K. Hüttel gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild index 614d8b106522..0f51c3d5bd9d 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -53,6 +53,12 @@ src_prepare() { } src_configure() { + # configure tests for the existence of fallocate64; if it can't find + # it it replaces it with a wrapper incompatible with musl... /o\ + # we force it to assume its existence and then tell everyone to + # supply the *64 interface... bug 920159 + # this workaround will stop working around once musl drops the *64 functions. + 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) \ @@ -60,6 +66,7 @@ src_configure() { 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) \ + ac_cv_func_fallocate64=yes \ econf } @@ -80,7 +87,7 @@ _emake() { 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}" \ + RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS} -D_LARGEFILE64_SOURCE" \ CFLAGS_OPT='$(CFLAGS)' \ LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \ CC="$(tc-getCC)" \
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 36f1dd9c7957f38e7108f8181a27d2451ba08ca2 Author: Sam James gentoo org> AuthorDate: Thu Dec 28 04:05:17 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 28 04:05:17 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f1dd9c sys-fs/dd-rescue: drop 1.99.12, 1.99.13 Signed-off-by: Sam James gentoo.org> sys-fs/dd-rescue/Manifest | 1 - sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild | 101 sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild | 107 -- 3 files changed, 209 deletions(-) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 1ecb88836db8..7e349d7d3171 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,2 +1 @@ -DIST dd_rescue-1.99.12.tar.bz2 181798 BLAKE2B 547910af7ac5dde360179dbd75bed36e6420dda162a41f9bb60a454f5c6629d6a1be9b15240ce3d0e7b80e09c660a87765e826909614b037a506ad775b71041f SHA512 61f4f09e7e8442049634c5a5659f887cf82b16bc8b768c0aa79774e18feac6e91fbc258e5a6c8c3cac0577fadbdd26206261cf6c99b3980f763a1b584fb46001 DIST dd_rescue-1.99.13.tar.bz2 182574 BLAKE2B da16f37dffc702695d49517aed9a33ce4d00b5e9903c363deaf4b4ed8b5294246d0fe78e977b8a6f6128b9b643a8986437359c78726695fc8e68be41bb11d93e SHA512 2276128fe176dce3ecbd6aa8e0d00b9547887f0498ce0cd135e61dbf882c521e22e2afce3539a73496da1d0472cd9582971a30eb558ce3211820c8d0358c8241 diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild deleted file mode 100644 index dc4853c25354.. --- a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild +++ /dev/null @@ -1,101 +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 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}" - -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/dd-rescue-1.99.13.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild deleted file mode 100644 index 5c7208aeccda.. --- a/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools flag-o-matic toolchain-funcs - -MY_PN="${PN/-/_}"
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 5c257d4545f309af1e7051a976dd2f0f889d65e2 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 17 19:11:57 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 17 19:11:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c257d45 sys-fs/dd-rescue: Stabilize 1.99.13-r1 ppc, #919957 Signed-off-by: Arthur Zamarin gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild index 71aa716d5609..614d8b106522 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.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 ~arm64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ~arm64 ~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="
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: cc3d63ee172e6c4f70fe7a2dad564ccbc5fa2308 Author: Michał Górny gentoo org> AuthorDate: Fri Dec 15 10:10:10 2023 + Commit: Michał Górny gentoo org> CommitDate: Fri Dec 15 10:10:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc3d63ee sys-fs/dd-rescue: Stabilize 1.99.13-r1 x86, #919957 Signed-off-by: Michał Górny gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild index aa9dc68e7ca3..71aa716d5609 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.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 ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ~arm64 ~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="
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 9e10c2162c829b7c117bba8ac403a5a758caddaa Author: Michał Górny gentoo org> AuthorDate: Fri Dec 15 10:10:09 2023 + Commit: Michał Górny gentoo org> CommitDate: Fri Dec 15 10:10:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e10c216 sys-fs/dd-rescue: Stabilize 1.99.13-r1 amd64, #919957 Signed-off-by: Michał Górny gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild index d7300556f736..aa9dc68e7ca3 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.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 ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ~arm ~arm64 ~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="
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 327d0f5906277672664e810b7cf414521355e6e1 Author: Sam James gentoo org> AuthorDate: Sun Jul 23 02:04:57 2023 + Commit: Sam James gentoo org> CommitDate: Sun Jul 23 02:04:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327d0f59 sys-fs/dd-rescue: fix keywords Signed-off-by: Sam James gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild | 2 +- sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild index e36b59fed8a0..d0b6a87d18c7 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.13-r1.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=" 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 d0b6a87d18c7..e36b59fed8a0 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="
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: 3669e5495eeda680246ea087408dcf85e74b9f11 Author: brahmajit das protonmail com> AuthorDate: Thu Sep 15 07:01:43 2022 + Commit: Sam James gentoo org> CommitDate: Sun Jul 23 01:51:49 2023 + 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 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 protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/26455 Signed-off-by: Sam James 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 ..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 , 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 +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 ++ + #ifndef _DDR_CTRL_H + #define _DDR_CTRL_H + +--- a/ffs.h b/ffs.h +@@ -28,6 +28,9 @@ + #include + #endif + ++#ifdef HAVE_SYS_REG_H ++#include ++#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 ++#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 + + #ifndef _FMT_NO_H + #define _FMT_NO_H + +--- a/fstrim.h b/fstrim.h +@@ -1,3 +1,6 @@ ++#define
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 37ff36fdc0ef0db7f5379b91e88b1f2665ce1e8b Author: Jakov Smolić gentoo org> AuthorDate: Tue Apr 25 06:05:38 2023 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Apr 25 06:05:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37ff36fd sys-fs/dd-rescue: Stabilize 1.99.13 x86, #904927 Signed-off-by: Jakov Smolić gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 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.ebuild index 1d38cb678cea..d330001df26d 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="
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 3cc04a10297776a86bd33b96308c05bd3c443c1c Author: Jakov Smolić gentoo org> AuthorDate: Mon Apr 24 14:47:01 2023 + Commit: Jakov Smolić gentoo org> CommitDate: Mon Apr 24 14:47:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cc04a10 sys-fs/dd-rescue: Stabilize 1.99.13 amd64, #904927 Signed-off-by: Jakov Smolić gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 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.ebuild index 4d5c1eb6052a..1d38cb678cea 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="
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 2884aec0a0df113a67cd545b0ed298fa29b1c2b2 Author: Sam James gentoo org> AuthorDate: Mon Mar 13 21:00:02 2023 + Commit: Sam James gentoo org> CommitDate: Mon Mar 13 21:00:02 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2884aec0 sys-fs/dd-rescue: add 1.99.13 Closes: https://bugs.gentoo.org/901083 Signed-off-by: Sam James gentoo.org> sys-fs/dd-rescue/Manifest | 1 + sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild | 103 ++ 2 files changed, 104 insertions(+) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 0e9690fb61e1..1ecb88836db8 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1 +1,2 @@ DIST dd_rescue-1.99.12.tar.bz2 181798 BLAKE2B 547910af7ac5dde360179dbd75bed36e6420dda162a41f9bb60a454f5c6629d6a1be9b15240ce3d0e7b80e09c660a87765e826909614b037a506ad775b71041f SHA512 61f4f09e7e8442049634c5a5659f887cf82b16bc8b768c0aa79774e18feac6e91fbc258e5a6c8c3cac0577fadbdd26206261cf6c99b3980f763a1b584fb46001 +DIST dd_rescue-1.99.13.tar.bz2 182574 BLAKE2B da16f37dffc702695d49517aed9a33ce4d00b5e9903c363deaf4b4ed8b5294246d0fe78e977b8a6f6128b9b643a8986437359c78726695fc8e68be41bb11d93e SHA512 2276128fe176dce3ecbd6aa8e0d00b9547887f0498ce0cd135e61dbf882c521e22e2afce3539a73496da1d0472cd9582971a30eb558ce3211820c8d0358c8241 diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild new file mode 100644 index ..4d5c1eb6052a --- /dev/null +++ b/sys-fs/dd-rescue/dd-rescue-1.99.13.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic 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}" + +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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: 36a91459098d29de88e6218783d942d868ad869f Author: Sam James gentoo org> AuthorDate: Mon Dec 26 08:29:22 2022 + Commit: Sam James gentoo org> CommitDate: Mon Dec 26 08:33:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a91459 sys-fs/dd-rescue: drop 1.99.11 Signed-off-by: Sam James 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.. --- 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.. --- 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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 862f93bdfe267ab8598b0bd5bb4ef24ae6c763fb Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Oct 30 07:57:51 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Oct 30 07:57:51 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862f93bd sys-fs/dd-rescue: Stabilize 1.99.12 ppc, #878583 Signed-off-by: Agostino Sarubbo gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild index 2f9ff9bf50f5..dc4853c25354 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.12.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="lzo? ( dev-libs/lzo )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: bbfa68619e401feb6f23e35ade9ba0cded1f7c0f Author: Jakov Smolić gentoo org> AuthorDate: Sun Oct 30 04:12:39 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sun Oct 30 04:12:39 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfa6861 sys-fs/dd-rescue: Stabilize 1.99.12 amd64, #878583 Signed-off-by: Jakov Smolić gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild index afbbda5929f2..2f9ff9bf50f5 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.12.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="lzo? ( dev-libs/lzo )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: fc955574ab13d31184fd600b84dbf7ad2a5a03be Author: Jakov Smolić gentoo org> AuthorDate: Sat Oct 29 08:54:45 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Sat Oct 29 08:54:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc955574 sys-fs/dd-rescue: Stabilize 1.99.12 x86, #878583 Signed-off-by: Jakov Smolić gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild index 71b861626147..afbbda5929f2 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.12.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="lzo? ( dev-libs/lzo )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: 0ee601a96f4c89a77cf65549009c019cc81591d6 Author: Sam James gentoo org> AuthorDate: Fri Oct 28 20:05:14 2022 + Commit: Sam James gentoo org> CommitDate: Fri Oct 28 20:09:27 2022 + 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 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 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d 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.. --- 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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: be256a8d2bc6c0f4b49ecca1e6a8bb3cb7e0b932 Author: Jakov Smolić gentoo org> AuthorDate: Tue Aug 30 08:37:13 2022 + Commit: Jakov Smolić gentoo org> CommitDate: Tue Aug 30 08:37:13 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be256a8d sys-fs/dd-rescue: Stabilize 1.99.11 amd64, #795612 Signed-off-by: Jakov Smolić gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild index 881768ee7963..29ab8a745124 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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="lzo? ( dev-libs/lzo )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 07e4bcef82159f63365d5922b197967e7dd7d347 Author: Matthias Schwarzott gentoo org> AuthorDate: Tue Aug 30 07:32:53 2022 + Commit: Matthias Schwarzott gentoo org> CommitDate: Tue Aug 30 07:38:49 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e4bcef sys-fs/dd-rescue: add 1.99.12 Upstream also fixed bug #787134. The patch for musl seems no longer needed. The macro __WORDSIZE is no longer used by dd-rescue. loff_t should be found via fcntl.h. The patch for 1.99.11 looked strange as it did not add new includes. Closes: https://bugs.gentoo.org/787134 Signed-off-by: Matthias Schwarzott gentoo.org> sys-fs/dd-rescue/Manifest | 1 + sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild | 101 ++ 2 files changed, 102 insertions(+) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 8cf0f92b7681..269fad7c0926 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,2 +1,3 @@ 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 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild new file mode 100644 index ..71b861626147 --- /dev/null +++ b/sys-fs/dd-rescue/dd-rescue-1.99.12.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic 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}" + +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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: a6d426cd4825e082479cae20497ddf4cdb0dbb8e Author: Sam James gentoo org> AuthorDate: Mon Aug 2 00:43:03 2021 + Commit: Sam James gentoo org> CommitDate: Mon Aug 2 00:43:03 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d426cd sys-fs/dd-rescue: Stabilize 1.99.11 ppc, #795612 Signed-off-by: Sam James gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild index 5b84b240edb..881768ee796 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.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="lzo? ( dev-libs/lzo )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: ff2263ddee8abc2133fe29f2c78c037a1922f6e0 Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Jul 20 00:41:31 2021 + Commit: Georgy Yakovlev gentoo org> CommitDate: Tue Jul 20 00:41:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2263dd sys-fs/dd-rescue: keyword 1.99.11 for ~ppc64 Closes: https://bugs.gentoo.org/802801 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild index 8a52492e4e0..5b84b240edb 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.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 ~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="lzo? ( dev-libs/lzo )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: ceada631bd786ad0e94b1d83a1e739738c0940e9 Author: Sam James gentoo org> AuthorDate: Sun Jun 13 06:35:53 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jun 13 06:35:53 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceada631 sys-fs/dd-rescue: Stabilize 1.99.11 x86, #795612 Signed-off-by: Sam James gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild index f4c2898623c..8a52492e4e0 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +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 )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/, sys-fs/dd-rescue/files/
commit: 423cb12c8b9a54c7031d9b994186980144071f5b Author: David Seifert gentoo org> AuthorDate: Sat May 15 13:34:19 2021 + Commit: David Seifert gentoo org> CommitDate: Sat May 15 13:34:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=423cb12c sys-fs/dd-rescue: drop 1.99.10 Signed-off-by: David Seifert 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 deletions(-) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 50ff5b318f2..8cf0f92b768 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,3 +1,2 @@ -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 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.10.ebuild deleted file mode 100644 index 12cfa7fbbe6..000 --- a/sys-fs/dd-rescue/dd-rescue-1.99.10.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.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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: bdbe8b23eea7839f26228208c46c788e2b6e2a17 Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 29 17:55:44 2021 + Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 29 17:59:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbe8b23 sys-fs/dd-rescue: Removed old Signed-off-by: Lars Wendler 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 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d -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..000 --- 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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/, sys-fs/dd-rescue/files/
commit: 1e99186f1471d40274f09df44800525a640cdab2 Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 29 17:32:10 2021 + Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 29 17:59:19 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e99186f sys-fs/dd-rescue: Bump to version 1.99.11 Signed-off-by: Lars Wendler 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 insertions(+) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index c8efdcb67ef..e413d45aa7e 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,3 +1,4 @@ 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 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d DIST dd_rescue-1.99.9.tar.bz2 176015 BLAKE2B b0955182eaa9fff967e77278de8a5582b3ad75861f1279cf8aea47a5c50925692f2223408444f6c73a38b67bee9738df0ce2cf60b262e86d5d32c26d59aab97d SHA512 f181f33b80637da09f8c47efe2961b0c272540bb9df932a1e6714d3e3018b1ec251f9bca8473b04bb84673812fe68a4f12fd9cc72d2340b5246a7ac25b7f8238 diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild new file mode 100644 index 000..f4c2898623c --- /dev/null +++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.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.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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: 0a9e52505badb5edfe1eabbc927d769b4e7ce23c Author: Lars Wendler gentoo org> AuthorDate: Fri Mar 12 10:42:27 2021 + Commit: Lars Wendler gentoo org> CommitDate: Fri Mar 12 10:45:42 2021 + 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 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 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d 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 000..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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: ce311d62f26b0c0a359f7d34be58cd904d873854 Author: Lars Wendler gentoo org> AuthorDate: Mon Mar 1 11:04:33 2021 + Commit: Lars Wendler gentoo org> CommitDate: Mon Mar 1 11:04:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce311d62 sys-fs/dd-rescue: Fixed UnnecessarySlashStrip QA warning Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild index 51fcc2cf92d..04a8edd7459 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.9.ebuild @@ -98,7 +98,7 @@ 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 + cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die dodoc README.dd_rescue doman dd_rescue.1 use lzo && doman ddr_lzo.1
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: 6f785d6f9e50eba6c72cace0157f3e864fdf871d Author: Lars Wendler gentoo org> AuthorDate: Mon Mar 1 09:51:20 2021 + Commit: Lars Wendler gentoo org> CommitDate: Mon Mar 1 09:51:30 2021 + 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 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 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d +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 000..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 000..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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 1656b3dd41e04eaeccb6e5e31a1b721001c911cd Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 3 19:51:26 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun May 3 19:51:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1656b3dd sys-fs/dd-rescue: drop old Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> sys-fs/dd-rescue/Manifest | 1 - sys-fs/dd-rescue/dd-rescue-1.46.ebuild | 83 -- 2 files changed, 84 deletions(-) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index fd1c556fc06..380ebad15a8 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,2 +1 @@ -DIST dd_rescue-1.46.tar.gz 126790 BLAKE2B 027d509349e77fa020757b826184b4a2206c3f5923c797c294ca8caf210cf6af20afa1d518d826413989612295a4365c480d7aa4293686824ee96394cbbe9851 SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d diff --git a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild b/sys-fs/dd-rescue/dd-rescue-1.46.ebuild deleted file mode 100644 index 70f8a57d7af..000 --- a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2015 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.gz; - -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_PN} - -src_prepare() { - 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 -}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 46d7c7230ee36483cac6464931f583dbb3dd04f8 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 3 19:30:44 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun May 3 19:51:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d7c723 sys-fs/dd-rescue: fix tests under GCC 10 Closes: https://bugs.gentoo.org/707796 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild | 1 + 1 file changed, 1 insertion(+) 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 59957af5e23..85a5845b250 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild @@ -91,6 +91,7 @@ src_compile() { } src_test() { + append-cflags -fcommon # bug 707796 _emake check }
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: 9bc102eea96b304ee47910df2738c64c1b551e0d Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 3 19:48:57 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun May 3 19:51:37 2020 + 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 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 000..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 + #endif + ++#ifdef HAVE_SYS_RANDOM_H ++#include ++#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 000..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 +Date: Sat May 12 09:54:45 2018 + + +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 +
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: dab7cdc3f60277f55123b3b3f128b14786105966 Author: David Seifert gentoo org> AuthorDate: Sat Feb 8 16:52:38 2020 + Commit: David Seifert gentoo org> CommitDate: Sat Feb 8 16:52:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab7cdc3 sys-fs/dd-rescue: [QA] Fix UnnecessarySlashStrip Signed-off-by: David Seifert gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 a40b043634b..57548ff8a32 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild @@ -81,7 +81,7 @@ _emake() { 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}" \ + LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \ CC="$(tc-getCC)" \ "$@" }
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 2188b4b7fd2a73dadb50cecd71e855f45996c5df Author: Mikle Kolyada gentoo org> AuthorDate: Wed Aug 8 17:55:58 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed Aug 8 17:55:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2188b4b7 sys-fs/dd-rescue: amd64 stable wrt bug #662740 Package-Manager: Portage-2.3.40, Repoman-2.3.9 sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 da31c420c9b..00095ce89b2 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +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 )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 47223bae87905f8c32531bbb0918a2265a8083e3 Author: Mikle Kolyada gentoo org> AuthorDate: Wed Aug 8 17:56:49 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Wed Aug 8 17:56:49 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47223bae sys-fs/dd-rescue: ppc stable wrt bug #662740 Package-Manager: Portage-2.3.40, Repoman-2.3.9 sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 00095ce89b2..a40b043634b 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.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 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +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 )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: bb3ba93a666d23b2ece14efc66e397f66ce3c9bb Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Aug 5 00:47:07 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Aug 5 00:47:07 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb3ba93a sys-fs/dd-rescue: x86 stable (bug #662740) Package-Manager: Portage-2.3.44, Repoman-2.3.10 sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 8f5734a435d..da31c420c9b 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.99.8.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.99.8.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +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 )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: 7d0e5c540ad8167d761289cbde9dfaf2df0ccb56 Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 26 12:29:37 2018 + Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 26 12:29:51 2018 + 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 000..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 ++#ifdef HAVE_SYS_XATTR_H ++# include + #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 + #include + +-#ifdef HAVE_ATTR_XATTR_H +-#include ++#ifdef HAVE_SYS_XATTR_H ++#include + #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(>sxattr, "saltxattr"); + else if (!memcmp(param, "saltxattr=", 10)) { +@@ -709,7 +709,7
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/, sys-fs/dd-rescue/files/
commit: e1e23adc4a99c7daea563abef6e5c92944be2ed4 Author: Lars Wendler gentoo org> AuthorDate: Mon Feb 26 10:53:06 2018 + Commit: Lars Wendler gentoo org> CommitDate: Mon Feb 26 11:00:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e23adc sys-fs/dd-rescue: Removed old. Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-fs/dd-rescue/Manifest | 3 - sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild | 86 --- sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild| 93 sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild | 90 sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild | 104 - .../files/dd_rescue-1.99-disable-hmac-tests.patch | 21 --- .../dd-rescue/files/dd_rescue-1.99-musl-r1.patch | 161 - sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch | 90 .../dd-rescue/files/dd_rescue-1.99-test_fix.patch | 11 -- 9 files changed, 659 deletions(-) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 92c2e340758..fd1c556fc06 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 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d 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 6121e84d1aa..000 --- 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}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: 00312f382135326dc1f784f9fdda60e1ec9e453b Author: Sebastian Pipping gentoo org> AuthorDate: Wed Dec 13 00:08:09 2017 + Commit: Sebastian Pipping gentoo org> CommitDate: Wed Dec 13 00:09:31 2017 + 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 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac0d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d 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 000..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()
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 43d9989a3986fb8972299d628904f3459cd1d721 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Nov 23 18:56:05 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Nov 23 20:48:12 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d9989a sys-fs/dd-rescue: Bump to v1.99.7 Package-Manager: Portage-2.3.16, Repoman-2.3.6 sys-fs/dd-rescue/Manifest| 1 + sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild | 104 +++ 2 files changed, 105 insertions(+) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 826ea77ea4d..9438568c552 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,3 +1,4 @@ DIST dd_rescue-1.46.tar.gz 126790 SHA256 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 WHIRLPOOL ac965019d38539962018bcc5a6d32cbf303b4d00d5ed91d643655a820f17bfa1ca81b5123f95220663823e6622d55099a2da08aaacf60cefc37097aa3354c729 DIST dd_rescue-1.99.5.tar.bz2 170712 SHA256 125d327118d1beab24b5858accb2c755dc07ae5b40bb07a985d837c6e3256935 SHA512 a240eb9d50950cefbc65d953c84a8e3782d39282aff4e7fa42364b40cee0eb0a02f61315786a1008cf7ae9c3d758700e9f3a0087b9477b3ffbfcbcef59f07d88 WHIRLPOOL 543a818b748086b1d1163343b02b8e83f7a03713d5394fc0702f48b515cd50b24e30898990439689cbef8270d0b410fdea2dc5b50b8c45728f9ed38c23d414c5 DIST dd_rescue-1.99.6.tar.bz2 171621 SHA256 92b72d8b6962cfbff23b1360a1d401ae6946123be2d0c901cb585aa383b0b4f8 SHA512 b91508ebdd5f5a4945fa15a86b530bb03e49e74ffe6d2227c9dac4a5fa1b8e9ccf6f1e68204220b571b4661b78892be3a955005f253fd691a85977f35fc74b5e WHIRLPOOL d29a4ba69b319d6563d9822c3e951205cabd1263cdea1f8582803ef6046531549c22a2c838c909c65239b280eff07c1d314bef8ef1ceec335cdf9ab0ce02c161 +DIST dd_rescue-1.99.7.tar.bz2 172414 BLAKE2B 0f9bd9abd3936eeb4ec22f2c3cf59a3dbf2cb1c2e7fe854b7e0b0c5e3b521541595115952b0d840d739bfb2080a0f2920e867551b3598db62df1f41cb15f3121 SHA512 56e1aca8f068110376ba8b3b7ef7ec203a1632cf943d0b47e415699af67ac29984094a22fb685a4237f6a6962d4aa972714f2ac19e283d209ed3e5c193c9d72d diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.7.ebuild new file mode 100644 index 000..616ff38726c --- /dev/null +++ b/sys-fs/dd-rescue/dd-rescue-1.99.7.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-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() { +
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/, sys-fs/dd-rescue/files/
commit: e04bc2e851ac54864c388a674af9d0ce3c83ff66 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Oct 30 21:07:42 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Oct 30 21:08:35 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e04bc2e8 sys-fs/dd-rescue: Rev bump to fix build issue on ARM caused by MUSL patch In addition: - OpenSSL removal updated (crypto_EVP_aes_192_ctr lib check) - lzo USE flag handling fixed (HAVE_LZO_LZO1X_H caused to build with lzo even when USE=-lzo was set but dev-libs/lzo was installed) - HMAC tests disabled due to https://sourceforge.net/p/ddrescue/tickets/3/ Closes: https://bugs.gentoo.org/616364 Package-Manager: Portage-2.3.13, Repoman-2.3.4 sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild| 93 .../files/dd_rescue-1.99-disable-hmac-tests.patch | 21 +++ .../dd-rescue/files/dd_rescue-1.99-musl-r1.patch | 161 + 3 files changed, 275 insertions(+) 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 new file mode 100644 index 000..1d391a112ea --- /dev/null +++ b/sys-fs/dd-rescue/dd-rescue-1.99.6-r1.ebuild @@ -0,0 +1,93 @@ +# 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/files/dd_rescue-1.99-disable-hmac-tests.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch new file mode 100644 index 000..244f4312139 --- /dev/null +++ b/sys-fs/dd-rescue/files/dd_rescue-1.99-disable-hmac-tests.patch @@ -0,0 +1,21 @@ +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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 86241556a2efcc40996f4653b104b2adb038b360 Author: Lars Wendler gentoo org> AuthorDate: Tue Sep 5 20:16:27 2017 + Commit: Lars Wendler gentoo org> CommitDate: Tue Sep 5 20:40:05 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86241556 sys-fs/dd-rescue: Removed old. Package-Manager: Portage-2.3.8, Repoman-2.3.3 sys-fs/dd-rescue/Manifest | 1 - sys-fs/dd-rescue/dd-rescue-1.99-r1.ebuild | 86 --- 2 files changed, 87 deletions(-) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index dcd9b0aab35..826ea77ea4d 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,4 +1,3 @@ DIST dd_rescue-1.46.tar.gz 126790 SHA256 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 WHIRLPOOL ac965019d38539962018bcc5a6d32cbf303b4d00d5ed91d643655a820f17bfa1ca81b5123f95220663823e6622d55099a2da08aaacf60cefc37097aa3354c729 DIST dd_rescue-1.99.5.tar.bz2 170712 SHA256 125d327118d1beab24b5858accb2c755dc07ae5b40bb07a985d837c6e3256935 SHA512 a240eb9d50950cefbc65d953c84a8e3782d39282aff4e7fa42364b40cee0eb0a02f61315786a1008cf7ae9c3d758700e9f3a0087b9477b3ffbfcbcef59f07d88 WHIRLPOOL 543a818b748086b1d1163343b02b8e83f7a03713d5394fc0702f48b515cd50b24e30898990439689cbef8270d0b410fdea2dc5b50b8c45728f9ed38c23d414c5 DIST dd_rescue-1.99.6.tar.bz2 171621 SHA256 92b72d8b6962cfbff23b1360a1d401ae6946123be2d0c901cb585aa383b0b4f8 SHA512 b91508ebdd5f5a4945fa15a86b530bb03e49e74ffe6d2227c9dac4a5fa1b8e9ccf6f1e68204220b571b4661b78892be3a955005f253fd691a85977f35fc74b5e WHIRLPOOL d29a4ba69b319d6563d9822c3e951205cabd1263cdea1f8582803ef6046531549c22a2c838c909c65239b280eff07c1d314bef8ef1ceec335cdf9ab0ce02c161 -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-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99-r1.ebuild deleted file mode 100644 index b14f04d991a..000 --- a/sys-fs/dd-rescue/dd-rescue-1.99-r1.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2015 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 -}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 80aaee2531aab7304175954110404784ef75077d Author: Lars Wendler gentoo org> AuthorDate: Tue Sep 5 20:15:48 2017 + Commit: Lars Wendler gentoo org> CommitDate: Tue Sep 5 20:40:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80aaee25 sys-fs/dd-rescue: Bump to version 1.99.6 Package-Manager: Portage-2.3.8, Repoman-2.3.3 sys-fs/dd-rescue/Manifest| 1 + sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild | 90 2 files changed, 91 insertions(+) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 0085ba1270e..dcd9b0aab35 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,3 +1,4 @@ DIST dd_rescue-1.46.tar.gz 126790 SHA256 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 WHIRLPOOL ac965019d38539962018bcc5a6d32cbf303b4d00d5ed91d643655a820f17bfa1ca81b5123f95220663823e6622d55099a2da08aaacf60cefc37097aa3354c729 DIST dd_rescue-1.99.5.tar.bz2 170712 SHA256 125d327118d1beab24b5858accb2c755dc07ae5b40bb07a985d837c6e3256935 SHA512 a240eb9d50950cefbc65d953c84a8e3782d39282aff4e7fa42364b40cee0eb0a02f61315786a1008cf7ae9c3d758700e9f3a0087b9477b3ffbfcbcef59f07d88 WHIRLPOOL 543a818b748086b1d1163343b02b8e83f7a03713d5394fc0702f48b515cd50b24e30898990439689cbef8270d0b410fdea2dc5b50b8c45728f9ed38c23d414c5 +DIST dd_rescue-1.99.6.tar.bz2 171621 SHA256 92b72d8b6962cfbff23b1360a1d401ae6946123be2d0c901cb585aa383b0b4f8 SHA512 b91508ebdd5f5a4945fa15a86b530bb03e49e74ffe6d2227c9dac4a5fa1b8e9ccf6f1e68204220b571b4661b78892be3a955005f253fd691a85977f35fc74b5e WHIRLPOOL d29a4ba69b319d6563d9822c3e951205cabd1263cdea1f8582803ef6046531549c22a2c838c909c65239b280eff07c1d314bef8ef1ceec335cdf9ab0ce02c161 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.6.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild new file mode 100644 index 000..858a583dbdd --- /dev/null +++ b/sys-fs/dd-rescue/dd-rescue-1.99.6.ebuild @@ -0,0 +1,90 @@ +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 39516ed5700fbe4d02e6ebc97bef5c618b6e5c30 Author: Lars Wendler gentoo org> AuthorDate: Sat Dec 31 15:02:14 2016 + Commit: Lars Wendler gentoo org> CommitDate: Sat Dec 31 15:02:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39516ed5 sys-fs/dd-rescue: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-fs/dd-rescue/Manifest | 1 - sys-fs/dd-rescue/dd-rescue-1.28.ebuild | 45 -- sys-fs/dd-rescue/dd-rescue-1.99.ebuild | 86 -- 3 files changed, 132 deletions(-) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 1b0af6b..0085ba1 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,4 +1,3 @@ -DIST dd_rescue-1.28.tar.gz 22093 SHA256 4adcc368a1d4ad62577eaf8609809be1678335d54ef565a5a0fa6e1210489f03 SHA512 64a6eb2d6efbe79ca078b8de727ce551acd3a43bc6258b633a4de9ee51933944badc370855c27f05f306d8d3e95332c4b8884f7c11af321a9ac6797f9b02a3a3 WHIRLPOOL 138149efa98d0ade917d10eb6e64bae5cca0e60685eb4e804773e97cd31389f645544a969fd52747aa957260f01fa89db642929a8c36106b915d13eb87715fd4 DIST dd_rescue-1.46.tar.gz 126790 SHA256 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 WHIRLPOOL ac965019d38539962018bcc5a6d32cbf303b4d00d5ed91d643655a820f17bfa1ca81b5123f95220663823e6622d55099a2da08aaacf60cefc37097aa3354c729 DIST dd_rescue-1.99.5.tar.bz2 170712 SHA256 125d327118d1beab24b5858accb2c755dc07ae5b40bb07a985d837c6e3256935 SHA512 a240eb9d50950cefbc65d953c84a8e3782d39282aff4e7fa42364b40cee0eb0a02f61315786a1008cf7ae9c3d758700e9f3a0087b9477b3ffbfcbcef59f07d88 WHIRLPOOL 543a818b748086b1d1163343b02b8e83f7a03713d5394fc0702f48b515cd50b24e30898990439689cbef8270d0b410fdea2dc5b50b8c45728f9ed38c23d414c5 DIST dd_rescue-1.99.tar.bz2 168200 SHA256 5545f54a5e5bee2b9ac69959b1bc81aafae24939393efb8cc581e68ab1b2e47d SHA512 f484f1a86b3bd7c098eb568e193888d98def35b1bec2f553eb3543a5ae22417dbddb562a5c809613a1493ecac3689dcc2a45e26446a3e16036a19e716e38bd11 WHIRLPOOL 94ca6b49636c3f8b0a0901141a3ca16945f0cb5364b97d5d0d759ee1b034f33019ee0bf4f43f7977f0176832d95cecc0aab9cb89e783eabac14290ada4c9f1e1 diff --git a/sys-fs/dd-rescue/dd-rescue-1.28.ebuild b/sys-fs/dd-rescue/dd-rescue-1.28.ebuild deleted file mode 100644 index 8923192.. --- a/sys-fs/dd-rescue/dd-rescue-1.28.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit toolchain-funcs flag-o-matic - -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.gz; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~mips ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="static kernel_linux elibc_glibc" - -S=${WORKDIR}/${MY_PN} - -src_compile() { - use static && append-ldflags -static - - # Passing LDFLAGS together with CFLAGS is not often a good idea, but - # in this case it makes it possible to avoid patching; after all it - # only builds the progrma whole, not with object files. - # - # The falloc target creates a dd_rescue binary that uses the - # fallocate() function, present in Kernel 2.6.23 and later and GLIBC - # 2.10 and later. If somebody can think of a better way to - # optionally use it, suggestions are welcome. - emake RPM_OPT_FLAGS="${CFLAGS} ${LDFLAGS}" CC="$(tc-getCC)" \ - $(use kernel_linux && use elibc_glibc && echo "falloc") -} - -src_install() { - # easier to install by hand than trying to make sense of the - # Makefile. - into / - dobin dd_rescue - - dodoc README.dd_rescue -} diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.ebuild deleted file mode 100644 index 60021df.. --- a/sys-fs/dd-rescue/dd-rescue-1.99.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# 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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 45eaabb0f934e328843a8e10f30b5af527fcecb2 Author: Lars Wendler gentoo org> AuthorDate: Sat Dec 31 15:00:59 2016 + Commit: Lars Wendler gentoo org> CommitDate: Sat Dec 31 15:00:59 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45eaabb0 sys-fs/dd-rescue: Bump to version 1.99.5 Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-fs/dd-rescue/Manifest| 1 + sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild | 87 2 files changed, 88 insertions(+) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index de9ebaa..1b0af6b 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,3 +1,4 @@ DIST dd_rescue-1.28.tar.gz 22093 SHA256 4adcc368a1d4ad62577eaf8609809be1678335d54ef565a5a0fa6e1210489f03 SHA512 64a6eb2d6efbe79ca078b8de727ce551acd3a43bc6258b633a4de9ee51933944badc370855c27f05f306d8d3e95332c4b8884f7c11af321a9ac6797f9b02a3a3 WHIRLPOOL 138149efa98d0ade917d10eb6e64bae5cca0e60685eb4e804773e97cd31389f645544a969fd52747aa957260f01fa89db642929a8c36106b915d13eb87715fd4 DIST dd_rescue-1.46.tar.gz 126790 SHA256 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 WHIRLPOOL ac965019d38539962018bcc5a6d32cbf303b4d00d5ed91d643655a820f17bfa1ca81b5123f95220663823e6622d55099a2da08aaacf60cefc37097aa3354c729 +DIST dd_rescue-1.99.5.tar.bz2 170712 SHA256 125d327118d1beab24b5858accb2c755dc07ae5b40bb07a985d837c6e3256935 SHA512 a240eb9d50950cefbc65d953c84a8e3782d39282aff4e7fa42364b40cee0eb0a02f61315786a1008cf7ae9c3d758700e9f3a0087b9477b3ffbfcbcef59f07d88 WHIRLPOOL 543a818b748086b1d1163343b02b8e83f7a03713d5394fc0702f48b515cd50b24e30898990439689cbef8270d0b410fdea2dc5b50b8c45728f9ed38c23d414c5 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.5.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild new file mode 100644 index ..70369f8 --- /dev/null +++ b/sys-fs/dd-rescue/dd-rescue-1.99.5.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2016 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" + 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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/, sys-fs/dd-rescue/files/
commit: 5f5abc0f1b036921d6eb5b0f434c960ed280619f Author: jakeogh v6y net> AuthorDate: Tue Feb 9 05:38:00 2016 + Commit: Robin H. Johnson gentoo org> CommitDate: Tue Feb 9 20:36:46 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f sys-fs/dd-rescue: (musl) loff_t and __WORDSIZE includes Signed-off-by: Robin H. Johnson gentoo.org> sys-fs/dd-rescue/dd-rescue-1.99-r1.ebuild| 87 +++ sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch | 90 2 files changed, 177 insertions(+) diff --git a/sys-fs/dd-rescue/dd-rescue-1.99-r1.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99-r1.ebuild new file mode 100644 index 000..cdd1a10 --- /dev/null +++ b/sys-fs/dd-rescue/dd-rescue-1.99-r1.ebuild @@ -0,0 +1,87 @@ +# 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" + 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/files/dd_rescue-1.99-musl.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch new file mode 100644 index 000..6647e5f --- /dev/null +++ b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl.patch @@ -0,0 +1,90 @@ +--- a/ffs.h2016-02-09 03:37:14.422639513 + b/ffs.h2016-02-09 03:38:59.843641094 + +@@ -27,7 +27,8 @@ + #ifdef HAVE_ENDIAN_H + #include + #endif +- ++/* __WORDSIZE */ ++#include + + #ifdef HAVE_FFS + # define myffs(x) ffs(x) +--- a/fiemap.h 2016-02-09 03:45:05.550646582 + b/fiemap.h 2016-02-09 03:45:56.683647349 + +@@ -31,3 +31,4 @@ + + #endif/* _FIEMAPH */ + ++#include +--- a/libddr_hash.c2016-02-09 03:49:16.334650345 + b/libddr_hash.c2016-02-09 03:50:01.309651020 + +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #include/* For ntohl/htonl */ + #include +--- a/libddr_lzo.c 2016-02-09 03:52:31.775653278 + b/libddr_lzo.c 2016-02-09 03:52:53.537653604 + +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/libddr_null.c2016-02-09 03:54:04.110654663 + b/libddr_null.c2016-02-09 03:54:18.018654872 + +@@ -10,6 +10,7 @@ + #include "ddr_ctrl.h" + #include + #include ++#include + + /* fwd decl */ + extern ddr_plugin_t ddr_plug; +--- a/sha512.h 2016-02-09 03:55:33.209656000 + b/sha512.h 2016-02-09 03:56:39.923657001 + +@@ -2,6 +2,8 @@ + #define _SHA512_H + + #include "hash.h" ++/* __WORDSIZE */ ++#include + + void sha512_init(hash_t *ctx); + void sha384_init(hash_t *ctx); +--- a/fmt_no.h 2016-02-09 04:52:13.760707026 + b/fmt_no.h
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: e1e0b3bbe1ec9637ca6eddca86cec0b735bb8d10 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Sep 22 08:55:50 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Sep 22 08:57:19 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e0b3bb sys-fs/dd-rescue: ppc stable wrt bug #560076 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="ppc" sys-fs/dd-rescue/dd-rescue-1.46.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild b/sys-fs/dd-rescue/dd-rescue-1.46.ebuild index 2ef2dfe..219f2de 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.46.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +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 )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: 3bc696cbbc81fa5dc2ea1e193213a18c6e4d5bee Author: Agostino Sarubbo gentoo org> AuthorDate: Sun Sep 20 09:28:56 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sun Sep 20 09:28:56 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc696cb sys-fs/dd-rescue: x86 stable wrt bug #560076 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="x86" sys-fs/dd-rescue/dd-rescue-1.46.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild b/sys-fs/dd-rescue/dd-rescue-1.46.ebuild index f089c2c..2ef2dfe 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.46.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +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 )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: bec5984b8bfb45cbe1e7c9704d790e3a2218d1e9 Author: Agostino Sarubbo gentoo org> AuthorDate: Sat Sep 19 13:30:01 2015 + Commit: Agostino Sarubbo gentoo org> CommitDate: Sat Sep 19 13:30:01 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec5984b sys-fs/dd-rescue: amd64 stable wrt bug #560076 Package-Manager: portage-2.2.20.1 RepoMan-Options: --include-arches="amd64" sys-fs/dd-rescue/dd-rescue-1.46.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild b/sys-fs/dd-rescue/dd-rescue-1.46.ebuild index 7884a21..f089c2c 100644 --- a/sys-fs/dd-rescue/dd-rescue-1.46.ebuild +++ b/sys-fs/dd-rescue/dd-rescue-1.46.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.gz; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +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 )
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/files/, sys-fs/dd-rescue/
commit: 643bc0649ae41ad17b3a59cc01b359d2b5ef7b1a Author: Lars Wendler gentoo org> AuthorDate: Wed Sep 9 20:56:37 2015 + Commit: Lars Wendler gentoo org> CommitDate: Wed Sep 9 20:56:37 2015 + 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 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 000..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
[gentoo-commits] repo/gentoo:master commit in: sys-fs/dd-rescue/
commit: c2d919c7afccc60201b98f5f651ec77babf3dfe6 Author: Lars Wendler gentoo org> AuthorDate: Wed Sep 9 20:58:15 2015 + Commit: Lars Wendler gentoo org> CommitDate: Wed Sep 9 20:58:15 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2d919c7 sys-fs/dd-rescue: Removed old. Package-Manager: portage-2.2.20.1 Signed-off-by: Lars Wendler gentoo.org> sys-fs/dd-rescue/Manifest | 4 -- sys-fs/dd-rescue/dd-rescue-1.33.ebuild | 45 --- sys-fs/dd-rescue/dd-rescue-1.40.ebuild | 45 --- sys-fs/dd-rescue/dd-rescue-1.44.ebuild | 45 --- sys-fs/dd-rescue/dd-rescue-1.45.ebuild | 82 -- 5 files changed, 221 deletions(-) diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest index 1b0340a..de9ebaa 100644 --- a/sys-fs/dd-rescue/Manifest +++ b/sys-fs/dd-rescue/Manifest @@ -1,7 +1,3 @@ DIST dd_rescue-1.28.tar.gz 22093 SHA256 4adcc368a1d4ad62577eaf8609809be1678335d54ef565a5a0fa6e1210489f03 SHA512 64a6eb2d6efbe79ca078b8de727ce551acd3a43bc6258b633a4de9ee51933944badc370855c27f05f306d8d3e95332c4b8884f7c11af321a9ac6797f9b02a3a3 WHIRLPOOL 138149efa98d0ade917d10eb6e64bae5cca0e60685eb4e804773e97cd31389f645544a969fd52747aa957260f01fa89db642929a8c36106b915d13eb87715fd4 -DIST dd_rescue-1.33.tar.gz 36923 SHA256 630b4524c0df2109851b9cf2112ce1c5f53c53d3ca11145bb98892ae4a9f8102 SHA512 6e9bab7baa8a723cb459d28575724972df963e7632d588ac06ab2a2a1ea775beb8c88dd3c3db7faf5d3653c8df58f2f29ea01c936a1862017ece1b686ef26936 WHIRLPOOL e81ee54612baedffa58fdc583bf3d8fcbacdfb9188e4540641336d614562dde76323d51854d71a07fee1ac0a350f71a3f09a41188bd5618aeffee5b4abed50c7 -DIST dd_rescue-1.40.tar.gz 47107 SHA256 54545ebbe2be00597d8c9ba3d51abcfdd7ba89f17d51974629e612c2619730ff SHA512 a518f632c24161310bb03265c60d20bc08472b15888c167f8a28ceaaeb67fe5c942f6a320b7a4cce4c9e0fff9e73b549d64ba13bd26f015286698ad5f8c5fed4 WHIRLPOOL 55c091e63d7226d328616835c8aa0a0551a89eb7a708d4a30130fb78fc7ec2e14b93c2d91280de6565bc58e5ec9722f6f7843656fae5d4efebdbb71cce900b26 -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.33.ebuild b/sys-fs/dd-rescue/dd-rescue-1.33.ebuild deleted file mode 100644 index e5c0bde..000 --- a/sys-fs/dd-rescue/dd-rescue-1.33.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit toolchain-funcs flag-o-matic - -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.gz; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="static kernel_linux elibc_glibc" - -S=${WORKDIR}/${MY_PN} - -src_compile() { - use static && append-ldflags -static - - # Passing LDFLAGS together with CFLAGS is not often a good idea, but - # in this case it makes it possible to avoid patching; after all it - # only builds the progrma whole, not with object files. - # - # The falloc target creates a dd_rescue binary that uses the - # fallocate() function, present in Kernel 2.6.23 and later and GLIBC - # 2.10 and later. If somebody can think of a better way to - # optionally use it, suggestions are welcome. -