Added logrotate, fixed CP call in httping, added bind splitting, thanks to Sébastien Bourgasser

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@3243 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 138 insertions, 5 deletions

diff --git a/package/bind/Config.in b/package/bind/Config.in
index 38dc92f6f4..34a33c4503 100644
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -1,10 +1,89 @@
-#menu "bind.............................. A DNS server implementation"
+menu "bind.............................. A DNS server implementation"
 
 config BR2_COMPILE_BIND
 	tristate
 	default n
-	depends BR2_PACKAGE_BIND_CLIENT || BR2_PACKAGE_BIND_SERVER
-	
+	depends BR2_PACKAGE_BIND_CLIENT || BR2_PACKAGE_BIND_SERVER || BR2_PACKAGE_BIND_TOOLS || BR2_PACKAGE_BIND_RNDC || BR2_PACKAGE_BIND_CHECK || BR2_PACKAGE_BIND_DNSSEC || BR2_PACKAGE_BIND_HOST || BR2_PACKAGE_BIND_DIG
+
+config BR2_PACKAGE_BIND_TOOLS
+	prompt "bind-tools........................ Bind administration tools"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
+	select BR2_PACKAGE_LIBOPENSSL
+	help
+	  dig, host,  nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf, named-checkzone, rndc, rndc-confgen
+	  
+	  http://www.isc.org/sw/bind/
+	  
+	  Depends: openssl
+
+config BR2_PACKAGE_BIND_RNDC
+	prompt "bind-rndc......................... Bind administration tools (rndc & rndc-confgen only)"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
+	select BR2_PACKAGE_LIBOPENSSL
+	help
+	  rndc, rndc-confgen
+	  
+	  http://www.isc.org/sw/bind/
+	  
+	  Depends: openssl
+
+config BR2_PACKAGE_BIND_CHECK
+	prompt "bind-check........................ Bind administration tools (named-checkconf & named-checkzone only)"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
+	select BR2_PACKAGE_LIBOPENSSL
+	help
+	  named-checkconf, named-checkzone
+	  
+	  http://www.isc.org/sw/bind/
+	  
+	  Depends: openssl
+
+config BR2_PACKAGE_BIND_DNSSEC
+	prompt "bind-dnssec....................... Bind administration tools (dnssec-keygen & dnssec-signzone only)"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
+	select BR2_PACKAGE_LIBOPENSSL
+	help
+	  dnssec-keygen, dnssec-signzone
+	  
+	  http://www.isc.org/sw/bind/
+	  
+	  Depends: openssl
+
+config BR2_PACKAGE_BIND_HOST
+	prompt "bind-host......................... A simple DNS client"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
+	select BR2_PACKAGE_LIBOPENSSL
+	help
+	  host
+	  
+	  http://www.isc.org/sw/bind/
+	  
+	  Depends: openssl
+
+config BR2_PACKAGE_BIND_DIG
+	prompt "bind-dig.......................... A DNS client"
+	tristate
+	default m if CONFIG_DEVEL
+	select BR2_COMPILE_BIND
+	select BR2_PACKAGE_LIBOPENSSL
+	help
+	  dig
+	  
+	  http://www.isc.org/sw/bind/
+	  
+	  Depends: openssl
+
+
 config BR2_PACKAGE_BIND_CLIENT
 	prompt "bind-client....................... A dynamic DNS client"
 	tristate
@@ -29,6 +108,6 @@ config BR2_PACKAGE_BIND_SERVER
 	  
 	  http://www.isc.org/sw/bind/
 	  
-	  Depends: openssl
+	  Depends: libopenssl
 
-#endmenu
+endmenu
diff --git a/package/bind/Makefile b/package/bind/Makefile
index ba895f3c03..f635ef4ea1 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -19,6 +19,13 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,BIND_SERVER,bind-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,BIND_CLIENT,bind-client,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_TOOLS,bind-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_RNDC,bind-rndc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_CHECK,bind-check,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_HOST,bind-host,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,BIND_DIG,bind-dig,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
 
 $(PKG_BUILD_DIR)/.configured:
 	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
@@ -82,3 +89,50 @@ $(IPKG_BIND_CLIENT):
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(IDIR_BIND_CLIENT)/usr/bin/
 	$(RSTRIP) $(IDIR_BIND_CLIENT)
 	$(IPKG_BUILD) $(IDIR_BIND_CLIENT) $(PACKAGE_DIR)
+
+$(IPKG_BIND_TOOLS):
+	install -d -m0755 $(IDIR_BIND_TOOLS)/usr/bin
+	install -d -m0755 $(IDIR_BIND_TOOLS)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/dig $(IDIR_BIND_TOOLS)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/host $(IDIR_BIND_TOOLS)/usr/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(IDIR_BIND_TOOLS)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(IDIR_BIND_TOOLS)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(IDIR_BIND_TOOLS)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(IDIR_BIND_TOOLS)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(IDIR_BIND_TOOLS)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(IDIR_BIND_TOOLS)/usr/sbin/
+	$(RSTRIP) $(IDIR_BIND_TOOLS)
+	$(IPKG_BUILD) $(IDIR_BIND_TOOLS) $(PACKAGE_DIR)
+
+$(IPKG_BIND_RNDC):
+	install -d -m0755 $(IDIR_BIND_RNDC)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc $(IDIR_BIND_RNDC)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/rndc-confgen $(IDIR_BIND_RNDC)/usr/sbin/
+	$(RSTRIP) $(IDIR_BIND_RNDC)
+	$(IPKG_BUILD) $(IDIR_BIND_RNDC) $(PACKAGE_DIR)
+
+$(IPKG_BIND_CHECK):
+	install -d -m0755 $(IDIR_BIND_CHECK)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkconf $(IDIR_BIND_CHECK)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/named-checkzone $(IDIR_BIND_CHECK)/usr/sbin/
+	$(RSTRIP) $(IDIR_BIND_CHECK)
+	$(IPKG_BUILD) $(IDIR_BIND_CHECK) $(PACKAGE_DIR)
+
+$(IPKG_BIND_DNSSEC):
+	install -d -m0755 $(IDIR_BIND_DNSSEC)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-keygen $(IDIR_BIND_DNSSEC)/usr/sbin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnssec-signzone $(IDIR_BIND_DNSSEC)/usr/sbin/
+	$(RSTRIP) $(IDIR_BIND_DNSSEC)
+	$(IPKG_BUILD) $(IDIR_BIND_DNSSEC) $(PACKAGE_DIR)
+
+$(IPKG_BIND_HOST):
+	install -d -m0755 $(IDIR_BIND_HOST)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/host $(IDIR_BIND_HOST)/usr/bin/
+	$(RSTRIP) $(IDIR_BIND_HOST)
+	$(IPKG_BUILD) $(IDIR_BIND_HOST) $(PACKAGE_DIR)
+
+$(IPKG_BIND_DIG):
+	install -d -m0755 $(IDIR_BIND_DIG)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/dig $(IDIR_BIND_DIG)/usr/bin/
+	$(RSTRIP) $(IDIR_BIND_DIG)
+	$(IPKG_BUILD) $(IDIR_BIND_DIG) $(PACKAGE_DIR)