diff options
| author | mandree <mandree@FreeBSD.org> | 2015-06-16 08:48:01 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2015-06-16 08:48:01 +0800 |
| commit | 58b9394d90aaa581fa418573808ff84987ee234c (patch) | |
| tree | 4083786e2f710b780402d54da6f3106b81b88a38 /dns/dnsmasq/files | |
| parent | 96993761943a7a031e885ecd569f67393b336ecb (diff) | |
| download | freebsd-ports-gnome-58b9394d90aaa581fa418573808ff84987ee234c.tar.gz freebsd-ports-gnome-58b9394d90aaa581fa418573808ff84987ee234c.tar.zst freebsd-ports-gnome-58b9394d90aaa581fa418573808ff84987ee234c.zip | |
Upgrade dnsmasq to new release 2.73.
Changelog: http://www.thekelleys.org.uk/dnsmasq/CHANGELOGDisable dnsmasq-devel (older than stable).
Switch to using @sample keyword [1].
PR: 200717 [1]
Submitted by: Jimmy Olgeni
Diffstat (limited to 'dns/dnsmasq/files')
| -rw-r--r-- | dns/dnsmasq/files/patch-CVE-2015-3294 | 36 | ||||
| -rw-r--r-- | dns/dnsmasq/files/patch-dnsmasq.conf.example | 4 |
2 files changed, 2 insertions, 38 deletions
diff --git a/dns/dnsmasq/files/patch-CVE-2015-3294 b/dns/dnsmasq/files/patch-CVE-2015-3294 deleted file mode 100644 index 37d25d308ccd..000000000000 --- a/dns/dnsmasq/files/patch-CVE-2015-3294 +++ /dev/null @@ -1,36 +0,0 @@ -X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blobdiff_plain;f=src%2Frfc1035.c;h=a995ab50d74adde068c8839684f9b3a44f4976d0;hp=7a07b0cee90655e296f57fa79f4d4a3a409b7b89;hb=ad4a8ff7d9097008d7623df8543df435bfddeac8;hpb=04b0ac05377936d121a36873bb63d492cde292c9 - -diff --git a/src/rfc1035.c b/src/rfc1035.c -index 7a07b0c..a995ab5 100644 ---- a/src/rfc1035.c -+++ src/rfc1035.c -@@ -1198,7 +1198,10 @@ unsigned int extract_request(struct dns_header *header, size_t qlen, char *name, - size_t setup_reply(struct dns_header *header, size_t qlen, - struct all_addr *addrp, unsigned int flags, unsigned long ttl) - { -- unsigned char *p = skip_questions(header, qlen); -+ unsigned char *p; -+ -+ if (!(p = skip_questions(header, qlen))) -+ return 0; - - /* clear authoritative and truncated flags, set QR flag */ - header->hb3 = (header->hb3 & ~(HB3_AA | HB3_TC)) | HB3_QR; -@@ -1214,7 +1217,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen, - SET_RCODE(header, NOERROR); /* empty domain */ - else if (flags == F_NXDOMAIN) - SET_RCODE(header, NXDOMAIN); -- else if (p && flags == F_IPV4) -+ else if (flags == F_IPV4) - { /* we know the address */ - SET_RCODE(header, NOERROR); - header->ancount = htons(1); -@@ -1222,7 +1225,7 @@ size_t setup_reply(struct dns_header *header, size_t qlen, - add_resource_record(header, NULL, NULL, sizeof(struct dns_header), &p, ttl, NULL, T_A, C_IN, "4", addrp); - } - #ifdef HAVE_IPV6 -- else if (p && flags == F_IPV6) -+ else if (flags == F_IPV6) - { - SET_RCODE(header, NOERROR); - header->ancount = htons(1); diff --git a/dns/dnsmasq/files/patch-dnsmasq.conf.example b/dns/dnsmasq/files/patch-dnsmasq.conf.example index 8fa2d32845e6..2ec44e871198 100644 --- a/dns/dnsmasq/files/patch-dnsmasq.conf.example +++ b/dns/dnsmasq/files/patch-dnsmasq.conf.example @@ -1,5 +1,5 @@ ---- ./dnsmasq.conf.example.orig 2014-04-09 21:36:53.000000000 +0200 -+++ ./dnsmasq.conf.example 2014-04-15 19:32:54.000000000 +0200 +--- dnsmasq.conf.example.orig 2015-06-12 20:39:11 UTC ++++ dnsmasq.conf.example @@ -123,6 +123,12 @@ # running another nameserver on the same machine. #bind-interfaces |