Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package chrony for openSUSE:Factory checked
in at 2022-01-21 01:25:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chrony (Old)
and /work/SRC/openSUSE:Factory/.chrony.new.1938 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chrony"
Fri Jan 21 01:25:24 2022 rev:35 rq:947490 version:4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/chrony/chrony.changes 2021-12-24
20:23:26.186027477 +0100
+++ /work/SRC/openSUSE:Factory/.chrony.new.1938/chrony.changes 2022-01-21
01:25:51.454407276 +0100
@@ -1,0 +2,7 @@
+Mon Jan 10 17:26:02 UTC 2022 - Reinhard Max <m...@suse.com>
+
+- boo#1194206: Use /run instead of /var/run throughout.
+- bsc#1194229: Fix pool package dependencies, so that SLE actually
+ prefers chrony-pool-suse over chrony-pool-empty.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chrony.spec ++++++
--- /var/tmp/diff_new_pack.IPSsXe/_old 2022-01-21 01:25:52.262401736 +0100
+++ /var/tmp/diff_new_pack.IPSsXe/_new 2022-01-21 01:25:52.266401709 +0100
@@ -1,7 +1,7 @@
#
# spec file for package chrony
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,7 @@
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
%define chrony_helper %{_libexecdir}/chrony/helper
+%define chrony_rundir %{_rundir}/%{name}
Name: chrony
Version: 4.2
Release: 0
@@ -130,6 +131,7 @@
Conflicts: %name-pool
Requires: %name = %version
BuildArch: noarch
+Supplements: (chrony and branding-SLE)
Removepathpostfixes:.suse
%description pool-suse
@@ -158,7 +160,6 @@
Conflicts: %name-pool
Requires: %name = %version
BuildArch: noarch
-Supplements: (chrony and branding-SLE)
Removepathpostfixes:.empty
%description pool-empty
@@ -201,6 +202,8 @@
export LDFLAGS="-pie -Wl,-z,relro,-z,now"
%configure \
--docdir="%{_docdir}/%{name}" \
+ --chronyrundir=%{chrony_rundir} \
+ --with-pidfile=%{chrony_rundir}/chronyd.pid \
--enable-scfilter \
--with-user=chrony \
--with-hwclockfile=%{_sysconfdir}/adjtime \
@@ -265,7 +268,10 @@
mkdir -p %{buildroot}%{_sysusersdir}
install -m 0644 %{SOURCE14} %{buildroot}%{_sysusersdir}/
-find %{buildroot} -type f | xargs sed -i 's-@CHRONY_HELPER@-%{chrony_helper}-g'
+find %{buildroot} -type f | xargs sed -i '
+ s-@CHRONY_HELPER@-%{chrony_helper}-g
+ s-@CHRONY_RUNDIR@-%{chrony_rundir}-g
+'
%if %{with testsuite}
%ifnarch %ix86
++++++ chrony.helper ++++++
--- /var/tmp/diff_new_pack.IPSsXe/_old 2022-01-21 01:25:52.366401023 +0100
+++ /var/tmp/diff_new_pack.IPSsXe/_new 2022-01-21 01:25:52.370400996 +0100
@@ -5,11 +5,11 @@
# records are updated here using the dig utility.
chronyc=/usr/bin/chronyc
-helper_dir=/var/run/chrony-helper
+helper_dir=@CHRONY_RUNDIR@/chrony-helper
added_servers_file=$helper_dir/added_servers
network_sysconfig_file=/etc/sysconfig/network
-dhclient_servers_files=/var/run/netconfig/chrony.servers
+dhclient_servers_files=/run/netconfig/chrony.servers
dnssrv_servers_files=$helper_dir/dnssrv@*
dnssrv_timer_prefix=chrony-dnssrv@
