net-p2p/c-lightning: Upgrade from 0.8.2.1 to 0.9.1

4 files changed, 42 insertions, 20 deletions

diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile
index 09d6d34bf547..fb09f39397c7 100644
--- a/net-p2p/c-lightning/Makefile
+++ b/net-p2p/c-lightning/Makefile
@@ -3,13 +3,16 @@
 
 PORTNAME=	c-lightning
 # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present)
-PORTVERSION=	0.8.2.1
+PORTVERSION=	0.9.1
 DISTVERSIONPREFIX=	v
 # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c)
 #PORTVERSION=	0
 #PKGNAMESUFFIX=	-git-f8d8348c
 CATEGORIES=	net-p2p finance
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES=	4b4fe2f4f.patch:-p1
+
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Lightning Network implementation in C
 
@@ -52,9 +55,10 @@ GIT_COMMIT=	${PKGNAMESUFFIX:C/-git-//}
 GIT_COMMIT=	${DISTVERSIONPREFIX}${PORTVERSION}
 .endif
 GH_TUPLE=	ElementsProject:lightning:${GIT_COMMIT} \
-		ElementsProject:libwally-core:release_0.7.5:ext1/external/libwally-core \
+		ElementsProject:libwally-core:b8d7ea91049c3:ext1/external/libwally-core \
 		ianlancetaylor:libbacktrace:5a99ff7fed66b8e:ext2/external/libbacktrace \
-		zserge:jsmn:v1.0.0:ext3/external/jsmn
+		zserge:jsmn:v1.0.0:ext3/external/jsmn \
+		valyala:gheap:67fc83bc953324f4759e52951921d:ext4/external/gheap
 
 USERS=		c-lightning
 GROUPS=		c-lightning
@@ -65,6 +69,9 @@ SUB_FILES=	lightningd-bitcoin.conf.sample pkg-message
 SUB_LIST=	U="${USERS}" G="${GROUPS}" LIGHTNINGD_BASE_DIR="${DESTDIR}/var/db/c-lightning"
 PLIST_SUB=	U="${USERS}" G="${GROUPS}"
 
+post-patch:
+	${REINPLACE_CMD} 's/sha256sum/sha256 -r/' ${WRKSRC}/Makefile
+
 post-install:
 	${INSTALL_DATA} \
 		${WRKDIR}/lightningd-bitcoin.conf.sample \
diff --git a/net-p2p/c-lightning/distinfo b/net-p2p/c-lightning/distinfo
index f8c8fb48abcf..fe69841b2eec 100644
--- a/net-p2p/c-lightning/distinfo
+++ b/net-p2p/c-lightning/distinfo
@@ -1,9 +1,13 @@
-TIMESTAMP = 1590394947
-SHA256 (ElementsProject-lightning-v0.8.2.1_GH0.tar.gz) = 9ca4b00720228eda0f02f3891fe1895bcac823ca122c683be9568b761d0cea08
-SIZE (ElementsProject-lightning-v0.8.2.1_GH0.tar.gz) = 2735836
-SHA256 (ElementsProject-libwally-core-release_0.7.5_GH0.tar.gz) = e37b30be66dff973ad979d176f0d8e87331304769214522a0782bbbb79c18ec6
-SIZE (ElementsProject-libwally-core-release_0.7.5_GH0.tar.gz) = 963370
+TIMESTAMP = 1601908405
+SHA256 (ElementsProject-lightning-v0.9.1_GH0.tar.gz) = 0e2cb636a14b2179b5809cd049ea2ca7864810dfc8fd2935f90e376cbd90c2c3
+SIZE (ElementsProject-lightning-v0.9.1_GH0.tar.gz) = 3211414
+SHA256 (ElementsProject-libwally-core-b8d7ea91049c3_GH0.tar.gz) = 34cf8cee0dc4809eb9e38b09507d64803ece70972eedb681382e622dfe9f5d2d
+SIZE (ElementsProject-libwally-core-b8d7ea91049c3_GH0.tar.gz) = 1041393
 SHA256 (ianlancetaylor-libbacktrace-5a99ff7fed66b8e_GH0.tar.gz) = 2aad59f02cb008b5e912821c205ad6a140afcae69844e7ba9f7e590239ec41e2
 SIZE (ianlancetaylor-libbacktrace-5a99ff7fed66b8e_GH0.tar.gz) = 509368
 SHA256 (zserge-jsmn-v1.0.0_GH0.tar.gz) = 5b1f46312cf205e6a0923a0656893bde9e022c76d06d980958fa8dbf79f0ea06
 SIZE (zserge-jsmn-v1.0.0_GH0.tar.gz) = 11035
+SHA256 (valyala-gheap-67fc83bc953324f4759e52951921d_GH0.tar.gz) = b6f7a700cc2224ce04827d72cf78f7b2420b37b36b1f5ea7f9cfc98513cbf449
+SIZE (valyala-gheap-67fc83bc953324f4759e52951921d_GH0.tar.gz) = 25470
+SHA256 (4b4fe2f4f.patch) = f069501b80061b2da38874923851d9a4a47e28c69427d7fb46c852bd387954c8
+SIZE (4b4fe2f4f.patch) = 1251
diff --git a/net-p2p/c-lightning/files/patch-plugins_keysend.c b/net-p2p/c-lightning/files/patch-plugins_keysend.c
deleted file mode 100644
index a040c4d6a494..000000000000
--- a/net-p2p/c-lightning/files/patch-plugins_keysend.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/keysend.c.orig	2020-06-25 14:05:27 UTC
-+++ plugins/keysend.c
-@@ -133,7 +133,7 @@ static struct command_result *htlc_accepted_call(struc
- 
- 	ki = tal(cmd, struct keysend_in);
- 	memcpy(&ki->payment_preimage, preimage_field->value, 32);
--	ki->label = tal_fmt(ki, "keysend-%lu.%09lu", now.ts.tv_sec, now.ts.tv_nsec);
-+	ki->label = tal_fmt(ki, "keysend-%lu.%09lu", (unsigned long)now.ts.tv_sec, now.ts.tv_nsec);
- 	ki->payload = tal_steal(ki, payload);
- 	ki->preimage_field = preimage_field;
- 
diff --git a/net-p2p/c-lightning/pkg-plist b/net-p2p/c-lightning/pkg-plist
index fe83622ba130..cca0ddc87704 100644
--- a/net-p2p/c-lightning/pkg-plist
+++ b/net-p2p/c-lightning/pkg-plist
@@ -1,5 +1,6 @@
 @sample(%%U%%,%%G%%,0400) etc/lightningd-bitcoin.conf.sample
 bin/lightning-cli
+bin/lightning-hsmtool
 bin/lightningd
 libexec/c-lightning/lightning_channeld
 libexec/c-lightning/lightning_closingd
@@ -10,9 +11,10 @@ libexec/c-lightning/lightning_onchaind
 libexec/c-lightning/lightning_openingd
 libexec/c-lightning/plugins/autoclean
 libexec/c-lightning/plugins/bcli
-libexec/c-lightning/plugins/fundchannel
 libexec/c-lightning/plugins/keysend
 libexec/c-lightning/plugins/pay
+libexec/c-lightning/plugins/spenderp
+libexec/c-lightning/plugins/txprepare
 man/man1/lightning-cli.1.gz
 man/man5/lightningd-config.5.gz
 man/man7/lightning-autocleaninvoice.7.gz
@@ -24,37 +26,57 @@ man/man7/lightning-createonion.7.gz
 man/man7/lightning-decodepay.7.gz
 man/man7/lightning-delexpiredinvoice.7.gz
 man/man7/lightning-delinvoice.7.gz
+man/man7/lightning-delpay.7.gz
 man/man7/lightning-dev-sendcustommsg.7.gz
 man/man7/lightning-disconnect.7.gz
+man/man7/lightning-feerates.7.gz
 man/man7/lightning-fundchannel.7.gz
 man/man7/lightning-fundchannel_cancel.7.gz
 man/man7/lightning-fundchannel_complete.7.gz
 man/man7/lightning-fundchannel_start.7.gz
+man/man7/lightning-fundpsbt.7.gz
+man/man7/lightning-getinfo.7.gz
+man/man7/lightning-getlog.7.gz
 man/man7/lightning-getroute.7.gz
 man/man7/lightning-getsharedsecret.7.gz
+man/man7/lightning-help.7.gz
 man/man7/lightning-invoice.7.gz
+man/man7/lightning-keysend.7.gz
 man/man7/lightning-listchannels.7.gz
+man/man7/lightning-listconfigs.7.gz
 man/man7/lightning-listforwards.7.gz
 man/man7/lightning-listfunds.7.gz
 man/man7/lightning-listinvoices.7.gz
+man/man7/lightning-listnodes.7.gz
 man/man7/lightning-listpays.7.gz
 man/man7/lightning-listpeers.7.gz
 man/man7/lightning-listsendpays.7.gz
+man/man7/lightning-listtransactions.7.gz
+man/man7/lightning-multifundchannel.7.gz
+man/man7/lightning-multiwithdraw.7.gz
 man/man7/lightning-newaddr.7.gz
 man/man7/lightning-pay.7.gz
+man/man7/lightning-ping.7.gz
 man/man7/lightning-plugin.7.gz
+man/man7/lightning-reserveinputs.7.gz
 man/man7/lightning-sendonion.7.gz
 man/man7/lightning-sendpay.7.gz
+man/man7/lightning-sendpsbt.7.gz
 man/man7/lightning-setchannelfee.7.gz
 man/man7/lightning-signmessage.7.gz
+man/man7/lightning-signpsbt.7.gz
+man/man7/lightning-stop.7.gz
 man/man7/lightning-txdiscard.7.gz
 man/man7/lightning-txprepare.7.gz
 man/man7/lightning-txsend.7.gz
+man/man7/lightning-unreserveinputs.7.gz
+man/man7/lightning-utxopsbt.7.gz
 man/man7/lightning-waitanyinvoice.7.gz
 man/man7/lightning-waitblockheight.7.gz
 man/man7/lightning-waitinvoice.7.gz
 man/man7/lightning-waitsendpay.7.gz
 man/man7/lightning-withdraw.7.gz
+man/man8/lightning-hsmtool.8.gz
 man/man8/lightningd.8.gz
 share/doc/c-lightning/HACKING.md
 share/doc/c-lightning/INSTALL.md