From: Matthias Fischer <matthias.fischer@ipfire.org>
Date: Sat, 9 Jan 2016 19:29:41 +0000 (+0100)
Subject: ntp: Update to 4.2.8p5
X-Git-Tag: v2.19-core100~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1de76704acbb06bffbb4e6b15f66892db93c525;p=ipfire-2.x.git

ntp: Update to 4.2.8p5

"...addresses 1 medium-severity security issue, 14 bugfixes,
and contains other improvements over 4.2.8p4."

For a complete list, see:
http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/common/ntp b/config/rootfiles/common/ntp
index c6b95a56b9..fd1262e9bd 100644
--- a/config/rootfiles/common/ntp
+++ b/config/rootfiles/common/ntp
@@ -10,6 +10,7 @@ usr/bin/ntpd
 usr/bin/ntpdate
 usr/bin/ntpdc
 usr/bin/ntpq
+#usr/bin/ntpsnmpd
 usr/bin/ntptime
 usr/bin/ntptrace
 usr/bin/sntp
@@ -276,6 +277,7 @@ usr/bin/update-leap
 #usr/share/man/man1/ntpdc.1
 #usr/share/man/man1/ntpq.1
 #usr/share/man/man1/ntptrace.1
+#usr/share/man/man1/ntpsnmpd.1
 #usr/share/man/man1/sntp.1
 #usr/share/man/man1/update-leap.1
 #usr/share/man/man5/ntp.conf.5
diff --git a/lfs/ntp b/lfs/ntp
index 2d04b17ba0..3393f9059f 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2015  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2016  Michael Tremer & Christian Schmidt                      #
 #                                                                             #
 # 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.8p4
+VER        = 4.2.8p5
 
 THISAPP    = ntp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 6af96862b09324a8ef965ca76b759c8b
+$(DL_FILE)_MD5 = 9f02b2a0acc1617ce2716d529a58d2d8
 
 install : $(TARGET)
 
@@ -70,7 +70,6 @@ $(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-fix-sycing-with-local-clock.patch
 	cd $(DIR_APP) && \
 		./configure \
 			--prefix=/usr \