From: David Härdeman Date: Sat, 26 Jul 2025 23:12:52 +0000 (+0200) Subject: bind: remove obsolete zone files X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=3452949a08889ead8af62739c7088250ac20d160;p=feed%2Fpackages.git bind: remove obsolete zone files Bind9 has native support for these zones via the "empty-zones yes" directive, which is enabled by default. (cf. https://salsa.debian.org/dns-team/bind9/-/commit/bb1cda792b3ca03f61503be4f94c1f82d3392792) Signed-off-by: David Härdeman --- diff --git a/net/bind/Makefile b/net/bind/Makefile index 573d08e546..17f54386d0 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -223,27 +223,15 @@ define Package/bind-server/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/bind $(CP) \ - ./files/bind/db.0 \ - ./files/bind/db.127 \ - ./files/bind/db.255 \ - ./files/bind/db.local \ ./files/bind/db.root \ ./files/bind/bind.keys \ $(1)/etc/bind/ - sed -e '1s/ broadcast / empty rfc1918 /' \ - < ./files/bind/db.0 \ - > $(1)/etc/bind/db.empty $(CP) ./files/bind/named.conf.example $(1)/etc/bind/named.conf $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/named.init $(1)/etc/init.d/named - find $(1)/etc/bind/ -name ".svn" | xargs rm -rf endef define Package/bind-server/conffiles -/etc/bind/db.0 -/etc/bind/db.127 -/etc/bind/db.255 -/etc/bind/db.local /etc/bind/db.root /etc/bind/named.conf endef diff --git a/net/bind/files/bind/db.0 b/net/bind/files/bind/db.0 deleted file mode 100644 index e3aabdbeed..0000000000 --- a/net/bind/files/bind/db.0 +++ /dev/null @@ -1,12 +0,0 @@ -; -; BIND reverse data file for broadcast zone -; -$TTL 604800 -@ IN SOA localhost. root.localhost. ( - 1 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL -; -@ IN NS localhost. diff --git a/net/bind/files/bind/db.127 b/net/bind/files/bind/db.127 deleted file mode 100644 index cd05bef14a..0000000000 --- a/net/bind/files/bind/db.127 +++ /dev/null @@ -1,13 +0,0 @@ -; -; BIND reverse data file for local loopback interface -; -$TTL 604800 -@ IN SOA localhost. root.localhost. ( - 1 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL -; -@ IN NS localhost. -1.0.0 IN PTR localhost. diff --git a/net/bind/files/bind/db.255 b/net/bind/files/bind/db.255 deleted file mode 100644 index e3aabdbeed..0000000000 --- a/net/bind/files/bind/db.255 +++ /dev/null @@ -1,12 +0,0 @@ -; -; BIND reverse data file for broadcast zone -; -$TTL 604800 -@ IN SOA localhost. root.localhost. ( - 1 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL -; -@ IN NS localhost. diff --git a/net/bind/files/bind/db.local b/net/bind/files/bind/db.local deleted file mode 100644 index 66b4892351..0000000000 --- a/net/bind/files/bind/db.local +++ /dev/null @@ -1,13 +0,0 @@ -; -; BIND data file for local loopback interface -; -$TTL 604800 -@ IN SOA localhost. root.localhost. ( - 1 ; Serial - 604800 ; Refresh - 86400 ; Retry - 2419200 ; Expire - 604800 ) ; Negative Cache TTL -; -@ IN NS localhost. -@ IN A 127.0.0.1 diff --git a/net/bind/files/bind/named.conf.example b/net/bind/files/bind/named.conf.example index 8410705879..ca1e02d5ca 100644 --- a/net/bind/files/bind/named.conf.example +++ b/net/bind/files/bind/named.conf.example @@ -13,26 +13,3 @@ zone "." { type hint; file "/etc/bind/db.root"; }; - -// be authoritative for the localhost forward and reverse zones, and for -// broadcast zones as per RFC 1912 - -zone "localhost" { - type primary; - file "/etc/bind/db.local"; -}; - -zone "127.in-addr.arpa" { - type primary; - file "/etc/bind/db.127"; -}; - -zone "0.in-addr.arpa" { - type primary; - file "/etc/bind/db.0"; -}; - -zone "255.in-addr.arpa" { - type primary; - file "/etc/bind/db.255"; -};