net-p2p/c-lightning: Upgrade from 0.8.0 to 0.8.1

6 files changed, 25 insertions, 80 deletions

diff --git a/net-p2p/c-lightning/Makefile b/net-p2p/c-lightning/Makefile
index 84590bbbf127..cf4272aac22c 100644
--- a/net-p2p/c-lightning/Makefile
+++ b/net-p2p/c-lightning/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	c-lightning
 # To build from an arbitrary git commit comment PORTVERSION and PORTREVISION (if present)
-PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTVERSION=	0.8.1
 DISTVERSIONPREFIX=	v
 # and uncomment the following two lines (use for example -git-HEAD or -git-f8d8348c)
 #PORTVERSION=	0
@@ -53,7 +52,7 @@ GIT_COMMIT=	${PKGNAMESUFFIX:C/-git-//}
 GIT_COMMIT=	${DISTVERSIONPREFIX}${PORTVERSION}
 .endif
 GH_TUPLE=	ElementsProject:lightning:${GIT_COMMIT} \
-		ElementsProject:libwally-core:release_0.7.4:ext1/external/libwally-core \
+		ElementsProject:libwally-core:release_0.7.5:ext1/external/libwally-core \
 		ianlancetaylor:libbacktrace:5a99ff7fed66b8e:ext2/external/libbacktrace \
 		zserge:jsmn:v1.0.0:ext3/external/jsmn
 
@@ -66,10 +65,6 @@ 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} -e 's|cd external|unset CFLAGS \&\& cd external|' \
-		${WRKSRC}/external/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 01ffaedc1ee6..827e9d2620f0 100644
--- a/net-p2p/c-lightning/distinfo
+++ b/net-p2p/c-lightning/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1577715475
-SHA256 (ElementsProject-lightning-v0.8.0_GH0.tar.gz) = 6abe19465748cfbe59a1d3943d8f390bf0f810d1ba1eda07fcc02144ab939173
-SIZE (ElementsProject-lightning-v0.8.0_GH0.tar.gz) = 2622314
-SHA256 (ElementsProject-libwally-core-release_0.7.4_GH0.tar.gz) = d1ec3085d8b12ec5e4f604f747850ef77eb734c61c23e79d6c8a3b6c69c6c699
-SIZE (ElementsProject-libwally-core-release_0.7.4_GH0.tar.gz) = 900716
+TIMESTAMP = 1582009617
+SHA256 (ElementsProject-lightning-v0.8.1_GH0.tar.gz) = fee0ddaa23c4d143f5ce1d2c2c5a219891d69e0eca0ac636b2a42bf19cb42ede
+SIZE (ElementsProject-lightning-v0.8.1_GH0.tar.gz) = 2683725
+SHA256 (ElementsProject-libwally-core-release_0.7.5_GH0.tar.gz) = e37b30be66dff973ad979d176f0d8e87331304769214522a0782bbbb79c18ec6
+SIZE (ElementsProject-libwally-core-release_0.7.5_GH0.tar.gz) = 963370
 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
diff --git a/net-p2p/c-lightning/files/patch-Makefile b/net-p2p/c-lightning/files/patch-Makefile
index 1abd8f570676..2e4df11bd555 100644
--- a/net-p2p/c-lightning/files/patch-Makefile
+++ b/net-p2p/c-lightning/files/patch-Makefile
@@ -1,15 +1,14 @@
---- Makefile.orig	2019-12-08 14:26:28 UTC
+--- Makefile.orig	2020-02-17 08:37:09 UTC
 +++ Makefile
-@@ -1,7 +1,7 @@
- #! /usr/bin/make
+@@ -192,6 +192,7 @@ ALL_PROGRAMS =
  
- # Extract version from git, or if we're from a zipfile, use dirname
--VERSION=$(shell git describe --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | sed -n 's,.*/clightning-\(v[0-9.rc]*\)$$,\1,p')
-+VERSION=$(shell git describe --always --dirty=-modded --abbrev=7 2>/dev/null || pwd | sed -n 's|.*/c\{0,1\}lightning-v\{0,1\}\([0-9a-f.rc]*\)$$|\1|gp')
+ CPPFLAGS += -DBINTOPKGLIBEXECDIR="\"$(shell sh tools/rel.sh $(bindir) $(pkglibexecdir))\""
+ CFLAGS = $(CPPFLAGS) $(CWARNFLAGS) $(CDEBUGFLAGS) $(COPTFLAGS) -I $(CCANDIR) $(EXTERNAL_INCLUDE_FLAGS) -I . -I/usr/local/include $(FEATURES) $(COVFLAGS) $(DEV_CFLAGS) -DSHACHAIN_BITS=48 -DJSMN_PARENT_LINKS $(PIE_CFLAGS) $(COMPAT_CFLAGS) -DBUILD_ELEMENTS=1
++unexport CFLAGS
  
- ifeq ($(VERSION),)
- $(error "ERROR: git is required for generating version information")
-@@ -453,7 +453,7 @@ pkglibexecdir = $(libexecdir)/$(PKGNAME)
+ # We can get configurator to run a different compile cmd to cross-configure.
+ CONFIGURATOR_CC := $(CC)
+@@ -457,7 +458,7 @@ pkglibexecdir = $(libexecdir)/$(PKGNAME)
  plugindir = $(pkglibexecdir)/plugins
  datadir = $(PREFIX)/share
  docdir = $(datadir)/doc/$(PKGNAME)
@@ -18,7 +17,7 @@
  man1dir = $(mandir)/man1
  man5dir = $(mandir)/man5
  man7dir = $(mandir)/man7
