X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ntp.spec;h=20b0d18335d507a21e14b52cc2347905c2fe6682;hb=a71e0d28e9a5eca73032bacb1e24f7f17612a949;hp=fc9757c57cec8a162f286df1cdaebbbf32c1fc49;hpb=299584e5ea6568419ed8dcc493b1cbf0a87897c0;p=packages%2Fntp.git

diff --git a/ntp.spec b/ntp.spec
index fc9757c..20b0d18 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -1,60 +1,62 @@
 # TODO:
 # - 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
 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.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:	00df80a84ec9528fcfb09498075525bc
+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}.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
-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:	2fcae06100fa9193a3e770c1b59bbbe1
+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
 Patch103:	%{name}-4.2.6p1-bcast.patch
 Patch104:	%{name}-4.2.6p1-cmsgalign.patch
 Patch105:	%{name}-4.2.6p1-linkfastmath.patch
-Patch106:	%{name}-4.2.6p1-tentative.patch
 Patch107:	%{name}-4.2.6p1-retcode.patch
 Patch108:	%{name}-4.2.6p1-rtnetlink.patch
-Patch109:	%{name}-4.2.4p7-getprecision.patch
-Patch110:	%{name}-4.2.6p1-logdefault.patch
+Patch110:	%{name}-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:	automake
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	autogen-devel
+BuildRequires:	automake >= 1:1.10
 %{?with_avahi:BuildRequires:	avahi-compat-libdns_sd-devel}
 BuildRequires:	libcap-devel
+%{?with_sntp:BuildRequires:	libevent-devel >= 2.0}
 BuildRequires:	libnl-devel
+%{?with_seccomp:BuildRequires:	libseccomp-devel}
 BuildRequires:	libtool
 BuildRequires:	net-snmp-devel
 BuildRequires:	openssl-devel >= 0.9.7d
@@ -139,19 +141,6 @@ referência de horário. Este pacote contém utilitários e servidores que
 sincronizarão o relógio do seu computador com o horário universal
 (UTC) através do protocolo NTP e utilizando servidores NTP públicos.
 
-%package -n ntpd-upstart
-Summary:	Upstart job description for the NTP daemon
-Summary(pl.UTF-8):	Opis zadania Upstart dla demona NTP
-Group:		Daemons
-Requires:	ntpd = %{version}-%{release}
-Requires:	upstart >= 0.6
-
-%description -n ntpd-upstart
-Upstart job description for the NTP daemon.
-
-%description -n ntpd-upstart -l pl.UTF-8
-Opis zadania Upstart dla demona NTP.
-
 %package -n ntpdate
 Summary:	Utility to set the date and time via NTP
 Summary(pl.UTF-8):	Klient do synchronizacji czasu po NTP (Network Time Protocol)
@@ -183,29 +172,24 @@ servers.
 %description -n ntpdate -l pl.UTF-8
 Klient do synchronizacji czasu po NTP (Network Time Protocol).
 
-%package -n ntpdate-upstart
-Summary:	Upstart job description for NTP client
-Summary(pl.UTF-8):	Opis zadania Upstart dla klienta NTP
-Group:		Daemons
-Requires:	ntpdate = %{version}-%{release}
-Requires:	upstart >= 0.6
-
-%description -n ntpdate-upstart
-Upstart job description for the NTP client.
-
-%description -n ntpdate-upstart -l pl.UTF-8
-Opis zadania Upstart dla klienta NTP.
-
 %package -n mibs-ntp
 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.
 
+%description -n mibs-ntp -l pl.UTF-8
+Pliki MIB (Management Information Base) dla elementów czasu NTP
+
 %package -n net-snmp-ntpd
 Summary:	NTP SNMP subagent for Net-SNMP
+Summary(pl.UTF-8):	Podagent SNMP NTP dla usługi Net-SNMP
 Group:		Daemons
 Requires(post,preun):	/sbin/chkconfig
 Requires:	net-snmp
@@ -215,21 +199,35 @@ Suggests:	mibs-ntp
 %description -n net-snmp-ntpd
 NTP SNMP AgentX subagent for Net-SNMP.
 
+%description -n net-snmp-ntpd -l pl.UTF-8
+Podagent SNMP AgentX NTP dla usługi Net-SNMP.
+
 %package tools
 Summary:	NTP tools
