[gentoo-commits] repo/gentoo:master commit in: net-dns/dnssec-validator/files/, net-dns/dnssec-validator/

2023-09-15 Thread Conrad Kostecki
commit: 2f7374f8b31e0fe9f912ab51936b5419347e60d9
Author: Brahmajit Das  gmail  com>
AuthorDate: Fri Sep 15 19:26:04 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Fri Sep 15 22:47:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7374f8

net-dns/dnssec-validator: Fix call to undeclared function ns_name_pton

Closes: https://bugs.gentoo.org/897862
Signed-off-by: Brahmajit Das  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32816
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../dnssec-validator-2.2.3-r4.ebuild   | 61 ++
 .../files/dnssec-validator-2.2.3-musl-fix.patch| 29 ++
 2 files changed, 90 insertions(+)

diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2.3-r4.ebuild 
b/net-dns/dnssec-validator/dnssec-validator-2.2.3-r4.ebuild
new file mode 100644
index ..e0c2291fabef
--- /dev/null
+++ b/net-dns/dnssec-validator/dnssec-validator-2.2.3-r4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tools to ease the validation of DNSSEC related technologies"
+HOMEPAGE="https://www.dnssec-tools.org/;
+SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-${PV}.tar.gz;
+S="${WORKDIR}/DNSSEC-Tools-dnssec-tools-${PV}/dnssec-tools/validator"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dlv +nsec3 static-libs +threads"
+
+RDEPEND=">=dev-libs/openssl-1.1.0:0="
+DEPEND="${RDEPEND}"
+
+# Tests fail due "Cannot create context: -7"
+RESTRICT="test"
+
+PATCHES=(
+   # Users LDFLAGS are not respected
+   # See https://github.com/DNSSEC-Tools/DNSSEC-Tools/pull/9
+   "${FILESDIR}/${P}-ldflags.patch"
+   "${FILESDIR}/${PN}-2.2.3-musl-fix.patch"
+)
+
+src_prepare() {
+   default
+
+   mv configure.in configure.ac || die
+   eautoreconf
+}
+
+src_configure() {
+   local myeconfargs=(
+   $(use_with dlv)
+   $(use_with nsec3)
+   $(use_enable static-libs static)
+   $(use_with threads)
+   --with-dnsval-conf="${EPREFIX}/etc/dnssec-tools/dnsval.conf"
+   --with-ipv6
+   --with-resolv-conf="${EPREFIX}/etc/dnssec-tools/resolv.conf"
+   --with-root-hints="${EPREFIX}/etc/dnssec-tools/root.hints"
+   )
+
+   econf "${myeconfargs[@]}"
+}
+
+src_install() {
+   # Install fails with MAKEOPTS > -j1
+   # See https://github.com/DNSSEC-Tools/DNSSEC-Tools/issues/8
+   emake -j1 DESTDIR="${D}" install
+
+   einstalldocs
+
+   find "${D}" -name '*.la' -delete || die
+}

diff --git 
a/net-dns/dnssec-validator/files/dnssec-validator-2.2.3-musl-fix.patch 
b/net-dns/dnssec-validator/files/dnssec-validator-2.2.3-musl-fix.patch
new file mode 100644
index ..3d22d6a33582
--- /dev/null
+++ b/net-dns/dnssec-validator/files/dnssec-validator-2.2.3-musl-fix.patch
@@ -0,0 +1,29 @@
+https://github.com/DNSSEC-Tools/DNSSEC-Tools/pull/22
+From: Brahmajit Das 
+Date: Fri, 15 Sep 2023 19:20:12 +
+Subject: [PATCH] Fix build on musl libc
+
+Function such as ns_name_pton are glibc specific and are not available
+on other libc's like musl. This patch should make it possible to use
+those internal function. The need for this patch is due to some of the
+structs like __ns_sect are already defined on musl and glibc, thus would
+result in an redefinition error.
+
+First discovered on Gentoo linux.
+
+Bug: https://bugs.gentoo.org/897862
+Signed-off-by: Brahmajit Das 
+--- a/include/validator/validator-compat.h
 b/include/validator/validator-compat.h