-@@ -462,7 +462,11 @@ man8dir = $(mandir)/man8
+@@ -466,7 +467,11 @@ man8dir = $(mandir)/man8
  # Commands
  MKDIR_P = mkdir -p
  INSTALL = install
diff --git a/net-p2p/c-lightning/files/patch-tools_mockup.sh b/net-p2p/c-lightning/files/patch-tools_mockup.sh
deleted file mode 100644
index 9ed0e33dd00f..000000000000
--- a/net-p2p/c-lightning/files/patch-tools_mockup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- tools/mockup.sh.orig	2019-12-13 15:40:41 UTC
-+++ tools/mockup.sh
-@@ -6,8 +6,13 @@ if [ $# -eq 0 ]; then
-     set -- $(while read -r LINE; do
- 	case "$LINE" in
- 	    *undefined\ reference\ to*)
-+		# file.cc:(.text+0x10): undefined reference to `foo()'
- 		LINE=${LINE#*undefined reference to \`}
- 		echo "${LINE%\'*}"
-+		;;
-+	    *undefined\ symbol:*)
-+		# ld: error: undefined symbol: foo()
-+		echo "${LINE#*undefined symbol: }"
- 		;;
- 	    *)
- 		continue
diff --git a/net-p2p/c-lightning/files/patch-tools_update-mocks.sh b/net-p2p/c-lightning/files/patch-tools_update-mocks.sh
deleted file mode 100644
index 8f8cc2e8c269..000000000000
--- a/net-p2p/c-lightning/files/patch-tools_update-mocks.sh
+++ /dev/null
@@ -1,36 +0,0 @@
---- tools/update-mocks.sh.orig	2019-12-13 20:01:11 UTC
-+++ tools/update-mocks.sh
-@@ -12,20 +12,31 @@ trap 'mv $BASE.old $FILE; rm -f $BASE.*' EXIT
- START=$(grep -F -n '/* AUTOGENERATED MOCKS START */' "$FILE" | cut -d: -f1)
- END=$(grep -F -n '/* AUTOGENERATED MOCKS END */' "$FILE" | cut -d: -f1)
- 
-+function make_binary() {
-+    $MAKE "${FILE/%.c/}" 2> "${BASE}.err" >/dev/null
-+}
-+
- if [ -n "$START" ]; then
-     mv "$FILE" "${BASE}.old"
-     echo "${FILE}:"
-     head -n "$START" "${BASE}.old" > "$FILE"
-     tail -n +"$END" "${BASE}.old" >> "$FILE"
-     # Try to make binary.
--    if ! $MAKE "${FILE/%.c/}" 2> "${BASE}.err" >/dev/null; then
-+    if ! make_binary; then
-+	# Some linkers (e.g. LLVM's one) don't print all errors. If this is the
-+	# case, then re-run, asking them to do so. Search for something like
-+	# this in the output:
-+	# ld: error: too many errors emitted, stopping now (use -error-limit=0 to see all errors)
-+	if grep -q 'too many errors emitted.*-error-limit=0' "${BASE}.err"; then
-+	    LDFLAGS=-Wl,-error-limit=0 make_binary || :
-+	fi
- 	tools/mockup.sh < "${BASE}.err" >> "${BASE}.stubs"
- 	# If there are no link errors, maybe compile fail for other reason?
- 	if ! grep -F -q 'Generated stub for' "${BASE}.stubs"; then
- 	    cat "${BASE}.err"
- 	    exit 1
- 	fi
--	sed -n 's,.*Generated stub for \(.*\) .*,\t\1,p' < "${BASE}.stubs"
-+	sed -n 's,.*Generated stub for \(.*\) .*,	\1,p' < "${BASE}.stubs"
- 	head -n "$START" "${BASE}.old" > "$FILE"
- 	cat "${BASE}.stubs" >> "$FILE"
- 	tail -n +"$END" "${BASE}.old" >> "$FILE"
diff --git a/net-p2p/c-lightning/pkg-plist b/net-p2p/c-lightning/pkg-plist
index b806cbed0aa1..61a7563b8645 100644
--- a/net-p2p/c-lightning/pkg-plist
+++ b/net-p2p/c-lightning/pkg-plist
@@ -1,16 +1,17 @@
 @sample(%%U%%,%%G%%,0400) etc/lightningd-bitcoin.conf.sample
 bin/lightning-cli
 bin/lightningd
-libexec/c-lightning/plugins/fundchannel
-libexec/c-lightning/plugins/autoclean
-libexec/c-lightning/plugins/pay
-libexec/c-lightning/lightning_connectd
 libexec/c-lightning/lightning_channeld
-libexec/c-lightning/lightning_hsmd
 libexec/c-lightning/lightning_closingd
+libexec/c-lightning/lightning_connectd
 libexec/c-lightning/lightning_gossipd
-libexec/c-lightning/lightning_openingd
+libexec/c-lightning/lightning_hsmd
 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/pay
 man/man1/lightning-cli.1.gz
 man/man5/lightningd-config.5.gz
 man/man7/lightning-autocleaninvoice.7.gz
@@ -22,6 +23,7 @@ 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-dev-sendcustommsg.7.gz
 man/man7/lightning-disconnect.7.gz
 man/man7/lightning-fundchannel.7.gz
 man/man7/lightning-fundchannel_cancel.7.gz
@@ -47,6 +49,7 @@ man/man7/lightning-txdiscard.7.gz
 man/man7/lightning-txprepare.7.gz
 man/man7/lightning-txsend.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