X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fntp;h=8f845409ce7e379624af6e0b72844df06b7fcd8f;hb=c980ac7f2a0ba8ea08797005445328055993e31e;hp=bbfb4c6ead52b7bf5efb3f1fd00c46cd98f3b277;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=ipfire-2.x.git

diff --git a/lfs/ntp b/lfs/ntp
index bbfb4c6ead..8f845409ce 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -1,28 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# 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        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: ntp,v 1.6.2.3 2005/02/05 15:38:15 gespinasse Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,11 +24,11 @@
 
 include Config
 
-VER        = 4.2.0
+VER        = 4.2.8p12
 
 THISAPP    = ntp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -48,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f8fabe87cf54f409b57c6283f0c0c3d
+$(DL_FILE)_MD5 = 1522d66574bae14abb2622746dad2bdc
 
 install : $(TARGET)
 
@@ -78,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) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-linuxcaps.patch
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --enable-linuxcaps
-	cd $(DIR_APP) && make
+	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)