- up to 0.7.0

[packages/dehydrated.git] / pld.patch

diff --git a/pld.patch b/pld.patch
index d9a90f16f742870a566ddc89bdc98b84e38c5d54..0824d559d9a74cca67aa839bbe9c96f9f6bdbdd6 100644 (file)
--- a/pld.patch
+++ b/pld.patch
@@ -1,12 +1,22 @@
---- dehydrated-0.3.1/dehydrated        2016-11-22 19:57:26.978516490 +0200
-+++ dehydrated-0.3.1/dehydrated        2016-11-22 20:01:59.118747292 +0200
+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
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env bash
 +#!/bin/bash
  
- # letsencrypt.sh by lukas2511
- # Source: https://github.com/lukas2511/letsencrypt.sh
-@@ -94,7 +94,7 @@
+ # dehydrated by lukas2511
+ # Source: https://dehydrated.io
+@@ -11,7 +11,7 @@
+ [[ -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
+ 
+-umask 077 # paranoid umask, we're creating private keys
++umask 027 # allow root and dehydrated group only to protect private keys
+ 
+ # Close weird external file descriptors
+ exec 3>&-
+@@ -112,7 +112,7 @@
  load_config() {
    # Check for config in various locations
    if [[ -z "${CONFIG:-}" ]]; then
@@ -15,36 +25,54 @@
        if [[ -f "${check_config}/config" ]]; then
          BASEDIR="${check_config}"
          CONFIG="${check_config}/config"
-@@ -164,7 +164,7 @@
-   [[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}"
+@@ -148,8 +148,8 @@
+   IP_VERSION=
+   CHAINCACHE=
+   AUTO_CLEANUP="no"
+-  DEHYDRATED_USER=
+-  DEHYDRATED_GROUP=
++  DEHYDRATED_USER="root"
++  DEHYDRATED_GROUP="dehydrated"
+   API="auto"
+ 
+   if [[ -z "${CONFIG:-}" ]]; then
+@@ -228,7 +228,7 @@
  
+   # Create new account directory or symlink to account directory from old CA
    CAHASH="$(echo "${CA}" | urlbase64)"
 -  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts"
-+  [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated/accounts"
-   mkdir -p "${ACCOUNTDIR}/${CAHASH}"
-   [[ -f "${ACCOUNTDIR}/${CAHASH}/config" ]] && . "${ACCOUNTDIR}/${CAHASH}/config"
-   ACCOUNT_KEY="${ACCOUNTDIR}/${CAHASH}/account_key.pem"
-@@ -179,9 +179,9 @@
++  [[ -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() {
      mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
    fi
  
 -  [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
-+  [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated/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"
 +  [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated/acme-challenge"
    [[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
-   [[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE=""
- 
---- dehydrated-0.3.1/docs/examples/config      2016-10-17 22:32:37.370663315 +0300
-+++ dehydrated-0.3.1/docs/examples/config      2016-11-22 20:02:34.173827857 +0200
-@@ -37,13 +37,13 @@
+   [[ -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 @@
  #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"
  
@@ -54,7 +82,7 @@
  
  # Default keysize for private keys (default: 4096)
  #KEYSIZE="4096"
-@@ -61,7 +61,7 @@
+@@ -77,7 +77,7 @@
  #
  # BASEDIR and WELLKNOWN variables are exported and can be used in an external program
  # default: <unset>