From patchwork Wed Nov 30 13:43:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 6219 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NMgR52Kb1z3wgq for ; Wed, 30 Nov 2022 13:44:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NMgR32Wknz2q3; Wed, 30 Nov 2022 13:43:59 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NMgR316lzz2xVx; Wed, 30 Nov 2022 13:43:59 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NMgR24Jj8z2xPs for ; Wed, 30 Nov 2022 13:43:58 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NMgR12fJrz2Yk for ; Wed, 30 Nov 2022 13:43:56 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1669815838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoThPh7nMD+snmGxBrU3J1rtxbp/gp5DdicqAG7pwvQ=; b=iCCIQa+6JZeWiEWJvW9aLCB5wNRM4ecBaJJUZg1RyK9JgCySgea/bRuhSzzmanFNLMnkqB Sf0U7rVlVHU9cvAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1669815838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MoThPh7nMD+snmGxBrU3J1rtxbp/gp5DdicqAG7pwvQ=; b=Whj/aQPQmkXq5te46CP9CJlkTOcO93MT4tjXA3XHBeTUgnMy7pZ/I+z53vx0si3sKzTUfM FOtayELhGtpgGT662Dpox8qOcowy6VcJEXvbZXNWBjp941v4a3N+rYf4iAdv4oOnrOkGR/ OlatTJfLRQgVEjL9NmQZ3yefjXfExgPYd3mC1ugbOsgji3lRUOfRuTGkg3pAWjtPUf+VRl CwZMgoby/BPrredhxkBwLEutEmjb05Ol4Mrqdnqq8wIZyeu+f07TDn2CuoNjkWjKG0QVJA wie9n5/8K1Xn2C+B5M3JGKldy9vDM2H3ehegn/K1oFD8VDm2vAaNy3pgeHmOcQ== Message-ID: <02c53237-1795-77b6-ac7f-b3cc565fe4d1@ipfire.org> Date: Wed, 30 Nov 2022 14:43:54 +0100 MIME-Version: 1.0 Content-Language: en-US To: development@lists.ipfire.org From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] ldns: Update to 1.8.3 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Peter Müller --- ldns/ldns.nm | 23 +----- .../ldns-1.6.16-dsa-key-failures.patch | 28 ------- .../ldns-1.6.17-doxyparse-perl-5-22-fix.patch | 13 ---- ldns/patches/ldns-1.6.17-multilib.patch | 75 ------------------- 4 files changed, 3 insertions(+), 136 deletions(-) delete mode 100644 ldns/patches/ldns-1.6.16-dsa-key-failures.patch delete mode 100644 ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch delete mode 100644 ldns/patches/ldns-1.6.17-multilib.patch diff --git a/ldns/ldns.nm b/ldns/ldns.nm index d79d48c08..24484c878 100644 --- a/ldns/ldns.nm +++ b/ldns/ldns.nm @@ -4,11 +4,11 @@ ############################################################################### name = ldns -version = 1.6.17 +version = 1.8.3 release = 1 groups = Networking/DNS -url = http://www.nlnetlabs.nl/projects/ldns/ +url = https://www.nlnetlabs.nl/projects/ldns/ license = BSD summary = Low-level DNS(SEC) library with API @@ -24,12 +24,11 @@ description build process. end -source_dl = http://www.nlnetlabs.nl/downloads/%{name}/ +source_dl = https://www.nlnetlabs.nl/downloads/%{name}/ build requires ca-certificates - doxygen gcc-c++ libpcap-devel openssl-devel @@ -41,27 +40,11 @@ build end configure_options += \ - --enable-gost \ - --enable-ecdsa \ --with-ca-file=/etc/pki/tls/certs/ca-bundle.trust.crt \ --with-ca-path=/etc/pki/tls/certs/ \ --with-trust-anchor=%{sharedstatedir}/unbound/root.key \ --enable-rrtype-cds \ --enable-rrtype-uri - - build_cmds - pushd drill - ./configure %{configure_options} - make %{PARALLELISMFLAGS} - popd - end - - install_cmds - install -D -m644 packaging/libldns.pc \ - %{BUILDROOT}%{libdir}/pkgconfig/ldns.pc - - make -C drill DESTDIR=%{BUILDROOT} install - end end packages diff --git a/ldns/patches/ldns-1.6.16-dsa-key-failures.patch b/ldns/patches/ldns-1.6.16-dsa-key-failures.patch deleted file mode 100644 index 93e8a73c8..000000000 --- a/ldns/patches/ldns-1.6.16-dsa-key-failures.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up ldns-1.6.17/keys.c.dsa ldns-1.6.17/keys.c ---- ldns-1.6.17/keys.c.dsa 2014-01-10 22:04:41.000000000 +0100 -+++ ldns-1.6.17/keys.c 2014-03-18 17:54:34.751742493 +0100 -@@ -1324,7 +1324,6 @@ ldns_key_dsa2bin(unsigned char *data, DS - /* See RFC2536 */ - *size = (uint16_t)BN_num_bytes(k->p); - T = (*size - 64) / 8; -- memcpy(data, &T, 1); - - if (T > 8) { - #ifdef STDERR_MSGS -@@ -1335,12 +1334,13 @@ ldns_key_dsa2bin(unsigned char *data, DS - } - - /* size = 64 + (T * 8); */ -+ memset(data, 0, 21 + *size * 3); - data[0] = (unsigned char)T; - BN_bn2bin(k->q, data + 1 ); /* 20 octects */ - BN_bn2bin(k->p, data + 21 ); /* offset octects */ -- BN_bn2bin(k->g, data + 21 + *size); /* offset octets */ -- BN_bn2bin(k->pub_key, data + 21 + *size + *size); /* offset octets */ -- *size = 21 + (*size * 3); -+ BN_bn2bin(k->g, data + 21 + *size * 2 - BN_num_bytes(k->g)); -+ BN_bn2bin(k->pub_key,data + 21 + *size * 3 - BN_num_bytes(k->pub_key)); -+ *size = 21 + *size * 3; - return true; - } - diff --git a/ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch b/ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch deleted file mode 100644 index 2140ff5c0..000000000 --- a/ldns/patches/ldns-1.6.17-doxyparse-perl-5-22-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl -index 96a1732..745d564 100755 ---- a/doc/doxyparse.pl -+++ b/doc/doxyparse.pl -@@ -273,7 +273,7 @@ foreach (keys %manpages) { - - print MAN $MAN_MIDDLE; - -- if (defined(@$also)) { -+ if (@$also) { - print MAN "\n.SH SEE ALSO\n\\fI"; - print MAN join "\\fR, \\fI", @$also; - print MAN "\\fR.\nAnd "; diff --git a/ldns/patches/ldns-1.6.17-multilib.patch b/ldns/patches/ldns-1.6.17-multilib.patch deleted file mode 100644 index 5c7440a32..000000000 --- a/ldns/patches/ldns-1.6.17-multilib.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Naur ldns-1.6.17-orig/configure ldns-1.6.17/configure ---- ldns-1.6.17-orig/configure 2014-01-10 16:04:50.000000000 -0500 -+++ ldns-1.6.17/configure 2014-01-10 20:22:39.138190093 -0500 -@@ -662,6 +662,7 @@ - PYTHON_LDFLAGS - PYTHON_CPPFLAGS - PYTHON -+PYTHON_LIB - PYTHON_VERSION - UNINSTALL_CONFIG_MANPAGE - UNINSTALL_CONFIG -@@ -13599,6 +13600,7 @@ - # use the official shared library - ac_python_library=`echo "$ac_python_library" | sed "s/^lib//"` - PYTHON_LDFLAGS="-L$ac_python_libdir -l$ac_python_library" -+ PYTHON_LIB="$ac_python_library" - else - # old way: use libpython from python_configdir - ac_python_libdir=`$PYTHON -c \ -@@ -13606,6 +13608,7 @@ - import os; \ - print (os.path.join(f(plat_specific=1, standard_lib=1), 'config'));"` - PYTHON_LDFLAGS="-L$ac_python_libdir -lpython$ac_python_version" -+ PYTHON_LIB="python$ac_python_version" - fi - - if test -z "PYTHON_LDFLAGS"; then -diff -Naur ldns-1.6.17-orig/packaging/ldns-config.in ldns-1.6.17/packaging/ldns-config.in ---- ldns-1.6.17-orig/packaging/ldns-config.in 2014-01-10 16:04:41.000000000 -0500 -+++ ldns-1.6.17/packaging/ldns-config.in 2014-01-10 20:33:13.033665804 -0500 -@@ -3,13 +3,25 @@ - prefix="@prefix@" - exec_prefix="@exec_prefix@" - VERSION="@PACKAGE_VERSION@" --CFLAGS="@CFLAGS@" --CPPFLAGS="@CPPFLAGS@ @LIBSSL_CPPFLAGS@ @PYTHON_CPPFLAGS@" --LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ @PYTHON_LDFLAGS@" - LIBS="@LIBS@ @LIBSSL_LIBS@" --LIBDIR="@libdir@" - INCLUDEDIR="@includedir@" - LIBVERSION="@LIBLDNS_CURRENT@.@LIBLDNS_REVISION@.@LIBLDNS_AGE@" -+ARCH="`uname -m`" -+ -+case $ARCH in -+ x86_64 | amd64 | sparc64 | s390x | ppc64) -+ -+ LIBDIR="/usr/lib64" -+ LIBDIR_SEC="/usr/lib" -+ ;; -+ * ) -+ LIBDIR="/usr/lib" -+ LIBDIR_SEC="/usr/lib64" -+ ;; -+esac -+ -+LDFLAGS="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR -l@PYTHON_LIB@" -+LDFLAGS_SEC="@LDFLAGS@ @LIBSSL_LDFLAGS@ -L$LIBDIR_SEC -l@PYTHON_LIB@" - - for arg in $@ - do -@@ -21,9 +33,13 @@ - then - echo "${LDFLAGS} -L${LIBDIR} ${LIBS} -lldns" - fi -+ if [ $arg = "--libs_sec" ] -+ then -+ echo "${LDFLAGS_SEC} -L${LIBDIR_SEC} ${LIBS} -lldns" -+ fi - if [ $arg = "-h" ] || [ $arg = "--help" ] - then -- echo "Usage: $0 [--cflags] [--libs] [--version]" -+ echo "Usage: $0 [--cflags] [--libs] [--libs_sec] [--version]" - fi - if [ $arg = "--version" ] - then