Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2014-06-25 15:24:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntp" Changes: -------- --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2014-05-10 08:31:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2014-06-25 15:24:19.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Jun 18 09:04:59 UTC 2014 - [email protected] + +- Try to fix broken migration from openSUSE-13.1 + +------------------------------------------------------------------- +Thu Jun 12 15:36:51 UTC 2014 - [email protected] + +- Forward-port some bugs that got fixed for SLE11 (bnc#831311): + * bnc#817893 + * bnc#482349 + * bnc#817893.patch + +------------------------------------------------------------------- +Thu Jun 5 13:54:02 UTC 2014 - [email protected] + +- Cleanup with spec cleaner for better readability +- Remove conditionals for < 12.2 distros as it does not work on + them anyway. + +------------------------------------------------------------------- New: ---- bnc#817893.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.j6NuCy/_old 2014-06-25 15:24:21.000000000 +0200 +++ /var/tmp/diff_new_pack.j6NuCy/_new 2014-06-25 15:24:21.000000000 +0200 @@ -16,32 +16,17 @@ # -Name: ntp -%if 0%{?suse_version} > 1010 -BuildRequires: autoconf -BuildRequires: fdupes -%endif -BuildRequires: libcap-devel -BuildRequires: libtool -BuildRequires: openssl-devel -BuildRequires: readline-devel -# to allow the postinst script to succeed -BuildRequires: pwdutils -%if 0%{?suse_version} >= 1140 -BuildRequires: pkgconfig(systemd) -%{?systemd_requires} +%define ntpfaqversion 3.4 %if %{undefined _ntpunitsdir} -%global _ntpunitsdir /usr/lib/systemd/ntp-units.d +%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d %endif -%endif - -%define ntpfaqversion 3.4 -Url: http://www.ntp.org/ +Name: ntp Version: 4.2.6p5 Release: 0 Summary: Network Time Protocol daemon (version 4) License: (MIT and BSD-3-Clause and BSD-4-Clause) and GPL-2.0 Group: Productivity/Networking/Other +Url: http://www.ntp.org/ # main source Source0: http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-%{version}.tar.bz2 # configuration @@ -51,7 +36,7 @@ Source4: conf.sysconfig.ntp Source5: conf.sysconfig.syslog-ntp Source6: conf.ntp.reg -Source7: %name.firewall +Source7: %{name}.firewall Source8: conf.start-ntpd Source9: conf.ntp-wait.service # documentation @@ -70,16 +55,29 @@ Patch18: bnc#574885.diff Patch19: ntp-4.2.6p2-ntpq-speedup-782060.patch Patch20: ntp-sntp-recverr.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch21: bnc#817893.patch +BuildRequires: autoconf +BuildRequires: fdupes +BuildRequires: libcap-devel +BuildRequires: libtool +BuildRequires: openssl-devel +BuildRequires: readline-devel +BuildRequires: pkgconfig(systemd) +Requires: timezone +Requires(pre): %fillup_prereq +Requires(pre): %{_bindir}/chkconfig +Requires(pre): %{_bindir}/diff +Requires(pre): %{_bindir}/grep +Requires(pre): pwdutils +Suggests: logrotate Provides: ntp-daemon -Provides: xntp = %version -Provides: xntp3 = %version -Obsoletes: xntp < %version -Obsoletes: xntp3 < %version +Provides: xntp = %{version} +Provides: xntp3 = %{version} +Obsoletes: xntp < %{version} +Obsoletes: xntp3 < %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} Conflicts: openntpd -PreReq: pwdutils %fillup_prereq /usr/bin/diff /usr/bin/grep /sbin/chkconfig -Suggests: logrotate -Requires: timezone %description The Network Time Protocol (NTP) is used to synchronize the time of a @@ -89,59 +87,15 @@ Ntpd is an operating system daemon that sets and maintains the system time-of-day synchronized with Internet standard time servers. - - -Authors: --------- - Mark Andrews <[email protected]> - Viraj Bais <[email protected]> - Clayton Kirkwood <[email protected]> - Karl Berry <[email protected]> - Piete Brooks <[email protected]> - Steve Clift <[email protected]> - Casey Crellin <[email protected]> - Torsten Duwe <[email protected]> - John A. Dundas III <[email protected]> - Dennis Ferguson <[email protected]> - Glenn Hollinger <[email protected]> - Mike Iglesias <[email protected]> - Jim Jagielski <[email protected]> - Jeff Johnson <[email protected]> - William L. Jones <[email protected]> - Dave Katz <[email protected]> - Craig Leres <[email protected]> - George Lindholm <[email protected]> - Louis A. Mamakos <[email protected]> - Derek Mulcahy <[email protected]> - Damon Hart-Davis <[email protected]> - Lars H. Mathiesen <[email protected]> - David L. Mills <[email protected]> - Wolfgang Moeller <[email protected]> - Jeffrey Mogul <[email protected]> - Tom Moore <[email protected]> - Rainer Pruy <[email protected]> - Dirce Richards <[email protected]> - Nick Sayer <[email protected]> - Frank Kardel <[email protected]> - Ray Schnitzler <[email protected]> - Michael Shields <[email protected]> - Jeff Steinman <[email protected]> - Harlan Stenn <[email protected]> - Kenneth Stone <[email protected]> - Ajit Thyagarajan <[email protected]> - Tomoaki TSURUOKA <[email protected]> - Paul A Vixie <[email protected]> - Ulrich Windl <[email protected]> - %package doc -Provides: ntpdoc = %version -Provides: xntp-doc = %version -Provides: xntpdoc = %version -Obsoletes: ntpdoc < %version -Obsoletes: xntp-doc < %version -Obsoletes: xntpdoc < %version Summary: Additional Package Documentation for ntp Group: Documentation/Other +Provides: ntpdoc = %{version} +Provides: xntp-doc = %{version} +Provides: xntpdoc = %{version} +Obsoletes: ntpdoc < %{version} +Obsoletes: xntp-doc < %{version} +Obsoletes: xntpdoc < %{version} %description doc The complete set of documentation for building and configuring an NTP @@ -153,59 +107,15 @@ first try on a non-technical Mini-HOWTO and FAQ on NTP). Edited by Ulrich Windl and David Dalton. - - -Authors: --------- - Mark Andrews <[email protected]> - Viraj Bais <[email protected]> - Clayton Kirkwood <[email protected]> - Karl Berry <[email protected]> - Piete Brooks <[email protected]> - Steve Clift <[email protected]> - Casey Crellin <[email protected]> - Torsten Duwe <[email protected]> - John A. Dundas III <[email protected]> - Dennis Ferguson <[email protected]> - Glenn Hollinger <[email protected]> - Mike Iglesias <[email protected]> - Jim Jagielski <[email protected]> - Jeff Johnson <[email protected]> - William L. Jones <[email protected]> - Dave Katz <[email protected]> - Craig Leres <[email protected]> - George Lindholm <[email protected]> - Louis A. Mamakos <[email protected]> - Derek Mulcahy <[email protected]> - Damon Hart-Davis <[email protected]> - Lars H. Mathiesen <[email protected]> - David L. Mills <[email protected]> - Wolfgang Moeller <[email protected]> - Jeffrey Mogul <[email protected]> - Tom Moore <[email protected]> - Rainer Pruy <[email protected]> - Dirce Richards <[email protected]> - Nick Sayer <[email protected]> - Frank Kardel <[email protected]> - Ray Schnitzler <[email protected]> - Michael Shields <[email protected]> - Jeff Steinman <[email protected]> - Harlan Stenn <[email protected]> - Kenneth Stone <[email protected]> - Ajit Thyagarajan <[email protected]> - Tomoaki TSURUOKA <[email protected]> - Paul A Vixie <[email protected]> - Ulrich Windl <[email protected]> - %prep %setup -q -n ntp-%{version} # unpack ntp-faq -tar -x -C html -j -f %{S:10} +tar -x -C html -j -f %{SOURCE10} %patch1 %patch4 -p1 # copy README.SUSE -cp %{S:12} . -tar xzf %{S:13} +cp %{SOURCE12} . +tar xzf %{SOURCE13} %patch10 -p1 %patch11 %patch13 @@ -214,6 +124,7 @@ %patch18 %patch19 %patch20 +%patch21 # fix DOS line breaks sed -i 's/\r//g' html/scripts/{footer.txt,style.css} @@ -221,12 +132,7 @@ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac %build -%if 0%{?suse_version} && 0%{?suse_version} < 1141 -%{?suse_update_config} -%endif -%if 0%{?suse_version} > 1010 -autoreconf -fi -%endif +autoreconf -fvi export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -W -DOPENSSL_LOAD_CONF -Wall -Wstrict-prototypes -Wpointer-arith -Wno-unused-parameter -fno-strict-aliasing -fstack-protector" %ifarch alpha s390x export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O0" @@ -254,79 +160,74 @@ make %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} # Change permissions chmod 644 html/pic/neoclock4x.gif -%if 0%{?suse_version} > 1010 %fdupes -s html -%endif # # default configuration # -%__install -d %{buildroot}/var/lib/ntp/{drift,etc,var/{lib,run/ntp},dev} -%__install -d %{buildroot}/var/run -ln -s ../.. %{buildroot}/var/lib/ntp/var/lib/ntp -ln -s /usr/sbin/service %buildroot/usr/sbin/rcntpd -ln -s /usr/sbin/service %buildroot/usr/sbin/rcntp-wait -%__install -m 644 -D %{S:1} %{buildroot}/etc/logrotate.d/ntp -%__install -m 600 -D %{S:2} %{buildroot}/etc/ntp.conf -%__install -m 600 -D %{S:2} %{buildroot}/var/lib/ntp/etc/ntp.conf.iburst +install -d %{buildroot}%{_localstatedir}/lib/ntp/{drift,etc,var/{lib,run/ntp},dev} +install -d %{buildroot}%{_localstatedir}/run +ln -s ../.. %{buildroot}%{_localstatedir}/lib/ntp%{_localstatedir}/lib/ntp +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcntpd +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcntp-wait +install -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/ntp +install -m 600 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/ntp.conf +install -m 600 -D %{SOURCE2} %{buildroot}%{_localstatedir}/lib/ntp%{_sysconfdir}/ntp.conf.iburst # # boot scripts # -%__install -m 0644 -D %{S:3} %{buildroot}/%{_unitdir}/ntpd.service -%__install -m 0644 -D %{S:9} %{buildroot}/%{_unitdir}/ntp-wait.service -%__install -d %{buildroot}/usr/sbin -%__install -m 755 -D %{S:8} %{buildroot}/usr/sbin/start-ntpd +install -m 0644 -D %{SOURCE3} %{buildroot}/%{_unitdir}/ntpd.service +install -m 0644 -D %{SOURCE9} %{buildroot}/%{_unitdir}/ntp-wait.service +install -d %{buildroot}%{_prefix}/sbin +install -m 755 -D %{SOURCE8} %{buildroot}%{_sbindir}/start-ntpd # # fillup sysconfig.ntp # -%__install -m 644 -D %{S:4} %{buildroot}/var/adm/fillup-templates/sysconfig.ntp -%__install -m 644 -D %{S:5} %{buildroot}/var/adm/fillup-templates/sysconfig.syslog-ntp +install -m 644 -D %{SOURCE4} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.ntp +install -m 644 -D %{SOURCE5} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.syslog-ntp # # install SLP reg file # -%__install -m 644 -D %{S:6} %{buildroot}/etc/slp.reg.d/ntp.reg +install -m 644 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/slp.reg.d/ntp.reg # # man pages # -%__install -d %{buildroot}/%{_mandir}/{man5,man8} -%__install -m 644 man/man5/* %{buildroot}/%{_mandir}/man5 -%__install -m 644 man/man8/* %{buildroot}/%{_mandir}/man8 +install -d %{buildroot}/%{_mandir}/{man5,man8} +install -m 644 man/man5/* %{buildroot}/%{_mandir}/man5 +install -m 644 man/man8/* %{buildroot}/%{_mandir}/man8 # # firewall # -%__install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ -%__install -m 644 %{S:7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ +install -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} # # Logfile # -%__install -d %{buildroot}/var/log/ -touch %{buildroot}/var/log/ntp +install -d %{buildroot}%{_localstatedir}/log/ +touch %{buildroot}%{_localstatedir}/log/ntp # # service xml # -install -d %{buildroot}/usr/share/omc/svcinfo.d/ -install -m 644 %{S:14} %{buildroot}/usr/share/omc/svcinfo.d/ -install -m 755 scripts/ntp-wait %{buildroot}/usr/sbin/ +install -d %{buildroot}%{_datadir}/omc/svcinfo.d/ +install -m 644 %{SOURCE14} %{buildroot}%{_datadir}/omc/svcinfo.d/ +install -m 755 scripts/ntp-wait %{buildroot}%{_sbindir}/ %if %{defined _ntpunitsdir} -%__install -d %{buildroot}%{_ntpunitsdir} +install -d %{buildroot}%{_ntpunitsdir} echo ntpd.service > %{buildroot}%{_ntpunitsdir}/50-ntp.list %endif -%clean -%__rm -rf %{buildroot} - %pre -/usr/sbin/groupadd -r ntp 2> /dev/null || : -/usr/sbin/useradd -r -o -g ntp -u 74 -s /bin/false -c "NTP daemon" -d /var/lib/ntp ntp 2> /dev/null || : -/usr/sbin/usermod -g ntp ntp 2>/dev/null || : -test -L /var/run/ntp || rm -rf /var/run/ntp && : +%{_sbindir}/groupadd -r ntp 2> /dev/null || : +%{_sbindir}/useradd -r -o -g ntp -u 74 -s /bin/false -c "NTP daemon" -d %{_localstatedir}/lib/ntp ntp 2> /dev/null || : +%{_sbindir}/usermod -g ntp ntp 2>/dev/null || : +test -L %{_localstatedir}/run/ntp || rm -rf %{_localstatedir}/run/ntp && : %service_add_pre ntp.service ntpd.service %service_add_pre ntp-wait.service -if [ $FIRST_ARG -ne 1 -a ! -e "/var/lib/systemd/migrated/ntpd" ]; then - sed -i -e 's,ntp\t,ntpd\t,g' /var/lib/systemd/sysv-convert/database +if [ $FIRST_ARG -ne 1 -a ! -e "%{_localstatedir}/lib/systemd/migrated/ntpd" -a -e %{_localstatedir}/lib/systemd/sysv-convert/database ]; then + sed -i -e 's,ntp\t,ntpd\t,g' %{_localstatedir}/lib/systemd/sysv-convert/database fi %preun @@ -335,53 +236,53 @@ # no update? Then remove these files that aren't owned by the package if [ ${FIRST_ARG:-0} -eq 0 ]; then - test -e /var/lib/ntp/drift/ntp.drift && rm -f /var/lib/ntp/drift/ntp.drift - rm -f /var/lib/ntp/etc/* 2>/dev/null - test -e /var/log/ntp && rm -f /var/log/ntp + test -e %{_localstatedir}/lib/ntp/drift/ntp.drift && rm -f %{_localstatedir}/lib/ntp/drift/ntp.drift + rm -f %{_localstatedir}/lib/ntp%{_sysconfdir}/* 2>/dev/null + test -e %{_localstatedir}/log/ntp && rm -f %{_localstatedir}/log/ntp fi %post # Create ntp.keys file -if [ ! -f /etc/ntp.keys ]; then +if [ ! -f %{_sysconfdir}/ntp.keys ]; then tmp=$(dd if=/dev/urandom count=1 2>/dev/null | md5sum) - tmp=${tmp:0:7} > /etc/ntp.keys - echo "1 M $tmp" > /etc/ntp.keys - chown root:ntp /etc/ntp.keys - chmod 0640 /etc/ntp.keys + tmp=${tmp:0:7} > %{_sysconfdir}/ntp.keys + echo "1 M $tmp" > %{_sysconfdir}/ntp.keys + chown root:ntp %{_sysconfdir}/ntp.keys + chmod 0640 %{_sysconfdir}/ntp.keys fi # Are we in update mode? -if [ -f /etc/sysconfig/ntp ]; then - grep -q '^keys /etc/ntp.keys' /etc/ntp.conf || { +if [ -f %{_sysconfdir}/sysconfig/ntp ]; then + grep -q '^keys %{_sysconfdir}/ntp.keys' %{_sysconfdir}/ntp.conf || { echo "# # Authentication stuff # -keys /etc/ntp.keys # path for keys file +keys %{_sysconfdir}/ntp.keys # path for keys file trustedkey 1 # define trusted keys requestkey 1 # key (7) for accessing server variables # controlkey 15 # key (6) for accessing server variables -" >> /etc/ntp.conf +" >> %{_sysconfdir}/ntp.conf } fi # update from previous permissions -if [ -f /etc/ntp.conf ]; then - chown root:ntp /etc/ntp.conf +if [ -f %{_sysconfdir}/ntp.conf ]; then + chown root:ntp %{_sysconfdir}/ntp.conf fi -if [ -f /etc/ntp.keys ]; then - chown root:ntp /etc/ntp.keys +if [ -f %{_sysconfdir}/ntp.keys ]; then + chown root:ntp %{_sysconfdir}/ntp.keys fi -if [ -f /var/lib/ntp/etc/ntp.conf.iburst ]; then - chown --from=ntp:root root:ntp /var/lib/ntp/etc/ntp.conf.iburst +if [ -f %{_localstatedir}/lib/ntp%{_sysconfdir}/ntp.conf.iburst ]; then + chown --from=ntp:root root:ntp %{_localstatedir}/lib/ntp%{_sysconfdir}/ntp.conf.iburst fi %{fillup_only -n ntp } %{fillup_only -n syslog } -if [ ! -f /var/log/ntp ]; then - touch /var/log/ntp - chmod 644 /var/log/ntp +if [ ! -f %{_localstatedir}/log/ntp ]; then + touch %{_localstatedir}/log/ntp + chmod 644 %{_localstatedir}/log/ntp fi %service_add_post ntpd.service %service_add_post ntp-wait.service -if [ ! -e "/var/lib/systemd/migrated/ntpd" ]; then - touch /var/lib/systemd/migrated/ntpd +if [ ! -e "%{_localstatedir}/lib/systemd/migrated/ntpd" ]; then + touch %{_localstatedir}/lib/systemd/migrated/ntpd fi %postun @@ -402,16 +303,16 @@ %config %{_sysconfdir}/logrotate.d/ntp %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp %{_sbindir}/* -/var/lib/ntp -%attr(0640,root,ntp) %config(noreplace) /var/lib/ntp/etc/ntp.conf.iburst -%attr(0755,ntp,ntp) %dir /var/lib/ntp/drift +%{_localstatedir}/lib/ntp +%attr(0640,root,ntp) %config(noreplace) %{_localstatedir}/lib/ntp%{_sysconfdir}/ntp.conf.iburst +%attr(0755,ntp,ntp) %dir %{_localstatedir}/lib/ntp/drift %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* -/var/adm/fillup-templates/* -%attr(0755,ntp,root) /var/lib/ntp/var/run/ntp -%ghost %config(noreplace) /var/log/ntp -/usr/share/omc/svcinfo.d/ntp.xml +%{_localstatedir}/adm/fillup-templates/* +%attr(0755,ntp,root) %{_localstatedir}/lib/ntp%{_localstatedir}/run/ntp +%ghost %config(noreplace) %{_localstatedir}/log/ntp +%{_datadir}/omc/svcinfo.d/ntp.xml %files doc %defattr(-,root,root) ++++++ bnc#817893.patch ++++++ --- ntpd/ntp_io.c.old 2014-06-12 16:49:26.952375225 +0200 +++ ntpd/ntp_io.c 2014-06-12 16:49:53.511715934 +0200 @@ -2042,6 +2042,9 @@ msyslog(LOG_INFO, "peers refreshed"); } + if (sys_bclient) + io_setbclient(); + return new_interface_found; } ++++++ conf.ntp.conf ++++++ --- /var/tmp/diff_new_pack.j6NuCy/_old 2014-06-25 15:24:21.000000000 +0200 +++ /var/tmp/diff_new_pack.j6NuCy/_new 2014-06-25 15:24:21.000000000 +0200 @@ -39,7 +39,9 @@ ## ## Add external Servers using ## # rcntp addserver <yourserver> -## +## The servers will only be added to the currently running instance, not +## to /etc/ntp.conf. +## # Access control configuration; see /usr/share/doc/packages/ntp/html/accopt.html for # details. The web page <http://support.ntp.org/bin/view/Support/AccessRestrictions> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
