Skip to content

Commit 055cfd1

Browse files
rustyrussellcdecker
authored andcommitted
wire: locale-independent patch order for EXPERIMENTAL_FEATURES patches
Also, remove fuzz caused by varint->bigsize change. For some reason my build machine sorts patches into another order, and fails to patch: patching file wire/gen_onion_wire_csv.104951 Hunk #1 succeeded at 52 with fuzz 1 (offset -19 lines). patching file wire/gen_onion_wire_csv.104951 Hunk #1 FAILED at 8. 1 out of 1 hunk FAILED -- saving rejects to file wire/gen_onion_wire_csv.104951.rej make: *** [wire/Makefile:60: wire/gen_onion_wire_csv] Error 1 Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
1 parent 7ca00ca commit 055cfd1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

wire/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ wire/extracted_onion_experimental_csv:
5050
@touch $@
5151

5252
ifeq ($(EXPERIMENTAL_FEATURES),1)
53-
EXPERIMENTAL_PEER_PATCHES := $(wildcard wire/extracted_peer_experimental_*)
54-
EXPERIMENTAL_ONION_PATCHES := $(wildcard wire/extracted_onion_experimental_*)
53+
EXPERIMENTAL_PEER_PATCHES := $(sort $(wildcard wire/extracted_peer_experimental_*))
54+
EXPERIMENTAL_ONION_PATCHES := $(sort $(wildcard wire/extracted_onion_experimental_*))
5555

5656
wire/gen_peer_wire_csv: wire/extracted_peer_wire_csv $(EXPERIMENTAL_PEER_PATCHES)
5757
@set -e; trap "rm -f $@.$$$$" 0; cp $< $@.$$$$; for exp in $(EXPERIMENTAL_PEER_PATCHES); do patch $@.$$$$ $$exp >/dev/null ; done; mv $@.$$$$ $@

wire/extracted_onion_experimental_badonion_blinding

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ index 58f278f38..253a50012 100644
33
--- a/wire/extracted_onion_wire_csv
44
+++ b/wire/extracted_onion_wire_csv
55
@@ -71,3 +71,4 @@ msgtype,invalid_onion_payload,PERM|22
6-
msgdata,invalid_onion_payload,type,varint,
6+
msgdata,invalid_onion_payload,type,bigsize,
77
msgdata,invalid_onion_payload,offset,u16,
88
msgtype,mpp_timeout,23
99
+msgtype,invalid_onion_blinding,BADONION|PERM|24

0 commit comments

Comments
 (0)