gentoo resync : 18.12.2017

5 files changed, 142 insertions, 59 deletions

diff --git a/net-dns/dnssec-validator/Manifest b/net-dns/dnssec-validator/Manifest
index 0068c414f5eb..8eb14c04915d 100644
--- a/net-dns/dnssec-validator/Manifest
+++ b/net-dns/dnssec-validator/Manifest
@@ -1,6 +1,5 @@
 AUX dnssec-validator-2.1-respect-LDFLAGS.patch 529 BLAKE2B b4e3199c1263973e93b744077025b11a1ab9d525d28129744b5c3dc5b9e4e4fc5461dbe4a2d7c36e8dee6f3b743cf73ae328cc5b044f8c1887d6601b33fe8ac1 SHA512 c6ff47eee87ff5b1add81b80136f58369c3b782d2ebae7328152374e7e6ed565bd116a75d69f5fb8ec8273800c4ebd47707aa4560e7bff8007651e13a8590eb6
-DIST dnsval-2.1.tar.gz 1059451 BLAKE2B cf72deaeeacb12549cbf3bf2c1c6aa0527a9b7fc73fc6bd0c4211290fb854d19f66b176c18f56a3d1fc79f368d1bc7b9232c8fd5cca2ac97d7a48c813079643a SHA512 14de6fa86ff30aabcd77d14cbd3e058507f5963f91deadc39dc1a7022f27239010d509f46d392dc7086b6444e068ce66e576f579342ca87a04d7fc776962cd6d
+AUX dnssec-validator-2.2-glib-2.25.patch 5308 BLAKE2B 169c0163926388243d22f3ee5e73a30966525975c9dea800170dc82f61113902cb2d5d5e61bd4edab28ab41b9f0fd1cb2978f1433a1e75cc710cc481786bbc62 SHA512 17aa048f52c7fafc0074c83a725a6b487e88c4a55e3f3f082fa876b2d7ad95cbc3506401991de64546dd97f1ab75421dc3079a0b2d9dd02a26f90658830bf6af
 DIST dnsval-2.2.tar.gz 1060434 BLAKE2B 3a19d5f4128e32f81ae824a128c65b5c5b6f21cef2786d1050631db10084a479614241d869bb33d054d96e7a1e286c472296edf8c4c7e45abd84aaa4df599f28 SHA512 1a01911b08e447d992f4843db8e10bc91041f9e3eaa8a3c050f71f0d7028292145379d1b769e69a837a157443abfa8b0b8ecc289c1b2fa4d33a9234282e9ae05
-EBUILD dnssec-validator-2.1.ebuild 971 BLAKE2B 52046e6c71cb09999a7101cf318cb2558e1250c3e0d57131ba3046530c053948d3ba5f85ca1fa2c3fd361fbc72006a25b7fcc203a089f5d083041866b63894f4 SHA512 7adbfcb7b3953d763d70017e7f79455e4e8fdb3d9e4794e6f78c12559e218b61da2bcf436260e5e454c1b14012e318598d6247dfaf6ffdd260d88d86a1833027
-EBUILD dnssec-validator-2.2.ebuild 976 BLAKE2B edf2f269f2f5bd301f98b846b09af69c24888c7518bf40beb5e723e66413d4c0a47dba07fc291e017c74705a36a99e345afe530e784e0d7f883cadf2b07bed37 SHA512 02affd8004878fccdf629f8c006f06f56776dc42ce0122a2a2ba294d7f5f12936cce5d3b455f5f04a398e659a472fe97f7d4269758b42652496f5341c0601883
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+EBUILD dnssec-validator-2.2-r1.ebuild 1095 BLAKE2B 64479b256fd6c680b146b72a3bf8da23c0af0a9313ab1405867697f29260b74b47dd162b8bbf6958bcad5505e8e29ed22d3fe39e06d85a81c817e97beebb6781 SHA512 e6e006f353fafd640b0b01b19daff0095e138989c07b36253bf45c03811fd2f2bee5d1f9f8f7a06ee3ab901324eb2afeec544a6566394a3c8aec96954d062c0c
+MISC metadata.xml 310 BLAKE2B 16857a33a25e737e90d9ddb904f807971bba345a8372f15c927447c54571982136277175a315b62132c683b9645d959ff79fc5b192595b68bf5f3d3c95747b0b SHA512 0b345a842da8774a69de31efa6be5c693c8bef93d1a045541702b607c167787dd7edb6ceb30dbf05fd9fbb4ed0a3f5ac8ec87d33f98decd4b5ed9928c97bdec1
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.1.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild
index 463f68b8f707..7830c98a5d5b 100644
--- a/net-dns/dnssec-validator/dnssec-validator-2.1.ebuild
+++ b/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
 inherit eutils
 
@@ -11,25 +11,26 @@ SRC_URI="http://www.dnssec-tools.org/download/dnsval-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 static-libs +threads"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ipv6 static-libs +threads +ecdsa-check"
 
-RDEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:0
+	ecdsa-check? ( dev-libs/openssl:0[-bindist] )
 	!<net-dns/dnssec-tools-1.13"
 DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/dnsval-${PV}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-respect-LDFLAGS.patch
-}
+PATCHES=( "${FILESDIR}"/${PN}-2.1-respect-LDFLAGS.patch
+	"${FILESDIR}"/${P}-glib-2.25.patch )
 
 src_configure() {
 	econf \
 		--with-nsec3 \
 		--with-dlv \
 		$(use_with ipv6) \
-		$(use_with threads)
+		$(use_with threads) \
+		$(use_enable ecdsa-check)
 }
 
 src_install() {
diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild
deleted file mode 100644
index c170b3fb200a..000000000000
--- a/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils
-
-DESCRIPTION="DNSSEC validator (dnsval)"
-HOMEPAGE="http://www.dnssec-tools.org/"
-SRC_URI="http://www.dnssec-tools.org/download/dnsval-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6 static-libs +threads"
-
-RDEPEND="dev-libs/openssl
-	!<net-dns/dnssec-tools-1.13"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/dnsval-${PV}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1-respect-LDFLAGS.patch
-}
-
-src_configure() {
-	econf \
-		--with-nsec3 \
-		--with-dlv \
-		$(use_with ipv6) \
-		$(use_with threads)
-}
-
-src_install() {
-	dodir /usr/bin /usr/include/validator
-	default
-
-	insinto /etc/dnssec-tools
-	doins etc/{dnsval.conf,root.hints}
-	elog "Creating /etc/dnssec-tools/resolv.conf as symlink to /etc/resolv.conf"
-	dosym ../resolv.conf /etc/dnssec-tools/resolv.conf
-
-	use static-libs || find "${D}" -name "*.a" -delete
-	prune_libtool_files
-}
diff --git a/net-dns/dnssec-validator/files/dnssec-validator-2.2-glib-2.25.patch b/net-dns/dnssec-validator/files/dnssec-validator-2.2-glib-2.25.patch
new file mode 100644
index 000000000000..8d2a5560b981
--- /dev/null
+++ b/net-dns/dnssec-validator/files/dnssec-validator-2.2-glib-2.25.patch
@@ -0,0 +1,126 @@
+--- validator/include/validator/validator-compat.h
++++ validator/include/validator/validator-compat.h
+@@ -678,6 +678,11 @@ typedef enum __ns_rcode {
+ #define ns_t_zxfr    256 /* BIND-specific, nonstandard. */
+ #endif /* HAVE_NS_T_KX */
+
++/* glibc 2.25 is missing ns_t_zxfr */
++#if !defined(ns_t_zxfr)
++#define ns_t_zxfr    256 /* BIND-specific, nonstandard. */
++#endif /* glibc 2.25 */
++
+ #if !HAVE_DECL_NS_T_DS
+ #define ns_t_ds       43
+ #endif
+@@ -818,53 +823,6 @@ typedef enum __ns_flag {
+         ns_f_max
+ } ns_flag;
+
+-/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
+-#define NS_ALG_MD5RSA           1       /* MD5 with RSA */
+-#define NS_ALG_DH               2       /* Diffie Hellman KEY */
+-#define NS_ALG_DSA              3       /* DSA KEY */
+-#define NS_ALG_DSS              NS_ALG_DSA
+-#define NS_ALG_EXPIRE_ONLY      253     /* No alg, no security */
+-#define NS_ALG_PRIVATE_OID      254     /* Key begins with OID giving alg */
+-
+-/* Protocol values  */
+-/* value 0 is reserved */
+-#define NS_KEY_PROT_TLS         1
+-#define NS_KEY_PROT_EMAIL       2
+-#define NS_KEY_PROT_DNSSEC      3
+-#define NS_KEY_PROT_IPSEC       4
+-#define NS_KEY_PROT_ANY         255
+-
+-/* Signatures */
+-#define NS_MD5RSA_MIN_BITS       512    /* Size of a mod or exp in bits */
+-#define NS_MD5RSA_MAX_BITS      2552
+-        /* Total of binary mod and exp */
+-#define NS_MD5RSA_MAX_BYTES     ((NS_MD5RSA_MAX_BITS+7/8)*2+3)
+-        /* Max length of text sig block */
+-#define NS_MD5RSA_MAX_BASE64    (((NS_MD5RSA_MAX_BYTES+2)/3)*4)
+-#define NS_MD5RSA_MIN_SIZE      ((NS_MD5RSA_MIN_BITS+7)/8)
+-#define NS_MD5RSA_MAX_SIZE      ((NS_MD5RSA_MAX_BITS+7)/8)
+-
+-#define NS_DSA_SIG_SIZE         41
+-#define NS_DSA_MIN_SIZE         213
+-#define NS_DSA_MAX_BYTES        405
+-
+-/* Offsets into SIG record rdata to find various values */
+-#define NS_SIG_TYPE     0       /* Type flags */
+-#define NS_SIG_ALG      2       /* Algorithm */
+-#define NS_SIG_LABELS   3       /* How many labels in name */
+-#define NS_SIG_OTTL     4       /* Original TTL */
+-#define NS_SIG_EXPIR    8       /* Expiration time */
+-#define NS_SIG_SIGNED   12      /* Signature time */
+-#define NS_SIG_FOOT     16      /* Key footprint */
+-#define NS_SIG_SIGNER   18      /* Domain name of who signed it */
+-
+-/* How RR types are represented as bit-flags in NXT records */
+-#define NS_NXT_BITS 8
+-#define NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
+-#define NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
+-#define NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
+-#define NS_NXT_MAX 127
+-
+ /*
+  * Inline versions of get/put short/long.  Pointer is advanced.
+  */
+@@ -931,6 +889,57 @@ int	ns_parse_ttl(const char *, u_long *);
+
+ #endif /* HAVE_ARPA_NAMESER_H */
+
++/* glibc 2.25 passes HAVE_ARPA_NAMESER_H, but doesn't have NS_ALG_MD5RSA and more defines. */
++#if !defined(HAVE_ARPA_NAMESER_H) || defined(eabi) || defined(ANDROID) ||defined(__OpenBSD__) || !defined(NS_ALG_MD5RSA)
++/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */
++#define NS_ALG_MD5RSA           1       /* MD5 with RSA */
++#define NS_ALG_DH               2       /* Diffie Hellman KEY */
++#define NS_ALG_DSA              3       /* DSA KEY */
++#define NS_ALG_DSS              NS_ALG_DSA
++#define NS_ALG_EXPIRE_ONLY      253     /* No alg, no security */
++#define NS_ALG_PRIVATE_OID      254     /* Key begins with OID giving alg */
++
++/* Protocol values  */
++/* value 0 is reserved */
++#define NS_KEY_PROT_TLS         1
++#define NS_KEY_PROT_EMAIL       2
++#define NS_KEY_PROT_DNSSEC      3
++#define NS_KEY_PROT_IPSEC       4
++#define NS_KEY_PROT_ANY         255
++
++/* Signatures */
++#define NS_MD5RSA_MIN_BITS       512    /* Size of a mod or exp in bits */
++#define NS_MD5RSA_MAX_BITS      2552
++        /* Total of binary mod and exp */
++#define NS_MD5RSA_MAX_BYTES     ((NS_MD5RSA_MAX_BITS+7/8)*2+3)
++        /* Max length of text sig block */
++#define NS_MD5RSA_MAX_BASE64    (((NS_MD5RSA_MAX_BYTES+2)/3)*4)
++#define NS_MD5RSA_MIN_SIZE      ((NS_MD5RSA_MIN_BITS+7)/8)
++#define NS_MD5RSA_MAX_SIZE      ((NS_MD5RSA_MAX_BITS+7)/8)
++
++#define NS_DSA_SIG_SIZE         41
++#define NS_DSA_MIN_SIZE         213
++#define NS_DSA_MAX_BYTES        405
++
++/* Offsets into SIG record rdata to find various values */
++#define NS_SIG_TYPE     0       /* Type flags */
++#define NS_SIG_ALG      2       /* Algorithm */
++#define NS_SIG_LABELS   3       /* How many labels in name */
++#define NS_SIG_OTTL     4       /* Original TTL */
++#define NS_SIG_EXPIR    8       /* Expiration time */
++#define NS_SIG_SIGNED   12      /* Signature time */
++#define NS_SIG_FOOT     16      /* Key footprint */
++#define NS_SIG_SIGNER   18      /* Domain name of who signed it */
++
++/* How RR types are represented as bit-flags in NXT records */
++#define NS_NXT_BITS 8
++#define NS_NXT_BIT_SET(  n,p) (p[(n)/NS_NXT_BITS] |=  (0x80>>((n)%NS_NXT_BITS)))
++#define NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS)))
++#define NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] &   (0x80>>((n)%NS_NXT_BITS)))
++#define NS_NXT_MAX 127
++#endif
++/* glibc 2.25 */
++
+ int libsres_msg_getflag(ns_msg han, int flag);
+ /*
+  * at one open ns_msg_getflag was a macro on Linux, but now it is a
diff --git a/net-dns/dnssec-validator/metadata.xml b/net-dns/dnssec-validator/metadata.xml
index a535b8852829..6f3178436bbc 100644
--- a/net-dns/dnssec-validator/metadata.xml
+++ b/net-dns/dnssec-validator/metadata.xml
@@ -5,4 +5,7 @@
 <email>xmw@gentoo.org</email>
 <name>Michael Weber</name>
 </maintainer>
+<use>
+	<flag name="ecdsa-check">Requires openssl[-bindist]</flag>
+</use>
 </pkgmetadata>