From 84e71d2c8fda6778fc71362a6f04a22066b45b41 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 5 Feb 2012 15:44:11 +0000
Subject: [PATCH] ntpd: merge r28408, r28572, r28881, r28882, r28883, r29127,
 r29990

SVN-Revision: 30229
---
 net/ntpd/Makefile        | 52 +++++++++++++++++++++++++++++++++-------
 net/ntpd/files/ntp.conf  |  5 ++--
 net/ntpd/files/ntpd.init | 12 ++++++----
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/net/ntpd/Makefile b/net/ntpd/Makefile
index 26c2e5606..6cda63a5f 100644
--- a/net/ntpd/Makefile
+++ b/net/ntpd/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ntp
-PKG_VERSION:=4.2.6p3
-PKG_RELEASE:=2
+PKG_VERSION:=4.2.6p5
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
-PKG_MD5SUM:=59876a9009b098ff59767ee45a88ebd2
+PKG_MD5SUM:=00df80a84ec9528fcfb09498075525bc
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -30,6 +30,7 @@ define Package/ntpd/Default
   TITLE:=ISC ntp
   MAINTAINER:=Peter Wagner <tripolar@gmx.at>
   URL:=http://www.ntp.org/
+  DEPENDS:=+libcap
 endef
 
 define Package/ntpd/Default/description
@@ -54,7 +55,7 @@ define Package/ntpd-ssl
 $(call Package/ntpd/Default)
   TITLE+= server (with OpenSSL support)
   VARIANT:=ssl
-  DEPENDS:=+libopenssl
+  DEPENDS+= +libopenssl
 endef
 
 define Package/ntpd-ssl/description
@@ -79,13 +80,37 @@ define Package/ntp-utils
 $(call Package/ntpd/Default)
   TITLE+= utilities
   VARIANT:=nossl
-  DEPENDS:=+libncurses
 endef
 
 define Package/ntp-utils/description
 $(call Package/ntpd/Default/description)
  .
- This package contains ntpdc and ntpq.
+ This package contains ntpdc, ntpq and ntptime.
+endef
+
+define Package/ntp-keygen
+$(call Package/ntpd/Default)
+  TITLE+=keygen
+  VARIANT:=nossl
+endef
+
+define Package/ntp-keygen/description
+$(call Package/ntpd/Default/description)
+ .
+ This package contains the ntp-keygen.
+endef
+
+define Package/ntp-keygen-ssl
+$(call Package/ntpd/Default)
+  TITLE+=keygen (with OpenSSL support)
+  VARIANT:=ssl
+  DEPENDS+= +libopenssl
+endef
+
+define Package/ntp-keygen-ssl/description
+$(call Package/ntpd/Default/description)
+ .
+ This package contains the ntp-keygen with OpenSSL support.
 endef
 
 define Package/ntpd/conffiles
@@ -103,11 +128,12 @@ CONFIGURE_VARS += \
 CONFIGURE_ARGS += \
 	--disable-all-clocks \
 	--disable-parse-clocks \
+	--without-ntpsnmpd \
+	--without-lineeditlibs \
 	--enable-NMEA \
 	--enable-LOCAL-CLOCK \
 	--enable-SHM \
-	--disable-linuxcaps \
-	--without-ntpsnmpd \
+	--enable-linuxcaps
 
 ifeq ($(BUILD_VARIANT),ssl)
   CONFIGURE_ARGS += \
@@ -153,9 +179,19 @@ define Package/ntp-utils/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpdc/ntpdc $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ntpq/ntpq $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/util/ntptime $(1)/usr/sbin/
 endef
 
+define Package/ntp-keygen/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/util/ntp-keygen $(1)/usr/sbin/
+endef
+
+Package/ntp-keygen-ssl/install = $(Package/ntp-keygen/install)
+
 $(eval $(call BuildPackage,ntpd))
 $(eval $(call BuildPackage,ntpd-ssl))
 $(eval $(call BuildPackage,ntpdate))
 $(eval $(call BuildPackage,ntp-utils))
+$(eval $(call BuildPackage,ntp-keygen))
+$(eval $(call BuildPackage,ntp-keygen-ssl))
diff --git a/net/ntpd/files/ntp.conf b/net/ntpd/files/ntp.conf
index b81030502..8bfb8e3d5 100644
--- a/net/ntpd/files/ntp.conf
+++ b/net/ntpd/files/ntp.conf
@@ -1,13 +1,12 @@
-# use a random selection of 8 public stratum 2 servers
+# use a random selection of 4 public stratum 2 servers
 # see http://twiki.ntp.org/bin/view/Servers/NTPPoolServers
 
 #restrict default nomodify notrap noquery
 #restrict default noquery
 
-
 restrict 127.0.0.1
 
-driftfile  /tmp/ntp.drift
+driftfile  /var/lib/ntp/ntp.drift
 
 server 0.openwrt.pool.ntp.org iburst
 server 1.openwrt.pool.ntp.org iburst
diff --git a/net/ntpd/files/ntpd.init b/net/ntpd/files/ntpd.init
index d8dd4f55d..5eb75f646 100644
--- a/net/ntpd/files/ntpd.init
+++ b/net/ntpd/files/ntpd.init
@@ -2,16 +2,20 @@
 # Copyright (C) 2006-2011 OpenWrt.org
 
 START=65
+STOP=65
 
-PIDFILE="/var/run/ntpd.pid"
+SERVICE_USE_PID=1
 
 start() {
 #	ln -sf /dev/ttyS0 /dev/gps0
 #	/usr/sbin/setgarmin -d /dev/gps -c /etc/setgarmin.conf
-	stop
-	/sbin/ntpd -g -p $PIDFILE
+	user_exists ntp 123 || user_add ntp 123 123 ntp /var/lib/ntp
+	group_exists ntp 123 || group_add ntp 123
+	mkdir -p /var/lib/ntp
+	chown -R ntp:ntp /var/lib/ntp
+	service_start /sbin/ntpd -g -u ntp:ntp -p /var/run/ntpd.pid
 }
 
 stop() {
-	[ -f "$PIDFILE" ] && kill $(cat "$PIDFILE") 2>/dev/null >/dev/null
+	service_stop /sbin/ntpd
 }
-- 
2.30.2