+@@ -896,6 +896,11 @@ typedef enum __ns_flag {
+ (cp) += NS_INT32SZ; \
+ } while (0)
+ 
++#endif /* HAVE_ARPA_NAMESER_H */
++
++/* eabi = android */
++/* OpenBSD has arpa/nameser.h, but it doesn't define ns_msg */
++#if !defined(HAVE_ARPA_NAMESER_H) || defined(eabi) || defined(ANDROID) 
||defined(__OpenBSD__) || !defined(__GLIBC__)
+ int   ns_name_uncompress(const u_char *, const u_char *,
+   const u_char *, char *, size_t);
+ int   ns_name_compress(const char *, u_char *, size_t,



[gentoo-commits] repo/gentoo:master commit in: net-dns/dnssec-validator/files/, net-dns/dnssec-validator/

2019-07-21 Thread Andreas Sturmlechner
commit: 063e0ebd71e451419879bcfe3dcd9ccba4ff753a
Author: Conrad Kostecki  kostecki  com>
AuthorDate: Sun Jul 21 19:41:36 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 21 21:46:13 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=063e0ebd

net-dns/dnssec-validator: drop old version

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Conrad Kostecki  kostecki.com>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-dns/dnssec-validator/Manifest  |   1 -
 .../dnssec-validator-2.2-r1.ebuild |  47 
 .../dnssec-validator-2.1-respect-LDFLAGS.patch |  22 
 .../files/dnssec-validator-2.2-glib-2.25.patch | 126 -
 net-dns/dnssec-validator/metadata.xml  |   1 -
 5 files changed, 197 deletions(-)

diff --git a/net-dns/dnssec-validator/Manifest 
b/net-dns/dnssec-validator/Manifest
index 206db72518a..01fe151b425 100644
--- a/net-dns/dnssec-validator/Manifest
+++ b/net-dns/dnssec-validator/Manifest
@@ -1,2 +1 @@
 DIST dnssec-tools-2.2.3.tar.gz 42941393 BLAKE2B 
b7b6a54113fb5cf030bd60e18f5446b02d1ceba3564ac854b0305225672545e802fecfa1169dc81e68ffe195533e06082dc22500a51b48965aa9c0fc32c915ed
 SHA512 
fd2467f116f77089bddf9311706f356957f4ae735d827d393534e4001b621c9dfc904ff3d4da698d37e8e97b1be9448ab2fd5455c124656399aac30f1f642baf
-DIST dnsval-2.2.tar.gz 1060434 BLAKE2B 
3a19d5f4128e32f81ae824a128c65b5c5b6f21cef2786d1050631db10084a479614241d869bb33d054d96e7a1e286c472296edf8c4c7e45abd84aaa4df599f28
 SHA512 
1a01911b08e447d992f4843db8e10bc91041f9e3eaa8a3c050f71f0d7028292145379d1b769e69a837a157443abfa8b0b8ecc289c1b2fa4d33a9234282e9ae05

diff --git a/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild 
b/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild
deleted file mode 100644
index e1adc510a27..000
--- a/net-dns/dnssec-validator/dnssec-validator-2.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="DNSSEC validator (dnsval)"
-HOMEPAGE="https://www.dnssec-tools.org/;
-SRC_URI="https://www.dnssec-tools.org/download/dnsval-${PV}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="ipv6 static-libs +threads +ecdsa-check"
-
-RDEPEND="dev-libs/openssl:0
-   ecdsa-check? ( dev-libs/openssl:0[-bindist] )
-   !>((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_BYTES405
-+
-+/* 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_EXPIR8   /* 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 

[gentoo-commits] repo/gentoo:master commit in: net-dns/dnssec-validator/files/, net-dns/dnssec-validator/

2017-12-18 Thread Michael Weber
commit: 7363d590b8869c0f6241bc7bcba2f7cb3e5bb373
Author: Michael Weber  gentoo  org>
AuthorDate: Mon Dec 18 08:44:15 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Mon Dec 18 08:46:23 2017 +
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
!>((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_BYTES405
++
++/* 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_EXPIR8   /* 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