From owner-svn-ports-head@freebsd.org Thu Jan 7 23:44:02 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08F8BA671E1; Thu, 7 Jan 2016 23:44:02 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB142122B; Thu, 7 Jan 2016 23:44:01 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u07Ni0Bv097525; Thu, 7 Jan 2016 23:44:00 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u07Ni0nc097522; Thu, 7 Jan 2016 23:44:00 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201601072344.u07Ni0nc097522@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Thu, 7 Jan 2016 23:44:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405491 - in head/dns/dnsmasq: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Jan 2016 23:44:02 -0000 Author: mandree Date: Thu Jan 7 23:44:00 2016 New Revision: 405491 URL: https://svnweb.freebsd.org/changeset/ports/405491 Log: Cherry-pick two upstream fixes for crashers. (But bump PORTREVISION instead of PORTEPOCH ;-)) http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=0007ee90646a5a78a96ee729932e89d31c69513a http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=41a8d9e99be9f2cc8b02051dd322cb45e0faac87 Submitted by: garga@ Obtained from: Edwin Török, Simon Kelley Differential Revision: D4813 Added: head/dns/dnsmasq/files/patch-src_cache.c (contents, props changed) head/dns/dnsmasq/files/patch-src_option.c (contents, props changed) Modified: head/dns/dnsmasq/Makefile Modified: head/dns/dnsmasq/Makefile ============================================================================== --- head/dns/dnsmasq/Makefile Thu Jan 7 23:20:46 2016 (r405490) +++ head/dns/dnsmasq/Makefile Thu Jan 7 23:44:00 2016 (r405491) @@ -3,6 +3,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.75 +PORTREVISION= 1 # leave this in even if 0 to avoid PORTEPOCH bumps PORTEPOCH= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://www.thekelleys.org.uk/dnsmasq/ \ Added: head/dns/dnsmasq/files/patch-src_cache.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsmasq/files/patch-src_cache.c Thu Jan 7 23:44:00 2016 (r405491) @@ -0,0 +1,11 @@ +--- 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) Added: head/dns/dnsmasq/files/patch-src_option.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/dnsmasq/files/patch-src_option.c Thu Jan 7 23:44:00 2016 (r405491) @@ -0,0 +1,23 @@ +--- 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 + {