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

4 files changed, 9 insertions, 11 deletions

diff --git a/package/scanlogd/Makefile b/package/scanlogd/Makefile
index 4963d4590..1b7db8704 100644
--- a/package/scanlogd/Makefile
+++ b/package/scanlogd/Makefile
@@ -9,13 +9,17 @@ PKG_NAME:=		scanlogd
 PKG_VERSION:=		2.2.6
 PKG_RELEASE:=		8
 PKG_MD5SUM:=		7b8187ea718ebe47f22805b921b909ab
-MASTER_SITES:=		http://www.openwall.com/scanlogd/ \
+PKG_DESCR:=		Portscan logger
+PKG_SECTION:=		net
+PKG_DEPENDS:=		libpcap libnet libnids
+PKG_URL:=		http://www.openwall.com/scanlogd
+PKG_SITES:=		http://www.openwall.com/scanlogd/ \
 			ftp://ftp.wiretapped.net/pub/openwall/ \
 			http://distro.ibiblio.org/pub/linux/distributions/openwall/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,SCANLOGD,scanlogd,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,SCANLOGD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE:=		auto
 MAKE_FLAGS+=		CC="${TARGET_CC}" LD="${TARGET_CC}" CFLAGS="-c ${TARGET_CFLAGS}" \
@@ -30,10 +34,7 @@ do-configure:
 	${SED} "s,#undef SCANLOGD_DEVICE,#define SCANLOGD_DEVICE \"all\"," ${WRKBUILD}/params.h
 
 do-install:
-	${INSTALL_DIR} ${IDIR_SCANLOGD}/etc/init.d
 	${INSTALL_DIR} ${IDIR_SCANLOGD}/usr/sbin
-	${INSTALL_BIN} ./files/scanlogd.init \
-		${IDIR_SCANLOGD}/etc/init.d/${PKG_NAME}
 	${INSTALL_BIN} ${WRKBUILD}/${PKG_NAME} ${IDIR_SCANLOGD}/usr/sbin/
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/scanlogd/files/scanlogd.init b/package/scanlogd/files/scanlogd.init
index 37285b348..cd4279e4c 100644
--- a/package/scanlogd/files/scanlogd.init
+++ b/package/scanlogd/files/scanlogd.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG scanlogd
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/scanlogd/ipkg/scanlogd.postinst b/package/scanlogd/files/scanlogd.postinst
index 60b036da4..60b036da4 100644
--- a/package/scanlogd/ipkg/scanlogd.postinst
+++ b/package/scanlogd/files/scanlogd.postinst
diff --git a/package/scanlogd/ipkg/scanlogd.control b/package/scanlogd/ipkg/scanlogd.control
deleted file mode 100644
index 4156ff55c..000000000
--- a/package/scanlogd/ipkg/scanlogd.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: scanlogd
-Priority: optional
-Section: net
-Description: Port scan logger.
-Depends: libpcap, libnet, libnids