Hello community, here is the log from the commit of package ntp for openSUSE:Factory checked in at 2017-03-11 15:17:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ntp (Old) and /work/SRC/openSUSE:Factory/.ntp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ntp" Sat Mar 11 15:17:30 2017 rev:108 rq:461929 version:4.2.8p9 Changes: -------- --- /work/SRC/openSUSE:Factory/ntp/ntp.changes 2016-11-25 12:02:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ntp.new/ntp.changes 2017-03-11 15:17:34.609046096 +0100 @@ -1,0 +2,19 @@ +Tue Feb 21 11:08:46 CET 2017 - [email protected] + +- Move ntp-kod to /var/lib/ntp/db, because /var/db is not a + standard directory and causes problems for transactional updates + (ntp-move-kod-file.patch) + +------------------------------------------------------------------- +Tue Jan 17 11:22:21 UTC 2017 - [email protected] + +- Remove 50-ntp.list (bsc#1011919). +- Use system-wide libevent instead of local copy. + +------------------------------------------------------------------- +Mon Nov 28 15:05:09 UTC 2016 - [email protected] + +- Simplify ntpd's search for its own executable to prevent AppArmor + warnings (bsc#956365, ntp-pathfind.patch). + +------------------------------------------------------------------- New: ---- ntp-move-kod-file.patch ntp-pathfind.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ntp.spec ++++++ --- /var/tmp/diff_new_pack.0YQ8c3/_old 2017-03-11 15:17:35.684893852 +0100 +++ /var/tmp/diff_new_pack.0YQ8c3/_new 2017-03-11 15:17:35.688893286 +0100 @@ -17,9 +17,6 @@ %define ntpfaqversion 3.4 -%if %{undefined _ntpunitsdir} -%global _ntpunitsdir %{_libexecdir}/systemd/ntp-units.d -%endif Name: ntp Version: 4.2.8p9 Release: 0 @@ -61,11 +58,14 @@ Patch26: ntp-sntp-a.patch Patch27: ntp-netlink.patch Patch28: ntp-trap.patch +Patch29: ntp-pathfind.patch +Patch30: ntp-move-kod-file.patch BuildRequires: autoconf BuildRequires: avahi-compat-mDNSResponder-devel BuildRequires: fdupes BuildRequires: libcap-devel +BuildRequires: libevent-devel BuildRequires: libtool BuildRequires: openssl-devel %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 @@ -140,6 +140,8 @@ %patch26 %patch27 %patch28 +%patch29 +%patch30 # fix DOS line breaks sed -i 's/\r//g' html/scripts/{footer.txt,style.css} @@ -243,13 +245,8 @@ install -d %{buildroot}%{_datadir}/omc/svcinfo.d/ install -m 644 %{SOURCE14} %{buildroot}%{_datadir}/omc/svcinfo.d/ install -m 755 scripts/ntp-wait/ntp-wait %{buildroot}%{_sbindir}/ -install -d %{buildroot}/var/db -install -m 644 /dev/null %{buildroot}/var/db/ntp-kod - -%if %{defined _ntpunitsdir} -install -d %{buildroot}%{_ntpunitsdir} -echo ntpd.service > %{buildroot}%{_ntpunitsdir}/50-ntp.list -%endif +install -d %{buildroot}/var/lib/ntp/db +install -m 644 /dev/null %{buildroot}/var/lib/ntp/db/ntp-kod %pre %{_sbindir}/groupadd -r ntp 2> /dev/null || : @@ -339,9 +336,6 @@ %dir %{_sysconfdir}/slp.reg.d %{_unitdir}/ntpd.service %{_unitdir}/ntp-wait.service -%if %{defined _ntpunitsdir} -%{_ntpunitsdir}/50-ntp.list -%endif %config(noreplace) %{_sysconfdir}/slp.reg.d/ntp.reg %config %{_sysconfdir}/logrotate.d/ntp %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ntp @@ -366,7 +360,7 @@ %attr(0755,ntp,root) %{_localstatedir}/lib/ntp%{_localstatedir}/run/ntp %ghost %config(noreplace) %{_localstatedir}/log/ntp %{_datadir}/omc/svcinfo.d/ntp.xml -/var/db +/var/lib/ntp/db %files doc %defattr(-,root,root) ++++++ ntp-move-kod-file.patch ++++++ --- html/sntp.html +++ html/sntp.html 2017/02/16 16:49:54 @@ -47,7 +47,7 @@ <dt><tt>-g <i>delay</i>, --gap <i>delay</i></tt></dt> <dd>Specify the <i>delay</i> in milliseconds between outgoing queries, defaulting to 50. <tt>sntp</tt> sends queries to all provided hostnames/addresses in short succession, and by default terminates once the first valid response is received. With multiple time sources provided, all but one will not be used. To limit the number of queries whose responses will not be used, each query is separated from the preceding one by <i>delay</i> milliseconds, to allow time for responses to earlier queries to be received. A larger <i>delay</i> reduces the query load on the time sources, increasing the time to receive a valid response if the first source attempted is slow or unreachable.</dd> <dt><tt>-K <i>kodfile</i>, --kod <i>kodfile</i></tt></dt> - <dd>Specifies the filename <i>kodfile</i> to be used for the persistent history of KoD (Kiss Of Death, or rate-limiting) responses received from servers. The default is <tt>/var/db/ntp-kod</tt>. If the file does not exist, a warning message will be displayed. The file will not be created. Note that the short option is <tt>-K</tt>, an uppercase letter K.</dd> + <dd>Specifies the filename <i>kodfile</i> to be used for the persistent history of KoD (Kiss Of Death, or rate-limiting) responses received from servers. The default is <tt>/var/lib/ntp/db/ntp-kod</tt>. If the file does not exist, a warning message will be displayed. The file will not be created. Note that the short option is <tt>-K</tt>, an uppercase letter K.</dd> <dt><tt>-k <i>keyfile</i>, --keyfile <i>keyfile</i></tt></dt> <dd>Specifies the filename <i>keyfile</i> used with the <tt>-a</tt>/<tt>--authentication</tt> option. The format of the file is described on the <a href="keygen.html"><tt>ntp-keygen</tt> page</a>.</dd> <dt><tt>-l <i>logfile</i>, --filelog <i>logfile</i></tt></dt> --- sntp/sntp.1sntpman +++ sntp/sntp.1sntpman 2017/02/16 16:47:47 @@ -154,7 +154,7 @@ \f\*[I-Font]file\-name\f[] for this option is: .ti +4 - /var/db/ntp-kod + /var/lib/ntp/db/ntp-kod .sp Specifies the filename to be used for the persistent history of KoD responses received from servers. If the file does not exist, a --- sntp/sntp.man.in +++ sntp/sntp.man.in 2017/02/16 16:48:11 @@ -154,7 +154,7 @@ \f\*[I-Font]file\-name\f[] for this option is: .ti +4 - /var/db/ntp-kod + /var/lib/ntp/db/ntp-kod .sp Specifies the filename to be used for the persistent history of KoD responses received from servers. If the file does not exist, a --- sntp/sntp-opts.c +++ sntp/sntp-opts.c 2017/02/16 16:49:18 @@ -114,7 +114,7 @@ /* 1491 */ "KoD history filename\0" /* 1512 */ "KOD\0" /* 1516 */ "kod\0" -/* 1520 */ "/var/db/ntp-kod\0" +/* 1520 */ "/var/lib/ntp/db/ntp-kod\0" /* 1536 */ "Look in this file for the key specified with -a\0" /* 1584 */ "KEYFILE\0" /* 1592 */ "keyfile\0" ++++++ ntp-pathfind.patch ++++++ --- sntp/libopts/init.c.orig +++ sntp/libopts/init.c @@ -33,6 +33,8 @@ static tSuccess do_presets(tOptions * opts); /* = = = END-STATIC-FORWARD = = = */ +#define PROC_BINARY "/proc/self/exe" + /** * Make sure the option descriptor is there and that we understand it. * This should be called from any user entry point where one needs to @@ -104,7 +106,13 @@ validate_struct(tOptions * opts, char co else *pp = pname; - pz = pathfind(getenv("PATH"), pname, "rx"); +#if defined(HAVE_CANONICALIZE_FILE_NAME) + pz = canonicalize_file_name(PROC_BINARY); +#elif defined(HAVE_REALPATH) + pz = realpath(PROC_BINARY, NULL); +#else + pz = pathfind(getenv("PATH"), pp, "rx"); +#endif if (pz != NULL) pname = VOIDP(pz);
