From nobody Wed Feb 28 10:46:44 2024 X-Original-To: dev-commits-ports-all@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 4Tl9yX2G4Hz5D5nN; Wed, 28 Feb 2024 10:46:44 +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 4Tl9yX1dgLz4Nb3; Wed, 28 Feb 2024 10:46:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709117204; 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=G8LzQZU1/Fm7fX2EGBukgAvBPtXKCBmisbGmblYLn8E=; b=shLIcIgD6OsR0sTCB1iu/OtGQ2uw2KXB+JRfNYzShjRo35eErcoHNInvTebIhwCbVBK8NI h0bV5F7JPGDnXsHGLiVaNiDxl0jOIq7gvY/Ydk4xWZtul3+W9H9SxuHEAsr0B/9zajVLDT GVUvnYrsfsQ9VdeCgx1aWGDeVYlE4T91jF3Re0RU/I8812Enx+gJf9u+D+TZSj5NOgXvWl m4Ks4Eb2wamZpNH2gatkO7seRYroyfBStbt0m7Z/hYgwSOfZD2zfUAFiatZOxEhRJ9PZ0L IESlG8fctXYYfPf4BD01w1VATyLrrtIpUYye+x8MOW9Cmu7GOktIaoAL0C51AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709117204; a=rsa-sha256; cv=none; b=xGR1FixCAxzK5ZDjGzLZVnG7aYT47LCUEj2cfdiX6JbwC8plM1gfS69HeR6s14XWWxQUfT GELr1WHLAqOvHoGdT99v5JJJ2XUBEjLiUPdfTJNnZp8aZW7ZoYCAUHXy4ZPkl22fKe2/Dz gJVKtUaeWK43i9vuyPeO/pSiNOw60E56U5RWAUiFghEd2T6RiXxHhWqYW/yn8HXsUPNMsl gNIL5VQiRDzIn8ikvMlI5s/9952w8DEE9C16qNceO6pBm25o8iCqDgW1f+l4L9P1ZI+5xC 9QRzR76hP3m/bhG7FQqja4XHeOYZYQx2Nnc5WcYuiinxlyRC6kHEpWDlWs/fqA== 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=1709117204; 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=G8LzQZU1/Fm7fX2EGBukgAvBPtXKCBmisbGmblYLn8E=; b=WFcb3dFEWTBFQUYsn2dxWiOgPyy/qgzRw/J53pZvJq9/WOPTbE+sBhnU5r6AoKEpOWHJJm T+UedBWIw9e4NRCzeY86DM8Lz3NGcG9anpQ8+nzjA0oziBsAWXhIXYCQ0hW0cLBXRBA2GS nkmnaUCOO2vXTY/p24S4yjfsLjFCoRbf4NGMcsGs3qNL27ctPNQ4nNELdVlasp/lSkpGwl J9buqCNTtCa/kLpgJO4v9CqFXcMSF0oKxWIAskquZLaj730YniTwaVLp58fqnLJSQGScGR llcqxyPUz1rDVzQZ1uFutv1M2ja+wv99w2Y+nn6h8vdvtMMGM3m6PB/OCo38VA== 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 4Tl9yX0hwzztBR; Wed, 28 Feb 2024 10:46:44 +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 41SAkiP0010544; Wed, 28 Feb 2024 10:46:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SAkijQ010541; Wed, 28 Feb 2024 10:46:44 GMT (envelope-from git) Date: Wed, 28 Feb 2024 10:46:44 GMT Message-Id: <202402281046.41SAkijQ010541@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: 76e8026e3415 - main - net-p2p/c-lightning: upgrade from 23.11.2 to 24.02 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 76e8026e3415271e09ab5fac130e09efe2b4222d Auto-Submitted: auto-generated The branch main has been updated by vd: URL: https://cgit.FreeBSD.org/ports/commit/?id=76e8026e3415271e09ab5fac130e09efe2b4222d commit 76e8026e3415271e09ab5fac130e09efe2b4222d Author: Vasil Dimov AuthorDate: 2024-02-28 10:45:12 +0000 Commit: Vasil Dimov CommitDate: 2024-02-28 10:46:12 +0000 net-p2p/c-lightning: upgrade from 23.11.2 to 24.02 --- net-p2p/c-lightning/Makefile | 25 +++++++++---------- net-p2p/c-lightning/distinfo | 14 +++++------ ...nal_libwally-core_src_ccan_ccan_base64_base64.c | 29 ---------------------- net-p2p/c-lightning/pkg-plist | 2 ++ 4 files changed, 21 insertions(+), 49 deletions(-) diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile index 46e60ede7156..87450d81dc56 100644 --- a/net-p2p/c-lightning/Makefile +++ b/net-p2p/c-lightning/Makefile @@ -1,8 +1,7 @@ PORTNAME= c-lightning # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present) -PORTVERSION= 23.11.2 +PORTVERSION= 24.02 DISTVERSIONPREFIX= v -PORTREVISION= 1 # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c) #PORTVERSION= 0 #PKGNAMESUFFIX= -git-f8d8348c @@ -18,17 +17,15 @@ BUILD_DEPENDS= bash:shells/bash \ lowdown:textproc/lowdown \ ${PYTHON_PKGNAMEPREFIX}mako>=1.0.14:textproc/py-mako@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mrkd>=0.2.0_1:devel/py-mrkd@${PY_FLAVOR} -LIB_DEPENDS= libgmp.so:math/gmp \ - libsodium.so:security/libsodium +LIB_DEPENDS= libsodium.so:security/libsodium RUN_DEPENDS= bitcoin-cli:net-p2p/bitcoin-utils USES= autoreconf:build \ compiler:c11 \ cpe \ - gettext \ + gettext-tools:build \ gmake \ libtool \ - python:build \ shebangfix CPE_VENDOR= elementsproject BINARY_ALIAS= python=${PYTHON_CMD} python3=${PYTHON_CMD} @@ -36,9 +33,6 @@ ALL_TARGET= default SHEBANG_FILES= plugins/clnrest/clnrest.py \ tools/reckless -EXTRA_PATCHES_aarch64= ${FILESDIR}/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c -EXTRA_PATCHES= ${EXTRA_PATCHES_${ARCH}} - OPTIONS_DEFINE= CLNRESTDEPS COMPATIBILITY DEBUG OPTIONS_MULTI= STORAGE OPTIONS_MULTI_STORAGE= POSTGRESQL SQLITE @@ -46,7 +40,8 @@ OPTIONS_RADIO= TESTING OPTIONS_RADIO_TESTING= ASAN VALGRIND CLNRESTDEPS_DESC= Install and depend on packages required by the clnrest plugin -# for d in `grep -E '^[^[:space:]]' work/lightning-23.11.2/plugins/clnrest/requirements.txt |cut -f 1 -d =` ; do echo "=== $d ===" ; portsearch -n "py.*$d" -o path ; done +# for d in $(grep -E '^[^[:space:]]' work/lightning-*/plugins/clnrest/requirements.txt |cut -f 1 -d =) ; do if [ -z "$(make -V CLNRESTDEPS_RUN_DEPENDS |grep -i "$(make -V PYTHON_PKGNAMEPREFIX)${d/-/.}>")" ] ; then echo "$d" ; fi ; done +# ignore cryptography (handled separately via USE_PYTHON+=cryptography) and pkgutil-resolve-name (included in Python 3.9) CLNRESTDEPS_RUN_DEPENDS=\ ${PYTHON_PKGNAMEPREFIX}Flask-Cors>0:www/py-flask-cors@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ @@ -110,7 +105,10 @@ OPTIONS_DEFAULT=COMPATIBILITY SQLITE .include .if ${PORT_OPTIONS:MCLNRESTDEPS} +USES+= python:3.9+ USE_PYTHON+= cryptography +.else +USES+= python:build .endif HAS_CONFIGURE= yes @@ -126,8 +124,8 @@ GIT_COMMIT= ${PKGNAMESUFFIX:C/-git-//} GIT_COMMIT= ${DISTVERSIONPREFIX}${PORTVERSION} .endif GH_TUPLE= ElementsProject:lightning:${GIT_COMMIT} \ - ElementsProject:libwally-core:bb4cd3ac802c7:ext1/external/libwally-core \ - ElementsProject:secp256k1-zkp:ff33018fe765d:ext2/external/libwally-core/src/secp256k1 \ + ElementsProject:libwally-core:ec348c884e93a:ext1/external/libwally-core \ + ElementsProject:secp256k1-zkp:1e04d324476f9:ext2/external/libwally-core/src/secp256k1 \ ianlancetaylor:libbacktrace:2446c66076480ce:ext3/external/libbacktrace \ zserge:jsmn:18e9fe42cbfe21d65076f5c77ae2be3:ext4/external/jsmn \ valyala:gheap:67fc83bc953324f4759e52951921d:ext5/external/gheap @@ -144,7 +142,7 @@ PLIST_SUB= U="${USERS}" G="${GROUPS}" .include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 )) -CPPFLAGS+= -Wno-error=unused-but-set-variable +CPPFLAGS+= -Wno-error=unused-but-set-variable .endif post-install: @@ -171,6 +169,7 @@ post-install: ${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/recover ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/spenderp ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/sql ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/c-lightning/plugins/topology diff --git a/net-p2p/c-lightning/distinfo b/net-p2p/c-lightning/distinfo index 203341264c21..20f22c5d9863 100644 --- a/net-p2p/c-lightning/distinfo +++ b/net-p2p/c-lightning/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1707727195 -SHA256 (ElementsProject-lightning-v23.11.2_GH0.tar.gz) = 0a37a8312415de505bc06d5dd04b313ce2157ef6612a26df88cd61d16618a736 -SIZE (ElementsProject-lightning-v23.11.2_GH0.tar.gz) = 6766561 -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 +TIMESTAMP = 1709099120 +SHA256 (ElementsProject-lightning-v24.02_GH0.tar.gz) = f6c1b8d1a839e3e4b7872a240dd4493f3e8bf30c1218cf3925e4df61e298bc8c +SIZE (ElementsProject-lightning-v24.02_GH0.tar.gz) = 7336498 +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 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/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c b/net-p2p/c-lightning/files/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c deleted file mode 100644 index d577ba598d09..000000000000 --- a/net-p2p/c-lightning/files/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c +++ /dev/null @@ -1,29 +0,0 @@ ---- external/libwally-core/src/ccan/ccan/base64/base64.c.orig 2023-07-18 11:13:39 UTC -+++ external/libwally-core/src/ccan/ccan/base64/base64.c -@@ -34,7 +34,7 @@ static int8_t sixbit_from_b64(const base64_maps_t *map - int8_t ret; - - ret = maps->decode_map[(unsigned char)b64letter]; -- if (ret == (char)0xff) { -+ if (ret == -1) { - errno = EDOM; - return -1; - } -@@ -44,7 +44,7 @@ bool base64_char_in_alphabet(const base64_maps_t *maps - - bool base64_char_in_alphabet(const base64_maps_t *maps, const char b64char) - { -- return (maps->decode_map[(const unsigned char)b64char] != (char)0xff); -+ return (maps->decode_map[(const unsigned char)b64char] != -1); - } - - void base64_init_maps(base64_maps_t *dest, const char src[64]) -@@ -52,7 +52,7 @@ void base64_init_maps(base64_maps_t *dest, const char - unsigned char i; - - memcpy(dest->encode_map,src,64); -- memset(dest->decode_map,0xff,256); -+ memset(dest->decode_map,-1,256); - for (i=0; i<64; i++) { - dest->decode_map[(unsigned char)src[i]] = i; - } diff --git a/net-p2p/c-lightning/pkg-plist b/net-p2p/c-lightning/pkg-plist index c55d8fa0d61b..66fcff8feceb 100644 --- a/net-p2p/c-lightning/pkg-plist +++ b/net-p2p/c-lightning/pkg-plist @@ -41,6 +41,7 @@ libexec/c-lightning/plugins/funder libexec/c-lightning/plugins/keysend libexec/c-lightning/plugins/offers libexec/c-lightning/plugins/pay +libexec/c-lightning/plugins/recover libexec/c-lightning/plugins/spenderp libexec/c-lightning/plugins/sql libexec/c-lightning/plugins/topology @@ -80,6 +81,7 @@ man/man7/lightning-delexpiredinvoice.7.gz man/man7/lightning-delforward.7.gz man/man7/lightning-delinvoice.7.gz man/man7/lightning-delpay.7.gz +man/man7/lightning-deprecations.7.gz man/man7/lightning-disableinvoicerequest.7.gz man/man7/lightning-disableoffer.7.gz man/man7/lightning-disconnect.7.gz