1 |
commit: 1e99186f1471d40274f09df44800525a640cdab2 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Apr 29 17:32:10 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 29 17:59:19 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e99186f |
7 |
|
8 |
sys-fs/dd-rescue: Bump to version 1.99.11 |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
sys-fs/dd-rescue/Manifest | 1 + |
13 |
sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild | 105 +++++++++++++++++++++ |
14 |
.../files/dd-rescue-1.99.11-musl-r2.patch | 30 ++++++ |
15 |
3 files changed, 136 insertions(+) |
16 |
|
17 |
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest |
18 |
index c8efdcb67ef..e413d45aa7e 100644 |
19 |
--- a/sys-fs/dd-rescue/Manifest |
20 |
+++ b/sys-fs/dd-rescue/Manifest |
21 |
@@ -1,3 +1,4 @@ |
22 |
DIST dd_rescue-1.99.10.tar.bz2 176603 BLAKE2B 66e9f54274363eb9b66c3fb098d398f7ae6f43812eb1560304c14bbe4b0e8158881f891a80ef2b03a77d205402651c7b9ed8bcdc14b3e6e865f4e713ab9249f4 SHA512 8f7cd4fca09302035f26102ce057a05130dcd808f2e44bd057f776dcd0222f9df6317b9703ab6c3b133a55e4bbbdf0ff58fdcbbbc3f1fc20889b29092b522e06 |
23 |
+DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904 |
24 |
DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d |
25 |
DIST dd_rescue-1.99.9.tar.bz2 176015 BLAKE2B b0955182eaa9fff967e77278de8a5582b3ad75861f1279cf8aea47a5c50925692f2223408444f6c73a38b67bee9738df0ce2cf60b262e86d5d32c26d59aab97d SHA512 f181f33b80637da09f8c47efe2961b0c272540bb9df932a1e6714d3e3018b1ec251f9bca8473b04bb84673812fe68a4f12fd9cc72d2340b5246a7ac25b7f8238 |
26 |
|
27 |
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild |
28 |
new file mode 100644 |
29 |
index 00000000000..f4c2898623c |
30 |
--- /dev/null |
31 |
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild |
32 |
@@ -0,0 +1,105 @@ |
33 |
+# Copyright 1999-2021 Gentoo Authors |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=7 |
37 |
+ |
38 |
+inherit autotools flag-o-matic multilib toolchain-funcs |
39 |
+ |
40 |
+MY_PN="${PN/-/_}" |
41 |
+MY_P="${MY_PN}-${PV}" |
42 |
+ |
43 |
+DESCRIPTION="Similar to dd but can copy from source with errors" |
44 |
+HOMEPAGE="http://www.garloff.de/kurt/linux/ddrescue/" |
45 |
+SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2" |
46 |
+ |
47 |
+LICENSE="GPL-2" |
48 |
+SLOT="0" |
49 |
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
50 |
+IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr" |
51 |
+ |
52 |
+RDEPEND="lzo? ( dev-libs/lzo ) |
53 |
+ xattr? ( sys-apps/attr )" |
54 |
+DEPEND="${RDEPEND}" |
55 |
+ |
56 |
+S="${WORKDIR}/${MY_P}" |
57 |
+ |
58 |
+PATCHES=( |
59 |
+ "${FILESDIR}"/${PN}-1.99.11-musl-r2.patch |
60 |
+) |
61 |
+ |
62 |
+src_prepare() { |
63 |
+ default |
64 |
+ |
65 |
+ if ! use cpu_flags_x86_sse4_2; then |
66 |
+ sed -i \ |
67 |
+ -e 's:^CC_FLAGS_CHECK(-msse4.2,SSE42):#&:' \ |
68 |
+ configure.ac || die |
69 |
+ fi |
70 |
+ |
71 |
+ if ! use cpu_flags_x86_avx2; then |
72 |
+ sed -i \ |
73 |
+ -e 's:^CC_FLAGS_CHECK(-mavx2,AVX2):#&:' \ |
74 |
+ configure.ac || die |
75 |
+ fi |
76 |
+ |
77 |
+ eautoreconf |
78 |
+ |
79 |
+ sed -i \ |
80 |
+ -e 's:\(-ldl\):$(LDFLAGS) \1:' \ |
81 |
+ -e 's:\(-shared\):$(CFLAGS) $(LDFLAGS) \1:' \ |
82 |
+ Makefile || die |
83 |
+} |
84 |
+ |
85 |
+src_configure() { |
86 |
+ use static && append-ldflags -static |
87 |
+ # OpenSSL is only used by a random helper tool we don't install. |
88 |
+ ac_cv_header_attr_xattr_h=$(usex xattr) \ |
89 |
+ ac_cv_header_openssl_evp_h=no \ |
90 |
+ ac_cv_lib_crypto_EVP_aes_192_ctr=no \ |
91 |
+ ac_cv_lib_lzo2_lzo1x_1_compress=$(usex lzo) \ |
92 |
+ ac_cv_header_lzo_lzo1x_h=$(usex lzo) \ |
93 |
+ econf |
94 |
+} |
95 |
+ |
96 |
+_emake() { |
97 |
+ local arch |
98 |
+ case ${ARCH} in |
99 |
+ x86) arch=i386;; |
100 |
+ amd64) arch=x86_64;; |
101 |
+ arm) arch=arm;; |
102 |
+ arm64) arch=aarch64;; |
103 |
+ esac |
104 |
+ |
105 |
+ local os=$(usex kernel_linux Linux IDK) |
106 |
+ |
107 |
+ # The Makefile is a mess. Override a few vars rather than patch it. |
108 |
+ emake \ |
109 |
+ MACH="${arch}" \ |
110 |
+ OS="${os}" \ |
111 |
+ HAVE_SSE42=$(usex cpu_flags_x86_sse4_2 1 0) \ |
112 |
+ HAVE_AVX2=$(usex cpu_flags_x86_avx2 1 0) \ |
113 |
+ RPM_OPT_FLAGS="${CFLAGS} ${CPPFLAGS}" \ |
114 |
+ CFLAGS_OPT='$(CFLAGS)' \ |
115 |
+ LDFLAGS="${LDFLAGS} -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/${PN}" \ |
116 |
+ CC="$(tc-getCC)" \ |
117 |
+ "$@" |
118 |
+} |
119 |
+ |
120 |
+src_compile() { |
121 |
+ _emake |
122 |
+} |
123 |
+ |
124 |
+src_test() { |
125 |
+ append-cflags -fcommon # bug 707796 |
126 |
+ _emake check |
127 |
+} |
128 |
+ |
129 |
+src_install() { |
130 |
+ # easier to install by hand than trying to make sense of the Makefile. |
131 |
+ dobin dd_rescue |
132 |
+ dodir /usr/$(get_libdir)/${PN} |
133 |
+ cp -pPR libddr_*.so "${ED}"/usr/$(get_libdir)/${PN}/ || die |
134 |
+ dodoc README.dd_rescue |
135 |
+ doman dd_rescue.1 |
136 |
+ use lzo && doman ddr_lzo.1 |
137 |
+} |
138 |
|
139 |
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 |
140 |
new file mode 100644 |
141 |
index 00000000000..d88649d65ea |
142 |
--- /dev/null |
143 |
+++ b/sys-fs/dd-rescue/files/dd-rescue-1.99.11-musl-r2.patch |
144 |
@@ -0,0 +1,30 @@ |
145 |
+From 69c3974670f5a8ee0f2258f10a9228b39025b464 Mon Sep 17 00:00:00 2001 |
146 |
+From: Thomas Deutschmann <whissi@g.o> |
147 |
+Date: Wed, 13 Dec 2017 01:02:12 +0100 |
148 |
+Subject: [PATCH] loff_t and __WORDSIZE includes for MUSL |
149 |
+ |
150 |
+Rewrite of Justin Keogh's patch [Link 1] to fix build problems |
151 |
+on ARM. |
152 |
+ |
153 |
+Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f |
154 |
+Fixes: https://bugs.gentoo.org/616364 |
155 |
+--- |
156 |
+ configure.ac | 2 +- |
157 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
158 |
+ |
159 |
+diff --git a/configure.ac b/configure.ac |
160 |
+index 7332da8..ef2016a 100644 |
161 |
+--- a/configure.ac |
162 |
++++ b/configure.ac |
163 |
+@@ -11,7 +11,7 @@ AC_C_INLINE |
164 |
+ |
165 |
+ #AC_PROG_INSTALL |
166 |
+ #CFLAGS="$CFLAGS -DHAVE_CONFIG_H" |
167 |
+-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]) |
168 |
++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]) |
169 |
+ AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs __builtin_cpu_supports getrlimit aligned_alloc]) |
170 |
+ AC_CHECK_LIB(dl,dlsym) |
171 |
+ AC_CHECK_LIB(fallocate,linux_fallocate64) |
172 |
+-- |
173 |
+2.31.1 |
174 |
+ |