Hello community, here is the log from the commit of package chrony for openSUSE:Leap:15.2 checked in at 2020-04-08 12:48:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/chrony (Old) and /work/SRC/openSUSE:Leap:15.2/.chrony.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chrony" Wed Apr 8 12:48:15 2020 rev:29 rq:790998 version:3.2 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/chrony/chrony.changes 2020-01-23 09:20:48.598697161 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.chrony.new.3248/chrony.changes 2020-04-08 12:48:50.698356667 +0200 @@ -1,0 +2,13 @@ +Fri Mar 27 15:19:29 UTC 2020 - Reinhard Max <[email protected]> + +- Read runtime servers from /var/run/netconfig/chrony.servers to + fix bsc#1099272 and bsc#1161119. +- Move chrony-helper to /usr/lib/chrony/helper, because there + should be no executables in /usr/share. +- Add chrony-pool-suse and chrony-pool-openSUSE subpackages that + preconfigure chrony to use NTP servers from the respective + pools for SUSE and openSUSE (bsc#1156884, SLE-11424). +- Add chrony-pool-empty to still allow installing chrony without + preconfigured servers. + +------------------------------------------------------------------- New: ---- pool.conf.opensuse pool.conf.suse ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chrony.spec ++++++ --- /var/tmp/diff_new_pack.0pkLu6/_old 2020-04-08 12:48:51.498357083 +0200 +++ /var/tmp/diff_new_pack.0pkLu6/_new 2020-04-08 12:48:51.502357086 +0200 @@ -16,7 +16,6 @@ # -%define vendorzone opensuse. %global clknetsim_ver 71dbbc5 #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} @@ -35,6 +34,8 @@ Source4: chrony.helper Source5: [email protected] Source6: [email protected] +Source7: pool.conf.suse +Source8: pool.conf.opensuse # Simulator for test suite Source10: https://github.com/mlichvar/clknetsim/archive/%{clknetsim_ver}/clknetsim-%{clknetsim_ver}.tar.gz # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -61,6 +62,8 @@ Requires(post): %fillup_prereq Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd +Requires: %name-pool +Recommends: %name-pool-nonempty Provides: ntp-daemon %ifarch s390 s390x ppc64le BuildRequires: libseccomp-devel >= 2.2.0 @@ -90,6 +93,48 @@ running on the same computer as the chronyd instance it is controlling or a different computer. +%package pool-suse +Summary: Chrony preconfiguration for SUSE +Group: Productivity/Networking/Other +Provides: %name-pool = %version +Provides: %name-pool-nonempty +Conflicts: otherproviders(%name-pool) +Requires: %name = %version +BuildArch: noarch +RemovePathPostfixes: .suse + +%description pool-suse +This package configures chrony to use the SUSE NTP server pool by +default. + +%package pool-openSUSE +Summary: Chrony preconfiguration for openSUSE +Group: Productivity/Networking/Other +Provides: %name-pool = %version +Provides: %name-pool-nonempty +Conflicts: otherproviders(%name-pool) +Requires: %name = %version +BuildArch: noarch +RemovePathPostfixes: .opensuse + +%description pool-openSUSE +This package configures chrony to use the openSUSE NTP server pool by +default. + +%package pool-empty +Summary: Empty pool preconfiguration for chrony +Group: Productivity/Networking/Other +Provides: %name-pool = %version +Conflicts: otherproviders(%name-pool) +Requires: %name = %version +BuildArch: noarch +RemovePathPostfixes: .empty + +%description pool-empty +This package provides an empty /etc/chrony.d/pool.conf file for +situations when having servers preconfigured in chrony is undesirable, +e.g. because the servers will be set via DHCP. + %prep %setup -q -a 10 %patch0 -p1 @@ -99,16 +144,12 @@ %patch6 %patch7 -# If this is an openSUSE build, use our vendor zone -# (2.*pool.ntp.org names include IPv6 addresses). If not -# an openSUSE build, comment out the pool statement -%if 0%{?is_opensuse} -sed -e 's|^\(pool \)\(pool.ntp.org\)|\12.%{vendorzone}\2|' \ - < examples/chrony.conf.example2 > chrony.conf -%else + +# Remove pool statements from the default /etc/chrony.conf. They will +# be provided by branding packages in /etc/chrony.d/pool.conf . + sed -e 's|^\pool|! pool|' \ < examples/chrony.conf.example2 > chrony.conf -%endif cat << EOF >> chrony.conf @@ -170,11 +211,15 @@ install -Dpm 0644 %{SOURCE2} \ %{buildroot}%{_fillupdir}/sysconfig.chronyd install -Dpm 755 %{SOURCE4} \ - %{buildroot}%{_datadir}/chrony-helper + %{buildroot}%{_libexecdir}/%name/helper install -d %{buildroot}%{_localstatedir}/log/chrony touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc} +# Install the NTP pool files +install -Dpm 644 %{SOURCE7} %{SOURCE8} %{buildroot}/etc/chrony.d +touch %{buildroot}/etc/chrony.d/pool.conf.empty + %check # Set random seed to get deterministic results export CLKNETSIM_RANDOM_SEED=24501 @@ -210,7 +255,7 @@ %{_sysconfdir}/dhcp/dhclient.d/chrony.sh %{_bindir}/chronyc %{_sbindir}/chronyd -%{_datadir}/chrony-helper +%{_libexecdir}/%name %{_mandir}/man1/chronyc.1%{ext_man} %{_mandir}/man5/chrony.conf.5%{ext_man} %{_mandir}/man8/chronyd.8%{ext_man} @@ -224,4 +269,13 @@ %ghost %attr(640,chrony,chrony) %{_localstatedir}/lib/chrony/rtc %dir %attr(750,chrony,chrony) %{_localstatedir}/log/chrony +%files pool-empty +%config (noreplace) /etc/chrony.d/pool.conf.empty + +%files pool-suse +%config (noreplace) /etc/chrony.d/pool.conf.suse + +%files pool-openSUSE +%config (noreplace) /etc/chrony.d/pool.conf.opensuse + %changelog ++++++ [email protected] ++++++ --- /var/tmp/diff_new_pack.0pkLu6/_old 2020-04-08 12:48:51.562357117 +0200 +++ /var/tmp/diff_new_pack.0pkLu6/_new 2020-04-08 12:48:51.566357119 +0200 @@ -5,4 +5,4 @@ [Service] Type=oneshot -ExecStart=/usr/share/chrony-helper update-dnssrv-servers %I +ExecStart=/usr/lib/chrony/helper update-dnssrv-servers %I ++++++ chrony-service-helper.patch ++++++ --- /var/tmp/diff_new_pack.0pkLu6/_old 2020-04-08 12:48:51.602357138 +0200 +++ /var/tmp/diff_new_pack.0pkLu6/_new 2020-04-08 12:48:51.602357138 +0200 @@ -4,7 +4,7 @@ PIDFile=/var/run/chronyd.pid EnvironmentFile=-/etc/sysconfig/chronyd ExecStart=/usr/sbin/chronyd $OPTIONS -+ExecStartPost=/usr/share/chrony-helper update-daemon ++ExecStartPost=/usr/lib/chrony/helper update-daemon PrivateTmp=yes ProtectHome=yes ProtectSystem=full ++++++ chrony.dhclient ++++++ --- /var/tmp/diff_new_pack.0pkLu6/_old 2020-04-08 12:48:51.622357148 +0200 +++ /var/tmp/diff_new_pack.0pkLu6/_new 2020-04-08 12:48:51.626357150 +0200 @@ -8,13 +8,13 @@ for server in $new_ntp_servers; do echo "$server ${NTPSERVERARGS:-iburst}" >> $SERVERFILE done - /usr/share/chrony-helper update-daemon || : + /usr/lib/chrony/helper update-daemon || : fi } chrony_restore() { if [ -f $SERVERFILE ]; then rm -f $SERVERFILE - /usr/share/chrony-helper update-daemon || : + /usr/lib/chrony/helper update-daemon || : fi } ++++++ chrony.helper ++++++ --- /var/tmp/diff_new_pack.0pkLu6/_old 2020-04-08 12:48:51.650357162 +0200 +++ /var/tmp/diff_new_pack.0pkLu6/_new 2020-04-08 12:48:51.650357162 +0200 @@ -9,7 +9,7 @@ added_servers_file=$helper_dir/added_servers network_sysconfig_file=/etc/sysconfig/network -dhclient_servers_files=/var/lib/dhclient/chrony.servers.* +dhclient_servers_files=/var/run/netconfig/chrony.servers dnssrv_servers_files=$helper_dir/dnssrv@* dnssrv_timer_prefix=chrony-dnssrv@ ++++++ pool.conf.opensuse ++++++ pool 2.opensuse.pool.ntp.org ++++++ pool.conf.suse ++++++ pool 2.suse.pool.ntp.org
