替换dnsmasq为dnsmasq-full

JimLee1996 · Aug 27, 2017 · 9c25cba · 9c25cba
1 parent 236ef7f
commit 9c25cba
Show file tree

Hide file tree

Showing 18 changed files with 94 additions and 42 deletions.
diff --git a/squashfs-root/etc/config/dhcp b/squashfs-root/etc/config/dhcp
@@ -3,7 +3,7 @@ config dnsmasq
 	option boguspriv	1
 	option filterwin2k	0  # enable for dial on demand
 	option localise_queries	1
-	option rebind_protection 0  # disable if upstream must serve RFC1918 addresses
+	option rebind_protection 1  # disable if upstream must serve RFC1918 addresses
 	option rebind_localhost 1  # enable for RBL checking and similar services
 	#list rebind_domain example.lan  # whitelist RFC1918 responses for domains
 	option local	'/lan/'
@@ -20,16 +20,11 @@ config dnsmasq
 	#list notinterface	lo
 	#list bogusnxdomain     '64.94.110.11'
 
-config dnsmasq 'welcome'
-	list address '/#/192.168.2.1'
-	option local_ttl 1
-
 config dhcp lan
-    option ignore 0
 	option interface	lan
 	option start 	100
-	option limit	151
-	option leasetime	24h
+	option limit	150
+	option leasetime	12h
 
 config dhcp wan
 	option interface	wan

diff --git a/squashfs-root/usr/lib/libgmp.so.10 b/squashfs-root/usr/lib/libgmp.so.10
@@ -0,0 +1 @@
+libgmp.so.10.2.0
diff --git a/squashfs-root/usr/lib/libgmp.so.10.2.0 b/squashfs-root/usr/lib/libgmp.so.10.2.0
diff --git a/squashfs-root/usr/lib/libhogweed.so.2 b/squashfs-root/usr/lib/libhogweed.so.2
@@ -0,0 +1 @@
+libhogweed.so.2.5
diff --git a/squashfs-root/usr/lib/libhogweed.so.2.5 b/squashfs-root/usr/lib/libhogweed.so.2.5
diff --git a/squashfs-root/usr/lib/libnettle.so.4 b/squashfs-root/usr/lib/libnettle.so.4
@@ -0,0 +1 @@
+libnettle.so.4.7
diff --git a/squashfs-root/usr/lib/libnettle.so.4.7 b/squashfs-root/usr/lib/libnettle.so.4.7
diff --git a/...-root/usr/lib/opkg/info/dnsmasq.conffiles → .../usr/lib/opkg/info/dnsmasq-full.conffiles b/...-root/usr/lib/opkg/info/dnsmasq.conffiles → .../usr/lib/opkg/info/dnsmasq-full.conffiles
diff --git a/squashfs-root/usr/lib/opkg/info/dnsmasq-full.control b/squashfs-root/usr/lib/opkg/info/dnsmasq-full.control
@@ -0,0 +1,12 @@
+Package: dnsmasq-full
+Version: 2.71-4
+Depends: libc, kmod-ipv6, libnettle
+Source: package/network/services/dnsmasq
+License: GPLv2
+LicenseFiles: COPYING
+Section: net
+Architecture: ramips_1004kc
+Installed-Size: 134707
+Description:  It is intended to provide coupled DNS and DHCP service to a LAN.
+
+ This is a variant with DHCPv6, DNSSEC, Authroitative DNS and IPSET support
diff --git a/squashfs-root/usr/lib/opkg/info/dnsmasq.list → ...-root/usr/lib/opkg/info/dnsmasq-full.list b/squashfs-root/usr/lib/opkg/info/dnsmasq.list → ...-root/usr/lib/opkg/info/dnsmasq-full.list
@@ -3,3 +3,4 @@
 /etc/config/dhcp
 /etc/init.d/dnsmasq
 /usr/sbin/dnsmasq
+/usr/share/dnsmasq/trust-anchors.conf
diff --git a/squashfs-root/usr/lib/opkg/info/dnsmasq.control b/squashfs-root/usr/lib/opkg/info/dnsmasq.control
diff --git a/squashfs-root/usr/lib/opkg/info/libgmp.control b/squashfs-root/usr/lib/opkg/info/libgmp.control
@@ -0,0 +1,9 @@
+Package: libgmp
+Version: 6.0.0-1
+Depends: libc
+Source: package/libs/gmp
+Section: libs
+Architecture: ramips_1004kc
+Installed-Size: 206818
+Description:  GMP is a free library for arbitrary precision arithmetic, operating on
+ signed integers, rational numbers, and floating point numbers.
diff --git a/squashfs-root/usr/lib/opkg/info/libgmp.list b/squashfs-root/usr/lib/opkg/info/libgmp.list
@@ -0,0 +1,2 @@
+/usr/lib/libgmp.so.10.2.0
+/usr/lib/libgmp.so.10
diff --git a/squashfs-root/usr/lib/opkg/info/libnettle.control b/squashfs-root/usr/lib/opkg/info/libnettle.control
@@ -0,0 +1,11 @@
+Package: libnettle
+Version: 2.7.1-1
+Depends: libc, libgmp
+Source: package/libs/nettle
+License: LGPLv2
+LicenseFiles: COPYING
+Section: libs
+Maintainer: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Architecture: ramips_1004kc
+Installed-Size: 221010
+Description:  GNU crypto library
diff --git a/squashfs-root/usr/lib/opkg/info/libnettle.list b/squashfs-root/usr/lib/opkg/info/libnettle.list
@@ -0,0 +1,4 @@
+/usr/lib/libhogweed.so.2.5
+/usr/lib/libnettle.so.4
+/usr/lib/libnettle.so.4.7
+/usr/lib/libhogweed.so.2
diff --git a/squashfs-root/usr/lib/opkg/status b/squashfs-root/usr/lib/opkg/status
@@ -415,24 +415,21 @@ Conffiles:
  /etc/config/ddns 5438cd197244324c9400275a93574414
 Installed-Time: 1502269015
 
