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

5 files changed, 14 insertions, 16 deletions

diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 049bf44af..80b757823 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -9,15 +9,22 @@ PKG_NAME:=		krb5
 PKG_VERSION:=		1.6.3
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		2dc1307686eb1c2bf1ab08ea805dad46
-MASTER_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.6/
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-signed.tar
+PKG_DESCR:=		MIT kerberos server
+PKG_SECTION:=		net
+PKG_DEPENDS:=		krb5-libs
+PKG_URL:=		http://web.mit.edu/kerberos
+PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.6/
+
+PKG_DESCR_1:=		MIT kerberos libraries
+PKG_SECTION_1:=		libs
 
+DISTFILES:=		${PKG_NAME}-${PKG_VERSION}-signed.tar
 WRKSRC=			${WRKDIST}/src
 
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,KRB5_SERVER,krb5-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,KRB5_LIBS,krb5-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--without-krb4 --disable-static --without-tcl
@@ -33,13 +40,12 @@ post-extract:
 	(cd ${WRKDIR}; tar xzf ${PKG_NAME}-${PKG_VERSION}.tar.gz)
 
 post-install:
-	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/init.d
+	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/etc/krb5kdc
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/sbin
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib
 	${INSTALL_DIR} ${IDIR_KRB5_SERVER}/usr/lib/krb5/plugins/kdb
 	${INSTALL_DATA} ./files/kdc.conf ${IDIR_KRB5_SERVER}/etc/krb5kdc
-	${INSTALL_BIN} ./files/krb5.init ${IDIR_KRB5_SERVER}/etc/init.d/krb5
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/{ktutil,kdb5_util,krb5kdc,kadmind,kadmin.local,kadmin} \
 		${IDIR_KRB5_SERVER}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/usr/lib/krb5/plugins/kdb/db2.so \
diff --git a/package/krb5/ipkg/krb5-server.postinst b/package/krb5/files/krb5-server.postinst
index 24f1f7d78..24f1f7d78 100644
--- a/package/krb5/ipkg/krb5-server.postinst
+++ b/package/krb5/files/krb5-server.postinst
diff --git a/package/krb5/files/krb5.init b/package/krb5/files/krb5.init
index 732088fcb..f91d0427b 100644
--- a/package/krb5/files/krb5.init
+++ b/package/krb5/files/krb5.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 70
+#PKG krb5-server
+#INIT 70
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/krb5/ipkg/krb5-libs.control b/package/krb5/ipkg/krb5-libs.control
deleted file mode 100644
index 64ff0962b..000000000
--- a/package/krb5/ipkg/krb5-libs.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: krb5-libs
-Priority: optional
-Section: net
-Depends: libpthread
-Description: MIT kerberos libraries
diff --git a/package/krb5/ipkg/krb5-server.control b/package/krb5/ipkg/krb5-server.control
deleted file mode 100644
index 6eea59a65..000000000
--- a/package/krb5/ipkg/krb5-server.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: krb5-server
-Priority: optional
-Section: net
-Description: MIT kerberos server