From nobody Tue Aug 29 11:08:48 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RZl6S2cbZz4rgYL; Tue, 29 Aug 2023 11:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RZl6S24qtz4kBh; Tue, 29 Aug 2023 11:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693307328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y0ohiNO+f1CzalOEyPrcbXo+aQeP97X0gozcVhpvY0w=; b=DgtBJXBDKN8hgKIQEFO77SDvVGbOhz35V10eWvzXrAQwVzgvcOv46zz1LktRpMWc201xlT 2LiyjinDlhWEG5FUjEoDlaevQ99PBBYRd9cp6pTMnpPk7nqaPc037sVxvPu5Cdmlhf+b2I 3+MYF83ge1cU9otZPofR83hQQCVHAesfq0Gzw/22Otsy4UnuNLo2Ic0WTn53UpNsEC9yv8 /h2n85v9HUn13hF8dAzHSbgHnpkcNImOiHLank7UxPuuCBlxKDekvCR4A3lOi6ikOHk+ce ayJrItAO5M/NiT/cv/H/Oha3Gz9ZFFqYNzfw6mLbm0uK58uxJBeVuOFjFXnNpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693307328; a=rsa-sha256; cv=none; b=BA4H6Crx4+gmtpZ/WfunoijU0bQdZOhtrUj0wfF7Pu2AmB+tbveiOUE8e8Ue489NMBl1zV zZAxISvlqovFbL8W6uVswb6zt+HlJzcKvG/zj7NorUq070+yWCsiftFkymCW4UTrck+ecP uwqspiu1IqmSpdP74/k6eCcma9PHzcdGf4CFeQ+AJsdgnoz9ul7mS/NFqiAy2EVm9ooQff RkS8nGH5MZfpF0ZE0OB6Ul87LjBbpweMGvCo6BfTuWahWsaqHkksH86EbjVzXDMm95USfl QovwcPsRXy22DZZSOriJkB8YF5PJBOSBY6okBGD6vZa12hBUrE5Fk/do8erY9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693307328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y0ohiNO+f1CzalOEyPrcbXo+aQeP97X0gozcVhpvY0w=; b=oi0WjGQcmdzTp4eqxG+lGpK65UCYXCSNq7MFwU07fuq8ns4Z/k6v0dKOWHZVwO6/BERQp7 We9n/AvNUCJ0IlaoquWkYNNslST+ZrS9cCSf5W8jB0zkHMueAvCeKhuavNDHItWZGlj7ib u7Y93NnAFJ+lRWR9DYXrbKlWqlgdEOn62jH8UAU2WlvsRVt7FjxAox5Y6MymeD974fSJ2l lSsPBa2a5apvPt+nyu25lHU9wFkzK6bRRoVUljwVV91ulaRew5zeLrxMwAMlEoDvKK5mvC j0Ktj9ZWo17xp0wvmf7CODr82nzP0Ul5W3KF5LZjtqVsOaW2EKsPFu3g8D7TuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RZl6S18z9zpt5; Tue, 29 Aug 2023 11:08:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37TB8mLl028079; Tue, 29 Aug 2023 11:08:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37TB8mXe028076; Tue, 29 Aug 2023 11:08:48 GMT (envelope-from git) Date: Tue, 29 Aug 2023 11:08:48 GMT Message-Id: <202308291108.37TB8mXe028076@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vasil Dimov Subject: git: 54cb4dcf25c7 - main - net-p2p/c-lightning: Upgrade from 23.05.2 to 23.08 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54cb4dcf25c72be168a2449f66af439552925e38 Auto-Submitted: auto-generated The branch main has been updated by vd: URL: https://cgit.FreeBSD.org/ports/commit/?id=54cb4dcf25c72be168a2449f66af439552925e38 commit 54cb4dcf25c72be168a2449f66af439552925e38 Author: Vasil Dimov AuthorDate: 2023-08-29 11:05:56 +0000 Commit: Vasil Dimov CommitDate: 2023-08-29 11:08:29 +0000 net-p2p/c-lightning: Upgrade from 23.05.2 to 23.08 --- net-p2p/c-lightning/Makefile | 13 ++++++------- net-p2p/c-lightning/distinfo | 14 +++++++------- net-p2p/c-lightning/files/patch-Makefile | 16 ++++++++-------- net-p2p/c-lightning/pkg-plist | 30 ++++++++++++++++++++++++++++-- 4 files changed, 49 insertions(+), 24 deletions(-) diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile index dd82ff17ad3e..31c475eae28d 100644 --- a/net-p2p/c-lightning/Makefile +++ b/net-p2p/c-lightning/Makefile @@ -1,6 +1,6 @@ PORTNAME= c-lightning # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present) -PORTVERSION= 23.05.2 +PORTVERSION= 23.08 DISTVERSIONPREFIX= v # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c) #PORTVERSION= 0 @@ -32,13 +32,14 @@ USES= autoreconf:build \ CPE_VENDOR= elementsproject BINARY_ALIAS= python=${PYTHON_CMD} python3=${PYTHON_CMD} ALL_TARGET= default -SHEBANG_FILES= tools/reckless +SHEBANG_FILES= plugins/clnrest/clnrest.py \ + tools/reckless EXTRA_PATCHES_aarch64= ${FILESDIR}/extra-patch-ccan_ccan_base64_base64.c \ ${FILESDIR}/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c EXTRA_PATCHES= ${EXTRA_PATCHES_${ARCH}} -OPTIONS_DEFINE= COMPATIBILITY DEVELOPER EXPERIMENTAL +OPTIONS_DEFINE= COMPATIBILITY DEVELOPER OPTIONS_MULTI= STORAGE OPTIONS_MULTI_STORAGE= POSTGRESQL SQLITE OPTIONS_RADIO= TESTING @@ -48,8 +49,6 @@ COMPATIBILITY_CONFIGURE_ENABLE= compat COMPATIBILITY_DESC= Compatibility mode, good to disable to see if your software breaks DEVELOPER_CONFIGURE_ENABLE= developer DEVELOPER_DESC= Developer mode, good for testing -EXPERIMENTAL_CONFIGURE_ENABLE= experimental-features -EXPERIMENTAL_DESC= Enable experimental features POSTGRESQL_DESC= Use PostgreSQL for storage POSTGRESQL_USES= pgsql WANT_PGSQL= client @@ -71,8 +70,8 @@ GIT_COMMIT= ${PKGNAMESUFFIX:C/-git-//} GIT_COMMIT= ${DISTVERSIONPREFIX}${PORTVERSION} .endif GH_TUPLE= ElementsProject:lightning:${GIT_COMMIT} \ - ElementsProject:libwally-core:9f2f42df357f5:ext1/external/libwally-core \ - ElementsProject:secp256k1-zkp:6ec1ff6040164:ext2/external/libwally-core/src/secp256k1 \ + ElementsProject:libwally-core:bb4cd3ac802c7:ext1/external/libwally-core \ + ElementsProject:secp256k1-zkp:ff33018fe765d:ext2/external/libwally-core/src/secp256k1 \ ianlancetaylor:libbacktrace:2446c66076480ce:ext3/external/libbacktrace \ zserge:jsmn:18e9fe42cbfe21d65076f5c77ae2be3:ext4/external/jsmn \ valyala:gheap:67fc83bc953324f4759e52951921d:ext5/external/gheap diff --git a/net-p2p/c-lightning/distinfo b/net-p2p/c-lightning/distinfo index ee6209b7a561..1fd7906d2448 100644 --- a/net-p2p/c-lightning/distinfo +++ b/net-p2p/c-lightning/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1688055650 -SHA256 (ElementsProject-lightning-v23.05.2_GH0.tar.gz) = cee51563ea4b64e8be2bce42fa943200858b2908eb498baab62847b2a44f604d -SIZE (ElementsProject-lightning-v23.05.2_GH0.tar.gz) = 4509397 -SHA256 (ElementsProject-libwally-core-9f2f42df357f5_GH0.tar.gz) = 95dbd7609fe78b6b7ce1d8d5085a2fb8ace22b0e8c577f2f0edac6885d4ac9ba -SIZE (ElementsProject-libwally-core-9f2f42df357f5_GH0.tar.gz) = 989859 -SHA256 (ElementsProject-secp256k1-zkp-6ec1ff6040164_GH0.tar.gz) = 8ee65e032075e86c4894f0e215b333eb60e98d167c56586aebd790de5c0ddac2 -SIZE (ElementsProject-secp256k1-zkp-6ec1ff6040164_GH0.tar.gz) = 2605673 +TIMESTAMP = 1693235199 +SHA256 (ElementsProject-lightning-v23.08_GH0.tar.gz) = d46e257d6c20932b01e6d3bcbde7c71534128c1a63afa22d5a8ba57f193ebc6d +SIZE (ElementsProject-lightning-v23.08_GH0.tar.gz) = 5413090 +SHA256 (ElementsProject-libwally-core-bb4cd3ac802c7_GH0.tar.gz) = 730855832586831683363ed93517917b8b1a20b42440f4e119955deac2ef2454 +SIZE (ElementsProject-libwally-core-bb4cd3ac802c7_GH0.tar.gz) = 1009990 +SHA256 (ElementsProject-secp256k1-zkp-ff33018fe765d_GH0.tar.gz) = b9ab83539c89d280d5f34f08e5932430932182bee45481666d78ae1aac738909 +SIZE (ElementsProject-secp256k1-zkp-ff33018fe765d_GH0.tar.gz) = 2606353 SHA256 (ianlancetaylor-libbacktrace-2446c66076480ce_GH0.tar.gz) = 3be5fde76f559cdaef40386c1f2e85e35cc2c8df6fbf0ae98134f80a1c037cf0 SIZE (ianlancetaylor-libbacktrace-2446c66076480ce_GH0.tar.gz) = 665689 SHA256 (zserge-jsmn-18e9fe42cbfe21d65076f5c77ae2be3_GH0.tar.gz) = 2e90b8b42876f384ba229097cd9f8534250683abb135256843b538cb45dd907f diff --git a/net-p2p/c-lightning/files/patch-Makefile b/net-p2p/c-lightning/files/patch-Makefile index 0e6bf5da2c8a..ff53286f8604 100644 --- a/net-p2p/c-lightning/files/patch-Makefile +++ b/net-p2p/c-lightning/files/patch-Makefile @@ -1,18 +1,18 @@ ---- Makefile.orig 2023-06-06 02:31:42 UTC +--- Makefile.orig 2023-08-23 06:24:14 UTC +++ Makefile -@@ -260,9 +260,9 @@ ifeq ($(STATIC),1) +@@ -268,9 +268,9 @@ ifeq ($(STATIC),1) # For MacOS, Jacob Rapoport changed this to: - # -L/usr/local/lib -Wl,-lgmp -lsqlite3 -lz -Wl,-lm -lpthread -ldl $(COVFLAGS) + # -L/usr/local/lib -lsqlite3 -lz -Wl,-lm -lpthread -ldl $(COVFLAGS) # But that doesn't static link. --LDLIBS = -L$(CPATH) -Wl,-dn -lgmp $(SQLITE3_LDLIBS) -lz -Wl,-dy -lm -lpthread -ldl $(COVFLAGS) -+LDLIBS = -L$(LIBRARY_PATH) -Wl,-dn -lgmp $(SQLITE3_LDLIBS) -lz -Wl,-dy -lm -lpthread -ldl $(COVFLAGS) +-LDLIBS = -L$(CPATH) -Wl,-dn $(SQLITE3_LDLIBS) -lz -Wl,-dy -lm -lpthread -ldl $(COVFLAGS) ++LDLIBS = -L$(LIBRARY_PATH) -Wl,-dn $(SQLITE3_LDLIBS) -lz -Wl,-dy -lm -lpthread -ldl $(COVFLAGS) else --LDLIBS = -L$(CPATH) -lm -lgmp $(SQLITE3_LDLIBS) -lz $(COVFLAGS) -+LDLIBS = -L$(LIBRARY_PATH) -lm -lgmp $(SQLITE3_LDLIBS) -lz $(COVFLAGS) +-LDLIBS = -L$(CPATH) -lm $(SQLITE3_LDLIBS) -lz $(COVFLAGS) ++LDLIBS = -L$(LIBRARY_PATH) -lm $(SQLITE3_LDLIBS) -lz $(COVFLAGS) endif # If we have the postgres client library we need to link against it as well -@@ -750,7 +750,7 @@ docdir = $(datadir)/doc/$(PKGNAME) +@@ -760,7 +760,7 @@ docdir = $(datadir)/doc/$(PKGNAME) plugindir = $(pkglibexecdir)/plugins datadir = $(PREFIX)/share docdir = $(datadir)/doc/$(PKGNAME) diff --git a/net-p2p/c-lightning/pkg-plist b/net-p2p/c-lightning/pkg-plist index 4e6501d361e4..f6fe1c25f70d 100644 --- a/net-p2p/c-lightning/pkg-plist +++ b/net-p2p/c-lightning/pkg-plist @@ -16,6 +16,23 @@ libexec/c-lightning/plugins/autoclean libexec/c-lightning/plugins/bcli libexec/c-lightning/plugins/bookkeeper libexec/c-lightning/plugins/chanbackup +libexec/c-lightning/plugins/cln-renepay +libexec/c-lightning/plugins/clnrest/.github/screenshots/Postman-bkpr-plugin.png +libexec/c-lightning/plugins/clnrest/.github/screenshots/Postman-with-body.png +libexec/c-lightning/plugins/clnrest/.github/screenshots/Postman.png +libexec/c-lightning/plugins/clnrest/.github/screenshots/Swagger-auth.png +libexec/c-lightning/plugins/clnrest/.github/screenshots/Swagger-list-methods.png +libexec/c-lightning/plugins/clnrest/.github/screenshots/Swagger-rpc-method.png +libexec/c-lightning/plugins/clnrest/.github/screenshots/Swagger.png +libexec/c-lightning/plugins/clnrest/README.md +libexec/c-lightning/plugins/clnrest/__init__.py +libexec/c-lightning/plugins/clnrest/clnrest.py +libexec/c-lightning/plugins/clnrest/requirements.txt +libexec/c-lightning/plugins/clnrest/utilities/__init__.py +libexec/c-lightning/plugins/clnrest/utilities/generate_certs.py +libexec/c-lightning/plugins/clnrest/utilities/rpc_plugin.py +libexec/c-lightning/plugins/clnrest/utilities/rpc_routes.py +libexec/c-lightning/plugins/clnrest/utilities/shared.py libexec/c-lightning/plugins/commando libexec/c-lightning/plugins/fetchinvoice libexec/c-lightning/plugins/funder @@ -38,8 +55,10 @@ man/man7/lightning-bkpr-inspect.7.gz man/man7/lightning-bkpr-listaccountevents.7.gz man/man7/lightning-bkpr-listbalances.7.gz man/man7/lightning-bkpr-listincome.7.gz +man/man7/lightning-blacklistrune.7.gz man/man7/lightning-check.7.gz man/man7/lightning-checkmessage.7.gz +man/man7/lightning-checkrune.7.gz man/man7/lightning-close.7.gz man/man7/lightning-commando-blacklist.7.gz man/man7/lightning-commando-listrunes.7.gz @@ -48,6 +67,7 @@ man/man7/lightning-commando.7.gz man/man7/lightning-connect.7.gz man/man7/lightning-createinvoice.7.gz man/man7/lightning-createonion.7.gz +man/man7/lightning-createrune.7.gz man/man7/lightning-datastore.7.gz man/man7/lightning-decode.7.gz man/man7/lightning-decodepay.7.gz @@ -110,6 +130,8 @@ man/man7/lightning-plugin.7.gz man/man7/lightning-preapproveinvoice.7.gz man/man7/lightning-preapprovekeysend.7.gz man/man7/lightning-recoverchannel.7.gz +man/man7/lightning-renepay.7.gz +man/man7/lightning-renepaystatus.7.gz man/man7/lightning-reserveinputs.7.gz man/man7/lightning-sendcustommsg.7.gz man/man7/lightning-sendinvoice.7.gz @@ -118,10 +140,15 @@ man/man7/lightning-sendonionmessage.7.gz man/man7/lightning-sendpay.7.gz man/man7/lightning-sendpsbt.7.gz man/man7/lightning-setchannel.7.gz +man/man7/lightning-setconfig.7.gz man/man7/lightning-setpsbtversion.7.gz +man/man7/lightning-showrunes.7.gz man/man7/lightning-signinvoice.7.gz man/man7/lightning-signmessage.7.gz man/man7/lightning-signpsbt.7.gz +man/man7/lightning-splice_init.7.gz +man/man7/lightning-splice_signed.7.gz +man/man7/lightning-splice_update.7.gz man/man7/lightning-sql.7.gz man/man7/lightning-staticbackup.7.gz man/man7/lightning-stop.7.gz @@ -130,6 +157,7 @@ man/man7/lightning-txprepare.7.gz man/man7/lightning-txsend.7.gz man/man7/lightning-unreserveinputs.7.gz man/man7/lightning-utxopsbt.7.gz +man/man7/lightning-wait.7.gz man/man7/lightning-waitanyinvoice.7.gz man/man7/lightning-waitblockheight.7.gz man/man7/lightning-waitinvoice.7.gz @@ -139,7 +167,5 @@ man/man7/lightningd-rpc.7.gz man/man7/reckless.7.gz man/man8/lightning-hsmtool.8.gz man/man8/lightningd.8.gz -share/doc/c-lightning/HACKING.md -share/doc/c-lightning/INSTALL.md share/doc/c-lightning/LICENSE share/doc/c-lightning/README.md