X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fntp;h=8f845409ce7e379624af6e0b72844df06b7fcd8f;hb=0971726e1372d743f92b7f0e6969ebbaa8718756;hp=966041f5929f433a2a367369b04b17fd7deedb70;hpb=3bf9b58e4d017f22431c18f1318809e6376209fa;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/ntp b/lfs/ntp
index 966041f592..8f845409ce 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.4p7
+VER        = 4.2.8p12
 
 THISAPP    = ntp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8c19ff62ed4f7d64f8e2aa59cb11f364
+$(DL_FILE)_MD5 = 1522d66574bae14abb2622746dad2bdc
 
 install : $(TARGET)
 
@@ -70,15 +70,32 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/usr/sbin \
-					    --sysconfdir=/etc --disable-nls
+	cd $(DIR_APP) && \
+		./configure \
+			--prefix=/usr \
+			--sysconfdir=/etc \
+			--disable-nls \
+			--enable-all-clocks \
+			--enable-parse-clocks
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
 	-mkdir /etc/ntp
 	chown -R ntp:ntp /etc/ntp
-	echo "restrict default nomodify noquery" >  /etc/ntp.conf
-	echo "server  127.127.1.0"			>> /etc/ntp.conf
+	echo "disable monitor" > /etc/ntp.conf
+	echo "restrict default nomodify noquery" >>  /etc/ntp.conf
+	echo "server  127.127.1.0 prefer"	>> /etc/ntp.conf
 	echo "fudge   127.127.1.0 stratum 10"	>> /etc/ntp.conf
 	echo "driftfile /etc/ntp/drift"		>> /etc/ntp.conf
+
+	#Enable it by default...
+	cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/
+	chmod 644 /var/ipfire/time/*
+	chown nobody:nobody /var/ipfire/time/*
+	ln -svf ../init.d/ntp /etc/rc.d/rc0.d/K46ntpd
+	ln -svf ../init.d/ntp /etc/rc.d/rc6.d/K46ntpd
+	ln -svf ../init.d/ntp /etc/rc.d/rc3.d/S26ntpd
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)