Accepting request 587022 from home:dmolkentin:branches:security:dehydrated

- Fix issues introduced by 0.6.1 (bsc#1085305)
  * bring back man page
  * reflect new endpoint in (commented out) config file section
    (adds 0001-fixed-CA-url-in-example-config.patch, backported
    from upstream's master branch)

OBS-URL: https://build.opensuse.org/request/show/587022
OBS-URL: https://build.opensuse.org/package/show/security:dehydrated/dehydrated?expand=0&rev=30

0001-fixed-CA-url-in-example-config.patch

@@ -0,0 +1,36 @@
+From b93eac389395c8228be48999bf51c9f45e775a88 Mon Sep 17 00:00:00 2001
+From: Lukas Schauer <lukas@schauer.so>
+Date: Tue, 13 Mar 2018 21:08:20 +0100
+Subject: [PATCH] fixed CA url in example config
+
+---
+ docs/examples/config | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/docs/examples/config b/docs/examples/config
+index 1aa7d63..665704d 100644
+--- a/docs/examples/config
++++ b/docs/examples/config
+@@ -21,15 +21,15 @@
+ # default: <unset>
+ #IP_VERSION=
+ 
+-# Path to certificate authority (default: https://acme-v01.api.letsencrypt.org/directory)
+-#CA="https://acme-v01.api.letsencrypt.org/directory"
++# Path to certificate authority (default: https://acme-v02.api.letsencrypt.org/directory)
++#CA="https://acme-v02.api.letsencrypt.org/directory"
+ 
+ # Path to old certificate authority
+ # Set this value to your old CA value when upgrading from ACMEv1 to ACMEv2 under a different endpoint.
+ # If dehydrated detects an account-key for the old CA it will automatically reuse that key
+ # instead of registering a new one.
+-# default: <unset>
+-#OLDCA=
++# default: https://acme-v01.api.letsencrypt.org/directory
++#OLDCA="https://acme-v01.api.letsencrypt.org/directory"
+ 
+ # Which challenge should be used? Currently http-01 and dns-01 are supported
+ #CHALLENGETYPE="http-01"
+-- 
+2.13.6
+

dehydrated.changes

@@ -1,7 +1,12 @@
 -------------------------------------------------------------------
 Wed Mar 14 16:51:29 UTC 2018 - daniel.molkentin@suse.com
 
-- Properly install man page again (bsc#1085305)
+- Fix issues introduced by 0.6.1 (bsc#1085305)
+
+  * bring back man page
+  * reflect new endpoint in (commented out) config file section
+    (adds 0001-fixed-CA-url-in-example-config.patch, backported
+    from upstream's master branch)
 
 -------------------------------------------------------------------
 Tue Mar 13 20:21:49 UTC 2018 - daniel.molkentin@suse.com

dehydrated.spec

@@ -65,6 +65,7 @@ Source10:       README.Fedora
 Source11:       README.hooks
 Source12:       %{name}-%{version}.tar.gz.asc
 Source13:       %{name}.keyring
+Patch1:         0001-fixed-CA-url-in-example-config.patch
 BuildRequires:  %{_apache}
 Requires:       coreutils
 Requires:       curl
@@ -182,6 +183,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf ||:
 
 %prep
 %setup -q
+%patch1 -p1
 cp %{SOURCE9} .
 cp %{SOURCE10} .