From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 8 Oct 2019 07:06:17 +0000 (+0200)
Subject: - up to 0.6.5
X-Git-Tag: auto/th/dehydrated-0.6.5-1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;ds=sidebyside;h=06072c47edea3e80e6839017797a2b32fe913c7f;p=packages%2Fdehydrated.git

- up to 0.6.5
---

diff --git a/dehydrated.spec b/dehydrated.spec
index e83d5bc..991ea1d 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,11 +1,11 @@
 Summary:	letsencrypt/acme client implemented as a shell-script
 Name:		dehydrated
-Version:	0.6.2
-Release:	3
+Version:	0.6.5
+Release:	1
 License:	MIT
 Group:		Applications/Networking
 Source0:	https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	d4db13d5965054b0a231bf95285c6cf0
+# Source0-md5:	cedf07369517c317c4e1075540b94699
 Source1:	apache.conf
 Source2:	lighttpd.conf
 Source3:	nginx.conf
diff --git a/pld.patch b/pld.patch
index a46fc29..0824d55 100644
--- a/pld.patch
+++ b/pld.patch
@@ -45,12 +45,13 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated
    if [[ ! -e "${ACCOUNTDIR}/${CAHASH}" ]]; then
      OLDCAHASH="$(echo "${OLDCA}" | urlbase64)"
      mkdir -p "${ACCOUNTDIR}"
-@@ -253,10 +253,10 @@
+@@ -257,11 +257,11 @@ load_config() {
      mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
    fi
  
 -  [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
 +  [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated//certs"
+   [[ -z "${ALPNCERTDIR}" ]] && ALPNCERTDIR="${BASEDIR}/alpn-certs"
    [[ -z "${CHAINCACHE}" ]] && CHAINCACHE="${BASEDIR}/chains"
    [[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
 -  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
@@ -61,13 +62,17 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated
 diff -ur dehydrated-0.6.2.orig/docs/examples/config dehydrated-0.6.2/docs/examples/config
 --- dehydrated-0.6.2.orig/docs/examples/config	2018-04-25 21:22:40.000000000 +0000
 +++ dehydrated-0.6.2/docs/examples/config	2018-12-19 22:42:55.015403000 +0000
-@@ -47,13 +47,13 @@
+@@ -52,16 +52,16 @@
  #DOMAINS_TXT="${BASEDIR}/domains.txt"
  
  # Output directory for generated certificates
 -#CERTDIR="${BASEDIR}/certs"
 +#CERTDIR="/var/lib/dehydrated/certs"
  
+ # Output directory for alpn verification certificates
+-#ALPNCERTDIR="${BASEDIR}/alpn-certs"
++#ALPNCERTDIR="/var/lib/dehydrated//alpn-certs"
+ 
  # Directory for account keys and registration information
  #ACCOUNTDIR="${BASEDIR}/accounts"