diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-30 11:44:06 +0100 |
commit | f516638b7fe9592837389826a6152a7e1b251c54 (patch) | |
tree | 8bfecb640b7b6403d7a3d662d923eed630033da7 /net-dns/dnsmasq/files | |
parent | 1a61119f9f7b057830e2ce0563f913ec86f282ad (diff) |
gentoo resync : 30.05.2020
Diffstat (limited to 'net-dns/dnsmasq/files')
3 files changed, 0 insertions, 106 deletions
diff --git a/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch deleted file mode 100644 index a44ceabece71..000000000000 --- a/net-dns/dnsmasq/files/dnsmasq-2.80-cve-2019-14834.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix memory leak in helper.c - -Thanks to Xu Mingjie <xumingjie1995@outlook.com> for spotting this. - -author: Simon Kelley <simon@thekelleys.org.uk> -commit-url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=69bc94779c2f035a9fffdb5327a54c3aeca73ed5 -diff --git a/src/helper.c b/src/helper.c -index 33ba120..c392eec 100644 (file) ---- a/src/helper.c -+++ b/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)) diff --git a/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch deleted file mode 100644 index 21bd7cd39ff6..000000000000 --- a/net-dns/dnsmasq/files/dnsmasq-2.80-linux-headers-5.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3052ce208acf602f0163166dcefb7330d537cedb Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby@suse.cz> -Date: Wed, 24 Jul 2019 17:34:48 +0100 -Subject: [PATCH] Fix build after y2038 changes in glib. - -SIOCGSTAMP is defined in linux/sockios.h, not asm/sockios.h now. ---- - src/dnsmasq.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index ff3204a..3ef04ad 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -137,6 +137,7 @@ typedef unsigned long long u64; - #endif - - #if defined(HAVE_LINUX_NETWORK) -+#include <linux/sockios.h> - #include <linux/capability.h> - /* There doesn't seem to be a universally-available - userspace header for these. */ --- -1.7.10.4 - diff --git a/net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch b/net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch deleted file mode 100644 index 7d77a21de7cb..000000000000 --- a/net-dns/dnsmasq/files/dnsmasq-2.80-nettle-3.5.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6fd9aba7abe1e084123bc5002959350897774ace Mon Sep 17 00:00:00 2001 -From: Vladislav Grishenko <themiron@mail.ru> -Date: Wed, 26 Jun 2019 20:27:11 +0500 -Subject: [PATCH] Fix build with libnettle 3.5 - ---- - src/crypto.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/crypto.c b/src/crypto.c -index 1f1c12b..9cfe371 100644 ---- a/src/crypto.c -+++ b/src/crypto.c -@@ -296,6 +296,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) - { -@@ -315,7 +319,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; -@@ -328,7 +332,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; |