unbound: Remove named.cache

The custom list of DNS root servers provided with the package is not necessary.
Unbound ships with a built-in list.

Signed-off-by: Michael Hanselmann <public@hansmi.ch>

diff --git a/net/unbound/Makefile b/net/unbound/Makefile
index 8549f6191cf9f7f5c45c2cf4e07335a68846c893..67dcb65a39a8de8d3f2e51a987675ce950071d81 100644 (file)
--- a/net/unbound/Makefile
+++ b/net/unbound/Makefile
@@ -113,6 +113,7 @@ CONFIGURE_ARGS += \
        --enable-allsymbols \
        --with-libexpat="$(STAGING_DIR)/usr" \
        --with-ssl="$(STAGING_DIR)/usr" \
+       --with-pidfile=/var/run/unbound.pid \
        --without-pthreads
 
 define Package/unbound/conffiles
@@ -137,7 +138,6 @@ define Package/unbound/install
                $(PKG_INSTALL_DIR)/etc/unbound/unbound.conf \
                $(1)/etc/unbound/
        $(INSTALL_CONF) ./files/root.key $(1)/etc/unbound/
-       $(INSTALL_CONF) ./files/named.cache $(1)/etc/unbound/
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/unbound.init $(1)/etc/init.d/unbound
 endef

diff --git a/net/unbound/files/named.cache b/net/unbound/files/named.cache
deleted file mode 100644 (file)
index 9cc2022..0000000
--- a/net/unbound/files/named.cache
+++ /dev/null
@@ -1,90 +0,0 @@
-;       This file holds the information on root name servers needed to
-;       initialize cache of Internet domain name servers
-;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers).
-;
-;       This file is made available by InterNIC 
-;       under anonymous FTP as
-;           file                /domain/named.cache
-;           on server           FTP.INTERNIC.NET
-;       -OR-                    RS.INTERNIC.NET
-;
-;       last update:    November 05, 2014
-;       related version of root zone:   2014110501
-;
-; formerly NS.INTERNIC.NET
-;
-.                        3600000      NS    A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:ba3e::2:30
-;
-; FORMERLY NS1.ISI.EDU
-;
-.                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
-B.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:84::b
-;
-; FORMERLY C.PSI.NET
-;
-.                        3600000      NS    C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-C.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2::c
-;
-; FORMERLY TERP.UMD.EDU
-;
-.                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
-D.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2d::d
-;
-; FORMERLY NS.NASA.GOV
-;
-.                        3600000      NS    E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
-;
-; FORMERLY NS.ISC.ORG
-;
-.                        3600000      NS    F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2f::f
-;
-; FORMERLY NS.NIC.DDN.MIL
-;
-.                        3600000      NS    G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
-;
-; FORMERLY AOS.ARL.ARMY.MIL
-;
-.                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803f:235
-;
-; FORMERLY NIC.NORDU.NET
-;
-.                        3600000      NS    I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fe::53
-;
-; OPERATED BY VERISIGN, INC.
-;
-.                        3600000      NS    J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
-J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:c27::2:30
-;
-; OPERATED BY RIPE NCC
-;
-.                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7fd::1
-;
-; OPERATED BY ICANN
-;
-.                        3600000      NS    L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
-;
-; OPERATED BY WIDE
-;
-.                        3600000      NS    M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:dc3::35
-; End of file

diff --git a/net/unbound/patches/001-conf.patch b/net/unbound/patches/001-conf.patch
index eab0df3757ca59f10178ef8d345cf5ab9d07bb05..352fe942cea3998dc94ecbd54d86d96b15a4e1ba 100644 (file)
--- a/net/unbound/patches/001-conf.patch
+++ b/net/unbound/patches/001-conf.patch
@@ -97,19 +97,6 @@ index ff90e3b..5c20fdf 100644
  
        # the working directory. The relative files in this config are
        # relative to this directory. If you give "" the working directory
-@@ -240,10 +256,12 @@ server:
- 
-       # the pid file. Can be an absolute path outside of chroot/work dir.
-       # pidfile: "@UNBOUND_PIDFILE@"
-+      pidfile: "/var/run/unbound.pid"
- 
-       # file to read root hints from.
-       # get one from https://www.internic.net/domain/named.cache
-       # root-hints: ""
-+      root-hints: "/etc/unbound/named.cache"
- 
-       # enable to not answer id.server and hostname.bind queries.
-       # hide-identity: no
 @@ -266,12 +284,15 @@ server:
        #       positive value: fetch that many targets opportunistically.
        # Enclose the list of numbers between quotes ("").