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

6 files changed, 13 insertions, 18 deletions

diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index a7177388c..186dae9af 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -9,13 +9,18 @@ PKG_NAME:=		dropbear
 PKG_VERSION:=		0.52
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		1c69ec674481d7745452f68f2ea5597e
-MASTER_SITES:=		http://matt.ucc.asn.au/dropbear/releases/ \
+PKG_DESCR:=		SSH 2 server/client designed for small memory environments
+PKG_SECTION:=		net
+PKG_URL:=		http://matt.ucc.asn.au/dropbear
+PKG_SITES:=		http://matt.ucc.asn.au/dropbear/releases/ \
 			http://www.mirrors.wiretapped.net/security/cryptography/apps/ssh/dropbear/
 
+PKG_DESCR_1:=		Utility for converting SSH keys
+
 include $(TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE)))
-$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,DROPBEAR,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_1},${PKG_SECTION}))
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--disable-pam \
@@ -44,7 +49,6 @@ do-build:
 
 do-install:
 	# main package
-	$(INSTALL_DIR) $(IDIR_DROPBEAR)/etc/init.d
 	$(INSTALL_DIR) $(IDIR_DROPBEAR)/usr/bin
 	$(INSTALL_DIR) $(IDIR_DROPBEAR)/usr/sbin
 	$(INSTALL_BIN) $(WRKBUILD)/dropbearmulti \
@@ -53,8 +57,6 @@ do-install:
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/ssh
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dbclient
 	ln -sf ../sbin/dropbear $(IDIR_DROPBEAR)/usr/bin/dropbearkey
-	$(INSTALL_DATA) ./files/dropbear.init \
-		$(IDIR_DROPBEAR)/etc/init.d/dropbear
 	# subpackage dropbearconvert
 	$(INSTALL_DIR) $(IDIR_DBCONVERT)/usr/bin
 	$(INSTALL_BIN) $(WRKBUILD)/dropbearconvert \
diff --git a/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
index cb1408fa0..b1623c919 100644
--- a/package/dropbear/files/dropbear.init
+++ b/package/dropbear/files/dropbear.init
@@ -1,5 +1,6 @@
 #!/bin/sh
-#FWINIT 50
+#PKG dropbear
+#INIT 50
 . /etc/rc.conf
 
 bothlog() {
diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst
new file mode 100644
index 000000000..1e45f3924
--- /dev/null
+++ b/package/dropbear/files/dropbear.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf '"NO" to disable' dropbear_flags ""
diff --git a/package/dropbear/ipkg/dropbear.control b/package/dropbear/ipkg/dropbear.control
deleted file mode 100644
index 0aa8cc5b8..000000000
--- a/package/dropbear/ipkg/dropbear.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dropbear
-Priority: optional
-Section: net
-Description: a small SSH 2 server/client designed for small memory environments.
diff --git a/package/dropbear/ipkg/dropbear.postinst b/package/dropbear/ipkg/dropbear.postinst
deleted file mode 100644
index 30a86fef6..000000000
--- a/package/dropbear/ipkg/dropbear.postinst
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf '"NO" to disable, "@OPTIONS@" otherwise' dropbear_flags "@OPTIONS@"
diff --git a/package/dropbear/ipkg/dropbearconvert.control b/package/dropbear/ipkg/dropbearconvert.control
deleted file mode 100644
index 2b352cea1..000000000
--- a/package/dropbear/ipkg/dropbearconvert.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: dropbearconvert
-Priority: optional
-Section: net
-Description: Utility for converting SSH keys