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

package/base-files/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk
 
 PKG_NAME:=		base-files
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		44
+PKG_RELEASE:=		45
 PKG_SECTION:=		base
 PKG_DESCR:=		basic files and scripts
 

package/base-files/src/sbin/adkupdate

@@ -29,8 +29,9 @@ check_exit() {
 prepare() {
 	cd /
 	if [ -x /sbin/cfgfs ];then
-		pkill crond
-		umount -f /etc
+		mount -o bind /tmp/.cfgfs/root /etc
+		check_exit
+		mount -o remount,rw /etc
 		check_exit
 	fi
 	mount -o remount,rw /
@@ -90,7 +91,7 @@ esac
 
 sync
 if [ -x /sbin/cfgfs ];then
-	mount -o bind /etc /tmp/.cfgfs/root
+	umount /etc
 fi
 if [ "$system" == "RB532" ];then
 	umount -f /boot

package/ntpclient/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ntpclient
-PKG_VERSION:=		2007_365
+PKG_VERSION:=		2010_365
 PKG_RELEASE:=		2
-PKG_MD5SUM:=		cb98711f11769cdd22fc592844cef414
+PKG_MD5SUM:=		a64689398f2df8933ee0d8da246e9eaa
 PKG_DESCR:=		NTP client for setting system time from NTP servers
 PKG_SECTION:=		ntp
 PKG_DEPENDS:=		libpthread
@@ -14,14 +14,14 @@ PKG_URL:=		http://doolittle.icarus.com/ntpclient/
 PKG_SITES:=		http://doolittle.icarus.com/ntpclient/
 
 DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}-2007
+WRKDIST=		${WRKDIR}/${PKG_NAME}-2010
 
 PKG_FLAVOURS_NTPCLIENT:=	STARTUP
 PKGFD_STARTUP:=	Fetch time on startup
 
 PKG_FLAVOURS_STRING_NTPCLIENT:=	HOST
 PKGFD_HOST:=	Fetch time from this NTP host
-PKGFX_HOST:=	0.de.pool.ntp.org
+PKGFX_HOST:=	pool.ntp.org
 PKGFC_HOST:=	depends on ADK_PACKAGE_NTPCLIENT_STARTUP
 
 include ${TOPDIR}/mk/package.mk

package/ntpclient/patches/patch-ntpclient_c

@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ntpclient-2007.orig/ntpclient.c	2008-01-01 03:16:10.000000000 +0100
-+++ ntpclient-2007/ntpclient.c	2008-10-10 15:59:26.000000000 +0200
-@@ -146,7 +146,7 @@ static int get_current_freq(void)
- #ifdef __linux__
- 	struct timex txc;
- 	txc.modes=0;
--	if (__adjtimex(&txc) < 0) {
-+	if (adjtimex(&txc) < 0) {
- 		perror("adjtimex"); exit(1);
- 	}
- 	return txc.freq;
-@@ -163,7 +163,7 @@ static int set_freq(int new_freq)
- 	struct timex txc;
- 	txc.modes = ADJ_FREQUENCY;
- 	txc.freq = new_freq;
--	if (__adjtimex(&txc) < 0) {
-+	if (adjtimex(&txc) < 0) {
- 		perror("adjtimex"); exit(1);
- 	}
- 	return txc.freq;