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, 22 insertions, 40 deletions

diff --git a/package/rp-pppoe/Makefile b/package/rp-pppoe/Makefile
index ec8d5ce80..679b4d1b7 100644
--- a/package/rp-pppoe/Makefile
+++ b/package/rp-pppoe/Makefile
@@ -9,14 +9,20 @@ PKG_NAME:=		rp-pppoe
 PKG_VERSION:=		3.10
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		d58a13cc4185bca6121a606ff456dec0
-MASTER_SITES:=		http://www.roaringpenguin.com/files/download/
+PKG_DESCR:=		PPPoE (PPP over Ethernet) tools
+PKG_SECTION:=		net
+PKG_DEPENDS:=		ppp
+PKG_URL:=		http://www.roaringpenguin.com
+PKG_SITES:=		http://www.roaringpenguin.com/files/download/
+
+WRKSRC:=		${WRKDIST}/src
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,PPPOE_CLIENT,pppoe-client,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPPOE_SERVER,pppoe-server,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,PPPOE_SNIFF,pppoe-sniff,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,PPPOE_CLIENT,pppoe-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPPOE_RELAY,pppoe-relay,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPPOE_SERVER,pppoe-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,PPPOE_SNIFF,pppoe-sniff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIGURE_STYLE:=	gnu
 CONFIGURE_ENV+=		ac_cv_func_setvbuf_reversed=no \
@@ -27,14 +33,9 @@ CONFIGURE_ENV+=		ac_cv_func_setvbuf_reversed=no \
 			ac_cv_pack_bitfields_reversed=yes
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
-WRKSRC:=		${WRKDIST}/src
 
 post-install:
-	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/init.d
-	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/ppp
-	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/usr/sbin
-	${INSTALL_BIN} ./files/pppoe-client.init \
-		${IDIR_PPPOE_CLIENT}/etc/init.d/pppoe-client
+	${INSTALL_DIR} ${IDIR_PPPOE_CLIENT}/etc/ppp ${IDIR_PPPOE_CLIENT}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe.conf ${IDIR_PPPOE_CLIENT}/etc/ppp
 	${CP} ${WRKINST}/usr/sbin/pppoe ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/pppoe-connect ${IDIR_PPPOE_CLIENT}/usr/sbin/
@@ -42,16 +43,9 @@ post-install:
 	${CP} ${WRKINST}/usr/sbin/pppoe-stop ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/pppoe-status ${IDIR_PPPOE_CLIENT}/usr/sbin/
 	${CP} ${WRKINST}/usr/sbin/pppoe-setup ${IDIR_PPPOE_CLIENT}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_PPPOE_RELAY}/etc/init.d
 	${INSTALL_DIR} ${IDIR_PPPOE_RELAY}/usr/sbin
-	${INSTALL_BIN} ./files/pppoe-relay.init \
-		${IDIR_PPPOE_RELAY}/etc/init.d/pppoe-relay
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-relay ${IDIR_PPPOE_RELAY}/usr/sbin/
-	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/etc/init.d
-	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/etc/ppp
-	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/usr/sbin
-	${INSTALL_BIN} ./files/pppoe-server.init \
-		${IDIR_PPPOE_SERVER}/etc/init.d/pppoe-server
+	${INSTALL_DIR} ${IDIR_PPPOE_SERVER}/etc/ppp ${IDIR_PPPOE_SERVER}/usr/sbin
 	${INSTALL_DATA} ${WRKINST}/etc/ppp/pppoe-server-options ${IDIR_PPPOE_SERVER}/etc/ppp/
 	${INSTALL_BIN} ${WRKINST}/usr/sbin/pppoe-server ${IDIR_PPPOE_SERVER}/usr/sbin/
 	${INSTALL_DIR} ${IDIR_PPPOE_SNIFF}/usr/sbin
