- updated to 4.2.8p8 (fixes CVE-2015-7973 CVE-2015-7974 CVE-2015-7975 CVE-2015-7976

[packages/ntp.git] / ntp.spec

diff --git a/ntp.spec b/ntp.spec
index b3851dd1c5dc75e31fe0199342c44986d7e94fb0..20b0d18335d507a21e14b52cc2347905c2fe6682 100644 (file)
--- a/ntp.spec
+++ b/ntp.spec
@@ -2,9 +2,11 @@
 # - enable and package ntpdsim?
 # - net-snmp-ntpd needs initscript
 # - update FC patches
+# - update man pages (from Debian?)
 #
 # Conditional build:
-%bcond_without avahi  # disable DNS-SD support via Avahi
+%bcond_without avahi   # disable DNS-SD support via Avahi
+%bcond_without sntp    # disable building sntp and sntp/tests
 %bcond_with    seccomp         # enable experimental support for libseccomp sandboxing
 
 %include       /usr/lib/rpm/macros.perl
@@ -12,12 +14,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.8p3
-Release:       2
+Version:       4.2.8p8
+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: b98b0cbb72f6df04608e1dd5f313808b
+Source0:       https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
+# Source0-md5: 4a8636260435b230636f053ffd070e34
 Source1:       %{name}.conf
 Source2:       %{name}.keys
 Source3:       %{name}d.init
@@ -30,7 +32,7 @@ Source10:     %{name}date-wrapper
 Source11:      %{name}d.service
 Source12:      %{name}date.service
 Source13:      http://www.ietf.org/timezones/data/leap-seconds.list
-# Source13-md5:        e99a84cf28b14c77fba76c05565604ac
+# Source13-md5:        2fcae06100fa9193a3e770c1b59bbbe1
 Patch0:                %{name}-build.patch
 Patch1:                %{name}-no_libelf.patch
 Patch2:                %{name}-ipv6.patch
@@ -47,12 +49,12 @@ Patch108:   %{name}-4.2.6p1-rtnetlink.patch
 Patch110:      %{name}-logdefault.patch
 Patch111:      %{name}-4.2.6p1-mlock.patch
 URL:           http://www.ntp.org/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.61
 BuildRequires: autogen-devel
-BuildRequires: automake
+BuildRequires: automake >= 1:1.10
 %{?with_avahi:BuildRequires:   avahi-compat-libdns_sd-devel}
 BuildRequires: libcap-devel
-BuildRequires: libevent-devel
+%{?with_sntp:BuildRequires:    libevent-devel >= 2.0}
 BuildRequires: libnl-devel
 %{?with_seccomp:BuildRequires: libseccomp-devel}
 BuildRequires: libtool
@@ -175,6 +177,9 @@ Summary:    MIBs for NTP time entities
 Summary(pl.UTF-8):     Pliki MIB dla elementów czasu NTP
 Group:         Applications/System
 Requires:      mibs-dirs
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description -n mibs-ntp
 The Management Information Base for NTP time entities.
@@ -220,6 +225,9 @@ Summary:    HTML documentation for ntp
 Summary(pl.UTF-8):     Dokumentacja HTML dla ntp
 Summary(pt_BR.UTF-8):  Documentação adicional para o pacote ntp
 Group:         Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description doc-html
 HTML documentation for ntp.
@@ -261,17 +269,24 @@ echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac
 %{__automake}
 cd sntp
 %{__libtoolize}
-%{__aclocal} -I libopts/m4 -I libevent/m4
+%{__aclocal} -I m4 -I libopts/m4 -I libevent/m4
 %{__autoconf}
 %{__automake}
-cd ..
+cd libevent
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
+cd ../..
 
 CPPFLAGS="%{rpmcppflags} -I/usr/include/readline"
 %configure \
+       --disable-silent-rules \
        --with-binsubdir=sbin \
        --enable-linuxcaps \
        --enable-getifaddrs \
        %{?with_seccomp:--enable-libseccomp} \
+       %{__with_without sntp} \
        --enable-ipv6 \
        --enable-ntp-signd \
        --with-lineeditlibs=readline \
@@ -410,7 +425,7 @@ fi
 %attr(750,root,root) %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/keys
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntp.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntp.leapseconds
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntp.leapseconds
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ntpd
 %attr(754,root,root) /etc/rc.d/init.d/ntpd
 %{systemdunitdir}/ntpd.service