From 8f53c538c5b06e24de7c8fd84001e3901731be192546a06a185751fed964c420 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 8 Jul 2022 11:28:23 +0000 Subject: [PATCH 1/2] Accepting request 987889 from home:darix:branches:security:dehydrated - Copy the changes entry into README.postrun-hooks to make it easier for users to find the information how to restore the postrun-hooks after the split. OBS-URL: https://build.opensuse.org/request/show/987889 OBS-URL: https://build.opensuse.org/package/show/security:dehydrated/dehydrated?expand=0&rev=77 --- README.postrun-hooks | 7 +++++++ dehydrated.changes | 7 +++++++ dehydrated.spec | 5 ++++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 README.postrun-hooks diff --git a/README.postrun-hooks b/README.postrun-hooks new file mode 100644 index 0000000..a87372b --- /dev/null +++ b/README.postrun-hooks @@ -0,0 +1,7 @@ +Rework support for /etc/dehydrated/postrun-hooks.d/: +dehydrated.service nolonger starts them directly, the support was +moved to a separate unit file. Please run: + +systemctl enable dehydrated-postrun-hooks.service + +to restore this functionality diff --git a/dehydrated.changes b/dehydrated.changes index 45bbfd8..6eea3c7 100644 --- a/dehydrated.changes +++ b/dehydrated.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jul 8 11:24:13 UTC 2022 - Marcus Rueckert + +- Copy the changes entry into README.postrun-hooks to make it + easier for users to find the information how to restore the + postrun-hooks after the split. + ------------------------------------------------------------------- Tue Mar 30 14:20:42 UTC 2021 - Marcus Rueckert diff --git a/dehydrated.spec b/dehydrated.spec index e9fd6c3..281ebcd 100644 --- a/dehydrated.spec +++ b/dehydrated.spec @@ -1,7 +1,7 @@ # # spec file for package dehydrated # -# 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 @@ -76,6 +76,7 @@ Source16: dehydrated@.timer Source17: dehydrated.target Source18: dehydrated-postrun-hooks.service Source19: dehydrated-postrun-hooks@.service +Source20: README.postrun-hooks Patch: more-examples.patch BuildRequires: %{_apache} Requires: coreutils @@ -174,6 +175,7 @@ if [ -e %{_sysconfdir}/dehydrated/config.sh ]; then mv %{_sysconfdir}/dehydrated %patch -p1 cp %{SOURCE9} . cp %{SOURCE10} . +cp %{SOURCE20} . %build @@ -275,6 +277,7 @@ diff -urN docs/examples/config %{buildroot}%{_home}/config ||: %if %{defined redhat} %doc README.Fedora %endif +%doc README.postrun-hooks %if %{with systemd} %{_tmpfilesdir}/%{name}.conf %{_unitdir}/dehydrated*.service From 7743484cd70dfcccf0fac646bfd311967446214471d7b51fd36a5e0fab307fcd Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Fri, 8 Jul 2022 11:40:34 +0000 Subject: [PATCH 2/2] - Target should not PartOf on itself. OBS-URL: https://build.opensuse.org/package/show/security:dehydrated/dehydrated?expand=0&rev=78 --- dehydrated.changes | 5 +++++ dehydrated.target | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dehydrated.changes b/dehydrated.changes index 6eea3c7..28249b0 100644 --- a/dehydrated.changes +++ b/dehydrated.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 8 11:38:36 UTC 2022 - Marcus Rueckert + +- Target should not PartOf on itself. + ------------------------------------------------------------------- Fri Jul 8 11:24:13 UTC 2022 - Marcus Rueckert diff --git a/dehydrated.target b/dehydrated.target index 93f6b8c..9c27939 100644 --- a/dehydrated.target +++ b/dehydrated.target @@ -1,4 +1,2 @@ [Unit] Description=Target to allow restarting and stopping of all parts of dehydrated -PartOf=dehydrated.target -