From 788f17e98d5e75b180692ba7abd4bf7999840876 Mon Sep 17 00:00:00 2001 From: Daniel H Date: Wed, 12 Apr 2017 22:51:58 +0200 Subject: [PATCH] acme: Fix for curl linked against mbed TLS. (#4254) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use newest acme.sh release (2.6.8). Remove dependency on ca-certificates and add dependency on ca-bundle. Update environment variable. Signed-off-by: Daniel Halmschlager Backport to 17.01 for compatibility with 17.01.2, but keep the old envvar so it'll hopefully keep working for users who haven't upgraded. Closes #4579, closes #4699. Signed-off-by: Toke Høiland-Jørgensen --- net/acme/Makefile | 6 +++--- net/acme/files/run.sh | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/net/acme/Makefile b/net/acme/Makefile index 9d35f8005f..a7f0664508 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme -PKG_SOURCE_VERSION:=6d84da588b98733dd9c4f5b88440281ab1eb4989 -PKG_VERSION:=1.4 +PKG_SOURCE_VERSION:=7b40cbe8c1a52041351524bcde4b37665a7cdf79 +PKG_VERSION:=1.5 PKG_RELEASE:=1 PKG_LICENSE:=GPLv3 @@ -25,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk define Package/acme SECTION:=net CATEGORY:=Network - DEPENDS:=+curl +ca-certificates +openssl-util +netcat + DEPENDS:=+curl +ca-bundle +openssl-util +netcat TITLE:=ACME (Letsencrypt) client PKGARCH:=all MAINTAINER:=Toke Høiland-Jørgensen diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh index 94fd624262..d395b5bea7 100644 --- a/net/acme/files/run.sh +++ b/net/acme/files/run.sh @@ -10,7 +10,11 @@ CHECK_CRON=$1 ACME=/usr/lib/acme/acme.sh +# We export both ca variables in an attempts to keep backwards +# compatibility with older versions of curl that was linked against +# openssl export SSL_CERT_DIR=/etc/ssl/certs +export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt export NO_TIMESTAMP=1 UHTTPD_LISTEN_HTTP= -- 2.30.2