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, 72 insertions, 20 deletions

diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index 2f2e32c02..628ddca35 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -6,21 +6,21 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		htpdate
-PKG_VERSION:=		0.9.0
-PKG_RELEASE:=		9
-PKG_MD5SUM:=		12cf883c5619cf4c13a62f77f1a55b54
-MASTER_SITES:=		http://www.clevervest.com/htp/archive/c/
+PKG_VERSION:=		1.0.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		82953fe72d2f40411585222f85f2afab
+PKG_DESCR:=		an HTP (Hypertext Time Protocol) implementation
+PKG_SECTION:=		net
+PKG_URL:=		http://www.clevervest.com/twiki/bin/view/HTP
+PKG_SITES:=		http://www.clevervest.com/htp/archive/c/
 
 include ${TOPDIR}/mk/package.mk
 
-$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE}))
+$(eval $(call PKG_template,HTPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 BUILD_STYLE=		auto
 
 do-install:
-	${INSTALL_DIR} ${IDIR_HTPDATE}/etc/init.d/
-	${INSTALL_BIN} ./files/htpdate.init \
-		${IDIR_HTPDATE}/etc/init.d/htpdate
 	${INSTALL_DIR} ${IDIR_HTPDATE}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/htpdate ${IDIR_HTPDATE}/usr/sbin/
 
diff --git a/package/htpdate/files/htpdate.init b/package/htpdate/files/htpdate.init
index 3c291ef54..4457e4391 100644
--- a/package/htpdate/files/htpdate.init
+++ b/package/htpdate/files/htpdate.init
@@ -1,5 +1,7 @@
 #!/bin/sh
-#FWINIT 60
+#PKG htpdate
+#INIT 60
+
 . /etc/rc.conf
 
 case $1 in
@@ -21,6 +23,5 @@ restart)
 *)
 	echo "usage: $0 {start | stop | restart}"
 	exit 1
-
 esac
 exit $?
diff --git a/package/htpdate/ipkg/htpdate.postinst b/package/htpdate/files/htpdate.postinst
index baf149665..baf149665 100644
--- a/package/htpdate/ipkg/htpdate.postinst
+++ b/package/htpdate/files/htpdate.postinst
diff --git a/package/htpdate/ipkg/htpdate.control b/package/htpdate/ipkg/htpdate.control
deleted file mode 100644
index cdb470c2d..000000000
--- a/package/htpdate/ipkg/htpdate.control
+++ /dev/null
@@ -1,4 +0,0 @@
-Package: htpdate
-Priority: optional
-Section: net
-Description: an HTP (Hypertext Time Protocol) implementation
diff --git a/package/htpdate/patches/patch-Makefile b/package/htpdate/patches/patch-Makefile
index edd5b9c38..46b1a9cef 100644
--- a/package/htpdate/patches/patch-Makefile
+++ b/package/htpdate/patches/patch-Makefile
@@ -1,14 +1,14 @@
-$Id$
---- htpdate-0.9.0.orig/Makefile	Sun Dec 11 22:34:35 2005
-+++ htpdate-0.9.0/Makefile	Tue Jan 16 23:47:33 2007
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- htpdate-1.0.3.orig/Makefile	2008-09-02 22:24:09.000000000 +0200
++++ htpdate-1.0.3/Makefile	2009-05-29 14:24:39.045810534 +0200
 @@ -2,8 +2,8 @@ prefix = /usr
  bindir = ${prefix}/bin
  mandir = ${prefix}/share/man
  
 -CC = gcc
--CFLAGS += -Wall -ansi -Os -DDEBUG
+-CFLAGS += -Wall -pedantic -ansi -O2
 +CC ?= gcc
-+CFLAGS ?= -Wall -ansi -Os -DDEBUG
++CFLAGS ?= -Wall -pedantic -ansi -O2
+ #CFLAGS += -Wall -ansi -O2
  
  INSTALL = /usr/bin/install -c
- STRIP = /usr/bin/strip -s
diff --git a/package/htpdate/patches/patch-htpdate_c b/package/htpdate/patches/patch-htpdate_c
new file mode 100644
index 000000000..6dec28424
--- /dev/null
+++ b/package/htpdate/patches/patch-htpdate_c
@@ -0,0 +1,55 @@
+$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
+--- htpdate-1.0.3.orig/htpdate.c	2008-09-02 22:24:09.000000000 +0200
++++ htpdate-1.0.3/htpdate.c	2009-05-29 14:28:27.252071728 +0200
+@@ -351,6 +351,7 @@ static int setclock( double timedelta, i
+ }
+ 
+ 
++#if 0
+ static int htpdate_adjtimex( double drift ) {
+ 	struct timex		tmx;
+ 	long				freq;
+@@ -379,6 +380,7 @@ static int htpdate_adjtimex( double drif
+ 	}
+ 
+ }
++#endif
+ 
+ 
+ static void showhelp() {
+@@ -404,7 +406,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid 
+   -s    set time\n\
+   -t    turn off sanity time check\n\
+   -u    run daemon as user\n\
+-  -x    adjust kernel clock\n\
+   host  web server hostname or ip address (maximum of 16)\n\
+   port  port number (default 80 and 8080 for proxy server)\n");
+ 
+@@ -584,9 +585,11 @@ int main( int argc, char *argv[] ) {
+ 				}
+ 			}
+ 			break;
++#if 0
+ 		case 'x':			/* adjust time and "kernel" */
+ 			setmode = 3;
+ 			break;
++#endif
+ 		case 'D':			/* run as daemon */
+ 			daemonize = 1;
+ 			logmode = 1;
+@@ -777,6 +780,7 @@ int main( int argc, char *argv[] ) {
+ 					printlog( 0, "Drift %.2f PPM, %.2f s/day", \
+ 							drift*1e6, drift*86400 );
+ 
++#if 0
+ 					/* Adjust system clock */
+ 					if ( setmode == 3 ) {
+ 						starttime = time(NULL);
+@@ -787,6 +791,7 @@ int main( int argc, char *argv[] ) {
+ 						/* Drop root privileges again */
+ 						if ( sw_uid ) seteuid( sw_uid );
+ 					}
++#endif
+ 				} else {
+ 					starttime = time(NULL);
+ 				}