Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] ldns 1.7.1
@ 2019-07-27 11:51 voidlinux-github
  2019-07-30  8:00 ` [PR PATCH] [Merged]: " voidlinux-github
  0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2019-07-27 11:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is a new pull request by leahneukirchen against master on the void-packages repository

https://github.com/leahneukirchen/void-packages ldns171
https://github.com/void-linux/void-packages/pull/13364

ldns 1.7.1


A patch file from https://github.com/void-linux/void-packages/pull/13364.patch is attached

[-- Warning: decoded text below may be mangled --]
[-- Attachment #2: github-pr-ldns171-13364.patch --]
[-- Type: text/x-diff, Size: 4835 bytes --]

From d546e7dc5e0ac4861c2da696432a1705073333f2 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Jul 2019 13:45:36 +0200
Subject: [PATCH 1/2] ldns: update to 1.7.1.

---
 common/shlibs                               |  2 +-
 srcpkgs/ldns/patches/CVE-2017-1000231.patch | 29 -------------------
 srcpkgs/ldns/patches/CVE-2017-1000232.patch | 31 ---------------------
 srcpkgs/ldns/template                       |  9 +++---
 4 files changed, 5 insertions(+), 66 deletions(-)
 delete mode 100644 srcpkgs/ldns/patches/CVE-2017-1000231.patch
 delete mode 100644 srcpkgs/ldns/patches/CVE-2017-1000232.patch

diff --git a/common/shlibs b/common/shlibs
index be6f9fc3676..37f8cacd6a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1928,7 +1928,7 @@ libusbmuxd.so.4 libusbmuxd-1.0.10_1
 libimobiledevice.so.6 libimobiledevice-1.2.0_1
 libstfl.so.0 stfl-0.23_1
 libCDApplet.so cairo-dock-plugins-3.4.0_1
-libldns.so.2 libldns-1.7.0_1
+libldns.so.3 libldns-1.7.1_1
 libopenjpeg.so.5 libopenjpeg-1.5.2_1
 liboping.so.0 liboping-1.8.0_1
 libloudmouth-1.so.0 loudmouth-1.4.3_1
diff --git a/srcpkgs/ldns/patches/CVE-2017-1000231.patch b/srcpkgs/ldns/patches/CVE-2017-1000231.patch
deleted file mode 100644
index ab04f9deab7..00000000000
--- a/srcpkgs/ldns/patches/CVE-2017-1000231.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c8391790c96d4c8a2c10f9ab1460fda83b509fc2 Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem@nlnetlabs.nl>
-Date: Thu, 27 Apr 2017 00:14:58 +0200
-Subject: Check parse limit before t increment
-
-Thanks Stephan Zeisberg
----
- parse.c   | 4 ++++
- 1 file changed, 4 insertions(+)
-
-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;
--- 
-cgit v1.1
-
-
diff --git a/srcpkgs/ldns/patches/CVE-2017-1000232.patch b/srcpkgs/ldns/patches/CVE-2017-1000232.patch
deleted file mode 100644
index 2cc209beb8d..00000000000
--- a/srcpkgs/ldns/patches/CVE-2017-1000232.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3bdeed02505c9bbacb3b64a97ddcb1de967153b7 Mon Sep 17 00:00:00 2001
-From: Willem Toorop <willem@nlnetlabs.nl>
-Date: Thu, 27 Apr 2017 00:25:20 +0200
-Subject: bugfix #1257: Free after reallocing to 0 size
-
-Thanks Stephan Zeisberg
----
- str2host.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-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) {
--- 
-cgit v1.1
-
-
diff --git a/srcpkgs/ldns/template b/srcpkgs/ldns/template
index 815e12c2f0a..839c5112d3b 100644
--- a/srcpkgs/ldns/template
+++ b/srcpkgs/ldns/template
@@ -1,8 +1,7 @@
 # Template file for 'ldns'
 pkgname=ldns
-version=1.7.0
-revision=9
-patch_args="-Np1"
+version=1.7.1
+revision=1
 build_style=gnu-configure
 configure_args="--with-drill --with-examples --disable-dane-ta-usage
  --with-trust-anchor=/etc/dns/root.key
@@ -11,10 +10,10 @@ hostmakedepends="perl"
 makedepends="libpcap-devel libressl-devel dnssec-anchors"
 short_desc="Modern DNS/DNSSEC library -- utils"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="BSD"
+license="BSD-3-Clause"
 homepage="http://www.nlnetlabs.nl/projects/ldns/"
 distfiles="http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc
+checksum=8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
 
 post_extract() {
 	sed -i 's/defined(@\$also)/@$also/' doc/doxyparse.pl

From 10bc67a03b6ad6e484a34004d3f319fa81947e17 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sat, 27 Jul 2019 13:49:43 +0200
Subject: [PATCH 2/2] openssh: bump for ldns-1.7.1.

---
 srcpkgs/openssh/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openssh/template b/srcpkgs/openssh/template
index a44c209a5eb..e8619a250d9 100644
--- a/srcpkgs/openssh/template
+++ b/srcpkgs/openssh/template
@@ -1,7 +1,7 @@
 # Template file for 'openssh'
 pkgname=openssh
 version=8.0p1
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--datadir=/usr/share/openssh
  --sysconfdir=/etc/ssh --without-selinux --with-privsep-user=nobody

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: ldns 1.7.1
  2019-07-27 11:51 [PR PATCH] ldns 1.7.1 voidlinux-github
@ 2019-07-30  8:00 ` " voidlinux-github
  0 siblings, 0 replies; 2+ messages in thread
From: voidlinux-github @ 2019-07-30  8:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 143 bytes --]

There's a merged pull request on the void-packages repository

ldns 1.7.1
https://github.com/void-linux/void-packages/pull/13364
Description: 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-27 11:51 [PR PATCH] ldns 1.7.1 voidlinux-github
2019-07-30  8:00 ` [PR PATCH] [Merged]: " voidlinux-github

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git