optimize ipkg package management

- generate ipkg control file from PKG_* variables
- automatically install init scripts from ./files/*.init
  set #PKG pkgname to set the binary package
- rename FWINIT -> INIT
- move postinst and conffiles meta data to ./files
- update the packages to the latest upstream version
- remove some unready or unused package (strongswan,..)

more cleanups needed after allmodconfig

14 files changed, 33 insertions, 118 deletions

diff --git a/package/bind/Config.in b/package/bind/Config.in
index b9eef008a..1286057ba 100644
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -8,21 +8,6 @@ config ADK_DUMMY_BIND
 	tristate
 	default n
 
-config ADK_PACKAGE_BIND_TOOLS
-	prompt "bind-tools........................ Bind administration tools"
-	tristate
-	default n
-	depends ADK_DUMMY_BIND
-	select ADK_COMPILE_BIND
-	select ADK_PACKAGE_LIBBIND
-	help
-	  dig, host,  nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf,
-	  named-checkzone, rndc, rndc-confgen
-
-	  http://www.isc.org/sw/bind/
-
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_RNDC
 	prompt "bind-rndc......................... Bind administration tools (rndc & rndc-confgen only)"
 	tristate
@@ -32,11 +17,8 @@ config ADK_PACKAGE_BIND_RNDC
 	select ADK_PACKAGE_LIBBIND
 	help
 	  rndc, rndc-confgen
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_CHECK
 	prompt "bind-check........................ Bind administration tools (named-checkconf & named-checkzone only)"
 	tristate
@@ -46,11 +28,8 @@ config ADK_PACKAGE_BIND_CHECK
 	select ADK_PACKAGE_LIBBIND
 	help
 	  named-checkconf, named-checkzone
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_DNSSEC
 	prompt "bind-dnssec....................... Bind administration tools (dnssec-keygen & dnssec-signzone only)"
 	tristate
@@ -60,11 +39,8 @@ config ADK_PACKAGE_BIND_DNSSEC
 	select ADK_PACKAGE_LIBBIND
 	help
 	  dnssec-keygen, dnssec-signzone
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_HOST
 	prompt "bind-host......................... A simple DNS client"
 	tristate
@@ -73,11 +49,9 @@ config ADK_PACKAGE_BIND_HOST
 	select ADK_COMPILE_BIND
 	select ADK_PACKAGE_LIBBIND
 	help
-	  host
-
+	  host utility.
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
 
 config ADK_PACKAGE_BIND_DIG
 	prompt "bind-dig.......................... A DNS client"
@@ -87,12 +61,9 @@ config ADK_PACKAGE_BIND_DIG
 	select ADK_COMPILE_BIND
 	select ADK_PACKAGE_LIBBIND
 	help
-	  dig
-
+	  dig utility.
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 
 config ADK_PACKAGE_BIND_CLIENT
 	prompt "bind-client....................... A dynamic DNS client"
@@ -103,11 +74,8 @@ config ADK_PACKAGE_BIND_CLIENT
 	select ADK_PACKAGE_LIBBIND
 	help
 	  A DNS dynamic client (nsupdate)
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
 config ADK_PACKAGE_BIND_SERVER
 	prompt "bind-server....................... A DNS server"
 	tristate
@@ -117,12 +85,8 @@ config ADK_PACKAGE_BIND_SERVER
 	select ADK_PACKAGE_LIBBIND
 	help
 	  A DNS server (named)
-
 	  http://www.isc.org/sw/bind/
 
-	  Depends: libopenssl
-
-
 config ADK_PACKAGE_LIBBIND
         prompt "libbind........................... Support library for the bind tools and dns server/client."
         tristate
@@ -131,6 +95,3 @@ config ADK_PACKAGE_LIBBIND
         select ADK_COMPILE_BIND
         help
           http://www.isc.org/sw/bind/
-
-          Depends: libopenssl
-
diff --git a/package/bind/Makefile b/package/bind/Makefile
index 6e668008c..b527e13b1 100644
--- a/package/bind/Makefile
+++ b/package/bind/Makefile
@@ -9,19 +9,32 @@ PKG_NAME:=		bind
 PKG_VERSION:=		9.4.1
 PKG_RELEASE:=		4
 PKG_MD5SUM:=		09b54d35036cb0423b2e618f21766285
-MASTER_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
+PKG_DESCR:=		popular DNS server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libopenssl libbind
+PKG_URL:=		https://www.isc.org/software/bind
+PKG_SITES:=		ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/
+
+PKG_DESCR_1:=		dynamic dns client (nsupdate utility)
+PKG_DESCR_2:=		Support library for the bind tools and dns server/client
+PKG_DESCR_3:=		rndc & rndc-confgen utilities
+PKG_DESCR_4:=		named-checkconf & named-checkzone utilities
+PKG_DESCR_5:=		dnssec-keygen & dnssec-signzone utilities
+PKG_DESCR_6:=		host utility
+PKG_DESCR_7:=		dig utility
+
+PKG_SECTION_2:=		libs
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_TOOLS,bind-tools,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,BIND_SERVER,bind-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_CLIENT,bind-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
+$(eval $(call PKG_template,LIBBIND,libbind,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,BIND_RNDC,bind-rndc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_3},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_CHECK,bind-check,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_4},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_DNSSEC,bind-dnssec,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_5},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_HOST,bind-host,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_6},${PKG_SECTION}))
+$(eval $(call PKG_template,BIND_DIG,bind-dig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_7},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=         BUILD_CC="${TARGET_CC}"
@@ -42,26 +55,12 @@ pre-build:
 post-install:
 	# bind server
 	${INSTALL_DIR} ${IDIR_BIND_SERVER}/usr/sbin
-	${INSTALL_DIR} ${IDIR_BIND_SERVER}/etc/init.d
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/named ${IDIR_BIND_SERVER}/usr/sbin/
 	${CP} ./files/bind ${IDIR_BIND_SERVER}/etc
-	${INSTALL_BIN} ./files/named.init \
-		${IDIR_BIND_SERVER}/etc/init.d/named
 	find ${IDIR_BIND_SERVER}/etc/bind -name ".svn" | xargs rm -rf
 	# nsupdate
 	${INSTALL_DIR} ${IDIR_BIND_CLIENT}/usr/bin
 	${INSTALL_BIN} ${WRKINST}/usr/bin/nsupdate ${IDIR_BIND_CLIENT}/usr/bin/
-	# bind all tools
-	${INSTALL_DIR} ${IDIR_BIND_TOOLS}/usr/bin
-	${INSTALL_DIR} ${IDIR_BIND_TOOLS}/usr/sbin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_TOOLS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/bin/host ${IDIR_BIND_TOOLS}/usr/bin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-keygen ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/dnssec-signzone ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkconf ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/named-checkzone ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_TOOLS}/usr/sbin/
-	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc-confgen ${IDIR_BIND_TOOLS}/usr/sbin/
 	# rndc
 	${INSTALL_DIR} ${IDIR_BIND_RNDC}/usr/sbin
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/rndc ${IDIR_BIND_RNDC}/usr/sbin/
@@ -82,11 +81,11 @@ post-install:
 	${INSTALL_BIN} ${WRKINST}/usr/bin/dig ${IDIR_BIND_DIG}/usr/bin/
 	# bind lib
 	${INSTALL_DIR} ${IDIR_LIBBIND}/usr/lib
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libbind9.so.30 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.32 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.30 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.30 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.32 ${IDIR_LIBBIND}/usr/lib/
-	${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.30 ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libbind9.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libdns.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccc.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libisccfg.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/libisc.so.* ${IDIR_LIBBIND}/usr/lib/
+	${INSTALL_BIN} ${WRKINST}/usr/lib/liblwres.so.* ${IDIR_LIBBIND}/usr/lib/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/bind/ipkg/bind-server.conffiles b/package/bind/files/bind-server.conffiles
index c4cfe37d5..c4cfe37d5 100644
--- a/package/bind/ipkg/bind-server.conffiles
+++ b/package/bind/files/bind-server.conffiles
diff --git a/package/bind/ipkg/bind-server.postinst b/package/bind/files/bind-server.postinst
index bca89fd22..bca89fd22 100644
--- a/package/bind/ipkg/bind-server.postinst
+++ b/package/bind/files/bind-server.postinst
diff --git a/package/bind/files/named.init b/package/bind/files/named.init
index 1838eefee..ce0c0abfa 100644
--- a/package/bind/files/named.init
+++ b/package/bind/files/named.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 60
+#PKG bind-server
+#INIT 60
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/bind/ipkg/bind-check.control b/package/bind/ipkg/bind-check.control
deleted file mode 100644
index ba90d8274..000000000
--- a/package/bind/ipkg/bind-check.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-check
-Priority: optional
-Section: net
-Description: named-checkconf & named-checkzone utilities
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-client.control b/package/bind/ipkg/bind-client.control
deleted file mode 100644
index fa20c18a3..000000000
--- a/package/bind/ipkg/bind-client.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-client
-Priority: optional
-Section: net
-Description: dynamic dns client
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-dig.control b/package/bind/ipkg/bind-dig.control
deleted file mode 100644
index e91e30066..000000000
--- a/package/bind/ipkg/bind-dig.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-dig
-Priority: optional
-Section: net
-Description: dig utility
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-dnssec.control b/package/bind/ipkg/bind-dnssec.control
deleted file mode 100644
index c7c213617..000000000
--- a/package/bind/ipkg/bind-dnssec.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-dnssec
-Priority: optional
-Section: net
-Description: dnssec-keygen & dnssec-signzone utilities
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-host.control b/package/bind/ipkg/bind-host.control
deleted file mode 100644
index 20440381a..000000000
--- a/package/bind/ipkg/bind-host.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: bind-host
-Priority: optional
-Section: net
-Description: host utility
-Depends: libopenssl libbind
-
diff --git a/package/bind/ipkg/bind-rndc.control b/package/bind/ipkg/bind-rndc.control
deleted file mode 100644
index a0eee7ebb..000000000
--- a/package/bind/ipkg/bind-rndc.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-rndc
-Priority: optional
-Section: net
-Description: rndc & rndc-confgen utilities
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/bind-server.control b/package/bind/ipkg/bind-server.control
deleted file mode 100644
index 73b10d2f2..000000000
--- a/package/bind/ipkg/bind-server.control
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: bind-server
-Priority: optional
-Section: net
-Description: popular dns server
-Depends: libopenssl libbind
-Conflicts: dnsmasq
diff --git a/package/bind/ipkg/bind-tools.control b/package/bind/ipkg/bind-tools.control
deleted file mode 100644
index 623d0a547..000000000
--- a/package/bind/ipkg/bind-tools.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: bind-tools
-Priority: optional
-Section: net
-Description: dig, host, nslookup, nsupdate, dnssec-keygen, dnssec-signzone, named-checkconf, named-checkzone, rndc, rndc-confgen
-Depends: libopenssl libbind
diff --git a/package/bind/ipkg/libbind.control b/package/bind/ipkg/libbind.control
deleted file mode 100644
index 5b4e86674..000000000
--- a/package/bind/ipkg/libbind.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: libbind
-Priority: optional
-Section: libs
-Description: Support library for the bind tools and dns server/client.