Merge branch 'master' into next

[ipfire-2.x.git] / lfs / ntp

diff --git a/lfs/ntp b/lfs/ntp
index c3d8d5855edc8fcaf27ac1cf55b0f5b13f5ecad0..241a21e1c6c7d6e3fac1d5c218af9a67e620cbb6 100644 (file)
--- 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-2020  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.8
+VER        = 4.2.8p15
 
 THISAPP    = ntp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6972a626be6150db8cfbd0b63d8719e7
+$(DL_FILE)_BLAKE2 = 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef
 
 install : $(TARGET)
 
@@ -48,10 +48,10 @@ check : $(patsubst %,$(DIR_CHK)/%,$(objects))
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
+b2 : $(subst %,%_BLAKE2,$(objects))
 
 ###############################################################################
-# Downloading, checking, md5sum
+# Downloading, checking, b2sum
 ###############################################################################
 
 $(patsubst %,$(DIR_CHK)/%,$(objects)) :
@@ -60,8 +60,8 @@ $(patsubst %,$(DIR_CHK)/%,$(objects)) :
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+$(subst %,%_BLAKE2,$(objects)) :
+       @$(B2SUM)
 
 ###############################################################################
 # Installation Details
@@ -70,6 +70,8 @@ $(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/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch
+       $(UPDATE_AUTOMAKE)
        cd $(DIR_APP) && \
                ./configure \
                        --prefix=/usr \
@@ -82,12 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make install
 
        -mkdir /etc/ntp
-       chown -R ntp:ntp /etc/ntp
-       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
+       install -v -m 644 $(DIR_SRC)/config/ntp/ntp.conf /etc/ntp.conf
 
        #Enable it by default...
        cp -vf $(DIR_SRC)/config/time/* /var/ipfire/time/