All,
I've bumped dnsmasq to version 2.61. From my analysis, the
101-ipv6.patch is no longer required. I believe this was simplifying the
config/build process to make sure IPv6 support was enabled correctly.
The associate file, /src/config.h has been cleaned up in the newest
version and it seems to work just fine without this patch. I tested two
ways.
1. Without IPv6 enabled in menuconfig, specifically I disabled
CONFIG_IPV6. When I did that and ran dnsmasq compiled with that flag
disabled, it fired up without IPv6 support:
May 26 01:06:22 alix daemon.info dnsmasq[18416]: started, version 2.61
cachesize 150
May 26 01:06:22 alix daemon.info dnsmasq[18416]: compile time options:
no-IPv6 GNU-getopt no-DBus no-i18n no-IDN DHCP no-DHCPv6 no-Lua TFTP
no-conntrack
May 26 01:06:22 alix daemon.info dnsmasq-dhcp[18416]: DHCP, IP range
172.28.1.220 -- 172.28.1.249, lease time 8h
May 26 01:06:22 alix daemon.info dnsmasq[18416]: using local addresses
only for domain lan
May 26 01:06:22 alix daemon.info dnsmasq[18416]: reading
/tmp/resolv.conf.auto
May 26 01:06:22 alix daemon.info dnsmasq[18416]: using nameserver
24.25.5.60#53
May 26 01:06:22 alix daemon.info dnsmasq[18416]: using nameserver
24.25.5.61#53
May 26 01:06:22 alix daemon.info dnsmasq[18416]: using local addresses
only for domain lan
May 26 01:06:22 alix daemon.info dnsmasq[18416]: read /etc/hosts - 1
addresses
2. Then I cleaned the package, enabled CONFIG_IPV6, recompiled and ran
it again, this time it launches with IPv6 support:
May 26 01:07:39 alix daemon.info dnsmasq[18860]: started, version 2.61
cachesize 150
May 26 01:07:39 alix daemon.info dnsmasq[18860]: compile time options:
IPv6 GNU-getopt no-DBus no-i18n no-IDN DHCP DHCPv6 no-Lua TFTP no-conntrack
May 26 01:07:39 alix daemon.info dnsmasq-dhcp[18860]: DHCP, IP range
172.28.1.220 -- 172.28.1.249, lease time 8h
May 26 01:07:39 alix daemon.info dnsmasq[18860]: using local addresses
only for domain lan
May 26 01:07:39 alix daemon.info dnsmasq[18860]: reading
/tmp/resolv.conf.auto
May 26 01:07:39 alix daemon.info dnsmasq[18860]: using nameserver
24.25.5.60#53
May 26 01:07:39 alix daemon.info dnsmasq[18860]: using nameserver
24.25.5.61#53
May 26 01:07:39 alix daemon.info dnsmasq[18860]: using local addresses
only for domain lan
May 26 01:07:39 alix daemon.info dnsmasq[18860]: read /etc/hosts - 1
addresses
Any input and/or suggestions are welcome. Note, this version of dnsmasq
has some DHCPv6 support, however, the dnsmasq.init file has not been
updated to support it via UCI.
Signed-off-by: Adam Gensler <[email protected]>
---
Index: package/dnsmasq/patches/101-ipv6.patch
===================================================================
--- package/dnsmasq/patches/101-ipv6.patch (revision 31858)
+++ package/dnsmasq/patches/101-ipv6.patch (working copy)
@@ -1,13 +0,0 @@
---- a/src/config.h
-+++ b/src/config.h
-@@ -263,8 +263,9 @@ NOTES:
- /* We assume that systems which don't have IPv6
- headers don't have ntop and pton either */
-
--#if defined(INET6_ADDRSTRLEN) && defined(IPV6_V6ONLY) && !defined(NO_IPV6)
-+#if defined(INET6_ADDRSTRLEN) && !defined(NO_IPV6)
- # define HAVE_IPV6
-+# define IPV6_V6ONLY 26
- # define ADDRSTRLEN INET6_ADDRSTRLEN
- # if defined(SOL_IPV6)
- # define IPV6_LEVEL SOL_IPV6
Index: package/dnsmasq/Makefile
===================================================================
--- package/dnsmasq/Makefile (revision 31858)
+++ package/dnsmasq/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=dnsmasq
-PKG_VERSION:=2.59
-PKG_RELEASE:=4
+PKG_VERSION:=2.61
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=b5757ef2d7b651748eeebb88af29d7d6
+PKG_MD5SUM:=6ed0a5c2524dfc3a74ef494ee2469f09
PKG_INSTALL:=1
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
