diff options
| author | mandree <mandree@FreeBSD.org> | 2016-05-19 06:17:09 +0800 |
|---|---|---|
| committer | mandree <mandree@FreeBSD.org> | 2016-05-19 06:17:09 +0800 |
| commit | bb12245333e6d3833bbd2d223015e60e355cc6e5 (patch) | |
| tree | 8cdb9a4b1b5fcea0274fa0287d8a66a6d951f0cd /dns | |
| parent | e36dee66c8d77b07a106170f88e1692d63aa8e45 (diff) | |
| download | freebsd-ports-gnome-bb12245333e6d3833bbd2d223015e60e355cc6e5.tar.gz freebsd-ports-gnome-bb12245333e6d3833bbd2d223015e60e355cc6e5.tar.zst freebsd-ports-gnome-bb12245333e6d3833bbd2d223015e60e355cc6e5.zip | |
Update, new upstream feature+bugfix release v2.76
The upstream maintainer's change log is here, and in the installed
CHANGELOG file:
<http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blob_plain;f=CHANGELOG;hb=v2.76>
Drop two patch files that were previously cherry-picked from the
post-v2.75 upstream repository and should no longer be needed.
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/dnsmasq/Makefile | 4 | ||||
| -rw-r--r-- | dns/dnsmasq/distinfo | 5 | ||||
| -rw-r--r-- | dns/dnsmasq/files/patch-src_cache.c | 11 | ||||
| -rw-r--r-- | dns/dnsmasq/files/patch-src_option.c | 23 |
4 files changed, 5 insertions, 38 deletions
diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index f631a513302c..a959834c2f94 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= dnsmasq -DISTVERSION= 2.75 -PORTREVISION= 2 # leave this in even if 0 to avoid PORTEPOCH bumps +DISTVERSION= 2.76 +PORTREVISION= 0 # leave this in even if 0 to avoid PORTEPOCH bumps PORTEPOCH= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ diff --git a/dns/dnsmasq/distinfo b/dns/dnsmasq/distinfo index ff26dea18a43..6c4469bece5e 100644 --- a/dns/dnsmasq/distinfo +++ b/dns/dnsmasq/distinfo @@ -1,2 +1,3 @@ -SHA256 (dnsmasq-2.75.tar.xz) = 640c4e1d4c298e42458419cd78cfc26acc549401b1a34d271cd3e0e4226941f1 -SIZE (dnsmasq-2.75.tar.xz) = 472484 +TIMESTAMP = 1463608856 +SHA256 (dnsmasq-2.76.tar.xz) = 4b92698dee19ca0cb2a8f2e48f1d2dffd01a21eb15d1fbed4cf085630c8c9f96 +SIZE (dnsmasq-2.76.tar.xz) = 480796 diff --git a/dns/dnsmasq/files/patch-src_cache.c b/dns/dnsmasq/files/patch-src_cache.c deleted file mode 100644 index 2c0b026a0712..000000000000 --- a/dns/dnsmasq/files/patch-src_cache.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/cache.c.orig 2015-07-30 19:59:07 UTC -+++ src/cache.c -@@ -481,7 +481,7 @@ struct crec *cache_insert(char *name, st - existing record is for an A or AAAA and - the record we're trying to insert is the same, - just drop the insert, but don't error the whole process. */ -- if ((flags & (F_IPV4 | F_IPV6)) && (flags & F_FORWARD)) -+ if ((flags & (F_IPV4 | F_IPV6)) && (flags & F_FORWARD) && addr) - { - if ((flags & F_IPV4) && (new->flags & F_IPV4) && - new->addr.addr.addr.addr4.s_addr == addr->addr.addr4.s_addr) diff --git a/dns/dnsmasq/files/patch-src_option.c b/dns/dnsmasq/files/patch-src_option.c deleted file mode 100644 index 91cbd33d4a6d..000000000000 --- a/dns/dnsmasq/files/patch-src_option.c +++ /dev/null @@ -1,23 +0,0 @@ ---- src/option.c.orig 2015-07-30 19:59:07 UTC -+++ src/option.c -@@ -1501,10 +1501,16 @@ static int one_opt(int option, char *arg - li = opt_malloc(sizeof(struct list)); - if (*arg == '*') - { -- li->next = match_suffix; -- match_suffix = li; -- /* Have to copy: buffer is overwritten */ -- li->suffix = opt_string_alloc(arg+1); -+ /* "*" with no suffix is a no-op */ -+ if (arg[1] == 0) -+ free(li); -+ else -+ { -+ li->next = match_suffix; -+ match_suffix = li; -+ /* Have to copy: buffer is overwritten */ -+ li->suffix = opt_string_alloc(arg+1); -+ } - } - else - { |