From e380fa5085311a532320c2b8d31c5182a86a2680 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 5 Jun 2020 11:01:32 +0200
Subject: [PATCH] evoacme: upstream release 20.06.1

---
 CHANGELOG.md                   | 2 +-
 evoacme/files/evoacme.sh       | 2 +-
 evoacme/files/make-csr.sh      | 6 +++---
 evoacme/files/vhost-domains.sh | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55334f8b..bc4a85b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,7 @@ The **patch** part changes incrementally at each release.
 * redis: create sudoers file if missing
 * redis: new syntax for match filter
 * redis: raise an error is port 6379 is used in "instance" mode
-* evoacme: upstream release 20.06
+* evoacme: upstream release 20.06.1
 * certbot: install certbot dependencies non-interactively for jessie
 
 ### Fixed
diff --git a/evoacme/files/evoacme.sh b/evoacme/files/evoacme.sh
index 3b6d9771..d98f061e 100755
--- a/evoacme/files/evoacme.sh
+++ b/evoacme/files/evoacme.sh
@@ -303,7 +303,7 @@ readonly QUIET=${QUIET:-"0"}
 readonly TEST=${TEST:-"0"}
 readonly DRY_RUN=${DRY_RUN:-"0"}
 
-readonly VERSION="20.06"
+readonly VERSION="20.06.1"
 
 # Read configuration file, if it exists
 [ -r /etc/default/evoacme ] && . /etc/default/evoacme
diff --git a/evoacme/files/make-csr.sh b/evoacme/files/make-csr.sh
index d7abb204..7e08cfe0 100755
--- a/evoacme/files/make-csr.sh
+++ b/evoacme/files/make-csr.sh
@@ -204,8 +204,8 @@ main() {
     [ "$1" = "-V" ] || [ "$1" = "--version" ] && show_version && exit 0
 
     if [ -t 0 ]; then
-        # We have STDIN, so we should have 2 arguments
-        [ "$#" -eq 2 ] || error "invalid argument(s)"
+        # We have STDIN, so we should at least 2 arguments
+        [ "$#" -ge 2 ] || error "invalid argument(s)"
 
         # read VHOST from first argument
         VHOST="$1"
@@ -265,7 +265,7 @@ readonly ARGS=$@
 readonly VERBOSE=${VERBOSE:-"0"}
 readonly QUIET=${QUIET:-"0"}
 
-readonly VERSION="20.06"
+readonly VERSION="20.06.1"
 
 # Read configuration file, if it exists
 [ -r /etc/default/evoacme ] && . /etc/default/evoacme
diff --git a/evoacme/files/vhost-domains.sh b/evoacme/files/vhost-domains.sh
index 6bf91286..8b9ef3a5 100755
--- a/evoacme/files/vhost-domains.sh
+++ b/evoacme/files/vhost-domains.sh
@@ -170,7 +170,7 @@ readonly ARGS=$@
 readonly VERBOSE=${VERBOSE:-"0"}
 readonly QUIET=${QUIET:-"0"}
 
-readonly VERSION="20.06"
+readonly VERSION="20.06.1"
 
 readonly SRV_IP=${SRV_IP:-""}