git: f290545cdd7d - main - net-p2p/c-lightning: upgrade from 24.08.2 to 24.11.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vasil Dimov <vd_at_FreeBSD.org>
Date: Thu, 19 Dec 2024 14:17:17 UTC
The branch main has been updated by vd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f290545cdd7d1f52127b0fe4c1e6cc993469466f

commit f290545cdd7d1f52127b0fe4c1e6cc993469466f
Author:     Vasil Dimov <vd@FreeBSD.org>
AuthorDate: 2024-12-19 14:15:56 +0000
Commit:     Vasil Dimov <vd@FreeBSD.org>
CommitDate: 2024-12-19 14:17:01 +0000

    net-p2p/c-lightning: upgrade from 24.08.2 to 24.11.1
---
 net-p2p/c-lightning/Makefile             |  5 +++--
 net-p2p/c-lightning/distinfo             |  6 +++---
 net-p2p/c-lightning/files/patch-Makefile | 24 ++++++++++++------------
 net-p2p/c-lightning/pkg-plist            | 22 +++++++++++++++-------
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile
index 52f533247a62..1f2440a34a18 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=	24.08.2
+PORTVERSION=	24.11.1
 DISTVERSIONPREFIX=	v
 # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c)
 #PORTVERSION=	0
@@ -14,6 +14,7 @@ WWW=		https://github.com/ElementsProject/lightning
 LICENSE=	MIT
 
 BUILD_DEPENDS=	bash:shells/bash \
+		gsed:textproc/gsed \
 		lowdown:textproc/lowdown \
 		jq:textproc/jq \
 		${PYTHON_PKGNAMEPREFIX}mako>=1.0.14:textproc/py-mako@${PY_FLAVOR} \
@@ -29,7 +30,7 @@ USES=		autoreconf:build \
 		libtool \
 		shebangfix
 CPE_VENDOR=	elementsproject
-BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD}
+BINARY_ALIAS=	python=${PYTHON_CMD} python3=${PYTHON_CMD} sed=${LOCALBASE}/bin/gsed
 ALL_TARGET=	default
 SHEBANG_FILES=	plugins/wss-proxy/wss-proxy.py \
 		plugins/clnrest/clnrest.py \
diff --git a/net-p2p/c-lightning/distinfo b/net-p2p/c-lightning/distinfo
index 1ba71fa96060..44e3975e3cb2 100644
--- a/net-p2p/c-lightning/distinfo
+++ b/net-p2p/c-lightning/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1731059544
-SHA256 (ElementsProject-lightning-v24.08.2_GH0.tar.gz) = e2ca0d92a241e90e3899834514d4662e4ae9683a88b286b27a1a06a58fe60c25
-SIZE (ElementsProject-lightning-v24.08.2_GH0.tar.gz) = 13343172
+TIMESTAMP = 1734614611
+SHA256 (ElementsProject-lightning-v24.11.1_GH0.tar.gz) = a1547eaace167d3a390cade96d5721aa207884e903f90b33bedf4e6993b37781
+SIZE (ElementsProject-lightning-v24.11.1_GH0.tar.gz) = 14357219
 SHA256 (ElementsProject-libwally-core-11e1bf6d60a13_GH0.tar.gz) = 199e3340e72048026043532684c301fcb6027ec4f19e5701c0bc288e2cd6065e
 SIZE (ElementsProject-libwally-core-11e1bf6d60a13_GH0.tar.gz) = 1040755
 SHA256 (BlockstreamResearch-secp256k1-zkp-1e04d3244_GH0.tar.gz) = cbf5b21c848a5b760ce1307b617990509cd6c054fe9bf072ce27f50262f707b2
diff --git a/net-p2p/c-lightning/files/patch-Makefile b/net-p2p/c-lightning/files/patch-Makefile
index 05cd9403e26f..e3b775b5975a 100644
--- a/net-p2p/c-lightning/files/patch-Makefile
+++ b/net-p2p/c-lightning/files/patch-Makefile
@@ -1,6 +1,15 @@
---- Makefile.orig	2024-08-29 06:49:21.000000000 +0200
-+++ Makefile	2024-09-03 12:56:39.050177000 +0200
-@@ -271,9 +271,9 @@
+--- Makefile.orig	2024-12-18 03:38:13 UTC
++++ Makefile
+@@ -240,7 +240,7 @@ docdir = $(datadir)/doc/$(PKGNAME)
+ plugindir = $(pkglibexecdir)/plugins
+ datadir = $(PREFIX)/share
+ docdir = $(datadir)/doc/$(PKGNAME)
+-mandir = $(datadir)/man
++mandir = $(PREFIX)/man
+ man1dir = $(mandir)/man1
+ man5dir = $(mandir)/man5
+ man7dir = $(mandir)/man7
+@@ -281,9 +281,9 @@ ifeq ($(STATIC),1)
  # For MacOS, Jacob Rapoport <jacob@rumblemonkey.com> changed this to:
  #  -L/usr/local/lib -lsqlite3 -lz -Wl,-lm -lpthread -ldl $(COVFLAGS)
  # But that doesn't static link.
