mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

net-p2p/c-lightning: upgrade from 24.05 to 24.08

Browse Source
This commit is contained in:
Vasil Dimov 2024-09-03 13:33:11 +02:00
parent 8aa1ffaa53
commit 3a870bc040
No known key found for this signature in database
GPG Key ID: 54DF06F64B55CBBF
6 changed files with 40 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
net-p2p/c-lightning/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= c-lightning
# To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present)
PORTVERSION= 24.05
PORTVERSION= 24.08
DISTVERSIONPREFIX= v
# and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c)
#PORTVERSION= 0
@ -100,7 +100,7 @@ ASAN_CONFIGURE_ENABLE= address-sanitizer
ASAN_DESC= Compile with address-sanitizer
VALGRIND_CONFIGURE_ENABLE= valgrind
VALGRIND_DESC= Run tests with Valgrind
WSSPROXYDEPS_DESC= Install and depend on packages required by the wss-proxy plugin
WSSPROXYDEPS_DESC= Install and depend on packages required by the wss-proxy plugin
# run files/check_python_plugins_deps.sh to verify the list below
WSSPROXYDEPS_RUN_DEPENDS=\
${PYTHON_PKGNAMEPREFIX}asn1crypto>0:devel/py-asn1crypto@${PY_FLAVOR} \
@ -140,8 +140,8 @@ GIT_COMMIT= ${PKGNAMESUFFIX:C/-git-//}
GIT_COMMIT= ${DISTVERSIONPREFIX}${PORTVERSION}
.endif
GH_TUPLE= ElementsProject:lightning:${GIT_COMMIT} \
ElementsProject:libwally-core:ec348c884e93a:ext1/external/libwally-core \
ElementsProject:secp256k1-zkp:1e04d324476f9:ext2/external/libwally-core/src/secp256k1 \
ElementsProject:libwally-core:11e1bf6d60a13:ext1/external/libwally-core \
BlockstreamResearch:secp256k1-zkp:1e04d3244:ext2/external/libwally-core/src/secp256k1 \
ianlancetaylor:libbacktrace:2446c66076480ce:ext3/external/libbacktrace \
zserge:jsmn:18e9fe42cbfe21d65076f5c77ae2be3:ext4/external/jsmn \
valyala:gheap:67fc83bc953324f4759e52951921d:ext5/external/gheap
@ -183,13 +183,14 @@ post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/bcli
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/bookkeeper
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/chanbackup
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/cln-askrene
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/cln-renepay
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/commando
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/fetchinvoice
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/funder
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/keysend
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/offers
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/pay
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/recklessrpc
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/recover
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/spenderp
${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/sql

14
net-p2p/c-lightning/distinfo
View File

@ -1,10 +1,10 @@
TIMESTAMP = 1718103408
SHA256 (ElementsProject-lightning-v24.05_GH0.tar.gz) = a1eeaa7e6c26f7db9693979ce0606dee726310404b8718850f8bb19985458b66
SIZE (ElementsProject-lightning-v24.05_GH0.tar.gz) = 13234942
SHA256 (ElementsProject-libwally-core-ec348c884e93a_GH0.tar.gz) = 6a56dcc73f589951db058eb66a3e95e33890c416492f9d1cdf4c68f0b31847c8
SIZE (ElementsProject-libwally-core-ec348c884e93a_GH0.tar.gz) = 1037396
SHA256 (ElementsProject-secp256k1-zkp-1e04d324476f9_GH0.tar.gz) = b987949687db5290fd9cf84029df7ccfecc6787358f9350c7190645969957e0a
SIZE (ElementsProject-secp256k1-zkp-1e04d324476f9_GH0.tar.gz) = 2769795
TIMESTAMP = 1725360763
SHA256 (ElementsProject-lightning-v24.08_GH0.tar.gz) = 234cacdd0b51a0e6dfa992262f82e74df2f16c071459806b7ea01eff816bfde2
SIZE (ElementsProject-lightning-v24.08_GH0.tar.gz) = 13333851
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
SIZE (BlockstreamResearch-secp256k1-zkp-1e04d3244_GH0.tar.gz) = 2767210
SHA256 (ianlancetaylor-libbacktrace-2446c66076480ce_GH0.tar.gz) = 3be5fde76f559cdaef40386c1f2e85e35cc2c8df6fbf0ae98134f80a1c037cf0
SIZE (ianlancetaylor-libbacktrace-2446c66076480ce_GH0.tar.gz) = 665689
SHA256 (zserge-jsmn-18e9fe42cbfe21d65076f5c77ae2be3_GH0.tar.gz) = 2e90b8b42876f384ba229097cd9f8534250683abb135256843b538cb45dd907f

9
net-p2p/c-lightning/files/check_python_plugins_deps.sh
View File

@ -1,12 +1,17 @@
#!/usr/bin/env bash
set -e
declare -A requirements=(["plugins/clnrest/requirements.txt"]="CLNRESTDEPS_RUN_DEPENDS"
["plugins/wss-proxy/requirements.txt"]="WSSPROXYDEPS_RUN_DEPENDS")
WRKSRC=$(make -V WRKSRC)
for file in ${!requirements[@]} ; do
(cd ${WRKSRC}/$(dirname ${file}) && poetry export --output $(basename ${file}))
make_var="${requirements[${file}]}"
ok=1
for req in $(grep -E '^[^[:space:]]' "$(make -V WRKSRC)/${file}" |cut -f 1 -d =) ; do
for req in $(grep -E '^[^[:space:]]' "${WRKSRC}/${file}" |cut -f 1 -d =) ; do
# "cryptography" is handled separately via USE_PYTHON+=cryptography
# "pkgutil-resolve-name" is included in Python 3.9
if [ "${req}" != "cryptography" -a \
@ -18,6 +23,6 @@ for file in ${!requirements[@]} ; do
fi
done
if [ ${ok} -eq 1 ] ; then
echo "ok: ${file}"
echo "ok: ${make_var} matches ${WRKSRC}/${file}"
fi
done

16
net-p2p/c-lightning/files/patch-Makefile
View File

@ -1,18 +1,18 @@
--- Makefile.orig 2023-08-23 06:24:14 UTC
+++ Makefile
@@ -268,9 +268,9 @@ ifeq ($(STATIC),1)
--- Makefile.orig 2024-08-29 06:49:21.000000000 +0200
+++ Makefile 2024-09-03 12:56:39.050177000 +0200
@@ -271,9 +271,9 @@
# 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.
-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)
-LDLIBS = -L$(CPATH) -Wl,-dn $(SQLITE3_LDLIBS) -Wl,-dy -lm -lpthread -ldl $(COVFLAGS)
+LDLIBS = -L$(LIBRARY_PATH) -Wl,-dn $(SQLITE3_LDLIBS) -Wl,-dy -lm -lpthread -ldl $(COVFLAGS)
else
-LDLIBS = -L$(CPATH) -lm $(SQLITE3_LDLIBS) -lz $(COVFLAGS)
+LDLIBS = -L$(LIBRARY_PATH) -lm $(SQLITE3_LDLIBS) -lz $(COVFLAGS)
-LDLIBS = -L$(CPATH) -lm $(SQLITE3_LDLIBS) $(COVFLAGS)
+LDLIBS = -L$(LIBRARY_PATH) -lm $(SQLITE3_LDLIBS) $(COVFLAGS)
endif
# If we have the postgres client library we need to link against it as well
@@ -760,7 +760,7 @@ docdir = $(datadir)/doc/$(PKGNAME)
@@ -767,7 +767,7 @@
plugindir = $(pkglibexecdir)/plugins
datadir = $(PREFIX)/share
docdir = $(datadir)/doc/$(PKGNAME)

4
net-p2p/c-lightning/files/patch-configure
View File

@ -1,4 +1,4 @@
--- configure.orig 2023-06-22 13:48:20 UTC
--- configure.orig 2024-06-05 01:23:24 UTC
+++ configure
@@ -15,7 +15,7 @@ else
LIBRARY_PATH=/opt/homebrew/lib
@ -7,5 +7,5 @@
-CPATH=/usr/local/lib
+CPATH=/usr/local/include
LIBRARY_PATH=/usr/local/lib
export PKG_CONFIG_PATH=/usr/local/opt/sqlite/lib/pkgconfig
export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/usr/local/opt/sqlite/lib/pkgconfig
fi

14
net-p2p/c-lightning/pkg-plist
View File

@ -16,6 +16,7 @@ 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-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
@ -30,18 +31,17 @@ libexec/c-lightning/plugins/clnrest/clnrest
libexec/c-lightning/plugins/clnrest/clnrest.py
libexec/c-lightning/plugins/clnrest/poetry.lock
libexec/c-lightning/plugins/clnrest/pyproject.toml
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
libexec/c-lightning/plugins/keysend
libexec/c-lightning/plugins/offers
libexec/c-lightning/plugins/pay
libexec/c-lightning/plugins/recklessrpc
libexec/c-lightning/plugins/recover
libexec/c-lightning/plugins/spenderp
libexec/c-lightning/plugins/sql
@ -50,7 +50,6 @@ libexec/c-lightning/plugins/txprepare
libexec/c-lightning/plugins/wss-proxy/Makefile
libexec/c-lightning/plugins/wss-proxy/poetry.lock
libexec/c-lightning/plugins/wss-proxy/pyproject.toml
libexec/c-lightning/plugins/wss-proxy/requirements.txt
libexec/c-lightning/plugins/wss-proxy/wss-proxy
libexec/c-lightning/plugins/wss-proxy/wss-proxy.py
libexec/c-lightning/plugins/wss-proxy/wss_proxy/__init__.py
@ -60,6 +59,12 @@ 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-create-channel.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-reserve.7.gz
share/man/man7/lightning-askrene-unreserve.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
@ -107,6 +112,7 @@ share/man/man7/lightning-fundpsbt.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-invoice.7.gz
share/man/man7/lightning-invoicerequest.7.gz
@ -145,6 +151,7 @@ share/man/man7/lightning-ping.7.gz
share/man/man7/lightning-plugin.7.gz
share/man/man7/lightning-preapproveinvoice.7.gz
share/man/man7/lightning-preapprovekeysend.7.gz
share/man/man7/lightning-reckless.7.gz
share/man/man7/lightning-recover.7.gz
share/man/man7/lightning-recoverchannel.7.gz
share/man/man7/lightning-renepay.7.gz
@ -153,7 +160,6 @@ share/man/man7/lightning-reserveinputs.7.gz
share/man/man7/lightning-sendcustommsg.7.gz
share/man/man7/lightning-sendinvoice.7.gz
share/man/man7/lightning-sendonion.7.gz
share/man/man7/lightning-sendonionmessage.7.gz
share/man/man7/lightning-sendpay.7.gz
share/man/man7/lightning-sendpsbt.7.gz
share/man/man7/lightning-setchannel.7.gz