From nobody Tue Oct 03 11:11:56 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 4S0FWw6ClTz4w6yn; Tue, 3 Oct 2023 11:11:56 +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 4S0FWw5k1cz4N71; Tue, 3 Oct 2023 11:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696331516; 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=bFS+Mh2USAhSvXBbimEkRCuX2QyivQnE5t8XyByiZLU=; b=Ubs3XA7QUsE84Wl/9tEbtSYiW4A5igzjbLVL/VtThbWeGPvVUCvmCJn/qhlVWZ+ibb1Nsk E0lsyzRMrxR+7Oyo6mB4V8BObYCr8PHHEX5ICEWeJaBvpPuGEgao1LWW1bMjFeVGlYDPt3 fKBbC5P0/brbgaKGuIJFUNoxJG5yOQYMn1d78OhXPcCkV+ZNbnoqTT8N/jS9mah0xiSD4L n13TGIH0ZoW0lCxkUkam+/s+ego75w4dRAFuwI8yHkiUwq28BKswDNem+fKMegVuUwP8kB hgSgmib/kZsnIC8CKtSLuVRSzLMFGbOUwN65tCW0thjmt+73GQqab4U+9a0Ulw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696331516; a=rsa-sha256; cv=none; b=ikqOVEISKIzzyn/qGbJoiQHWzo5HGZGAVByVG5UjLv5Qkv1KriQn25twXyx+RexbIreanS kJfFUOqI3ghcEFCcDP4Yhv0B9DKijq7aOHjanIxHL4EYQuxcJe7SqU712YK3aQQgOFu+0w 18Z8hNBZ+LmZaZp2ZmXqfG5UCTwFUeoNIeCydVZhwbo+aqmhvQgF0+7qz82Z/FHwH5YQ6o aseujD/CxG3Ceqv6g0ZraATmHOCYDfj1LsRXDm43sFCXUvVc05YqIusPeKeT6yUFXlfYFA IY3ySSceMFg/7kj7HWaVgIp54ianI4V19F3dMcNbt9Nz5exCvnrJeyC9ryyNfA== 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=1696331516; 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=bFS+Mh2USAhSvXBbimEkRCuX2QyivQnE5t8XyByiZLU=; b=yz23cFa3O5gIPbDW+112yu8hl9HVOS+zLB6vjlXjXSFV92JIrUx0P43hFy768jV/8agsQJ eyv0Gg0ZEV/AZqQOtivZRphuvewGlI3cbt0iOg71rtbywARV8JvgOSiuxY7d+lnim6fo3y O65D7sR6/IvR9IuUpViJDFYlFwDdM2ZwjaIT0SZjcr/Tldzj/9DvBskDeiG2AEctHIzUOY ecbhSR7uvilURqLVrXKzeWmtf1Zxb3QSntQP2qdth2ZQ2+DAOSQUnHRTJCQP3wPSGWYNot 03dAsjMyg2NGEnt3fNPc/WuJP24J0oF3pQhKOHKhdZvEIKSMd9ZwenAfZvq3fw== 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 4S0FWw4nd5zs69; Tue, 3 Oct 2023 11:11:56 +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 393BBuSR067772; Tue, 3 Oct 2023 11:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 393BBuCD067769; Tue, 3 Oct 2023 11:11:56 GMT (envelope-from git) Date: Tue, 3 Oct 2023 11:11:56 GMT Message-Id: <202310031111.393BBuCD067769@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: 62068131522c - main - net-p2p/c-lightning: Upgrade from 23.08 to 23.08.1 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: 62068131522cf018f55a37baca7d76a24029507c Auto-Submitted: auto-generated The branch main has been updated by vd: URL: https://cgit.FreeBSD.org/ports/commit/?id=62068131522cf018f55a37baca7d76a24029507c commit 62068131522cf018f55a37baca7d76a24029507c Author: Vasil Dimov AuthorDate: 2023-10-03 11:03:48 +0000 Commit: Vasil Dimov CommitDate: 2023-10-03 11:11:38 +0000 net-p2p/c-lightning: Upgrade from 23.08 to 23.08.1 --- net-p2p/c-lightning/Makefile | 5 ++-- net-p2p/c-lightning/distinfo | 6 ++--- .../files/extra-patch-ccan_ccan_base64_base64.c | 29 ---------------------- net-p2p/c-lightning/pkg-plist | 1 - 4 files changed, 5 insertions(+), 36 deletions(-) diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile index 31c475eae28d..9381d40d74e7 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.08 +PORTVERSION= 23.08.1 DISTVERSIONPREFIX= v # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c) #PORTVERSION= 0 @@ -35,8 +35,7 @@ ALL_TARGET= default 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_aarch64= ${FILESDIR}/extra-patch-external_libwally-core_src_ccan_ccan_base64_base64.c EXTRA_PATCHES= ${EXTRA_PATCHES_${ARCH}} OPTIONS_DEFINE= COMPATIBILITY DEVELOPER diff --git a/net-p2p/c-lightning/distinfo b/net-p2p/c-lightning/distinfo index 1fd7906d2448..99fa51606c39 100644 --- a/net-p2p/c-lightning/distinfo +++ b/net-p2p/c-lightning/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1693235199 -SHA256 (ElementsProject-lightning-v23.08_GH0.tar.gz) = d46e257d6c20932b01e6d3bcbde7c71534128c1a63afa22d5a8ba57f193ebc6d -SIZE (ElementsProject-lightning-v23.08_GH0.tar.gz) = 5413090 +TIMESTAMP = 1696329901 +SHA256 (ElementsProject-lightning-v23.08.1_GH0.tar.gz) = 7fc61d759b39b72cf0532c4a79fd78aa2cf3476d9b0ad3f0de030ed059b4306c +SIZE (ElementsProject-lightning-v23.08.1_GH0.tar.gz) = 5423026 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 diff --git a/net-p2p/c-lightning/files/extra-patch-ccan_ccan_base64_base64.c b/net-p2p/c-lightning/files/extra-patch-ccan_ccan_base64_base64.c deleted file mode 100644 index c29c8cb458ae..000000000000 --- a/net-p2p/c-lightning/files/extra-patch-ccan_ccan_base64_base64.c +++ /dev/null @@ -1,29 +0,0 @@ ---- ccan/ccan/base64/base64.c.orig 2023-07-18 11:01:33 UTC -+++ ccan/ccan/base64/base64.c -@@ -31,7 +31,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; - } -@@ -41,7 +41,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]) -@@ -49,7 +49,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 f6fe1c25f70d..cef1ae868cf2 100644 --- a/net-p2p/c-lightning/pkg-plist +++ b/net-p2p/c-lightning/pkg-plist @@ -24,7 +24,6 @@ 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