* [PR PATCH] dnsmasq: update to 2.81.
@ 2020-04-15 16:27 mobinmob
2020-04-15 23:35 ` Piraty
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: mobinmob @ 2020-04-15 16:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages dnsmasq
https://github.com/void-linux/void-packages/pull/21029
dnsmasq: update to 2.81.
A patch file from https://github.com/void-linux/void-packages/pull/21029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dnsmasq-21029.patch --]
[-- Type: text/x-diff, Size: 5141 bytes --]
From 309ce5a106ab75e916fb3f73f78728e1de048356 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 15 Apr 2020 19:27:10 +0300
Subject: [PATCH] dnsmasq: update to 2.81.
---
srcpkgs/dnsmasq/patches/CVE-2019-14834.patch | 45 --------------------
srcpkgs/dnsmasq/patches/nettle35.patch | 42 ------------------
srcpkgs/dnsmasq/template | 6 +--
3 files changed, 3 insertions(+), 90 deletions(-)
delete mode 100644 srcpkgs/dnsmasq/patches/CVE-2019-14834.patch
delete mode 100644 srcpkgs/dnsmasq/patches/nettle35.patch
diff --git a/srcpkgs/dnsmasq/patches/CVE-2019-14834.patch b/srcpkgs/dnsmasq/patches/CVE-2019-14834.patch
deleted file mode 100644
index 77748e31bdc..00000000000
--- a/srcpkgs/dnsmasq/patches/CVE-2019-14834.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Wed, 14 Aug 2019 20:44:50 +0100
-Subject: [PATCH] Fix memory leak in helper.c
-
-Thanks to Xu Mingjie <xumingjie1995@outlook.com> for spotting this.
----
- src/helper.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/helper.c b/src/helper.c
-index 33ba120..c392eec 100644
---- src/helper.c
-+++ src/helper.c
-@@ -80,7 +80,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
- pid_t pid;
- int i, pipefd[2];
- struct sigaction sigact;
--
-+ unsigned char *alloc_buff = NULL;
-+
- /* create the pipe through which the main program sends us commands,
- then fork our process. */
- if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)
-@@ -186,11 +187,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
- struct script_data data;
- char *p, *action_str, *hostname = NULL, *domain = NULL;
- unsigned char *buf = (unsigned char *)daemon->namebuff;
-- unsigned char *end, *extradata, *alloc_buff = NULL;
-+ unsigned char *end, *extradata;
- int is6, err = 0;
- int pipeout[2];
-
-- free(alloc_buff);
-+ /* Free rarely-allocated memory from previous iteration. */
-+ if (alloc_buff)
-+ {
-+ free(alloc_buff);
-+ alloc_buff = NULL;
-+ }
-
- /* we read zero bytes when pipe closed: this is our signal to exit */
- if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1))
---
-1.7.10.4
diff --git a/srcpkgs/dnsmasq/patches/nettle35.patch b/srcpkgs/dnsmasq/patches/nettle35.patch
deleted file mode 100644
index 90e83d2e00d..00000000000
--- a/srcpkgs/dnsmasq/patches/nettle35.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Vladislav Grishenko <themiron@mail.ru>
-Date: Wed, 26 Jun 2019 15:27:11 +0000 (+0500)
-Subject: Fix build with libnettle 3.5
-X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e;hp=69bc94779c2f035a9fffdb5327a54c3aeca73ed5
-
-Fix build with libnettle 3.5
----
-
-diff --git a/src/crypto.c b/src/crypto.c
-index ebb871e..fecc64a 100644
---- src/crypto.c
-+++ src/crypto.c
-@@ -275,6 +275,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
- static struct ecc_point *key_256 = NULL, *key_384 = NULL;
- static mpz_t x, y;
- static struct dsa_signature *sig_struct;
-+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4
-+#define nettle_get_secp_256r1() (&nettle_secp_256r1)
-+#define nettle_get_secp_384r1() (&nettle_secp_384r1)
-+#endif
-
- if (!sig_struct)
- {
-@@ -294,7 +298,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
- if (!(key_256 = whine_malloc(sizeof(struct ecc_point))))
- return 0;
-
-- nettle_ecc_point_init(key_256, &nettle_secp_256r1);
-+ nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
- }
-
- key = key_256;
-@@ -307,7 +311,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
- if (!(key_384 = whine_malloc(sizeof(struct ecc_point))))
- return 0;
-
-- nettle_ecc_point_init(key_384, &nettle_secp_384r1);
-+ nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
- }
-
- key = key_384;
-
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index a4e6be72e78..f1b39bda7d6 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,7 +1,7 @@
# Template file for 'dnsmasq'
pkgname=dnsmasq
-version=2.80
-revision=7
+version=2.81
+revision=1
conf_files="/etc/dnsmasq.conf"
hostmakedepends="pkg-config"
makedepends="dbus-devel libcap-devel libidn2-devel $(vopt_if dnssec nettle-devel)"
@@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
distfiles="http://www.thekelleys.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9e4a58f816ce0033ce383c549b7d4058ad9b823968d352d2b76614f83ea39adc
+checksum=3c28c68c6c2967c3a96e9b432c0c046a5df17a426d3a43cffe9e693cf05804d0
system_accounts="dnsmasq"
dnsmasq_homedir="/var/chroot"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: dnsmasq: update to 2.81.
2020-04-15 16:27 [PR PATCH] dnsmasq: update to 2.81 mobinmob
@ 2020-04-15 23:35 ` Piraty
2020-04-16 8:24 ` [PR PATCH] [Updated] " mobinmob
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Piraty @ 2020-04-15 23:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 163 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21029#issuecomment-614331493
Comment:
please add `changelog=`
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] dnsmasq: update to 2.81.
2020-04-15 16:27 [PR PATCH] dnsmasq: update to 2.81 mobinmob
2020-04-15 23:35 ` Piraty
@ 2020-04-16 8:24 ` mobinmob
2020-04-16 8:25 ` mobinmob
2020-04-17 14:18 ` [PR PATCH] [Merged]: " Hoshpak
3 siblings, 0 replies; 5+ messages in thread
From: mobinmob @ 2020-04-16 8:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 316 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages dnsmasq
https://github.com/void-linux/void-packages/pull/21029
dnsmasq: update to 2.81.
A patch file from https://github.com/void-linux/void-packages/pull/21029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dnsmasq-21029.patch --]
[-- Type: text/x-diff, Size: 5274 bytes --]
From 3703c7c026d8eb0af75d6cdd0a3e7209ad03d4a6 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Wed, 15 Apr 2020 19:27:10 +0300
Subject: [PATCH] dnsmasq: update to 2.81.
---
srcpkgs/dnsmasq/patches/CVE-2019-14834.patch | 45 --------------------
srcpkgs/dnsmasq/patches/nettle35.patch | 42 ------------------
srcpkgs/dnsmasq/template | 7 +--
3 files changed, 4 insertions(+), 90 deletions(-)
delete mode 100644 srcpkgs/dnsmasq/patches/CVE-2019-14834.patch
delete mode 100644 srcpkgs/dnsmasq/patches/nettle35.patch
diff --git a/srcpkgs/dnsmasq/patches/CVE-2019-14834.patch b/srcpkgs/dnsmasq/patches/CVE-2019-14834.patch
deleted file mode 100644
index 77748e31bdc..00000000000
--- a/srcpkgs/dnsmasq/patches/CVE-2019-14834.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 69bc94779c2f035a9fffdb5327a54c3aeca73ed5 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Wed, 14 Aug 2019 20:44:50 +0100
-Subject: [PATCH] Fix memory leak in helper.c
-
-Thanks to Xu Mingjie <xumingjie1995@outlook.com> for spotting this.
----
- src/helper.c | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/helper.c b/src/helper.c
-index 33ba120..c392eec 100644
---- src/helper.c
-+++ src/helper.c
-@@ -80,7 +80,8 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
- pid_t pid;
- int i, pipefd[2];
- struct sigaction sigact;
--
-+ unsigned char *alloc_buff = NULL;
-+
- /* create the pipe through which the main program sends us commands,
- then fork our process. */
- if (pipe(pipefd) == -1 || !fix_fd(pipefd[1]) || (pid = fork()) == -1)
-@@ -186,11 +187,16 @@ int create_helper(int event_fd, int err_fd, uid_t uid, gid_t gid, long max_fd)
- struct script_data data;
- char *p, *action_str, *hostname = NULL, *domain = NULL;
- unsigned char *buf = (unsigned char *)daemon->namebuff;
-- unsigned char *end, *extradata, *alloc_buff = NULL;
-+ unsigned char *end, *extradata;
- int is6, err = 0;
- int pipeout[2];
-
-- free(alloc_buff);
-+ /* Free rarely-allocated memory from previous iteration. */
-+ if (alloc_buff)
-+ {
-+ free(alloc_buff);
-+ alloc_buff = NULL;
-+ }
-
- /* we read zero bytes when pipe closed: this is our signal to exit */
- if (!read_write(pipefd[0], (unsigned char *)&data, sizeof(data), 1))
---
-1.7.10.4
diff --git a/srcpkgs/dnsmasq/patches/nettle35.patch b/srcpkgs/dnsmasq/patches/nettle35.patch
deleted file mode 100644
index 90e83d2e00d..00000000000
--- a/srcpkgs/dnsmasq/patches/nettle35.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Vladislav Grishenko <themiron@mail.ru>
-Date: Wed, 26 Jun 2019 15:27:11 +0000 (+0500)
-Subject: Fix build with libnettle 3.5
-X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commitdiff_plain;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e;hp=69bc94779c2f035a9fffdb5327a54c3aeca73ed5
-
-Fix build with libnettle 3.5
----
-
-diff --git a/src/crypto.c b/src/crypto.c
-index ebb871e..fecc64a 100644
---- src/crypto.c
-+++ src/crypto.c
-@@ -275,6 +275,10 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
- static struct ecc_point *key_256 = NULL, *key_384 = NULL;
- static mpz_t x, y;
- static struct dsa_signature *sig_struct;
-+#if NETTLE_VERSION_MAJOR == 3 && NETTLE_VERSION_MINOR < 4
-+#define nettle_get_secp_256r1() (&nettle_secp_256r1)
-+#define nettle_get_secp_384r1() (&nettle_secp_384r1)
-+#endif
-
- if (!sig_struct)
- {
-@@ -294,7 +298,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
- if (!(key_256 = whine_malloc(sizeof(struct ecc_point))))
- return 0;
-
-- nettle_ecc_point_init(key_256, &nettle_secp_256r1);
-+ nettle_ecc_point_init(key_256, nettle_get_secp_256r1());
- }
-
- key = key_256;
-@@ -307,7 +311,7 @@ static int dnsmasq_ecdsa_verify(struct blockdata *key_data, unsigned int key_len
- if (!(key_384 = whine_malloc(sizeof(struct ecc_point))))
- return 0;
-
-- nettle_ecc_point_init(key_384, &nettle_secp_384r1);
-+ nettle_ecc_point_init(key_384, nettle_get_secp_384r1());
- }
-
- key = key_384;
-
diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template
index a4e6be72e78..c142d48d343 100644
--- a/srcpkgs/dnsmasq/template
+++ b/srcpkgs/dnsmasq/template
@@ -1,7 +1,7 @@
# Template file for 'dnsmasq'
pkgname=dnsmasq
-version=2.80
-revision=7
+version=2.81
+revision=1
conf_files="/etc/dnsmasq.conf"
hostmakedepends="pkg-config"
makedepends="dbus-devel libcap-devel libidn2-devel $(vopt_if dnssec nettle-devel)"
@@ -9,8 +9,9 @@ short_desc="Lightweight, easy to configure DNS forwarder and DHCP server"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.thekelleys.org.uk/dnsmasq/doc.html"
+changelog="http://www.thekelleys.org.uk/dnsmasq/CHANGELOG"
distfiles="http://www.thekelleys.org.uk/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=9e4a58f816ce0033ce383c549b7d4058ad9b823968d352d2b76614f83ea39adc
+checksum=3c28c68c6c2967c3a96e9b432c0c046a5df17a426d3a43cffe9e693cf05804d0
system_accounts="dnsmasq"
dnsmasq_homedir="/var/chroot"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: dnsmasq: update to 2.81.
2020-04-15 16:27 [PR PATCH] dnsmasq: update to 2.81 mobinmob
2020-04-15 23:35 ` Piraty
2020-04-16 8:24 ` [PR PATCH] [Updated] " mobinmob
@ 2020-04-16 8:25 ` mobinmob
2020-04-17 14:18 ` [PR PATCH] [Merged]: " Hoshpak
3 siblings, 0 replies; 5+ messages in thread
From: mobinmob @ 2020-04-16 8:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21029#issuecomment-614495319
Comment:
> please add `changelog=`
Done! :+1:
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: dnsmasq: update to 2.81.
2020-04-15 16:27 [PR PATCH] dnsmasq: update to 2.81 mobinmob
` (2 preceding siblings ...)
2020-04-16 8:25 ` mobinmob
@ 2020-04-17 14:18 ` Hoshpak
3 siblings, 0 replies; 5+ messages in thread
From: Hoshpak @ 2020-04-17 14:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 158 bytes --]
There's a merged pull request on the void-packages repository
dnsmasq: update to 2.81.
https://github.com/void-linux/void-packages/pull/21029
Description:
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-04-17 14:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-15 16:27 [PR PATCH] dnsmasq: update to 2.81 mobinmob
2020-04-15 23:35 ` Piraty
2020-04-16 8:24 ` [PR PATCH] [Updated] " mobinmob
2020-04-16 8:25 ` mobinmob
2020-04-17 14:18 ` [PR PATCH] [Merged]: " Hoshpak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).