gentoo resync : 31.10.2017

4 files changed, 278 insertions, 0 deletions

diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 4646eb783d49..b0288c05c02f 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -1,3 +1,5 @@
+AUX dd_rescue-1.99-disable-hmac-tests.patch 1098 SHA256 2a72bca7f85f0fb3a39c067563314d8580ae6a2fec8a438da45b2581fc03e9ca SHA512 66de8719daf55ca02bc98b6bdbdb02c27cb4632ef981205b5c250511e058bd8d14408c4595b10dd2c3c0c6d0cf66a28a3b3b358d62420739537e221601be1c0f WHIRLPOOL 07e3217c91410a091ac8fd3e9904070d4f7f9a9694448b59001846706d1e314ea73da17547fd5dc977a1446eb561d0010ef346128fc1d547b7e069231c8581f8
+AUX dd_rescue-1.99-musl-r1.patch 4012 SHA256 9a6b267c7932be146b5ad87e8c7ef08dfbfa9fc38584205f140867f11bcd613e SHA512 3c49ea2e82d4196213ca9c0db659d5f9e38b299dc6214ba411b81bc7ef333ea8c0981cc1f86b124c06a84179ebb105133620d6a8334f6ff1d0046ffb432d79c0 WHIRLPOOL 1cd2d703d6af5a680b9ada56ed44f5a49c760df37bfeb18e3c81c422ba52792c43eb1e3cf7d0ffcbda672c87594a4c7904bc32106863ffde5eb919829f1a79a9
 AUX dd_rescue-1.99-musl.patch 2224 SHA256 f2f92ddca8e5d60ef7648ded5daae27d1ac54f5b4e141a4d64da4802db3da4b1 SHA512 51dd97748c96a711682450fd8c3018498fc6a3cc2663b52be6b1205c7cbdcb033d182543c81b5c09130f3ad26a4cd50ac1a16b2845996fe70118556b2804dd5b WHIRLPOOL 07cc2cb46cf735b2fdee0a5b7ca91dbe1a575e54c3e5aee6896b96b8d2da6db2f555d060187db8cdafbbad9f2b9ac82732d716ae2e13e2c12212c99a40cae445
 AUX dd_rescue-1.99-test_fix.patch 497 SHA256 233a02e8d3a4dfbac30748e00ce152f63cd0c7394a021556fb35dc074e77981a SHA512 2544e1336763d2951eceafed6de7c2155403bf005eb0eb26e813451b5efdefbdc74eacf97e75229da3720414d0df0f0e9c4dddb254f5068e310765057dcc4349 WHIRLPOOL bd650d61c0f195396732b11349c8cbcc56eb70fa68b795bc6d5a8cc3c04da01cccc64a4e698304bdaf3860520b1221f835c67f74cc4ac3935e1be02ad5be1b3f
 DIST dd_rescue-1.46.tar.gz 126790 SHA256 9e09b5583f778fe43b6c473998fe0455486d5ffeacbb72b022d6cf5ba8241aba SHA512 efd1bf5d80d4bafa6e6971caa84205dc5df4456a29a9fa3bb56aa984d68675ae3418e8ba3a355906f491f0f2e750c38fd695e37dbd193e554cd41afec3841e28 WHIRLPOOL ac965019d38539962018bcc5a6d32cbf303b4d00d5ed91d643655a820f17bfa1ca81b5123f95220663823e6622d55099a2da08aaacf60cefc37097aa3354c729
@@ -5,6 +7,7 @@ DIST dd_rescue-1.99.5.tar.bz2 170712 SHA256 125d327118d1beab24b5858accb2c755dc07
 DIST dd_rescue-1.99.6.tar.bz2 171621 SHA256 92b72d8b6962cfbff23b1360a1d401ae6946123be2d0c901cb585aa383b0b4f8 SHA512 b91508ebdd5f5a4945fa15a86b530bb03e49e74ffe6d2227c9dac4a5fa1b8e9ccf6f1e68204220b571b4661b78892be3a955005f253fd691a85977f35fc74b5e WHIRLPOOL d29a4ba69b319d6563d9822c3e951205cabd1263cdea1f8582803ef6046531549c22a2c838c909c65239b280eff07c1d314bef8ef1ceec335cdf9ab0ce02c161
 EBUILD dd-rescue-1.46.ebuild 1935 SHA256 039673bd5721f6b3cf0c72ce9da992b8ec83b0e8c8bedc11e8c3664861d93ffa SHA512 57bdaccabd2da99bb329c82f47e52fbd2066f736c742b8de551671fab294297e45a874daa0ddd701234a3e6c216f52ddee55283d70bf1a166d3538f32485e8c7 WHIRLPOOL 3b51461dd9868424b15051c2fc3cfdccb250b86e96a13eea7dce48e2cb2cace53d78ebf07a572bc960dbd65222ee10949b215866fe9495d9072454d359cd6fe3
 EBUILD dd-rescue-1.99.5.ebuild 2039 SHA256 5bc672b660cd03b7ab88cbb42a31c1a500c78f8b7e2b49c7d5aa7e716e0022f0 SHA512 411b9c56ae10eed02006538bb6f479e671128fca9d77829dbaeb7a5c4395dcf0e8619fdb564be2c3dfdd705ff8e5eab8fe18f653377ecf62da3e0125c74834fb WHIRLPOOL 5b36943f925e3100ddd9ee9e408ac5270f0815a0edadb8b7ba316863449e429fc6cda14175ba608391baa9a560e6a93cafaa25d3ade723b6564cfee96bde1e00
