+#
+# TODO:
+# - check which of the 'FC patches' are actually needed and update them
+# as needed
+# - ntpdseem.1 manual page 'disappeared'
+# - warning: Installed (but unpackaged) file(s) found:
+# /usr/share/man/man1/ntpsnmpd.1.gz
+#
+%include /usr/lib/rpm/macros.perl
Summary: Network Time Protocol utilities
-Summary(pl): Narzêdzia do synchronizacji czasu (Network Time Protocol)
-Summary(pt_BR): Network Time Protocol versão 4
+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.0
-Release: 6
+Version: 4.2.6p1
+Release: 0.1
License: distributable
-Group: Daemons
-Source0: ftp://ftp.udel.edu/pub/ntp/ntp4/%{name}-%{version}.tar.gz
-# Source0-md5: 0f8fabe87cf54f409b57c6283f0c0c3d
+Group: Networking/Daemons
+Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
+# Source0-md5: 0510396dfbde40678b92f808ec07c0d2
Source1: %{name}.conf
Source2: %{name}.keys
Source3: %{name}.init
Source4: %{name}.sysconfig
-Source5: %{name}d.8
-Source6: %{name}date.8
-Source7: %{name}-client.init
-Source8: %{name}-client.sysconfig
+Source5: %{name}-client.init
+Source6: %{name}-client.sysconfig
+Source7: %{name}-manpages.tar.gz
+# Source7-md5: 208fcc9019e19ab26d28e4597290bffb
+Source8: %{name}.upstart
Patch0: %{name}-time.patch
Patch1: %{name}-no_libelf.patch
Patch2: %{name}-ipv6.patch
+Patch3: %{name}-openssl_check.patch
+Patch4: %{name}-nano.patch
+Patch5: %{name}-ntpdc-link_order.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
URL: http://www.ntp.org/
+BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: libcap-devel
+BuildRequires: libtool
+BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: readline-devel >= 4.2
-Requires(post,preun): /sbin/chkconfig
-PreReq: rc-scripts
-Obsoletes: xntp3
+BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: rpmbuild(macros) >= 1.561
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/ntp
time with another reference time source. The ntp package contains
utilities and daemons which will synchronize your computer's time to
Coordinated Universal Time (UTC) via the NTP protocol and NTP servers.
-The ntp package includes ntpdate (a program for retrieving the date
-and time from remote machines via a network) and ntpd (a daemon which
-continuously adjusts system time).
-
-%description -l pl
-Pakiet zawiera narzêdzia i demony s³u¿±ce do dok³adnego
-synchronizowania czasu Twojego komputera: ntpdate, program podobny do
-rdate oraz ntpd, demon aktualizuj±cy czas w sposób ci±g³y.
-%description -l pt_BR
-Esta é a versão 4 do Network Time Protocol (NTP). Este protocolo é
-utilizado para sincronizar o relógio do computador com uma outra
-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.
+%description -l pl.UTF-8
+Network Time Protocol (NTP) służy do synchronizacji czasu komputera z
+innym, wzorcowym źródłem czasu. Pakiet ntp zawiera narzędzia i demony
+służące do dokładnego synchronizowania czasu komputera według czasu
+uniwersalnego (UTC) poprzez protokół NTP z serwerami NTP.
-Instale o pacote ntp se você necessitar de ferramentas para manter o
-relógio do seu computador constantemente atualizado.
+%description -l pt_BR.UTF-8
+Esta é a versão 4 do Network Time Protocol (NTP). Este protocolo é
+utilizado para sincronizar o relógio do computador com uma outra
+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.
-Este pacote obsoleta o antigo xntp3.
+Instale o pacote ntp se você necessitar de ferramentas para manter o
+relógio do seu computador constantemente atualizado.
-%package doc-html
-Summary: HTML documentation for ntp
-Summary(pl): Dokumentacja HTML dla ntp
-Summary(pt_BR): Documentação adicional para o pacote ntp
+%package -n ntpd
+Summary: The NTP daemon
+Summary(pl.UTF-8): Narzędzia do synchronizacji czasu (Network Time Protocol)
+Summary(pt_BR.UTF-8): Network Time Protocol versão 4
Group: Daemons
+Requires(post,preun): /sbin/chkconfig
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires: rc-scripts >= 0.4.3.0
+Provides: group(ntp)
+Provides: ntp = %{version}-%{release}
+Provides: ntpdaemon
+Provides: user(ntp)
+Obsoletes: ntp < 4.2.4p8-6
+Obsoletes: ntpdaemon
+Obsoletes: openntpd
+Obsoletes: xntp3
-%description doc-html
-HTML documentation for ntp.
+%description -n ntpd
+The Network Time Protocol (NTP) is used to synchronize a computer's
+time with another reference time source. The ntp package contains
+utilities and daemons which will synchronize your computer's time to
+Coordinated Universal Time (UTC) via the NTP protocol and NTP servers.
-%description doc-html -l pl
-Dokumentacja do ntp w HTML.
+This package includes ntpd (a daemon which continuously adjusts system
+time)
+
+%description -n ntpd -l pl.UTF-8
+Network Time Protocol (NTP) służy do synchronizacji czasu komputera z
+innym, wzorcowym źródłem czasu. Pakiet ntp zawiera narzędzia i demony
+służące do dokładnego synchronizowania czasu komputera według czasu
+uniwersalnego (UTC) poprzez protokół NTP z serwerami NTP.
-%description doc-html -l pt_BR
-Este pacote contém documentação adicional sobre o NTP versão 4.
+Pakiet ntp zawiera ntpd (demona, który w sposób ciągły aktualizuje
+czas systemowy)
-%package client
-Summary: Network Time Protocol client
-Summary(pl): Klient do synchronizacji czasu po NTP (Network Time Protocol)
-Group: Applications
+%description -n ntpd -l pt_BR.UTF-8
+Esta é a versão 4 do Network Time Protocol (NTP). Este protocolo é
+utilizado para sincronizar o relógio do computador com uma outra
+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)
+Group: Applications/Networking
+Requires(post,preun): /sbin/chkconfig
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Provides: group(ntp)
+Provides: user(ntp)
Conflicts: ntp < 4.2.0-3
+# for upgrades
+Provides: ntp-client = %{version}-%{release}
+Obsoletes: ntp-client < 4.2.4p8-6
+# virtual
+Provides: ntpclient
+Obsoletes: ntpclient
-%description client
-Network Time Protocol client.
+%description -n ntpdate
+ntpdate is a program for retrieving the date and time from NTP
+servers.
-%description doc-html -l pl
+%description -n ntpdate -l pl.UTF-8
Klient do synchronizacji czasu po NTP (Network Time Protocol).
+%package tools
+Summary: NTP tools
+Group: Applications/Networking
+Obsoletes: ntp-ntptrace
+
+%description 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
+
+%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
+
+%description doc-html
+HTML documentation for ntp.
+
+%description doc-html -l pl.UTF-8
+Dokumentacja do ntp w HTML.
+
+%description doc-html -l pt_BR.UTF-8
+Este pacote contém documentação adicional sobre o NTP versão 4.
+
%prep
-%setup -q
+%setup -q -a7
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+
+#%# FC patches
+#%%patch101 -p1
+#%%patch102 -p1
+#%%patch103 -p1
+#%%patch104 -p1
+#%%patch106 -p1
+#%%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
+
+echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> configure.ac
+echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac
%build
-cp /usr/share/automake/config.sub .
-%configure
+%{__libtoolize}
+%{__aclocal} -I m4 -I libopts/m4
+%{__autoconf}
+%{__automake}
+cd sntp
+%{__libtoolize}
+%{__aclocal} -I ../m4 -I libopts/m4
+%{__autoconf}
+%{__automake}
+cd ..
+
+CPPFLAGS="%{rpmcppflags} -I/usr/include/readline"
+%configure \
+ --with-binsubdir=sbin \
+ --enable-linuxcaps \
+ --enable-getifaddrs \
+ --enable-ipv6 \
+ --with-lineeditlibs=readline \
+ --with-crypto=openssl
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig},%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig,cron.hourly,init},%{_mandir}/man1}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ntp.conf
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/keys
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntpd
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntp
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/ntpd
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/ntp
-install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man8
-install %{SOURCE6} $RPM_BUILD_ROOT%{_mandir}/man8
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/ntp.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/keys
+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
+install -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/ntpd.conf
+cp -a 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
+EOF
%clean
rm -rf $RPM_BUILD_ROOT
-%post
+%pre -n ntpd
+%groupadd -g 246 ntp
+%useradd -u 246 -d %{_sysconfdir} -g ntp -c "NTP Daemon" ntp
+
+%post -n ntpd
/sbin/chkconfig --add ntpd
-if [ -f /var/lock/subsys/ntpd ]; then
- /etc/rc.d/init.d/ntpd restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/ntpd start\" to start ntpd daemon."
-fi
+%service ntpd restart "NTP Daemon"
-%preun
+%preun -n ntpd
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/ntpd ]; then
- /etc/rc.d/init.d/ntpd stop >&2
- fi
+ %service ntpd stop
/sbin/chkconfig --del ntpd
+ rm -f /var/lib/ntp/drift
fi
-%post client
-/sbin/chkconfig --add ntp
-if [ -f /var/lock/subsys/ntp ]; then
- /etc/rc.d/init.d/ntp restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/ntp start\" to start ntp."
+%post -n ntpd-upstart
+%upstart_post ntpd
+
+%postun -n ntpd-upstart
+%upstart_postun ntpd
+
+%postun -n ntp
+if [ "$1" = "0" ]; then
+ %userremove ntp
+ %groupremove ntp
fi
-%preun client
+
+%pre -n ntpdate
+%groupadd -g 246 ntp
+%useradd -u 246 -d %{_sysconfdir} -g ntp -c "NTP Daemon" ntp
+
+%post -n ntpdate
+/sbin/chkconfig --add ntpdate
+%service ntpdate restart "NTP Date"
+
+%preun -n ntpdate
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/ntp ]; then
- /etc/rc.d/init.d/ntp stop >&2
- fi
- /sbin/chkconfig --del ntp
+ %service ntpdate stop
+ /sbin/chkconfig --del ntpdate
fi
-%files
+%postun -n ntpdate
+if [ "$1" = "0" ]; then
+ %userremove ntp
+ %groupremove ntp
+fi
+
+%triggerun -n ntpd -- ntp < 4.2.4p8-3.14
+# Prevent preun from ntp from working
+chmod a-x /etc/rc.d/init.d/ntpd
+
+%triggerpostun -n ntpd -- ntp < 4.2.4p8-3.14
+# Restore what triggerun removed
+chmod 754 /etc/rc.d/init.d/ntpd
+sed -i -e 's,/etc/ntp/drift,/var/lib/ntp/drift,' %{_sysconfdir}/ntp.conf
+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
+
+%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
+
+%files -n ntpd
%defattr(644,root,root,755)
-%doc NEWS TODO WHERE-TO-START conf/*.conf
+%doc NEWS TODO WHERE-TO-START conf/*.conf COPYRIGHT
%attr(750,root,root) %dir %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not size md5 mtime) %{_sysconfdir}/*
-%attr(755,root,root) %{_sbindir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ntpd
%attr(754,root,root) /etc/rc.d/init.d/ntpd
-%attr(640,root,root) %config(noreplace) %verify(not size md5 mtime) /etc/sysconfig/ntpd
-%{_mandir}/man8/*
-%exclude %{_mandir}/man8/ntpdate*
-%exclude %{_sbindir}/ntpdate
+%attr(755,root,root) %{_sbindir}/ntpd
+%attr(755,root,root) %{_sbindir}/ntpdc
+%attr(755,root,root) %{_sbindir}/ntp-keygen
+%attr(755,root,root) %{_sbindir}/ntpq
+%attr(755,root,root) %{_sbindir}/ntptime
+%attr(755,root,root) %{_sbindir}/sntp
+%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*
+%{_mandir}/man1/sntp.1*
-%files doc-html
+%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)
-%doc html/*
+%config(noreplace) %verify(not md5 mtime size) /etc/init/ntpd.conf
-%files client
+%files -n ntpdate
%defattr(644,root,root,755)
+%doc COPYRIGHT
%attr(755,root,root) %{_sbindir}/ntpdate
-%attr(754,root,root) /etc/rc.d/init.d/ntp
-%attr(640,root,root) %config(noreplace) %verify(not size md5 mtime) /etc/sysconfig/ntp
-%{_mandir}/man8/ntpdate*
+%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
+%{_mandir}/man1/ntpdate*
+
+%files tools
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/ntptrace
+%attr(755,root,root) %{_sbindir}/ntp-wait
+%{_mandir}/man1/ntptrace*
+
+%files doc-html
+%defattr(644,root,root,755)
+%doc html/*
projects / packages / ntp.git / blobdiff