-Package: wpspbc
-Version: 1.1-1
-Depends: libc, libuci, phicomm_libs
+Package: libnettle
+Version: 2.7.1-1
+Depends: libc, libgmp
 Provides:
 Status: install user installed
 Architecture: ramips_1004kc
-Installed-Time: 1502269018
+Installed-Time: 1503804533
 
-Package: dnsmasq
-Version: 2.71-4
-Depends: libc
+Package: wpspbc
+Version: 1.1-1
+Depends: libc, libuci, phicomm_libs
 Provides:
 Status: install user installed
 Architecture: ramips_1004kc
-Conffiles:
- /etc/config/dhcp e501edba1357e23b6a7642b357c597c4
- /etc/dnsmasq.conf 7cf378e58d3fe5db31f4116a16c15c61
-Installed-Time: 1502269016
+Installed-Time: 1502269018
 
 Package: procd
 Version: 2014-09-15-c1a558f7d0c1e6c1ffa5a47d557a7b45205eef1d
@@ -1140,22 +1137,22 @@ Status: install user installed
 Architecture: ramips_1004kc
 Installed-Time: 1502269017
 
-Package: libxtables
+Package: ip6tables
 Version: 1.4.21-1
-Depends: libc
+Depends: libc, kmod-ip6tables, iptables
 Provides:
 Status: install user installed
 Architecture: ramips_1004kc
 Installed-Time: 1502269016
-Auto-Installed: yes
 
-Package: ip6tables
+Package: libxtables
 Version: 1.4.21-1
-Depends: libc, kmod-ip6tables, iptables
+Depends: libc
 Provides:
 Status: install user installed
 Architecture: ramips_1004kc
 Installed-Time: 1502269016
+Auto-Installed: yes
 
 Package: lighttpd-mod-redirect
 Version: 1.4.35-2
@@ -1223,14 +1220,6 @@ Status: install hold installed
 Architecture: ramips_1004kc
 Installed-Time: 1502269016
 
-Package: luci-lib-json
-Version: 1.0.0-1
-Depends: libc
-Provides:
-Status: install user installed
-Architecture: ramips_1004kc
-Installed-Time: 1502269017
-
 Package: kmod-hw_wdg
 Version: 3.10.14-1
 Depends: kernel (= 3.10.14-1-b111ad83351afe639183d8564c3857ca)
@@ -1239,6 +1228,14 @@ Status: install hold installed
 Architecture: ramips_1004kc
 Installed-Time: 1502269016
 
+Package: luci-lib-json
+Version: 1.0.0-1
+Depends: libc
+Provides:
+Status: install user installed
+Architecture: ramips_1004kc
+Installed-Time: 1502269017
+
 Package: kmod-nls-iso8859-1
 Version: 3.10.14-1
 Depends: kernel (= 3.10.14-1-b111ad83351afe639183d8564c3857ca), kmod-nls-base
@@ -1263,6 +1260,14 @@ Status: install hold installed
 Architecture: ramips_1004kc
 Installed-Time: 1502269016
 
+Package: libgmp
+Version: 6.0.0-1
+Depends: libc
+Provides:
+Status: install user installed
+Architecture: ramips_1004kc
+Installed-Time: 1503804519
+
 Package: luci-app-light
 Version: 1.0.0-1
 Depends: libc
@@ -1490,3 +1495,14 @@ Architecture: ramips_1004kc
 Installed-Time: 1502269016
 Auto-Installed: yes
 
+Package: dnsmasq-full
+Version: 2.71-4
+Depends: libc, kmod-ipv6, libnettle
+Provides:
+Status: install user installed
+Architecture: ramips_1004kc
+Conffiles:
+ /etc/config/dhcp 326e2116bd9bc3ecc5be4f75cd1e7647
+ /etc/dnsmasq.conf 7cf378e58d3fe5db31f4116a16c15c61
+Installed-Time: 1503804636
+
diff --git a/squashfs-root/usr/sbin/dnsmasq b/squashfs-root/usr/sbin/dnsmasq
diff --git a/squashfs-root/usr/share/dnsmasq/trust-anchors.conf b/squashfs-root/usr/share/dnsmasq/trust-anchors.conf
@@ -0,0 +1,9 @@
+# The root DNSSEC trust anchor, valid as at 30/01/2014
+
+# Note that this is a DS record (ie a hash of the root Zone Signing Key) 
+# If was downloaded from https://data.iana.org/root-anchors/root-anchors.xml
+
+trust-anchor=.,19036,8,2,49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5
+
+
+