[gentoo-commits] repo/gentoo:master commit in: net-libs/ldns/, net-libs/ldns/files/
commit: c64d638808ee411e7aad895d4883a66801509328
Author: Sam James gentoo org>
AuthorDate: Tue Feb 6 05:13:56 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 6 05:13:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64d6388
net-libs/ldns: fix build w/ swig-4.2.0
Closes: https://bugs.gentoo.org/921302
Signed-off-by: Sam James gentoo.org>
net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch | 101
net-libs/ldns/ldns-1.8.3-r2.ebuild | 91 +
2 files changed, 192 insertions(+)
diff --git a/net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch
b/net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch
new file mode 100644
index ..8165371d53bb
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.8.3-swig-4.2.0.patch
@@ -0,0 +1,101 @@
+https://bugs.gentoo.org/921302
+https://github.com/NLnetLabs/ldns/pull/232
+https://github.com/NLnetLabs/ldns/pull/233
+
+From daf38095763f758c77be538da25c267dc5cb73c8 Mon Sep 17 00:00:00 2001
+From: Florian Weimer
+Date: Fri, 26 Jan 2024 11:30:39 +0100
+Subject: [PATCH] SWIG_Python_str_AsChar removal in SWIG 4.2.0
+
+The replacement, SWIG_PyUnicode_AsUTF8AndSize, has different
+memory management requirements.
+---
+ contrib/python/ldns_rdf.i | 21 +++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/contrib/python/ldns_rdf.i b/contrib/python/ldns_rdf.i
+index 5d7448fd..60daf1a7 100644
+--- a/contrib/python/ldns_rdf.i
b/contrib/python/ldns_rdf.i
+@@ -56,7 +56,11 @@
+ */
+ %typemap(arginit, noblock=1) const ldns_rdf *
+ {
++#if SWIG_VERSION >= 0x040200
++ PyObject *$1_bytes = NULL;
++#else
+ char *$1_str = NULL;
++#endif
+ }
+
+ /*
+@@ -66,11 +70,17 @@
+ %typemap(in, noblock=1) const ldns_rdf * (void* argp, $1_ltype tmp = 0, int
res)
+ {
+ if (Python_str_Check($input)) {
++const char *argstr;
++#if SWIG_VERSION >= 0x040200
++argstr = SWIG_PyUnicode_AsUTF8AndSize($input, NULL, &$1_bytes);
++#else
+ $1_str = SWIG_Python_str_AsChar($input);
+-if ($1_str == NULL) {
++argstr = $1_str;
++#endif
++if (argstr == NULL) {
+ %argument_fail(SWIG_TypeError, "char *", $symname, $argnum);
+ }
+-tmp = ldns_dname_new_frm_str($1_str);
++tmp = ldns_dname_new_frm_str(argstr);
+ if (tmp == NULL) {
+ %argument_fail(SWIG_TypeError, "char *", $symname, $argnum);
+ }
+@@ -90,10 +100,17 @@
+ */
+ %typemap(freearg, noblock=1) const ldns_rdf *
+ {
++#if SWIG_VERSION >= 0x040200
++ if ($1_bytes != NULL) {
++/* Is not NULL only when a conversion form string occurred. */
++Py_XDECREF($1_bytes);
++ }
++#else
+ if ($1_str != NULL) {
+ /* Is not NULL only when a conversion form string occurred. */
+ SWIG_Python_str_DelForPy3($1_str); /* Is a empty macro for Python < 3. */
+ }
++#endif
+ }
+
+ %nodefaultctor ldns_struct_rdf; /* No default constructor. */
+
+From f91f61e10be595a6a46845112aaed7da24551bf9 Mon Sep 17 00:00:00 2001
+From: Florian Weimer
+Date: Fri, 26 Jan 2024 11:57:03 +0100
+Subject: [PATCH] 32-bit compatibility for Python SWIG bindings
+
+The ssize_t type can be int instead of long, and the pointer
+types are incompatible.
+---
+ contrib/python/ldns.i | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/contrib/python/ldns.i b/contrib/python/ldns.i
+index 881ba5e85..b4a740820 100644
+--- a/contrib/python/ldns.i
b/contrib/python/ldns.i
+@@ -99,12 +99,14 @@
+ %typemap(in, noblock=1) (ssize_t)
+ {
+ int $1_res = 0;
+- $1_res = SWIG_AsVal_long($input, &$1);
++ long val;
++ $1_res = SWIG_AsVal_long($input, );
+ if (!SWIG_IsOK($1_res)) {
+ SWIG_exception_fail(SWIG_ArgError($1_res), "in method '"
+ "$symname" "', argument " "$argnum" " of type '"
+ "$type""'");
+ }
++ $1 = val;
+ }
+
+
diff --git a/net-libs/ldns/ldns-1.8.3-r2.ebuild
b/net-libs/ldns/ldns-1.8.3-r2.ebuild
new file mode 100644
index ..15f1bf29756a
--- /dev/null
+++ b/net-libs/ldns/ldns-1.8.3-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit autotools python-single-r1 multilib-minimal
+
+DESCRIPTION="A library with the aim to simplify DNS programming in C"
+HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/;
+SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64
~riscv ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc examples python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test" # missing test directory
+
+BDEPEND="
+ python? ( dev-lang/swig )
+ doc? ( app-text/doxygen )
+"
+DEPEND="
+ python? ( ${PYTHON_DEPS} )
+ >=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?]
+ examples? ( net-libs/libpcap )
[gentoo-commits] repo/gentoo:master commit in: net-libs/ldns/, net-libs/ldns/files/
commit: 06390ada689b7eb8ea4f3d785f8080037c956032
Author: Sam James gentoo org>
AuthorDate: Thu Jan 26 07:28:38 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 26 07:55:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06390ada
net-libs/ldns: drop 1.7.1-r5, 1.7.1-r6, 1.8.0-r1
Signed-off-by: Sam James gentoo.org>
net-libs/ldns/Manifest| 1 -
net-libs/ldns/files/ldns-1.7.1-Makefile.patch | 11 ---
net-libs/ldns/ldns-1.7.1-r5.ebuild| 113 ---
net-libs/ldns/ldns-1.7.1-r6.ebuild| 103 -
net-libs/ldns/ldns-1.8.0-r1.ebuild| 123 --
5 files changed, 351 deletions(-)
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index fae73226a526..f7dff65c2db5 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,3 +1,2 @@
-DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B
8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d
SHA512
e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B
f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1
SHA512
54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B
ae01ef32571fe3996ddd41f911815239abb704ea1dee479fa612bfd701ca369222ab709923f014662248988cb4452a75bc5debad47d2b0386dc59169b353e6a3
SHA512
600f8e221716742caf439a425008827aef1814fc1d9e751f8f492d0235ff45ca48df90abba17979bac9f4485947bb9fe8102924d9cebe6cb56d5b788e1c4bd14
diff --git a/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
b/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
deleted file mode 100644
index d654bbda6131..
--- a/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
Makefile.in.orig 2019-09-29 15:17:24.728446345 +0200
-+++ Makefile.in2019-09-29 15:18:09.544008785 +0200
-@@ -301,7 +301,7 @@
- $(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS)
$(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
-
- _ldns.la: ldns_wrapper.lo libldns.la
-- $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS)
$(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info)
-no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns
$(LIBS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS)
-module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo
-rpath $(python_site) -L. -L.libs -lldns $(LDFLAGS) $(PYTHON_LDFLAGS) $(LIBS)
-
- $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
- BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir);
LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH"
DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL
LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
diff --git a/net-libs/ldns/ldns-1.7.1-r5.ebuild
b/net-libs/ldns/ldns-1.7.1-r5.ebuild
deleted file mode 100644
index f6d989650b3a..
--- a/net-libs/ldns/ldns-1.7.1-r5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9,10} )
-inherit multilib-minimal python-single-r1
-
-DESCRIPTION="A library with the aim to simplify DNS programming in C"
-HOMEPAGE="https://www.nlnetlabs.nl/projects/ldns/;
-SRC_URI="https://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz;
-
-LICENSE="BSD"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv
~s390 sparc x86 ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="+dane doc +ecdsa ed25519 ed448 gost python static-libs vim-syntax"
-
-# configure will die if ecdsa is enabled and ssl is not
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-RDEPEND="
- python? ( ${PYTHON_DEPS} )
- ecdsa? (
- >=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}]
- )
- ed25519? (
- >=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}]
- )
- ed448? (
- >=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}]
- )
- >=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- python? ( dev-lang/swig )
- doc? ( app-doc/doxygen )
-"
-
-RESTRICT="test" # 1.6.9 has no test directory
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/ldns-config
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
- # >=openssl-1.1.0 required for dane-ta
- if has_version "https://www.nlnetlabs.nl/projects/ldns/;
[gentoo-commits] repo/gentoo:master commit in: net-libs/ldns/, net-libs/ldns/files/
commit: 0a36d35cb709c129100be8cf867748d47e6aa934
Author: Mike Gilbert gentoo org>
AuthorDate: Wed Dec 22 21:32:51 2021 +
Commit: Marc Schiffbauer gentoo org>
CommitDate: Fri Dec 24 10:39:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a36d35c
net-libs/ldns: add 1.8.1 and clean up ebuild
Drop USE flags: dane, ecdsa, ed25519, ed448 gost
These features are now enabled unconditionally.
Drop obsolete sed calls and eautoreconf.
Add patch to fix static libs info in ldns.pc.
Closes: https://bugs.gentoo.org/829687
Signed-off-by: Mike Gilbert gentoo.org>
Signed-off-by: Marc Schiffbauer gentoo.org>
net-libs/ldns/Manifest | 1 +
net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch | 10 +++
net-libs/ldns/ldns-1.8.1.ebuild| 89 ++
3 files changed, 100 insertions(+)
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index a296b9b972ad..fae73226a526 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,2 +1,3 @@
DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B
8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d
SHA512
e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
DIST ldns-1.8.0.tar.gz 1283220 BLAKE2B
f916a8c76d788ac7c52aea8bfe675ad4c614a0c6fb011b61f5a27d4a5dc1a2adb33b5c6992b4813b3758c9b7cceab1c77f8c1d66baaa4de993f23888bce69df1
SHA512
54b306160bb7fd76d181f4be0a13134017f6f98ae96e0c954409f31f262e9dbe611c4b76fb6dff47bb6155c652ed8d026b52a50dfcf611e54d9c204b314c4fd6
+DIST ldns-1.8.1.tar.gz 1284971 BLAKE2B
ae01ef32571fe3996ddd41f911815239abb704ea1dee479fa612bfd701ca369222ab709923f014662248988cb4452a75bc5debad47d2b0386dc59169b353e6a3
SHA512
600f8e221716742caf439a425008827aef1814fc1d9e751f8f492d0235ff45ca48df90abba17979bac9f4485947bb9fe8102924d9cebe6cb56d5b788e1c4bd14
diff --git a/net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch
b/net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch
new file mode 100644
index ..7731ff6af7a2
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.8.1-pkgconfig.patch
@@ -0,0 +1,10 @@
+--- a/packaging/libldns.pc.in
b/packaging/libldns.pc.in
+@@ -8,6 +8,6 @@
+ URL: http://www.nlnetlabs.nl/projects/ldns
+ Version: @PACKAGE_VERSION@
+ Requires:
++Requires.private: libcrypto libssl
+ Libs: -L${libdir} -lldns
+-Libs.private: @LDFLAGS@
+ Cflags: -I${includedir}
diff --git a/net-libs/ldns/ldns-1.8.1.ebuild b/net-libs/ldns/ldns-1.8.1.ebuild
new file mode 100644
index ..51026edcbd17
--- /dev/null
+++ b/net-libs/ldns/ldns-1.8.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+inherit python-single-r1 multilib-minimal
+
+DESCRIPTION="a library with the aim to simplify DNS programming in C"
+HOMEPAGE="http://www.nlnetlabs.nl/projects/ldns/;
+SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${P}.tar.gz;
+
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv
~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc examples python static-libs vim-syntax"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+BDEPEND="
+ python? ( dev-lang/swig )
+ doc? ( app-doc/doxygen )
+"
+DEPEND="
+ python? ( ${PYTHON_DEPS} )
+ >=dev-libs/openssl-1.1.1l-r1:0=[${MULTILIB_USEDEP},static-libs?]
+ examples? ( net-libs/libpcap )
+"
+RDEPEND="${DEPEND}
+ !
[gentoo-commits] repo/gentoo:master commit in: net-libs/ldns/, net-libs/ldns/files/
commit: 0df4386ba600726361146039e8246f2ec490e6ea
Author: Marc Schiffbauer gentoo org>
AuthorDate: Sun Sep 29 13:43:42 2019 +
Commit: Marc Schiffbauer gentoo org>
CommitDate: Sun Sep 29 13:49:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df4386b
net-libs/ldns: reorder linking sources
fixes #641598
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Marc Schiffbauer gentoo.org>
net-libs/ldns/files/ldns-1.7.1-Makefile.patch | 11 +++
net-libs/ldns/ldns-1.7.1-r1.ebuild| 5 ++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
b/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
new file mode 100644
index 000..d654bbda613
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.7.1-Makefile.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2019-09-29 15:17:24.728446345 +0200
Makefile.in2019-09-29 15:18:09.544008785 +0200
+@@ -301,7 +301,7 @@
+ $(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS)
$(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@
+
+ _ldns.la: ldns_wrapper.lo libldns.la
+- $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS)
$(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info)
-no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns
$(LIBS)
++ $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS)
-module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo
-rpath $(python_site) -L. -L.libs -lldns $(LDFLAGS) $(PYTHON_LDFLAGS) $(LIBS)
+
+ $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL
+ BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir);
LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH"
DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL
LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR"
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild
b/net-libs/ldns/ldns-1.7.1-r1.ebuild
index c01ece38615..071708308e4 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_5 )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
inherit eutils multilib-minimal python-single-r1
DESCRIPTION="a library with the aim to simplify DNS programming in C"
@@ -74,8 +74,7 @@ multilib_src_configure() {
src_prepare() {
default
- #epatch "${FILESDIR}/${P}-CVE-2017-1000231.patch"
- #epatch "${FILESDIR}/${P}-CVE-2017-1000232.patch"
+ epatch "${FILESDIR}/${P}-Makefile.patch"
# remove non-existing dependency for target packaging/libldns.pc
sed -i 's,packaging/libldns.pc.in,,' "${S}"/Makefile.in || die 'could
not patch Makefile.in'
}
[gentoo-commits] repo/gentoo:master commit in: net-libs/ldns/, net-libs/ldns/files/
commit: bc5ac7f9daddfa46622cc9fed02ae05d0f1484cc
Author: Marc Schiffbauer gentoo org>
AuthorDate: Thu Nov 23 16:37:01 2017 +
Commit: Marc Schiffbauer gentoo org>
CommitDate: Thu Nov 23 16:47:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc5ac7f9
net-libs/ldns: add patches to fix CVE-2017-1000231/1000232
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-libs/ldns/Manifest | 2 +-
net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch | 15 +++
net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch | 17 +
.../ldns/{ldns-1.7.0.ebuild => ldns-1.7.0-r1.ebuild}| 6 ++
4 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index c444cb3ed12..419666a1102 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,2 +1,2 @@
DIST ldns-1.6.17.tar.gz 1315403 SHA256
8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd SHA512
5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785
WHIRLPOOL
08c8a13df3dbeccd5dc5ceeb52730a61ab231e70a85524e826f9275bbcde6e09d6e2fc5234303a6bceb431d2b91f510140ce61a2b59d77afbb2759a0627c7cb7
-DIST ldns-1.7.0.tar.gz 1304424 SHA256
c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc SHA512
8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16edb494ab4d0bce3bd8
WHIRLPOOL
4450b94dd3e2586230f1691b626947cad7ac2031e343d1e522343570d5b713cfd4bacd52e91713139a88c2fe2406f5f42594d2da0a0474c807f47fd2e98726b1
+DIST ldns-1.7.0.tar.gz 1304424 BLAKE2B
2f37aa2d00c1d9cf18711bd4f873f4722df01c4f4d0f627e054f04b2473c0fbf19449e293a130d5c8b98dcebafeb3d7b3f5923ae0244bd80139cea77f2171e06
SHA512
8a4e48bcc2a244b92447a9830b60efbb656fb7955f3559ef2eb6f8e724c4c0208776350c44ccf7dcf1ffe0b7b9d9ccc4cbddc5bc16edb494ab4d0bce3bd8
diff --git a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch
b/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch
new file mode 100644
index 000..9ff92e25c75
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000231.patch
@@ -0,0 +1,15 @@
+diff --git a/parse.c b/parse.c
+index e68627c..947dbb8 100644
+--- a/parse.c
b/parse.c
+@@ -118,6 +118,10 @@ ldns_fget_token_l(FILE *f, char *token, const char
*delim, size_t limit, int *li
+ if (line_nr) {
+ *line_nr = *line_nr + 1;
+ }
++ if (limit > 0 && (i >= limit || (size_t)(t-token) >=
limit)) {
++ *t = '\0';
++ return -1;
++ }
+ *t++ = ' ';
+ prev_c = c;
+ continue;
diff --git a/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch
b/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch
new file mode 100644
index 000..341dfa5916e
--- /dev/null
+++ b/net-libs/ldns/files/ldns-1.7.0-CVE-2017-1000232.patch
@@ -0,0 +1,17 @@
+diff --git a/str2host.c b/str2host.c
+index b274b17..f2a317b 100644
+--- a/str2host.c
b/str2host.c
+@@ -1525,8 +1525,10 @@ ldns_str2rdf_long_str(ldns_rdf **rd, const char *str)
+ if (! str) {
+ return LDNS_STATUS_SYNTAX_BAD_ESCAPE;
+ }
+- length = (size_t)(dp - data);
+-
++ if (!(length = (size_t)(dp - data))) {
++ LDNS_FREE(data);
++ return LDNS_STATUS_SYNTAX_EMPTY;
++ }
+ /* Lose the overmeasure */
+ data = LDNS_XREALLOC(dp = data, uint8_t, length);
+ if (! data) {
diff --git a/net-libs/ldns/ldns-1.7.0.ebuild
b/net-libs/ldns/ldns-1.7.0-r1.ebuild
similarity index 95%
rename from net-libs/ldns/ldns-1.7.0.ebuild
rename to net-libs/ldns/ldns-1.7.0-r1.ebuild
index 5e5b25fd009..d507363c921 100644
--- a/net-libs/ldns/ldns-1.7.0.ebuild
+++ b/net-libs/ldns/ldns-1.7.0-r1.ebuild
@@ -72,6 +72,12 @@ multilib_src_configure() {
# >=openssl-1.1.0 required for dane-ta
}
+src_prepare() {
+ cd "$S"
+ epatch "${FILESDIR}/${P}-CVE-2017-1000231.patch"
+ epatch "${FILESDIR}/${P}-CVE-2017-1000232.patch"
+}
+
multilib_src_compile() {
default
