From: Toke Høiland-Jørgensen <redacted>
Date: Mon, 28 Nov 2016 22:13:52 +0000 (+0100)
Subject: acme: Update to v1.4.
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=4cebee84ca2e58946bb0e32cdde2a50320e66af7;p=openwrt-packages.git

acme: Update to v1.4.

This updates to the latest git version of acme.sh and drops the patch to
disable timestamps from the output (since that is now supported
upstream).

Signed-off-by: Toke Høiland-Jørgensen <redacted>
---

diff --git a/net/acme/Makefile b/net/acme/Makefile
index 07e5d8d0e..9d35f8005 100644
--- a/net/acme/Makefile
+++ b/net/acme/Makefile
@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme
-PKG_SOURCE_VERSION:=3c33cdfa3da68000a40b85304821705f0deea951
-PKG_VERSION:=1.3
+PKG_SOURCE_VERSION:=6d84da588b98733dd9c4f5b88440281ab1eb4989
+PKG_VERSION:=1.4
 PKG_RELEASE:=1
 PKG_LICENSE:=GPLv3
 
diff --git a/net/acme/files/run.sh b/net/acme/files/run.sh
index 2e227c04a..94fd62426 100644
--- a/net/acme/files/run.sh
+++ b/net/acme/files/run.sh
@@ -11,6 +11,7 @@
 CHECK_CRON=$1
 ACME=/usr/lib/acme/acme.sh
 export SSL_CERT_DIR=/etc/ssl/certs
+export NO_TIMESTAMP=1
 
 UHTTPD_LISTEN_HTTP=
 STATE_DIR='/etc/acme'
diff --git a/net/acme/patches/0001-remove-timestamp.patch b/net/acme/patches/0001-remove-timestamp.patch
deleted file mode 100644
index 43ed932ed..000000000
--- a/net/acme/patches/0001-remove-timestamp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/acme.sh
-+++ b/acme.sh
-@@ -84,9 +84,9 @@ __red() {
- 
- _printargs() {
-   if [ -z "$2" ] ; then
--    printf -- "[$(date)] $1"
-+    printf -- " $1"
-   else
--    printf -- "[$(date)] $1='$2'"
-+    printf -- " $1='$2'"
-   fi
-   printf "\n"
- }