commit: 7363d590b8869c0f6241bc7bcba2f7cb3e5bb373 Author: Michael Weber <xmw <AT> gentoo <DOT> org> AuthorDate: Mon Dec 18 08:44:15 2017 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Mon Dec 18 08:46:23 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7363d590
net-dns/dnssec-validator: Revbump for EAPI=6 and newer glibc (thanks Conrad Kostecki). Closes: https://bugs.gentoo.org/609242 Package-Manager: Portage-2.3.19, Repoman-2.3.6 ...r-2.2.ebuild => dnssec-validator-2.2-r1.ebuild} | 11 +- .../dnssec-validator/dnssec-validator-2.2.ebuild | 2 +- .../files/dnssec-validator-2.2-glib-2.25.patch | 126 +++++++++++++++++++++ 3 files changed, 132 insertions(+), 7 deletions(-) diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild similarity index 83% copy from net-dns/dnssec-validator/dnssec-validator-2.2.ebuild copy to net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild index c170b3fb200..aebb02242a5 100644 --- a/net-dns/dnssec-validator/dnssec-validator-2.2.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 @@ -14,15 +14,14 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="ipv6 static-libs +threads" -RDEPEND="dev-libs/openssl +RDEPEND="dev-libs/openssl:0 !<net-dns/dnssec-tools-1.13" DEPEND="${RDEPEND}" S=${WORKDIR}/dnsval-${PV} -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.1-respect-LDFLAGS.patch -} +PATCHES=( "${FILESDIR}"/${PN}-2.1-respect-LDFLAGS.patch + "${FILESDIR}"/${P}-glib-2.25.patch ) src_configure() { econf \ diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild b/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild index c170b3fb200..73c71b53704 100644 --- a/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild +++ b/net-dns/dnssec-validator/dnssec-validator-2.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 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 00000000000..8d2a5560b98 --- /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
