X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fntp;h=c3d8d5855edc8fcaf27ac1cf55b0f5b13f5ecad0;hp=9bfe9d017543dbad62ea91935b237c4ad6da82f0;hb=d9c6f56c2ea171cbc1fa396feb30d2814b9a818d;hpb=6c29b4724b608b3dc5a757b25c23ce74e9b9f013

diff --git a/lfs/ntp b/lfs/ntp
index 9bfe9d0175..c3d8d5855e 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.4p7
+VER        = 4.2.8
 
 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 = 6972a626be6150db8cfbd0b63d8719e7
 
 install : $(TARGET)
 
@@ -70,16 +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 \
-					    -enable-all-clocks --enable-parse-clocks
+	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 "disable monitor" > /etc/ntp.conf
+	echo "restrict default nomodify noquery" >>  /etc/ntp.conf
 	echo "server  127.127.1.0"			>> /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)