Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 42 insertions, 22 deletions

diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index e8dbe39f3..39fcc7c9b 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -4,23 +4,22 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		htpdate
-PKG_VERSION:=		1.0.3
+PKG_VERSION:=		1.0.4
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		82953fe72d2f40411585222f85f2afab
+PKG_MD5SUM:=		a3da5ad8965345eb734695c765010acf
 PKG_DESCR:=		an HTP (Hypertext Time Protocol) implementation
 PKG_SECTION:=		net
-PKG_URL:=		http://www.clevervest.com/twiki/bin/view/HTP
+PKG_URL:=		http://www.vervest.org/htp/
 PKG_SITES:=		http://www.clevervest.com/htp/archive/c/
 
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,HTPDATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-BUILD_STYLE=		auto
+CONFIG_STYLE:=		manual
 
-do-install:
+post-install:
 	${INSTALL_DIR} ${IDIR_HTPDATE}/usr/sbin
 	${INSTALL_BIN} ${WRKBUILD}/htpdate ${IDIR_HTPDATE}/usr/sbin/
 
-
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/htpdate/patches/patch-Makefile b/package/htpdate/patches/patch-Makefile
index 46b1a9cef..9afe7bc70 100644
--- a/package/htpdate/patches/patch-Makefile
+++ b/package/htpdate/patches/patch-Makefile
@@ -1,14 +1,35 @@
-$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
+--- htpdate-1.0.4.orig/Makefile	2008-10-13 21:04:08.000000000 +0200
++++ htpdate-1.0.4/Makefile	2010-02-05 22:49:58.954334284 +0100
 @@ -2,8 +2,8 @@ prefix = /usr
  bindir = ${prefix}/bin
  mandir = ${prefix}/share/man
  
 -CC = gcc
--CFLAGS += -Wall -pedantic -ansi -O2
+-CFLAGS += -Wall -O2
 +CC ?= gcc
-+CFLAGS ?= -Wall -pedantic -ansi -O2
- #CFLAGS += -Wall -ansi -O2
++CFLAGS ?= -Wall -O2
+ #CFLAGS += -Wall -pedantic -ansi -O2
  
  INSTALL = /usr/bin/install -c
+@@ -15,15 +15,14 @@ htpdate: htpdate.c
+ 	$(CC) $(CFLAGS) -o htpdate htpdate.c
+ 
+ install: all
+-	$(STRIP) htpdate
+-	mkdir -p $(bindir)
+-	$(INSTALL) -m 755 htpdate $(bindir)/htpdate
+-	mkdir -p $(mandir)/man8
+-	$(INSTALL) -m 644 htpdate.8.gz $(mandir)/man8/htpdate.8.gz
++	mkdir -p $(DESTDIR)$(bindir)
++	$(INSTALL) -m 755 htpdate $(DESTDIR)$(bindir)/htpdate
++	mkdir -p $(DESTDIR)$(mandir)/man8
++	$(INSTALL) -m 644 htpdate.8.gz $(DESTDIR)$(mandir)/man8/htpdate.8.gz
+ 
+ clean:
+ 	rm -rf htpdate
+ 
+ uninstall:
+-	rm -rf $(bindir)/htpdate
+-	rm -rf $(mandir)/man8/htpdate.8.gz
++	rm -rf $(DESTDIR)$(bindir)/htpdate
++	rm -rf $(DESTDIR)$(mandir)/man8/htpdate.8.gz
diff --git a/package/htpdate/patches/patch-htpdate_c b/package/htpdate/patches/patch-htpdate_c
index 6dec28424..c8294b11c 100644
--- a/package/htpdate/patches/patch-htpdate_c
+++ b/package/htpdate/patches/patch-htpdate_c
@@ -1,7 +1,6 @@
-$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
+--- htpdate-1.0.4.orig/htpdate.c	2008-10-13 21:04:08.000000000 +0200
++++ htpdate-1.0.4/htpdate.c	2010-02-05 22:48:28.624323989 +0100
+@@ -353,6 +353,7 @@ static int setclock( double timedelta, i
  }
  
  
@@ -9,15 +8,16 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  static int htpdate_adjtimex( double drift ) {
  	struct timex		tmx;
  	long				freq;
-@@ -379,6 +380,7 @@ static int htpdate_adjtimex( double drif
+@@ -381,7 +382,7 @@ static int htpdate_adjtimex( double drif
  	}
  
  }
+-
 +#endif
  
- 
  static void showhelp() {
-@@ -404,7 +406,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid 
+ 	puts("htpdate version "VERSION"\n\
+@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid 
    -s    set time\n\
    -t    turn off sanity time check\n\
    -u    run daemon as user\n\
@@ -25,7 +25,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
    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[] ) {
+@@ -586,9 +586,11 @@ int main( int argc, char *argv[] ) {
  				}
  			}
  			break;
@@ -37,7 +37,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  		case 'D':			/* run as daemon */
  			daemonize = 1;
  			logmode = 1;
-@@ -777,6 +780,7 @@ int main( int argc, char *argv[] ) {
+@@ -779,6 +781,7 @@ int main( int argc, char *argv[] ) {
  					printlog( 0, "Drift %.2f PPM, %.2f s/day", \
  							drift*1e6, drift*86400 );
  
@@ -45,7 +45,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  					/* Adjust system clock */
  					if ( setmode == 3 ) {
  						starttime = time(NULL);
-@@ -787,6 +791,7 @@ int main( int argc, char *argv[] ) {
+@@ -789,6 +792,7 @@ int main( int argc, char *argv[] ) {
  						/* Drop root privileges again */
  						if ( sw_uid ) seteuid( sw_uid );
  					}