updated some fc patches, delaycalib.patch is applied upstream

[packages/ntp.git] / ntp.spec

diff --git a/ntp.spec b/ntp.spec
index fc9757c57cec8a162f286df1cdaebbbf32c1fc49..7b7ee0eb2e8f93f2dd118f9622d84f29634bd998 100644 (file)
--- a/ntp.spec
+++ b/ntp.spec
@@ -1,6 +1,7 @@
 # TODO:
 # - enable and package ntpdsim?
 # - net-snmp-ntpd needs initscript
+# - update FC patches
 #
 # Conditional build:
 %bcond_without avahi  # disable DNS-SD support via Avahi
@@ -10,18 +11,18 @@ 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.6p5
-Release:       8
+Version:       4.2.8
+Release:       0.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: 00df80a84ec9528fcfb09498075525bc
+# Source0-md5: 6972a626be6150db8cfbd0b63d8719e7
 Source1:       %{name}.conf
 Source2:       %{name}.keys
-Source3:       %{name}.init
-Source4:       %{name}.sysconfig
-Source5:       %{name}-client.init
-Source6:       %{name}-client.sysconfig
+Source3:       %{name}d.init
+Source4:       %{name}d.sysconfig
+Source5:       %{name}date.init
+Source6:       %{name}date.sysconfig
 Source7:       %{name}-manpages.tar.gz
 # Source7-md5: 208fcc9019e19ab26d28e4597290bffb
 Source8:       %{name}.upstart
@@ -29,12 +30,13 @@ Source9:    %{name}date.upstart
 Source10:      %{name}date-wrapper
 Source11:      %{name}d.service
 Source12:      %{name}date.service
-Patch0:                %{name}-time.patch
+Source13:      http://www.ietf.org/timezones/data/leap-seconds.list
+# Source13-md5:        e99a84cf28b14c77fba76c05565604ac
+Patch0:                %{name}-build.patch
 Patch1:                %{name}-no_libelf.patch
 Patch2:                %{name}-ipv6.patch
 Patch3:                %{name}-nano.patch
 Patch4:                %{name}-no_avahi.patch
-Patch5:                %{name}-format-security.patch
 # FC patches + 100
 Patch101:      %{name}-4.2.6p1-sleep.patch
 Patch102:      %{name}-4.2.6p1-droproot.patch
@@ -48,13 +50,15 @@ Patch109:   %{name}-4.2.4p7-getprecision.patch
 Patch110:      %{name}-4.2.6p1-logdefault.patch
 Patch111:      %{name}-4.2.6p1-mlock.patch
 Patch112:      %{name}-4.2.6p3-broadcastdelay.patch
-Patch113:      %{name}-4.2.6p3-delaycalib.patch
 URL:           http://www.ntp.org/
 BuildRequires: autoconf
+BuildRequires: autogen-devel
 BuildRequires: automake
 %{?with_avahi:BuildRequires:   avahi-compat-libdns_sd-devel}
 BuildRequires: libcap-devel
+BuildRequires: libevent-devel
 BuildRequires: libnl-devel
+BuildRequires: libseccomp-devel
 BuildRequires: libtool
 BuildRequires: net-snmp-devel
 BuildRequires: openssl-devel >= 0.9.7d
@@ -247,34 +251,34 @@ Este pacote contém documentação adicional sobre o NTP versão 4.
 %patch2 -p1
 %patch3 -p1
 %{!?with_avahi:%patch4 -p1}
-%patch5 -p1
 
 ## FC patches
-%patch101 -p1
+#%patch101 -p1
 %patch102 -p1
-%patch103 -p1
+#%patch103 -p1
 %patch104 -p1
 %patch105 -p1
-%patch106 -p1
+#%patch106 -p1 looks like obsolete
 %patch107 -p1
 %patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
+#%patch109 -p1 upstream already decreased to 20e-9, not needed then?
+#%patch110 -p1
+#%patch111 -p1
+#%patch112 -p1
 
 echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> configure.ac
 echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac
 
+rm sntp/m4/{lt*,libtool}.m4 sntp/libevent/m4/{lt*,libtool}.m4
+
 %build
 %{__libtoolize}
-%{__aclocal} -I m4 -I sntp/libopts/m4
+%{__aclocal} -I sntp/m4 -I sntp/libopts/m4 -I sntp/libevent/m4
 %{__autoconf}
 %{__automake}
 cd sntp
 %{__libtoolize}
-%{__aclocal} -I ../m4 -I libopts/m4
+%{__aclocal} -I libopts/m4 -I libevent/m4
 %{__autoconf}
 %{__automake}
 cd ..
@@ -284,16 +288,20 @@ CPPFLAGS="%{rpmcppflags} -I/usr/include/readline"
        --with-binsubdir=sbin \
        --enable-linuxcaps \
        --enable-getifaddrs \
+       --enable-libseccomp \
        --enable-ipv6 \
        --enable-ntp-signd \
        --with-lineeditlibs=readline \
-       --with-crypto=openssl
+       --with-crypto=openssl \
+       --disable-local-libopts \
+       --disable-local-libevent
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man1,%{systemdunitdir}} \
+       $RPM_BUILD_ROOT%{_libexecdir}/systemd/ntp-units.d \
        $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,cron.hourly,init}
 
 %{__make} install \
@@ -301,6 +309,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man1,%{systemdunitdir}} \
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ntp.conf
 cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/keys
+cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/ntp.leapseconds
 
 install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntpd
 install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntpdate
@@ -312,6 +321,8 @@ cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/init/ntpdate.conf
 install -p %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/ntpdate-wrapper
 cp -p %{SOURCE11} $RPM_BUILD_ROOT%{systemdunitdir}/ntpd.service
 cp -p %{SOURCE12} $RPM_BUILD_ROOT%{systemdunitdir}/ntpdate.service
+echo 'ntpd.service' > \
+        $RPM_BUILD_ROOT%{_libexecdir}/systemd/ntp-units.d/50-ntpd.list
 
 cp -p man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
@@ -333,6 +344,8 @@ EOF
 install -d $RPM_BUILD_ROOT%{mibdir}
 cp -p ntpsnmpd/ntpv4-mib.mib $RPM_BUILD_ROOT%{mibdir}
 
+rm -r $RPM_BUILD_ROOT%{_docdir}/ntp4
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -428,9 +441,11 @@ 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
 %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
+%{_libexecdir}/systemd/ntp-units.d/50-ntpd.list
 %attr(755,root,root) %{_sbindir}/ntpd
 %attr(755,root,root) %{_sbindir}/ntpdc
 %attr(755,root,root) %{_sbindir}/ntp-keygen