From e5d0ff542185f4597d15205bb9bdd05591a34165 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 26 Mar 2018 18:21:33 -0700 Subject: [PATCH] acme: Switch to normal releases + other fixes. As acme.sh has releases, switch to using those. Update the version accordingly. Also rearranged some stuff in the hope that uscan will start tracking releases instead of git commits. Makefile is more simple as a result. Signed-off-by: Rosen Penev --- net/acme/Makefile | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/net/acme/Makefile b/net/acme/Makefile index 56e436da8a..b3d4b55bf0 100644 --- a/net/acme/Makefile +++ b/net/acme/Makefile @@ -8,17 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acme -PKG_SOURCE_VERSION:=db3264ab8c8ee1aee1a84407702db4375f67765b -PKG_VERSION:=1.6 -PKG_RELEASE:=4 +PKG_VERSION:=2.7.8 +PKG_RELEASE:=1 PKG_LICENSE:=GPLv3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.xz -PKG_MIRROR_HASH:=a881b86fef2b754739fc0024efdf061312fecaf613502434770b18191bda741d -PKG_SOURCE_URL:=git://github.com/Neilpang/acme.sh.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE) -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE) +PKG_SOURCE_URL:=https://github.com/Neilpang/acme.sh +PKG_SOURCE_VERSION:=521d8c4b1f374c52ab1452d399a4d4910465e9fe +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.xz +PKG_MIRROR_HASH:=03e24eb41513b4d28dc42f5ae5c91be0030094149cbdbf9cdf9b6f87db9e36c0 +PKG_MAINTAINER:=Toke Høiland-Jørgensen + LUCI_DIR:=/usr/lib/lua/luci include $(INCLUDE_DIR)/package.mk @@ -28,8 +28,6 @@ define Package/acme CATEGORY:=Network DEPENDS:=+curl +ca-bundle +openssl-util +netcat TITLE:=ACME (Letsencrypt) client - PKGARCH:=all - MAINTAINER:=Toke Høiland-Jørgensen endef define Package/acme/description @@ -62,8 +60,6 @@ define Package/luci-app-acme SECTION:=luci CATEGORY:=LuCI TITLE:=ACME package - LuCI interface - MAINTAINER:=Toke Høiland-Jørgensen - PKGARCH:=all DEPENDS:= lua luci-base +acme luci-app-uhttpd SUBMENU:=3. Applications endef