diff --git a/package/rp-pppoe/ipkg/pppoe-client.conffiles b/package/rp-pppoe/files/pppoe-client.conffiles
index 7cf395925..7cf395925 100644
--- a/package/rp-pppoe/ipkg/pppoe-client.conffiles
+++ b/package/rp-pppoe/files/pppoe-client.conffiles
diff --git a/package/rp-pppoe/files/pppoe-client.init b/package/rp-pppoe/files/pppoe-client.init
index 79663eca3..ea00f57f0 100644
--- a/package/rp-pppoe/files/pppoe-client.init
+++ b/package/rp-pppoe/files/pppoe-client.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 50
+#PKG pppoe-server
+#INIT 50
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/rp-pppoe/ipkg/pppoe-client.postinst b/package/rp-pppoe/files/pppoe-client.postinst
index 2fd0db891..2fd0db891 100644
--- a/package/rp-pppoe/ipkg/pppoe-client.postinst
+++ b/package/rp-pppoe/files/pppoe-client.postinst
diff --git a/package/rp-pppoe/files/pppoe-relay.init b/package/rp-pppoe/files/pppoe-relay.init
index 0f340020a..5998b5291 100644
--- a/package/rp-pppoe/files/pppoe-relay.init
+++ b/package/rp-pppoe/files/pppoe-relay.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 50
+#PKG pppoe-relay
+#INIT 50
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/rp-pppoe/ipkg/pppoe-relay.postinst b/package/rp-pppoe/files/pppoe-relay.postinst
index 2a727ec96..2a727ec96 100644
--- a/package/rp-pppoe/ipkg/pppoe-relay.postinst
+++ b/package/rp-pppoe/files/pppoe-relay.postinst
diff --git a/package/rp-pppoe/ipkg/pppoe-server.conffiles b/package/rp-pppoe/files/pppoe-server.conffiles
index 438de2c2c..438de2c2c 100644
--- a/package/rp-pppoe/ipkg/pppoe-server.conffiles
+++ b/package/rp-pppoe/files/pppoe-server.conffiles
diff --git a/package/rp-pppoe/files/pppoe-server.init b/package/rp-pppoe/files/pppoe-server.init
index 4696a5745..f8c7c7fd5 100644
--- a/package/rp-pppoe/files/pppoe-server.init
+++ b/package/rp-pppoe/files/pppoe-server.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 50
+#PKG pppoe-server
+#INIT 50
+
 . /etc/rc.conf
 
 case $1 in
diff --git a/package/rp-pppoe/ipkg/rules b/package/rp-pppoe/files/rules
index cfb76b088..cfb76b088 100644
--- a/package/rp-pppoe/ipkg/rules
+++ b/package/rp-pppoe/files/rules
diff --git a/package/rp-pppoe/ipkg/version b/package/rp-pppoe/files/version
index 99d9948ce..99d9948ce 100644
--- a/package/rp-pppoe/ipkg/version
+++ b/package/rp-pppoe/files/version
diff --git a/package/rp-pppoe/ipkg/pppoe-client.control b/package/rp-pppoe/ipkg/pppoe-client.control
deleted file mode 100644
index dd64953c3..000000000
--- a/package/rp-pppoe/ipkg/pppoe-client.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pppoe-client
-Priority: optional
-Section: net
-Description: PPPoE (PPP over Ethernet) client
-Depends: ppp
diff --git a/package/rp-pppoe/ipkg/pppoe-relay.control b/package/rp-pppoe/ipkg/pppoe-relay.control
deleted file mode 100644
index de64b0bec..000000000
--- a/package/rp-pppoe/ipkg/pppoe-relay.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: pppoe-relay
-Priority: optional
-Section: net
-Description: PPPoE (PPP over Ethernet) relay
diff --git a/package/rp-pppoe/ipkg/pppoe-server.control b/package/rp-pppoe/ipkg/pppoe-server.control
deleted file mode 100644
index 530017b96..000000000
--- a/package/rp-pppoe/ipkg/pppoe-server.control
+++ /dev/null
@@ -1,5 +0,0 @@
-Package: pppoe-server
-Priority: optional
-Section: net
-Description: PPPoE (PPP over Ethernet) server
-Depends: ppp
diff --git a/package/rp-pppoe/ipkg/pppoe-sniff.control b/package/rp-pppoe/ipkg/pppoe-sniff.control
deleted file mode 100644
index df7b95cf2..000000000
--- a/package/rp-pppoe/ipkg/pppoe-sniff.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: pppoe-sniff
-Priority: optional
-Section: net
-Description: PPPoE (PPP over Ethernet) frame sniffer