+EBUILD dd-rescue-1.99.6-r1.ebuild 2157 SHA256 a970c35d19034299e5a9db4599239dbd4e5051fa87bd44fe6a84830bac71ed87 SHA512 58df8d72ced7136925407f44aa6d182baeb52e8bb45ec4be3df66e9ae5b675e20523c92ef3fb149f21d09812f7d4fb7f27ee8accf1ddf46861d65870f80af047 WHIRLPOOL 2307b1a49e48fc7223250be69849859781c91758e966e9b7632c1d3195ba94801efdc080c4279d6143ad1842211faee5e55659ec34574130cefa019659d01d46
 EBUILD dd-rescue-1.99.6.ebuild 2012 SHA256 fa2e9122e7341c5d665f2d999cf3cd35e0b7c78ebd57f24aa003cdb7902194c8 SHA512 cf7ae56d76409c667cdb25e836a0f55461b59427fdb6a78499147a8ffd718bafe68df7eff3047d088a8429396419afdcfb6f436a6d98750c4f6f2444229f6711 WHIRLPOOL 9ad0535955b3a72345c1c7e2864e7be8638cdd8423f9a77751b34f8787f4975f390fb3f177cab75ab10007308f99686dba9ad8ca8459853ba3a695269f2b219b
 MISC ChangeLog 4520 SHA256 94ed6b8cae2e5e6de6004ab39fbdff83159619ad6d156fab1650cc824b785b3e SHA512 20a625bebe3c67ae6f4eb1943dfec3261ffa9fcc8f65e2a91a82c3a9535c2d35c9ce79d50bcd4d200c9587acb438945e3d12f9bae58dce4c46b9e29055875a17 WHIRLPOOL 63e4f06c877c5b294255f9b1eaadfec2272fff0b7111cbb817520ab278403ea9a5f39ea884c64bc385fcd7b1df38abb181637f99cba89802924dc82666ef022c
 MISC ChangeLog-2015 5656 SHA256 1987982105db8d034407cb60b98ab9e6eb56a59d4cb946da4ab189a6bded83c7 SHA512 5da8ca84df5f25bdd12af1870102aea8b4157c7a38f92f1eeb4572e4f9646bee228b23d9631178d9d7f23343995f199e95f78b3a7e5ba3c5d526d820c472c1fb WHIRLPOOL b449b53f3c8ccef279878b69c33ed3f5ed8dfea42d624e94856967db9a697d6284c1342411d542d1d644e348335567d8e8247792dcf97314624fd511194a2c50
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 000000000000..1d391a112ea3
--- /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 000000000000..244f43121399
--- /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 ./libddr_hash.so=md5:hmacpwd=Jefe:chknm= TEST /dev/null
++	#rm -f /tmp/dd_rescue CHECKSUMS.sha512 TEST HMACS.md5
++	#if ./calchmac.py sha1 pass dd_rescue; then $(MAKE) check_hmac; else echo "Sorry, no more HMAC test due to missing python-hashlib support"; true; fi
+ 	$(MAKE) check_fault
+ 	#$(MAKE) check_aes
+ 	$(MAKE) check_crypt
diff --git a/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch
new file mode 100644
index 000000000000..6751cf009866
--- /dev/null
+++ b/sys-fs/dd-rescue/files/dd_rescue-1.99-musl-r1.patch
@@ -0,0 +1,161 @@
+From 66e7503f24b9693ddb20a0873ae054f799c3660f Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Mon, 30 Oct 2017 20:12:10 +0100
+Subject: [PATCH 49/49] loff_t and __WORDSIZE includes for MUSL
+
+Rewrite of Justin Keogh's patch [Link 1] to fix build problems
+on ARM.
+
+Link 1: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5abc0f1b036921d6eb5b0f434c960ed280619f
+Fixes: https://bugs.gentoo.org/616364
+---
+ configure.in  | 2 +-
+ ddr_ctrl.h    | 3 +++
+ ffs.h         | 3 +++
+ fiemap.h      | 4 ++++
+ fmt_no.h      | 2 ++
+ fstrim.h      | 3 +++
+ libddr_hash.c | 4 ++++
+ libddr_lzo.c  | 3 +++
+ libddr_null.c | 3 +++
+ sha512.h      | 4 ++++
+ 10 files changed, 30 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index f813d4b..c9d28c5 100644
+--- a/configure.in
++++ b/configure.in
+@@ -6,7 +6,7 @@ AC_C_INLINE
+ AC_HEADER_STDC
+ #AC_PROG_INSTALL
+ #CFLAGS="$CFLAGS -DHAVE_CONFIG_H"
+-AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
++AC_CHECK_HEADERS([fallocate.h dlfcn.h unistd.h attr/xattr.h sys/acl.h sys/ioctl.h sys/reg.h endian.h linux/fs.h linux/fiemap.h stdint.h lzo/lzo1x.h openssl/evp.h linux/random.h malloc.h sched.h sys/statvfs.h])
+ AC_CHECK_FUNCS([ffs ffsl basename fallocate64 splice getopt_long open64 pread pread64 lseek64 stat64 posix_fadvise posix_fadvise64 __builtin_prefetch htobe64 feof_unlocked getline getentropy getrandom posix_memalign valloc sched_yield fstatvfs])
+ AC_CHECK_LIB(dl,dlsym)
+ AC_CHECK_LIB(fallocate,linux_fallocate64)
+diff --git a/ddr_ctrl.h b/ddr_ctrl.h
+index ac71e4f..58cffd5 100644
+--- a/ddr_ctrl.h
++++ b/ddr_ctrl.h
+@@ -7,6 +7,9 @@
+  *  License: GNU GPLv2 or v3
+  */
+ 
++#define _GNU_SOURCE
++#include <fcntl.h>
++
+ #ifndef _DDR_CTRL_H
+ #define _DDR_CTRL_H
+ 
+diff --git a/ffs.h b/ffs.h
+index 2215080..c1f3444 100644
+--- a/ffs.h
++++ b/ffs.h
+@@ -28,6 +28,9 @@
+ #include <endian.h>
+ #endif
+ 
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
+ 
+ #ifdef HAVE_FFS
+ # define myffs(x) ffs(x)
+diff --git a/fiemap.h b/fiemap.h
+index df1ba95..31cde3b 100644
+--- a/fiemap.h
++++ b/fiemap.h
+@@ -29,5 +29,9 @@
+ 
+ #endif	/* HAVE_LINUX_FS_H */
+ 
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
++
+ #endif	/* _FIEMAPH */
+ 
+diff --git a/fmt_no.h b/fmt_no.h
+index 329f997..16eda5c 100644
+--- a/fmt_no.h
++++ b/fmt_no.h
+@@ -1,4 +1,6 @@
+ /** Decl for int to str conversion with highlighting */
++#define _GNU_SOURCE
++#include <fcntl.h>
+ 
+ #ifndef _FMT_NO_H
+ #define _FMT_NO_H
+diff --git a/fstrim.h b/fstrim.h
+index 7447061..b9cdcbb 100644
+--- a/fstrim.h
++++ b/fstrim.h
+@@ -1,3 +1,6 @@
++#define _GNU_SOURCE
++#include <fcntl.h>
++
+ #ifndef _FSTRIM_H
+ #define _FSTRIM_H
+ 
+diff --git a/libddr_hash.c b/libddr_hash.c
+index daa806e..264dba1 100644
+--- a/libddr_hash.c
++++ b/libddr_hash.c
+@@ -33,6 +33,10 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ 
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
++
+ #include <netinet/in.h>	/* For ntohl/htonl */
+ #include <endian.h>
+ 
+diff --git a/libddr_lzo.c b/libddr_lzo.c
+index 531df11..3220e2a 100644
+--- a/libddr_lzo.c
++++ b/libddr_lzo.c
+@@ -26,6 +26,9 @@
+ #include <errno.h>
+ #include <netinet/in.h>
+ #include <sys/stat.h>
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
+ #include <signal.h>
+ #include <lzo/lzo1x.h>
+ #include <lzo/lzo1y.h>
+diff --git a/libddr_null.c b/libddr_null.c
+index 3f0f194..c379961 100644
+--- a/libddr_null.c
++++ b/libddr_null.c
+@@ -10,6 +10,9 @@
+ #include "ddr_ctrl.h"
+ #include <string.h>
+ #include <stdlib.h>
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
+ 
+ /* fwd decl */
+ extern ddr_plugin_t ddr_plug;
+diff --git a/sha512.h b/sha512.h
+index 4d08043..f54d371 100644
+--- a/sha512.h
++++ b/sha512.h
+@@ -3,6 +3,10 @@
+ 
+ #include "hash.h"
+ 
++#ifdef HAVE_SYS_REG_H
++#include <sys/reg.h>
++#endif
++
+ void sha512_init(hash_t *ctx);
+ void sha384_init(hash_t *ctx);
+ void sha512_128(const uint8_t* msg, hash_t* ctx);
+-- 
+2.14.3
+