From: Adam Osuchowski <adwol@pld-linux.org>
Date: Wed, 29 Jul 2015 19:54:07 +0000 (+0200)
Subject: - up to 4.2.8p3
X-Git-Tag: auto/th/ntp-4.2.8p3-2~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fntp.git;a=commitdiff_plain;h=aade2e5

- up to 4.2.8p3
---

diff --git a/ntp-4.2.6p1-linkfastmath.patch b/ntp-4.2.6p1-linkfastmath.patch
index 8882619..2bc8a0b 100644
--- a/ntp-4.2.6p1-linkfastmath.patch
+++ b/ntp-4.2.6p1-linkfastmath.patch
@@ -1,11 +1,12 @@
---- ntp-4.2.8/ntpd/Makefile.in~	2014-12-19 14:42:16.000000000 +0200
-+++ ntp-4.2.8/ntpd/Makefile.in	2015-01-02 10:29:27.339577618 +0200
-@@ -537,7 +537,7 @@
+diff -ruN ntp-4.2.8p3.orig/ntpd/Makefile.in ntp-4.2.8p3/ntpd/Makefile.in
+--- ntp-4.2.8p3.orig/ntpd/Makefile.in	2015-06-29 22:24:11.000000000 +0200
++++ ntp-4.2.8p3/ntpd/Makefile.in	2015-07-29 20:26:43.269520417 +0200
+@@ -647,7 +647,7 @@
  # longer a reason to have ntpdbase-opts.def split off of ntpd-opts.def.
  LDADD_NTPD_COMMON = $(LDADD_LIBNTP) $(LIBOPTS_LDADD) $(PTHREAD_LIBS) \
  	$(LIBM) $(LDADD_NTP) $(LSCF)
--ntpd_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(LDADD_NTPD_COMMON)
-+ntpd_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) -ffast-math $(LDADD_NTPD_COMMON)
+-ntpd_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_NTPD_COMMON) $(LDADD_LIBUTIL)
++ntpd_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_NTPD_COMMON) -ffast-math $(LDADD_LIBUTIL)
  ntpdsim_LDADD = $(LDADD) ../libntp/libntpsim.a $(LDADD_NTPD_COMMON)
  ntpdsim_CPPFLAGS = $(AM_CPPFLAGS) -DSIM
  check_y2k_LDADD = $(LDADD) ../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(LDADD_LIBNTP) $(PTHREAD_LIBS)
diff --git a/ntp.spec b/ntp.spec
index 071f867..eda110c 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -11,12 +11,12 @@ Summary:	Network Time Protocol utilities
 Summary(pl.UTF-8):	Narzędzia do synchronizacji czasu (Network Time Protocol)
 Summary(pt_BR.UTF-8):	Network Time Protocol versão 4
 Name:		ntp
-Version:	4.2.8
-Release:	4
+Version:	4.2.8p3
+Release:	1
 License:	distributable
 Group:		Networking/Daemons
 Source0:	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
-# Source0-md5:	6972a626be6150db8cfbd0b63d8719e7
+# Source0-md5:	b98b0cbb72f6df04608e1dd5f313808b
 Source1:	%{name}.conf
 Source2:	%{name}.keys
 Source3:	%{name}d.init
@@ -324,7 +324,7 @@ EOF
 install -d $RPM_BUILD_ROOT%{mibdir}
 cp -p ntpsnmpd/ntpv4-mib.mib $RPM_BUILD_ROOT%{mibdir}
 
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{ntp4,sntp}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{ntp,sntp}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -422,12 +422,14 @@ fi
 %attr(755,root,root) %{_sbindir}/ntptime
 %attr(755,root,root) %{_sbindir}/sntp
 %attr(755,root,root) %{_sbindir}/tickadj
+%attr(755,root,root) %{_sbindir}/update-leap
 %{_mandir}/man1/ntpd.1*
 %{_mandir}/man1/ntpdc.1*
 %{_mandir}/man1/ntp-keygen.1*
 %{_mandir}/man1/ntpq.1*
 %{_mandir}/man1/ntptime.1*
 %{_mandir}/man1/sntp.1*
+%{_mandir}/man1/update-leap.1*
 %{_mandir}/man5/ntp.conf.5*
 %{_mandir}/man5/ntp.keys.5*