+# TODO:
+# - enable and package ntpdsim?
+# - net-snmp-ntpd needs initscript
+# - update FC patches
+#
+# Conditional build:
+%bcond_without avahi # disable DNS-SD support via Avahi
+
%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.4p8
-Release: 10
+Version: 4.2.8
+Release: 0.1
License: distributable
-Group: Daemons
+Group: Networking/Daemons
Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
-# Source0-md5: fe137056e7e611798a46971a783567ce
+# 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
-Patch0: %{name}-time.patch
+Source8: %{name}.upstart
+Source9: %{name}date.upstart
+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
+Patch0: %{name}-build.patch
Patch1: %{name}-no_libelf.patch
Patch2: %{name}-ipv6.patch
-Patch3: %{name}-openssl_check.patch
-Patch4: %{name}-clock_settime.patch
-Patch5: %{name}-md5.patch
-Patch6: %{name}-nano.patch
-Patch7: %{name}-manpage.patch
-# FC patches
-Patch101: %{name}-4.2.4p4-kernel.patch
-Patch102: %{name}-4.2.4p0-droproot.patch
-Patch103: %{name}-4.2.4-groups.patch
-Patch104: %{name}-4.2.4p7-daemonpll.patch
-Patch106: %{name}-4.2.4p2-tentative.patch
-Patch107: %{name}-4.2.4p2-noseed.patch
-Patch108: %{name}-4.2.4p4-multilisten.patch
-Patch109: %{name}-4.2.4-html2man.patch
-Patch110: %{name}-4.2.4p5-htmldoc.patch
-Patch111: %{name}-4.2.4p2-filegen.patch
-Patch112: %{name}-4.2.4-sprintf.patch
-Patch114: %{name}-4.2.4p8-mlock.patch
-Patch115: %{name}-4.2.4p2-clockselect.patch
-Patch117: %{name}-4.2.4p7-sleep.patch
-Patch118: %{name}-4.2.4p7-bcast.patch
-Patch119: %{name}-4.2.4p0-retcode.patch
-Patch120: %{name}-4.2.4p2-noif.patch
-Patch122: %{name}-4.2.4p4-cmsgalign.patch
-Patch124: %{name}-4.2.4p4-resinit.patch
-Patch125: %{name}-4.2.4p5-rtnetlink.patch
-Patch126: %{name}-4.2.4p7-stamode.patch
-Patch127: %{name}-4.2.4p5-driftonexit.patch
-Patch129: %{name}-4.2.4p7-minpoll.patch
-Patch130: %{name}-4.2.4p7-freqmode.patch
-Patch133: %{name}-4.2.4p7-getprecision.patch
+Patch3: %{name}-nano.patch
+Patch4: %{name}-no_avahi.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
+Patch111: %{name}-4.2.6p1-mlock.patch
+Patch112: %{name}-4.2.6p3-broadcastdelay.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
+BuildRequires: pciutils-devel
BuildRequires: readline-devel >= 4.2
BuildRequires: rpm-perlprov >= 4.1-13
-BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: rpmbuild(macros) >= 1.626
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/ntp
%define _bindir %{_sbindir}
+%define mibdir %{_datadir}/mibs
%description
The Network Time Protocol (NTP) is used to synchronize a computer's
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires: rc-scripts >= 0.4.0.10
+Requires(post,preun,postun): systemd-units >= 38
+Requires: rc-scripts >= 0.4.3.0
+Requires: systemd-units >= 38
Provides: group(ntp)
Provides: ntp = %{version}-%{release}
Provides: ntpdaemon
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)
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
+Requires(post,preun,postun): systemd-units >= 38
+Requires: rc-scripts >= 0.4.3.0
+Requires: systemd-units >= 38
Provides: group(ntp)
Provides: user(ntp)
Conflicts: ntp < 4.2.0-3
%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
+Group: Applications/System
+Requires: mibs-dirs
+
+%description -n mibs-ntp
+The Management Information Base for NTP time entities.
+
+%package -n net-snmp-ntpd
+Summary: NTP SNMP subagent for Net-SNMP
+Group: Daemons
+Requires(post,preun): /sbin/chkconfig
+Requires: net-snmp
+Requires: rc-scripts
+Suggests: mibs-ntp
+
+%description -n net-snmp-ntpd
+NTP SNMP AgentX subagent for Net-SNMP.
+
%package tools
Summary: NTP tools
Group: Applications/Networking
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p0
-%patch5 -p1
-%patch6 -p1
-%patch7 -p0
+%{!?with_avahi:%patch4 -p1}
-# FC patches
-%patch101 -p1
+## FC patches
+#%patch101 -p1
%patch102 -p1
-%patch103 -p1
+#%patch103 -p1
%patch104 -p1
-%patch106 -p1
+%patch105 -p1
+#%patch106 -p1 looks like obsolete
%patch107 -p1
%patch108 -p1
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch114 -p1
-%patch115 -p1
-%patch117 -p1
-%patch118 -p1
-%patch119 -p1
-%patch120 -p1
-%patch122 -p1
-%patch124 -p1
-%patch125 -p1
-%patch126 -p1
-%patch127 -p1
-%patch129 -p1
-%patch130 -p1
-%patch133 -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 libopts/m4
+%{__aclocal} -I sntp/m4 -I sntp/libopts/m4 -I sntp/libevent/m4
%{__autoconf}
%{__automake}
cd sntp
%{__libtoolize}
-%{__aclocal} -I libopts/m4
+%{__aclocal} -I libopts/m4 -I libevent/m4
%{__autoconf}
%{__automake}
cd ..
+CPPFLAGS="%{rpmcppflags} -I/usr/include/readline"
%configure \
--with-binsubdir=sbin \
--enable-linuxcaps \
--enable-getifaddrs \
+ --enable-libseccomp \
--enable-ipv6 \
- --with-crypto=openssl
+ --enable-ntp-signd \
+ --with-lineeditlibs=readline \
+ --with-crypto=openssl \
+ --disable-local-libopts \
+ --disable-local-libevent
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig,cron.hourly},%{_mandir}/man1}
+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 \
DESTDIR=$RPM_BUILD_ROOT
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ntp.conf
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/keys
+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 -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/ntpd
-cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/ntpdate
-cp -a man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
+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
install -d $RPM_BUILD_ROOT/var/lib/ntp
touch $RPM_BUILD_ROOT/var/lib/ntp/drift
cat > $RPM_BUILD_ROOT/etc/cron.hourly/ntpdate <<'EOF'
#!/bin/sh
-exec /sbin/service ntpdate cronsettime
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source ntpdate configuration
+. /etc/sysconfig/ntpdate
+
+is_yes "$NTPDATE_CRON" || exit 0
+exec %{_sbindir}/ntpdate-wrapper
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
%post -n ntpd
/sbin/chkconfig --add ntpd
%service ntpd restart "NTP Daemon"
+%systemd_post ntpd.service
%preun -n ntpd
if [ "$1" = "0" ]; then
/sbin/chkconfig --del ntpd
rm -f /var/lib/ntp/drift
fi
+%systemd_preun ntpd.service
%postun -n ntp
if [ "$1" = "0" ]; then
%userremove ntp
%groupremove ntp
fi
+%systemd_reload
+
+%post -n ntpd-upstart
+%upstart_post ntpd
+
+%postun -n ntpd-upstart
+%upstart_postun ntpd
%pre -n ntpdate
%groupadd -g 246 ntp
%post -n ntpdate
/sbin/chkconfig --add ntpdate
%service ntpdate restart "NTP Date"
+%systemd_post ntpdate.service
%preun -n ntpdate
if [ "$1" = "0" ]; then
%service ntpdate stop
/sbin/chkconfig --del ntpdate
fi
+%systemd_preun ntpdate.service
%postun -n ntpdate
if [ "$1" = "0" ]; then
%userremove ntp
%groupremove ntp
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
mv -f /etc/ntp/ntp.drift /var/lib/ntp/drift 2>/dev/null
mv -f /etc/ntp/drift /var/lib/ntp/drift 2>/dev/null
%service -q ntpd restart
+%systemd_trigger ntpd.service
+%systemd_post ntpdate
+
+%triggerpostun -n ntpd -- ntpd < 4.2.6p5-2
+%systemd_trigger ntpd.service
%triggerpostun -n ntpdate -- ntp-client < 4.2.4p8-3.2
if [ -f /etc/sysconfig/ntp.rpmsave ]; then
cp -f /etc/sysconfig/ntpdate{,.rpmnew}
mv -f /etc/sysconfig/ntp.rpmsave /etc/sysconfig/ntpdate
fi
+%systemd_trigger ntpdate.service
+
+%triggerpostun -n ntpdate -- ntpdate < 4.2.6p5-2
+%systemd_trigger ntpdate.service
%files -n ntpd
%defattr(644,root,root,755)
%doc NEWS TODO WHERE-TO-START conf/*.conf COPYRIGHT
%attr(750,root,root) %dir %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_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
%attr(755,root,root) %{_sbindir}/tickadj
%{_mandir}/man1/ntpd.1*
%{_mandir}/man1/ntpdc.1*
-%{_mandir}/man1/ntpdsim.1*
%{_mandir}/man1/ntp-keygen.1*
%{_mandir}/man1/ntpq.1*
%{_mandir}/man1/ntptime.1*
%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
%attr(755,root,root) %{_sbindir}/ntpdate
+%attr(755,root,root) %{_sbindir}/ntpdate-wrapper
%attr(754,root,root) /etc/rc.d/init.d/ntpdate
%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
+
+%files -n mibs-ntp
+%defattr(644,root,root,755)
+%{mibdir}/ntpv4-mib.mib
+
+%files -n net-snmp-ntpd
+%defattr(644,root,root,755)
+%doc ntpsnmpd/README
+%attr(755,root,root) %{_sbindir}/ntpsnmpd
+%{_mandir}/man1/ntpsnmpd.1*
+
%files tools
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/ntptrace
projects / packages / ntp.git / blobdiff