acme: make virtual package satisfiable by uacme

currently acme metapackage only able to satisfied with acme-acmesh,
but make is satisfieable by uacme if it's already installed.
still defaults to acme.sh

Signed-off-by: Seo Suchan <redacted>

diff --git a/net/acme-acmesh/Makefile b/net/acme-acmesh/Makefile
index c628852a83099cb3f369fdc4b2e94c19c186cc38..637899749f442c9b7f88cf16ae715cbaba43b0e9 100644 (file)
--- a/net/acme-acmesh/Makefile
+++ b/net/acme-acmesh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme-acmesh
 PKG_VERSION:=3.1.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?
@@ -51,13 +51,14 @@ endef
 define Package/acme-acmesh-dnsapi
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+acme-acmesh
+  DEPENDS:=+acme-common +PACKAGE_uacme:curl
   TITLE:=DNS API integration for ACME (Letsencrypt) client
   PKGARCH:=all
 endef
 
 define Package/acme-acmesh-dnsapi/description
  This package provides DNS API integration for ACME (Letsencrypt) client.
+ scripts are from acme.sh
 endef
 
 define Package/acme-acmesh-dnsapi/install

diff --git a/net/acme-common/Makefile b/net/acme-common/Makefile
index f07faa1fde60d6b5c45fb9f5020025e0591d91f8..061520d7e8ada24cf42659e024448e30a3c45935 100644 (file)
--- a/net/acme-common/Makefile
+++ b/net/acme-common/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme-common
-PKG_VERSION:=1.5.1
+PKG_VERSION:=1.5.2
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=GPL-3.0-only

diff --git a/net/acme/Makefile b/net/acme/Makefile
index 5f260a99762aebc8b025c5166368c073ae131ab8..afb5146e6f63be4729ab0b1825fcbfaac11c9ccd 100644 (file)
--- a/net/acme/Makefile
+++ b/net/acme/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=acme
-PKG_VERSION:=4.0.0
+PKG_VERSION:=4.0.1
 
 PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
 PKG_LICENSE:=GPL-3.0-only
@@ -19,13 +19,13 @@ include $(INCLUDE_DIR)/package.mk
 define Package/acme
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=+acme-acmesh
-  TITLE:=Shorthand package for acme-acmesh
+  DEPENDS:=+!PACKAGE_uacme:acme-acmesh
+  TITLE:=Virtual package for any acme clients, default to acme-acmesh
   PKGARCH:=all
 endef
 
 define Package/acme/description
-Shorthand package for acme-acmesh.
+Shorthand package for proper acme backend, default to acme.sh and support uacme
 endef
 
 define Package/acme/install