@@ -12,12 +21,3 @@
  endif
  
  # If we have the postgres client library we need to link against it as well
-@@ -767,7 +767,7 @@
- plugindir = $(pkglibexecdir)/plugins
- datadir = $(PREFIX)/share
- docdir = $(datadir)/doc/$(PKGNAME)
--mandir = $(datadir)/man
-+mandir = $(PREFIX)/man
- man1dir = $(mandir)/man1
- man5dir = $(mandir)/man5
- man7dir = $(mandir)/man7
diff --git a/net-p2p/c-lightning/pkg-plist b/net-p2p/c-lightning/pkg-plist
index 7237f4b3bba3..8f89ccf050c5 100644
--- a/net-p2p/c-lightning/pkg-plist
+++ b/net-p2p/c-lightning/pkg-plist
@@ -18,13 +18,7 @@ libexec/c-lightning/plugins/bookkeeper
 libexec/c-lightning/plugins/chanbackup
 libexec/c-lightning/plugins/cln-askrene
 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/cln-xpay
 libexec/c-lightning/plugins/clnrest/Makefile
 libexec/c-lightning/plugins/clnrest/__init__.py
 libexec/c-lightning/plugins/clnrest/clnrest
@@ -37,6 +31,7 @@ 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/exposesecret
 libexec/c-lightning/plugins/funder
 libexec/c-lightning/plugins/keysend
 libexec/c-lightning/plugins/offers
@@ -59,12 +54,18 @@ share/man/man1/lightning-cli.1.gz
 share/man/man5/lightningd-config.5.gz
 share/man/man7/lightning-addgossip.7.gz
 share/man/man7/lightning-addpsbtoutput.7.gz
+share/man/man7/lightning-askrene-age.7.gz
+share/man/man7/lightning-askrene-bias-channel.7.gz
 share/man/man7/lightning-askrene-create-channel.7.gz
+share/man/man7/lightning-askrene-create-layer.7.gz
 share/man/man7/lightning-askrene-disable-node.7.gz
 share/man/man7/lightning-askrene-inform-channel.7.gz
 share/man/man7/lightning-askrene-listlayers.7.gz
+share/man/man7/lightning-askrene-listreservations.7.gz
+share/man/man7/lightning-askrene-remove-layer.7.gz
 share/man/man7/lightning-askrene-reserve.7.gz
 share/man/man7/lightning-askrene-unreserve.7.gz
+share/man/man7/lightning-askrene-update-channel.7.gz
 share/man/man7/lightning-autoclean-once.7.gz
 share/man/man7/lightning-autoclean-status.7.gz
 share/man/man7/lightning-batching.7.gz
@@ -97,10 +98,12 @@ share/man/man7/lightning-delinvoice.7.gz
 share/man/man7/lightning-delpay.7.gz
 share/man/man7/lightning-deprecations.7.gz
 share/man/man7/lightning-dev-forget-channel.7.gz
+share/man/man7/lightning-dev-splice.7.gz
 share/man/man7/lightning-disableinvoicerequest.7.gz
 share/man/man7/lightning-disableoffer.7.gz
 share/man/man7/lightning-disconnect.7.gz
 share/man/man7/lightning-emergencyrecover.7.gz
+share/man/man7/lightning-exposesecret.7.gz
 share/man/man7/lightning-feerates.7.gz
 share/man/man7/lightning-fetchinvoice.7.gz
 share/man/man7/lightning-fundchannel.7.gz
@@ -109,14 +112,18 @@ share/man/man7/lightning-fundchannel_complete.7.gz
 share/man/man7/lightning-fundchannel_start.7.gz
 share/man/man7/lightning-funderupdate.7.gz
 share/man/man7/lightning-fundpsbt.7.gz
+share/man/man7/lightning-getemergencyrecoverdata.7.gz
 share/man/man7/lightning-getinfo.7.gz
 share/man/man7/lightning-getlog.7.gz
 share/man/man7/lightning-getroute.7.gz
 share/man/man7/lightning-getroutes.7.gz
 share/man/man7/lightning-help.7.gz
+share/man/man7/lightning-injectonionmessage.7.gz
+share/man/man7/lightning-injectpaymentonion.7.gz
 share/man/man7/lightning-invoice.7.gz
 share/man/man7/lightning-invoicerequest.7.gz
 share/man/man7/lightning-keysend.7.gz
+share/man/man7/lightning-listaddresses.7.gz
 share/man/man7/lightning-listchannels.7.gz
 share/man/man7/lightning-listclosedchannels.7.gz
 share/man/man7/lightning-listconfigs.7.gz
@@ -187,6 +194,7 @@ share/man/man7/lightning-waitblockheight.7.gz
 share/man/man7/lightning-waitinvoice.7.gz
 share/man/man7/lightning-waitsendpay.7.gz
 share/man/man7/lightning-withdraw.7.gz
+share/man/man7/lightning-xpay.7.gz
 share/man/man7/lightningd-rpc.7.gz
 share/man/man7/reckless.7.gz
 share/man/man8/lightning-hsmtool.8.gz