]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
ntp: Update to 4.2.6p5.
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Feb 2014 10:54:14 +0000 (11:54 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Feb 2014 10:54:14 +0000 (11:54 +0100)
config/rootfiles/core/76/filelists/ntp [new file with mode: 0644]
lfs/ntp

diff --git a/config/rootfiles/core/76/filelists/ntp b/config/rootfiles/core/76/filelists/ntp
new file mode 100644 (file)
index 0000000..c080f38
--- /dev/null
@@ -0,0 +1,11 @@
+etc/ntp.conf
+usr/bin/ntpd
+usr/bin/ntpdate
+usr/bin/ntpdc
+usr/bin/sntp
+usr/sbin/ntp-keygen
+usr/sbin/ntp-wait
+usr/sbin/ntpq
+usr/sbin/ntptime
+usr/sbin/ntptrace
+usr/sbin/tickadj
diff --git a/lfs/ntp b/lfs/ntp
index 1859212f5263b47d8dc71015cfd2452fba6abf4a..147e0a8f013e3d8467e5499957e5d7f1f10b23ab 100644 (file)
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.4p7
+VER        = 4.2.6p5
 
 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 = 00df80a84ec9528fcfb09498075525bc
 
 install : $(TARGET)
 
@@ -70,14 +70,22 @@ $(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 \
+                       --bindir=/usr/sbin \
+                       --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
@@ -86,9 +94,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/
        chmod 644 /var/ipfire/time/*
        chown nobody:nobody /var/ipfire/time/*
-       ln -s ../init.d/ntp /etc/rc.d/rc0.d/K46ntpd
-       ln -s ../init.d/ntp /etc/rc.d/rc6.d/K46ntpd
-       ln -s ../init.d/ntp /etc/rc.d/rc3.d/S26ntpd
+       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)