+Summary(pl.UTF-8):	Narzędzia NTP
 Group:		Applications/Networking
 Obsoletes:	ntp-ntptrace
 
 %description tools
-This package contains ntp tools:
+This package contains NTP tools:
 - ntptrace: Trace a chain of NTP servers back to the primary source
 - ntp-wait: Wait for NTP server to synchronize
+- calc_tickadj: Calculate optimal value for tick given ntp drift file
+
+%description tools -l pl.UTF-8
+Ten pakiet zawiera narzędzia NTP:
+- ntptrace: śledzenie łańcucha serwerów NTP aż do oryginalnego źródła
+- ntp-wait: oczekiwanie na synchronizację serwera NTP
+- calc_tickadj: obliczenie optymalnej wartości dla pliku dryfu ntp
 
 %package doc-html
 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.
@@ -247,71 +245,80 @@ 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
 %patch107 -p1
 %patch108 -p1
-%patch109 -p1
 %patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
+#%patch111 -p1  -- obsolete?
 
 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 m4 -I libopts/m4 -I libevent/m4
+%{__autoconf}
+%{__automake}
+cd libevent
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
-cd ..
+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 \
-	--with-crypto=openssl
+	--with-crypto=openssl \
+	--disable-local-libopts \
+	--disable-local-libevent
 
-%{__make}
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_mandir}/man1,%{systemdunitdir}} \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,cron.hourly,init}
+	$RPM_BUILD_ROOT%{_libexecdir}/systemd/ntp-units.d \
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,cron.hourly}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 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
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/ntpd
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/ntpdate
-cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/ntpd.conf
-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 +340,8 @@ EOF
 install -d $RPM_BUILD_ROOT%{mibdir}
 cp -p ntpsnmpd/ntpv4-mib.mib $RPM_BUILD_ROOT%{mibdir}
 
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{ntp,sntp}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -360,12 +369,6 @@ if [ "$1" = "0" ]; then
 fi
 %systemd_reload
 
-%post -n ntpd-upstart
-%upstart_post ntpd
-
-%postun -n ntpd-upstart
-%upstart_postun ntpd
-
 %pre -n ntpdate
 %groupadd -g 246 ntp
 %useradd -u 246 -d %{_sysconfdir} -g ntp -c "NTP Daemon" ntp
@@ -389,12 +392,6 @@ if [ "$1" = "0" ]; then
 fi
 %systemd_reload
 
-%post -n ntpdate-upstart
-%upstart_post ntpdate
-
-%postun -n ntpdate-upstart
-%upstart_postun ntpdate
-
 %triggerun -n ntpd -- ntp < 4.2.4p8-3.14
 # Prevent preun from ntp from working
 chmod a-x /etc/rc.d/init.d/ntpd
@@ -428,9 +425,12 @@ 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
+%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
+# dir not handled by systemd in pld
+#%{_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
@@ -438,20 +438,20 @@ 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*
 
 %dir %attr(770,root,ntp) /var/lib/ntp
 %attr(640,ntp,ntp) %ghost /var/lib/ntp/drift
 
-%files -n ntpd-upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/ntpd.conf
-
 %files -n ntpdate
 %defattr(644,root,root,755)
 %doc COPYRIGHT
@@ -461,11 +461,7 @@ fi
 %attr(754,root,root) /etc/cron.hourly/ntpdate
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ntpdate
 %{systemdunitdir}/ntpdate.service
-%{_mandir}/man1/ntpdate*
-
-%files -n ntpdate-upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/ntpdate.conf
+%{_mandir}/man1/ntpdate.1*
 
 %files -n mibs-ntp
 %defattr(644,root,root,755)
@@ -479,9 +475,14 @@ fi
 
 %files tools
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_sbindir}/ntptrace
+%attr(755,root,root) %{_sbindir}/calc_tickadj
 %attr(755,root,root) %{_sbindir}/ntp-wait
-%{_mandir}/man1/ntptrace*
+%attr(755,root,root) %{_sbindir}/ntptrace
+%dir %{_datadir}/ntp
+%{_datadir}/ntp/lib
+%{_mandir}/man1/calc_tickadj.1*
+%{_mandir}/man1/ntp-wait.1*
+%{_mandir}/man1/ntptrace.1*
 
 %files doc-html
 %defattr(644,root,root,755)