Accepting request 724273 from security:dehydrated

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/724273
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dehydrated?expand=0&rev=12

README.maintainer

@@ -2,14 +2,14 @@
 Acquiring TLS Certificates with Dehydrated
 ==========================================
 
-The SUSE dehydrated package has been designed to make acquiring TLS
+The dehydrated package has been designed to make acquiring TLS
 certificates (aka SSL Certificates) as simple as possible, while still being
 useful in a broad amount of use cases. Please consult the dehydrated man page,
 then continue reading here.
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-IMPORTANT: On systemd-enabled system (SLE12+), you need to enable the update
+IMPORTANT: On systemd-based systems, you need to enable the update
 timer, which has obsoleted the cron job. This is independent on which method
 you chose from below!
 

dehydrated.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Aug 10 17:18:25 UTC 2019 - Daniel Molkentin <daniel.molkentin@suse.com>
+
+- Behavioral change: Use cron only for older RHEL/CentOS versions
+  (along with SLE < 12.0). Everything else now uses systemd.
+  Please adopt accordingly! Refer to README.md for
+
 -------------------------------------------------------------------
 Wed Jun 26 11:03:27 UTC 2019 - Daniel Molkentin <daniel.molkentin@suse.com>
 

dehydrated.spec

@@ -21,7 +21,7 @@
 %define _home         %{_sysconfdir}/dehydrated
 %define _postrunhooks %{_home}/postrun-hooks.d
 
-%if 0%{?suse_version} > 1230
+%if 0%{?sle_version} >= 120100 || 0%{?suse_version} >= 1210 || 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700 
 %define  _lock_dir /run/dehydrated
 %bcond_without systemd
 %else
@@ -60,7 +60,7 @@ Source4:        dehydrated.cron.in
 Source5:        dehydrated.tmpfiles.d
 Source6:        dehydrated.service.in
 Source7:        dehydrated.timer
-Source9:        README.SUSE
+Source9:        README.maintainer
 Source10:       README.Fedora
 Source11:       README.hooks
 Source12:       %{name}-%{version}.tar.gz.asc
@@ -269,7 +269,7 @@ diff -urN docs/examples/config %{buildroot}%{_home}/config ||:
 %attr(-,%{_user},root) %dir %{_localstatedir}/lib/acme-challenge
 %{_mandir}/man1/*
 %doc LICENSE README.md docs/*.md docs/*.jpg
-%doc README.SUSE
+%doc README.maintainer
 %if %{defined redhat}
 %doc README.Fedora
 %endif
@@ -277,9 +277,11 @@ diff -urN docs/examples/config %{buildroot}%{_home}/config ||:
 %{_tmpfilesdir}/%{name}.conf
 %{_unitdir}/dehydrated.service
 %{_unitdir}/dehydrated.timer
+%if 0%{?suse_version}
 %{_sbindir}/rcdehydrated
+%endif
 %ghost %attr(700,%{_user},%{_user}) %dir %{_lock_dir}
-%else
+%else #with systemd
 %config %{_sysconfdir}/cron.d/dehydrated
 %attr(700,%{_user},%{_user}) %dir %{_lock_dir}
 %endif