rpm/dehydrated
SHA256
1
0
Fork 0
forked from pool/dehydrated
Code Pull Requests Activity

Accepting request 667788 from security:dehydrated

Browse Source 
- Remove RandomizedDelaySec attribute for distros with older systemd
  (boo#1110697) (forwarded request 667787 from dmolkentin)

OBS-URL: https://build.opensuse.org/request/show/667788
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dehydrated?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger 2019-01-24 13:13:30 +00:00 committed by Git OBS Bridge
commit 39ddfc827c
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dehydrated.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 22 11:52:00 UTC 2019 - Daniel Molkentin <daniel.molkentin@suse.com>
- Remove RandomizedDelaySec attribute for distros with older systemd
(boo#1110697)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 27 11:14:45 UTC 2018 - daniel.molkentin@suse.com Fri Apr 27 11:14:45 UTC 2018 - daniel.molkentin@suse.com

9
dehydrated.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package dehydrated # spec file for package dehydrated
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -90,6 +90,7 @@ BuildRequires: generic-logos-httpd
BuildRequires: shadow BuildRequires: shadow
%endif %endif
%if %{with systemd} %if %{with systemd}
BuildRequires: systemd
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
%{?systemd_requires} %{?systemd_requires}
%else #with_systemd %else #with_systemd
@ -229,6 +230,10 @@ install -D -m 0644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/%{name}.conf
sed "s,@POSTRUNHOOKS_DIR@,%{_postrunhooks},g" %{SOURCE6} > dehydrated.service sed "s,@POSTRUNHOOKS_DIR@,%{_postrunhooks},g" %{SOURCE6} > dehydrated.service
install -D -m 644 dehydrated.service %{buildroot}%{_unitdir}/dehydrated.service install -D -m 644 dehydrated.service %{buildroot}%{_unitdir}/dehydrated.service
install -D -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/dehydrated.timer install -D -m 644 %{SOURCE7} %{buildroot}%{_unitdir}/dehydrated.timer
if [ $(rpm -q --queryformat='%{VERSION}' systemd) -lt 229 ]; then
# No support for this attribute in systemd < v229
sed -i 's/^RandomizedDelaySec/#&/' %{buildroot}%{_unitdir}/dehydrated.timer
fi
%if 0%{?suse_version} %if 0%{?suse_version}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdehydrated ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcdehydrated
%endif %endif