--- package/network/services/dnsmasq/Makefile | 6 +-- .../0001-Fix-breakage-of-host-record-parsing.patch | 43 ++++++++++++++++++++ .../0001-Set-prefix-on-link-bit-in-RAs.patch | 42 ------------------- 3 files changed, 46 insertions(+), 45 deletions(-) create mode 100644 package/network/services/dnsmasq/patches/0001-Fix-breakage-of-host-record-parsing.patch delete mode 100644 package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index d92b00f..9213af1 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.62 -PKG_RELEASE:=2 +PKG_VERSION:=2.63 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq -PKG_MD5SUM:=f47e5cb8f5bac6343f24b2dbe317ab40 +PKG_MD5SUM:=43e771997615ebcd8f6c6ffa60c3e40b PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:=COPYING diff --git a/package/network/services/dnsmasq/patches/0001-Fix-breakage-of-host-record-parsing.patch b/package/network/services/dnsmasq/patches/0001-Fix-breakage-of-host-record-parsing.patch new file mode 100644 index 0000000..ecc47c1 --- /dev/null +++ b/package/network/services/dnsmasq/patches/0001-Fix-breakage-of-host-record-parsing.patch @@ -0,0 +1,43 @@ +From de9a037ffe6c546e9539b7900eb1c2f895bfabd0 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <[email protected]> +Date: Thu, 27 Sep 2012 21:52:26 +0100 +Subject: [PATCH] Fix breakage of --host-record parsing. + +--- + CHANGELOG | 4 ++++ + src/option.c | 6 +++--- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index e1daeef..249c1c7 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,7 @@ ++ Fix breakage of --host-record parsing, resulting in ++ infinte loop at startup. Regression in 2.63. Thanks to ++ Haim Gelfenbeyn for spotting this. ++ + version 2.63 + Do duplicate dhcp-host address check in --test mode. + +diff --git a/src/option.c b/src/option.c +index 22c08e7..a3e9d19 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -3146,10 +3146,10 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + for (tmp = new->names; tmp->next; tmp = tmp->next); + tmp->next = nl; + } +- +- arg = comma; +- comma = split(arg); + } ++ ++ arg = comma; ++ comma = split(arg); + } + + /* Keep list order */ +-- +1.7.10.GIT + diff --git a/package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch b/package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch deleted file mode 100644 index 8ead9af..0000000 --- a/package/network/services/dnsmasq/patches/0001-Set-prefix-on-link-bit-in-RAs.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fd05f127909bbf4f6983a4de2dcb611947488dee Mon Sep 17 00:00:00 2001 -From: Simon Kelley <[email protected]> -Date: Sun, 12 Aug 2012 17:48:50 +0100 -Subject: [PATCH] Set prefix on-link bit in RAs - ---- - CHANGELOG | 3 +++ - src/radv.c | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 8828694..e1daeef 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -45,6 +45,9 @@ version 2.63 - uk.org.thekelleys.dnsmasq. Thanks to Mathieu - Trudel-Lapierre for the patch. - -+ Set the "prefix on-link" bit in Router -+ Advertisements. Thanks to Gui Iribarren for the patch. -+ - - version 2.62 - Update German translation. Thanks to Conrad Kostecki. -diff --git a/src/radv.c b/src/radv.c -index a3e691a..d1f5268 100644 ---- a/src/radv.c -+++ b/src/radv.c -@@ -412,8 +412,8 @@ static int add_prefixes(struct in6_addr *local, int prefix, - opt->type = ICMP6_OPT_PREFIX; - opt->len = 4; - opt->prefix_len = prefix; -- /* autonomous only if we're not doing dhcp */ -- opt->flags = do_slaac ? 0x40 : 0x00; -+ /* autonomous only if we're not doing dhcp, always set "on-link" */ -+ opt->flags = do_slaac ? 0xC0 : 0x80; - opt->valid_lifetime = htonl(time); - opt->preferred_lifetime = htonl(deprecate ? 0 : time); - opt->reserved = 0; --- -1.7.10.GIT -
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
