From 8e85f472487f02dbc1f5f6d25405f81848a1f2e9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Fri, 8 Nov 2019 12:33:10 +0200
Subject: [PATCH] Force http/1.1 to workaround http/2 headers case

https://community.letsencrypt.org/t/jws-has-no-anti-replay-nonce/103324/6
---
 curl1.1.patch       | 27 +++++++++++++++++++++++++++
 letsencrypt.sh.spec |  4 +++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 curl1.1.patch

diff --git a/curl1.1.patch b/curl1.1.patch
new file mode 100644
index 0000000..aff8dda
--- /dev/null
+++ b/curl1.1.patch
@@ -0,0 +1,27 @@
+--- ./letsencrypt.sh~	2016-08-14 14:00:09.000000000 +0300
++++ ./letsencrypt.sh	2019-11-08 12:31:02.324585401 +0200
+@@ -76,6 +76,7 @@
+   OPENSSL_CNF="$(openssl version -d | cut -d\" -f2)/openssl.cnf"
+   CONTACT_EMAIL=
+   LOCKFILE=
++  CURL_OPTS="--http1.1"
+ 
+   if [[ -z "${CONFIG:-}" ]]; then
+     echo "#" >&2
+@@ -256,13 +257,13 @@
+ 
+   set +e
+   if [[ "${1}" = "head" ]]; then
+-    statuscode="$(curl -s -w "%{http_code}" -o "${tempcont}" "${2}" -I)"
++    statuscode="$(curl $CURL_OPTS -s -w "%{http_code}" -o "${tempcont}" "${2}" -I)"
+     curlret="${?}"
+   elif [[ "${1}" = "get" ]]; then
+-    statuscode="$(curl -s -w "%{http_code}" -o "${tempcont}" "${2}")"
++    statuscode="$(curl $CURL_OPTS -s -w "%{http_code}" -o "${tempcont}" "${2}")"
+     curlret="${?}"
+   elif [[ "${1}" = "post" ]]; then
+-    statuscode="$(curl -s -w "%{http_code}" -o "${tempcont}" "${2}" -d "${3}")"
++    statuscode="$(curl $CURL_OPTS -s -w "%{http_code}" -o "${tempcont}" "${2}" -d "${3}")"
+     curlret="${?}"
+   else
+     set -e
diff --git a/letsencrypt.sh.spec b/letsencrypt.sh.spec
index a1f663d..bfa55e4 100644
--- a/letsencrypt.sh.spec
+++ b/letsencrypt.sh.spec
@@ -1,7 +1,7 @@
 Summary:	letsencrypt/acme client implemented as a shell-script
 Name:		letsencrypt.sh
 Version:	0.2.0
-Release:	4
+Release:	5
 License:	MIT
 Group:		Applications/Networking
 Source0:	https://github.com/lukas2511/letsencrypt.sh/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@ Source5:	hook.sh
 Source6:	crontab
 Patch0:		pld.patch
 Patch1:		letsencrypt.sh-agrurl.patch
+Patch2:		curl1.1.patch
 URL:		https://github.com/lukas2511/letsencrypt.sh
 BuildRequires:	rpmbuild(macros) >= 1.713
 Requires:	crondaemon
@@ -49,6 +50,7 @@ Current features:
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-- 
2.44.0