git: 62068131522c - main - net-p2p/c-lightning: Upgrade from 23.08 to 23.08.1

The branch main has been updated by vd:

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

commit 62068131522cf018f55a37baca7d76a24029507c
Author:     Vasil Dimov <vd@FreeBSD.org>
AuthorDate: 2023-10-03 11:03:48 +0000
Commit:     Vasil Dimov <vd@FreeBSD.org>
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