pool/chrony
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- boo#1187906: Consolidate all references to the helper script.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:time/chrony?expand=0&rev=102
This commit is contained in:
Reinhard Max 2021-07-01 13:21:41 +00:00 committed by Git OBS Bridge
parent 8036ef535c
commit 0e5e2f49b2
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrony-dnssrv@.service
View File

@ -5,4 +5,4 @@ Wants=network-online.target
[Service] [Service]
Type=oneshot Type=oneshot
ExecStart=@LIBEXECDIR@/chrony/helper update-dnssrv-servers %I ExecStart=@CHRONY_HELPER@ update-dnssrv-servers %I

2
chrony-service-helper.patch
View File

@ -5,7 +5,7 @@ diff -burNE chrony-3.5_orig/examples/chronyd.service chrony-3.5/examples/chronyd
PIDFile=/run/chrony/chronyd.pid PIDFile=/run/chrony/chronyd.pid
EnvironmentFile=-/etc/sysconfig/chronyd EnvironmentFile=-/etc/sysconfig/chronyd
ExecStart=/usr/sbin/chronyd $OPTIONS ExecStart=/usr/sbin/chronyd $OPTIONS
+ExecStartPost=@LIBEXECDIR@/chrony/helper update-daemon +ExecStartPost=@CHRONY_HELPER@ update-daemon
PrivateTmp=yes PrivateTmp=yes
ProtectHome=yes ProtectHome=yes
ProtectSystem=full ProtectSystem=full

5
chrony.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Jul 1 12:38:13 UTC 2021 - Reinhard Max <max@suse.com>
- boo#1187906: Consolidate all references to the helper script.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jun 13 13:29:36 UTC 2021 - Callum Farmer <gmbr3@opensuse.org> Sun Jun 13 13:29:36 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>

4
chrony.dhclient
View File

@ -8,13 +8,13 @@ chrony_config() {
for server in $new_ntp_servers; do for server in $new_ntp_servers; do
echo "$server ${NTPSERVERARGS:-iburst}" >> $SERVERFILE echo "$server ${NTPSERVERARGS:-iburst}" >> $SERVERFILE
done done
/usr/share/chrony-helper update-daemon || : @CHRONY_HELPER@ update-daemon || :
fi fi
} }
chrony_restore() { chrony_restore() {
if [ -f $SERVERFILE ]; then if [ -f $SERVERFILE ]; then
rm -f $SERVERFILE rm -f $SERVERFILE
/usr/share/chrony-helper update-daemon || : @CHRONY_HELPER@ update-daemon || :
fi fi
} }

9
chrony.spec
View File

@ -25,6 +25,7 @@
%if ! %{defined _fillupdir} %if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif %endif
%define chrony_helper %{_libexecdir}/chrony/helper
Name: chrony Name: chrony
Version: 4.1 Version: 4.1
Release: 0 Release: 0
@ -63,10 +64,10 @@ BuildRequires: pkgconfig
BuildRequires: pps-tools-devel BuildRequires: pps-tools-devel
# The timezone package is needed for the "make check" tests. It can be # The timezone package is needed for the "make check" tests. It can be
# removed if the call to make check is ever deleted. # removed if the call to make check is ever deleted.
BuildRequires: sysuser-tools
BuildRequires: timezone BuildRequires: timezone
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildRequires: rubygem(asciidoctor) BuildRequires: rubygem(asciidoctor)
BuildRequires: sysuser-tools
Recommends: logrotate Recommends: logrotate
Requires(post): %fillup_prereq Requires(post): %fillup_prereq
%sysusers_requires %sysusers_requires
@ -147,8 +148,8 @@ e.g. because the servers will be set via DHCP.
%prep %prep
%setup -q -a 10 %setup -q -a 10
sed -e 's-@CHRONY_HELPER@-%{chrony_helper}-g' -i %{PATCH1} %{SOURCE3} %{SOURCE5}
%patch0 -p1 %patch0 -p1
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{PATCH1}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 %patch3
@ -203,7 +204,6 @@ install -Dpm 0644 examples/chronyd.service \
%{buildroot}%{_unitdir}/chronyd.service %{buildroot}%{_unitdir}/chronyd.service
install -Dpm 0644 examples/chrony-wait.service \ install -Dpm 0644 examples/chrony-wait.service \
%{buildroot}%{_unitdir}/chrony-wait.service %{buildroot}%{_unitdir}/chrony-wait.service
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE5}
install -Dpm 0644 %{SOURCE5} \ install -Dpm 0644 %{SOURCE5} \
%{buildroot}%{_unitdir}/chrony-dnssrv@.service %{buildroot}%{_unitdir}/chrony-dnssrv@.service
install -Dpm 0644 %{SOURCE6} \ install -Dpm 0644 %{SOURCE6} \
@ -221,8 +221,7 @@ echo 'chronyd.service' > \
install -Dpm 0644 %{SOURCE2} \ install -Dpm 0644 %{SOURCE2} \
%{buildroot}%{_fillupdir}/sysconfig.chronyd %{buildroot}%{_fillupdir}/sysconfig.chronyd
install -Dpm 755 %{SOURCE4} \ install -Dpm 755 %{SOURCE4} %{buildroot}%{chrony_helper}
%{buildroot}%{_libexecdir}/%name/helper
install -d %{buildroot}%{_localstatedir}/log/chrony install -d %{buildroot}%{_localstatedir}/log/chrony
touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc} touch %{buildroot}%{_localstatedir}/lib/chrony/{drift,rtc}