From 148dc0c7017f35eb20a22c1aefb525ff106c65e6 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 12 Feb 2014 09:11:10 +0100
Subject: [PATCH] ntp: update to 4.2.7p421 (dev) to fix amplification attacks.

---
 common/shlibs        |  2 ++
 srcpkgs/ntp/template | 34 ++++++++++++++++------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 73fcdcdd8d..5171181d93 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -624,6 +624,8 @@ liblber-2.4.so.2 libldap-2.4.21_1
 libldap-2.4.so.2 libldap-2.4.21_1
 libldap_r-2.4.so.2 libldap-2.4.21_1
 libevent-2.0.so.5 libevent-2.0.10_1
+libevent_core-2.0.so.5 libevent-2.0.21_1
+libevent_pthreads-2.0.so.5 libevent-2.0.21_1
 libSDL_mixer-1.2.so.0 SDL_mixer-1.2.11_1
 libapr-1.so.0 apr-1.4.2_1
 libaprutil-1.so.0 apr-util-1.3.9_1
diff --git a/srcpkgs/ntp/template b/srcpkgs/ntp/template
index a3e501165d..daaed79d50 100644
--- a/srcpkgs/ntp/template
+++ b/srcpkgs/ntp/template
@@ -1,23 +1,25 @@
 # Template file for 'ntp'
 pkgname=ntp
-version=4.2.6p5
-revision=14
+version=4.2.7p421
+revision=1
+wrksrc="ntp-dev-${version}"
 build_style=gnu-configure
-configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --with-lineeditlibs=readline"
-hostmakedepends="bison perl-HTML-Parser"
-makedepends="readline-devel openssl-devel libcap-devel"
-depends="shadow"
-conf_files="/etc/ntp.conf"
-systemd_services="ntpdate.service on ntpd.service on"
-system_accounts="ntpd"
-provides="ntp-daemon-0"
-replaces="ntp-daemon>=0"
+configure_args="--with-crypto --enable-linuxcap --enable-ipv6
+ --with-lineeditlibs=readline ol_cv_pthread_select_yields=yes"
+hostmakedepends="pkg-config bison"
+makedepends="readline-devel openssl-devel libcap-devel libevent-devel"
 short_desc="The Network Time Protocol daemon and utilities"
 license="BSD"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.ntp.org/"
-distfiles="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$version.tar.gz"
-checksum=d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c
+distfiles="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ntp-dev-${version}.tar.gz"
+checksum=cc362f1a5bce1658761283bf3dcb14674557de953a0688973bb04c501f8baf10
+
+depends="shadow"
+conf_files="/etc/ntp.conf"
+system_accounts="ntpd"
+provides="ntp-daemon-0"
+replaces="ntp-daemon>=0"
 
 post_install() {
 	# ntpd service
@@ -29,11 +31,6 @@ post_install() {
 	# For systemd-timedated.
 	vmkdir usr/lib/systemd/ntp-units.d
 	echo "ntpd.service" > ${DESTDIR}/usr/lib/systemd/ntp-units.d/60-ntp.list
-	# Convert html to manual pages.
-	cd html
-	../scripts/html2man
-	vmkdir usr/share/man
-	mv man/man* ${DESTDIR}/usr/share/man
 }
 
 ntp-perl_package() {
@@ -44,5 +41,6 @@ ntp-perl_package() {
 		for f in ntp-wait ntptrace; do
 			vmove usr/bin/${f}
 		done
+		vmove usr/share/ntp/lib
 	}
 }