- rediff patch

diff --git a/pld.patch b/pld.patch
index 0824d559d9a74cca67aa839bbe9c96f9f6bdbdd6..dc8dc96d0f652442f009734741de7dd9f0178a90 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -1,13 +1,13 @@
-diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated
---- dehydrated-0.6.2.orig/dehydrated   2018-04-25 21:22:40.000000000 +0000
-+++ dehydrated-0.6.2/dehydrated        2018-12-19 22:44:07.875403000 +0000
+diff -urNp -x '*.orig' dehydrated-0.7.0.org/dehydrated dehydrated-0.7.0/dehydrated
+--- dehydrated-0.7.0.org/dehydrated    2020-12-10 16:54:26.000000000 +0100
++++ dehydrated-0.7.0/dehydrated        2021-04-01 22:30:32.341214536 +0200
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/bash
  
  # dehydrated by lukas2511
  # Source: https://dehydrated.io
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ set -o pipefail
  [[ -n "${ZSH_VERSION:-}" ]] && set -o SH_WORD_SPLIT && set +o FUNCTION_ARGZERO && set -o NULL_GLOB && set -o noglob
  [[ -z "${ZSH_VERSION:-}" ]] && shopt -s nullglob && set -f
  
@@ -16,7 +16,7 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated
  
  # Close weird external file descriptors
  exec 3>&-
-@@ -112,7 +112,7 @@
+@@ -310,7 +310,7 @@ verify_config() {
  load_config() {
    # Check for config in various locations
    if [[ -z "${CONFIG:-}" ]]; then
@@ -25,7 +25,7 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated
        if [[ -f "${check_config}/config" ]]; then
          BASEDIR="${check_config}"
          CONFIG="${check_config}/config"
-@@ -148,8 +148,8 @@
+@@ -356,8 +356,8 @@ load_config() {
    IP_VERSION=
    CHAINCACHE=
    AUTO_CLEANUP="no"
@@ -36,16 +36,16 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated
    API="auto"
  
    if [[ -z "${CONFIG:-}" ]]; then
-@@ -228,7 +228,7 @@
- 
-   # Create new account directory or symlink to account directory from old CA
+@@ -461,7 +461,7 @@ load_config() {
+   # since it's a non-issue and trying to fix existing installations would be too much
+   # trouble
    CAHASH="$(echo "${CA}" | urlbase64)"
 -  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts"
 +  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated//accounts"
    if [[ ! -e "${ACCOUNTDIR}/${CAHASH}" ]]; then
      OLDCAHASH="$(echo "${OLDCA}" | urlbase64)"
      mkdir -p "${ACCOUNTDIR}"
-@@ -257,11 +257,11 @@ load_config() {
+@@ -492,11 +492,11 @@ load_config() {
      mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
    fi
  
@@ -59,10 +59,10 @@ diff -ur dehydrated-0.6.2.orig/dehydrated dehydrated-0.6.2/dehydrated
    [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
    [[ -z "${OPENSSL_CNF}" ]] && OPENSSL_CNF="$("${OPENSSL}" version -d | cut -d\" -f2)/openssl.cnf"
    [[ -n "${PARAM_LOCKFILE_SUFFIX:-}" ]] && LOCKFILE="${LOCKFILE}-${PARAM_LOCKFILE_SUFFIX}"
-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
-@@ -52,16 +52,16 @@
+diff -urNp -x '*.orig' dehydrated-0.7.0.org/docs/examples/config dehydrated-0.7.0/docs/examples/config
+--- dehydrated-0.7.0.org/docs/examples/config  2020-12-10 16:54:26.000000000 +0100
++++ dehydrated-0.7.0/docs/examples/config      2021-04-01 22:30:32.341214536 +0200
+@@ -54,16 +54,16 @@
  #DOMAINS_TXT="${BASEDIR}/domains.txt"
  
  # Output directory for generated certificates
@@ -82,7 +82,7 @@ diff -ur dehydrated-0.6.2.orig/docs/examples/config dehydrated-0.6.2/docs/exampl
  
  # Default keysize for private keys (default: 4096)
  #KEYSIZE="4096"
-@@ -77,7 +77,7 @@
+@@ -87,7 +87,7 @@
  #
  # BASEDIR and WELLKNOWN variables are exported and can be used in an external program
  # default: <unset>