From patchwork Sun Mar 15 14:44:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [v2,2/5] build_patches: Rebase onto OpenWrt 19.07.2 From: Fabian Blaese X-Patchwork-Id: 1296 Message-Id: <20200315144416.140346-3-fabian@blaese.de> To: franken-dev@freifunk.net Cc: Adrian Schmutzler Date: Sun, 15 Mar 2020 15:44:13 +0100 Refresh patches for main repo, packages and routing. Signed-off-by: Fabian Bläse Reviewed-by: Adrian Schmutzler --- ...-OpenWrt-config-migration-mechanisms.patch | 11 +- .../openwrt/0002-set-root-password.patch | 4 +- .../openwrt/0003-ntpd-host-as-string.patch | 10 +- ...5-allow-building-all-devives-as-tiny.patch | 13 +- ...tils-tplink-safeloader-Add-CPE210-v3.patch | 58 ------- ...xx-Add-support-for-TP-Link-CPE210-v3.patch | 141 ------------------ ...reguard-introduce-nohostroute-option.patch | 47 ------ ...202-gre-introduce-nohostroute-option.patch | 77 ---------- ...0020-fastd_generate_key_from_urandom.patch | 8 +- .../routing/0001-Update-babeld-to-1.9.1.patch | 31 ---- ...atch-to-remove-gw-mode-switch-messag.patch | 7 +- ...nclude-PKG_RELEASE-in-babeld-version.patch | 6 +- .../0012-babeld-Add-src_plen-patch.patch | 6 +- 13 files changed, 32 insertions(+), 387 deletions(-) delete mode 100644 build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch delete mode 100644 build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch delete mode 100644 build_patches/openwrt/0201-wireguard-introduce-nohostroute-option.patch delete mode 100644 build_patches/openwrt/0202-gre-introduce-nohostroute-option.patch delete mode 100644 feed_patches/routing/0001-Update-babeld-to-1.9.1.patch diff --git a/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch b/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch index 884cf95..fe36ea9 100644 --- a/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch +++ b/build_patches/openwrt/0001-Disable-OpenWrt-config-migration-mechanisms.patch @@ -1,3 +1,4 @@ +From 5bc010240769c167dcbe13fa6aa726fb71a84f17 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 8 Jul 2017 10:46:59 +0200 Subject: Disable OpenWrt config migration mechanisms @@ -6,21 +7,21 @@ This disables all OpenWrt config migration mechanisms except for files listed in /etc/sysupgrade.conf diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade -index b75bd097f3..8ad778fd69 100755 +index 6c518b780e..49d4514b98 100755 --- a/package/base-files/files/sbin/sysupgrade +++ b/package/base-files/files/sbin/sysupgrade -@@ -118,9 +118,9 @@ list_changed_conffiles() { - add_uci_conffiles() { +@@ -134,9 +134,9 @@ list_changed_conffiles() { + add_conffiles() { local file="$1" ( find $(sed -ne '/^[[:space:]]*$/d; /^#/d; p' \ - /etc/sysupgrade.conf /lib/upgrade/keep.d/* 2>/dev/null) \ + /etc/sysupgrade.conf 2>/dev/null) \ - -type f -o -type l 2>/dev/null; + \( -type f -o -type l \) $find_filter 2>/dev/null; - list_changed_conffiles ) | sort -u > "$file" + ) | sort -u > "$file" return 0 } -- -2.11.0 +2.25.1 diff --git a/build_patches/openwrt/0002-set-root-password.patch b/build_patches/openwrt/0002-set-root-password.patch index 5defc8f..40362b2 100644 --- a/build_patches/openwrt/0002-set-root-password.patch +++ b/build_patches/openwrt/0002-set-root-password.patch @@ -1,4 +1,4 @@ -From 6782f72e0666bc1121df061ec2ca34c1035faf86 Mon Sep 17 00:00:00 2001 +From d61fe229cf74badde02f617d66b2aab7d7ce96bc Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 8 Jul 2017 10:47:28 +0200 Subject: [PATCH 2/4] set root password @@ -18,5 +18,5 @@ index 4b4154f21f..b8d180a956 100644 ftp:*:0:0:99999:7::: network:*:0:0:99999:7::: -- -2.11.0 +2.25.1 diff --git a/build_patches/openwrt/0003-ntpd-host-as-string.patch b/build_patches/openwrt/0003-ntpd-host-as-string.patch index 0fb14c7..3a65506 100644 --- a/build_patches/openwrt/0003-ntpd-host-as-string.patch +++ b/build_patches/openwrt/0003-ntpd-host-as-string.patch @@ -1,4 +1,4 @@ -From 380f33fde8bfb4e35eae7e5073ca2d0fd8270abf Mon Sep 17 00:00:00 2001 +From bc184e5c95dd934ad8c9d41fb5449390b4e160d2 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Sat, 8 Jul 2017 10:47:56 +0200 Subject: [PATCH 3/4] ntpd host as string @@ -8,18 +8,18 @@ Subject: [PATCH 3/4] ntpd host as string 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/utils/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd -index e693e4031c..12383a4937 100755 +index 52866ba32a..b6b28cd025 100755 --- a/package/utils/busybox/files/sysntpd +++ b/package/utils/busybox/files/sysntpd @@ -30,7 +30,7 @@ get_dhcp_ntp_servers() { validate_ntp_section() { - uci_validate_section system timeserver "${1}" \ + uci_load_validate system timeserver "$1" "$2" \ - 'server:list(host)' 'enabled:bool:1' 'enable_server:bool:0' 'use_dhcp:bool:1' 'dhcp_interface:list(string)' + 'server:list(string)' 'enabled:bool:1' 'enable_server:bool:0' 'use_dhcp:bool:1' 'dhcp_interface:list(string)' } - start_service() { + start_ntpd_instance() { -- -2.11.0 +2.25.1 diff --git a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch index 7bfcb3a..e31487c 100644 --- a/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch +++ b/build_patches/openwrt/0005-allow-building-all-devives-as-tiny.patch @@ -1,28 +1,27 @@ From: Tim Niemeyer Date: Mon, 6 Aug 2018 18:39:04 +0200 -Subject: allow building all devives as tiny +Subject: [PATCH 4/4] allow building all devives as tiny diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile -index 1eaf1e457c8862b603cc2477af1638a05aa5a599..602323bba27ee1e401a3e99bb47b9327e9db2e6a 100644 +index 804532b55c..6328d5cc29 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile -@@ -22,6 +22,11 @@ endif - ifeq ($(SUBTARGET),tiny) +@@ -23,6 +23,10 @@ include ./tiny.mk include ./tiny-tp-link.mk include ./tiny-legacy-devices.mk + include ./tiny-senao.mk +include ./generic.mk +include ./generic-legacy-devices.mk -+include ./generic-senao.mk +include ./generic-tp-link.mk +include ./generic-ubnt.mk endif ifeq ($(SUBTARGET),nand) include ./nand.mk diff --git a/target/linux/ar71xx/tiny/config-default b/target/linux/ar71xx/tiny/config-default -index 2e9031a24cb23cc6b9a5fffc5223d93a5229fabb..02836de067f3bd2e175c9028596a896b26e2d332 100644 +index 1148d8c451..eccc01757e 100644 --- a/target/linux/ar71xx/tiny/config-default +++ b/target/linux/ar71xx/tiny/config-default -@@ -70,3 +70,19 @@ CONFIG_SOC_AR933X=y +@@ -74,3 +74,19 @@ CONFIG_SOC_AR933X=y CONFIG_SOC_AR934X=y CONFIG_SOC_QCA953X=y CONFIG_SOC_QCA956X=y diff --git a/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch b/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch deleted file mode 100644 index 71b394e..0000000 --- a/build_patches/openwrt/0011-firmware-utils-tplink-safeloader-Add-CPE210-v3.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Adrian Schmutzler -Date: Wed, 10 Oct 2018 20:05:53 +0200 -Subject: firmware-utils: tplink-safeloader: Add CPE210 v3 - -Add TP-Link CPE210 v3 to the support list. -It's identical to the v2. - -Signed-off-by: Robert Marko -[Use separate definition to prevent cross-updates] -Signed-off-by: Adrian Schmutzler - -diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c -index 4b227e1c97b6c5b236dba29dbdd5f0bcd68621cb..de15faf6796c993efc6c2a36b22bb1e978e3be90 100644 ---- a/tools/firmware-utils/src/tplink-safeloader.c -+++ b/tools/firmware-utils/src/tplink-safeloader.c -@@ -197,6 +197,42 @@ static struct device_info boards[] = { - .last_sysupgrade_partition = "support-list", - }, - -+ /** Firmware layout for the CPE210 V3 */ -+ { -+ .id = "CPE210V3", -+ .vendor = "CPE210(TP-LINK|UN|N300-2|00000000):3.0\r\n", -+ .support_list = -+ "SupportList:\r\n" -+ "CPE210(TP-LINK|EU|N300-2|45550000):3.0\r\n" -+ "CPE210(TP-LINK|UN|N300-2|00000000):3.0\r\n" -+ "CPE210(TP-LINK|UN|N300-2):3.0\r\n" -+ "CPE210(TP-LINK|EU|N300-2):3.0\r\n", -+ .support_trail = '\xff', -+ .soft_ver = NULL, -+ -+ .partitions = { -+ {"fs-uboot", 0x00000, 0x20000}, -+ {"partition-table", 0x20000, 0x02000}, -+ {"default-mac", 0x30000, 0x00020}, -+ {"product-info", 0x31100, 0x00100}, -+ {"device-info", 0x31400, 0x00400}, -+ {"signature", 0x32000, 0x00400}, -+ {"device-id", 0x33000, 0x00100}, -+ {"os-image", 0x40000, 0x1c0000}, -+ {"file-system", 0x200000, 0x5b0000}, -+ {"soft-version", 0x7b0000, 0x00100}, -+ {"support-list", 0x7b1000, 0x01000}, -+ {"user-config", 0x7c0000, 0x10000}, -+ {"default-config", 0x7d0000, 0x10000}, -+ {"log", 0x7e0000, 0x10000}, -+ {"radio", 0x7f0000, 0x10000}, -+ {NULL, 0, 0} -+ }, -+ -+ .first_sysupgrade_partition = "os-image", -+ .last_sysupgrade_partition = "support-list", -+ }, -+ - /** Firmware layout for the CPE510/520 */ - { - .id = "CPE510", diff --git a/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch b/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch deleted file mode 100644 index 2021373..0000000 --- a/build_patches/openwrt/0012-ar71xx-Add-support-for-TP-Link-CPE210-v3.patch +++ /dev/null @@ -1,141 +0,0 @@ -From: Adrian Schmutzler -Date: Wed, 10 Oct 2018 20:13:09 +0200 -Subject: ar71xx: Add support for TP-Link CPE210 v3 - -Looks identical to the v2 - -This PR adds support for a popular low-cost 2.4GHz N based AP - -Specifications: - - SoC: Qualcomm Atheros QCA9533 (650MHz) - - RAM: 64MB - - Storage: 8 MB SPI NOR - - Wireless: 2.4GHz N based built into SoC 2x2 - - Ethernet: 1x 100/10 Mbps, integrated into SoC, 24V POE IN - -Installation: -Flash factory image through stock firmware WEB UI or -through TFTP -To get to TFTP recovery just hold reset button while -powering on for around 4-5 seconds and release. -Rename factory image to recovery.bin -Stock TFTP server IP:192.168.0.100 -Stock device TFTP address:192.168.0.254 - -Signed-off-by: Robert Marko -[Adjusted for separate safeloader entry, do not inherit device -definition from cpe210-v2] -Signed-off-by: Adrian Schmutzler - -diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds -index 23f3d23bf53883fb08944bc65b98cac06a16c0a5..e0222f3637b60b89a6ef6c0d10cfb20fbe73f075 100755 ---- a/target/linux/ar71xx/base-files/etc/board.d/01_leds -+++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds -@@ -249,6 +249,7 @@ cf-e530n) - ;; - cpe210|\ - cpe210-v2|\ -+cpe210-v3|\ - cpe510|\ - wbs210|\ - wbs510) -@@ -259,7 +260,8 @@ wbs510) - ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "tp-link:green:link4" "wlan0" "76" "100" "-75" "13" - - case "$board" in -- cpe210-v2) -+ cpe210-v2|\ -+ cpe210-v3) - ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan0" "eth0" - ;; - *) -diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network -index e9522252a2b8ba7de1c8ca7d070ff7f2897aade9..386d93e58451b953937320b1bfe8d71ed73c69fd 100755 ---- a/target/linux/ar71xx/base-files/etc/board.d/02_network -+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network -@@ -75,6 +75,7 @@ ar71xx_setup_interfaces() - cf-e380ac-v1|\ - cf-e380ac-v2|\ - cpe210-v2|\ -+ cpe210-v3|\ - dr342|\ - eap120|\ - eap300v2|\ -diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index ccbd4e77c324a36e7fba6e6dccad59d8f94a3921..2200069c647b33220126e797b6a61928d1fb428e 100755 ---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh -+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -583,6 +583,10 @@ ar71xx_board_detect() { - name="cpe210-v2" - tplink_pharos_board_detect "$(tplink_pharos_v2_get_model_string)" - ;; -+ *"CPE210 v3") -+ name="cpe210-v3" -+ tplink_pharos_board_detect "$(tplink_pharos_v2_get_model_string)" -+ ;; - *"CPE505N") - name="cpe505n" - ;; -diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -index ca1270b7fdc84c53f8417c226f18ca4fff1f27d8..a04dd7441d28e9db4dc7c744707bb5f35936da00 100755 ---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh -@@ -587,7 +587,8 @@ platform_check_image() { - tplink_pharos_check_image "$1" "7f454c46" "$(tplink_pharos_get_model_string)" '' && return 0 - return 1 - ;; -- cpe210-v2) -+ cpe210-v2|\ -+ cpe210-v3) - tplink_pharos_check_image "$1" "01000000" "$(tplink_pharos_v2_get_model_string)" '\0\xff\r' && return 0 - return 1 - ;; -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c -index ceb1769ddd522d51014228fe65e2662f2f3e627c..f25a69f08e8a69d9b6de0ca9d7d7d14f8dff5fa0 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c -@@ -236,6 +236,9 @@ MIPS_MACHINE(ATH79_MACH_CPE210, "CPE210", "TP-LINK CPE210/220", - MIPS_MACHINE(ATH79_MACH_CPE210_V2, "CPE210V2", "TP-LINK CPE210 v2", - cpe210_v2_setup); - -+MIPS_MACHINE(ATH79_MACH_CPE210_V3, "CPE210V3", "TP-LINK CPE210 v3", -+ cpe210_v2_setup); -+ - MIPS_MACHINE(ATH79_MACH_CPE510, "CPE510", "TP-LINK CPE510/520", - cpe510_setup); - -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h -index 80f6e1d95b7a4e5559e7d5da041b32d962ad4e84..c82cb17cf613bdb3796a15e384215d4579767468 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h -+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h -@@ -75,6 +75,7 @@ enum ath79_mach_type { - ATH79_MACH_CF_E530N, /* COMFAST CF-E530N */ - ATH79_MACH_CPE210, /* TP-LINK CPE210 v1 */ - ATH79_MACH_CPE210_V2, /* TP-LINK CPE210 v2 */ -+ ATH79_MACH_CPE210_V3, /* TP-LINK CPE210 v3 */ - ATH79_MACH_CPE505N, /* P&W CPE505N */ - ATH79_MACH_CPE510, /* TP-LINK CPE510 */ - ATH79_MACH_CPE830, /* YunCore CPE830 */ -diff --git a/target/linux/ar71xx/image/generic-tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk -index daf6c35ae4610d844bd9e8f44ea5deab72143a48..8ad1f6e38228b639d1d127937ba875c030a6a632 100644 ---- a/target/linux/ar71xx/image/generic-tp-link.mk -+++ b/target/linux/ar71xx/image/generic-tp-link.mk -@@ -195,6 +195,18 @@ define Device/cpe210-v2 - endef - TARGET_DEVICES += cpe210-v2 - -+define Device/cpe210-v3 -+ $(Device/cpexxx) -+ DEVICE_TITLE := TP-LINK CPE210 v3 -+ BOARDNAME := CPE210V3 -+ TPLINK_BOARD_ID := CPE210V3 -+ KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header -+ TPLINK_HWID := 0x0 -+ TPLINK_HWREV := 0 -+ TPLINK_HEADER_VERSION := 1 -+endef -+TARGET_DEVICES += cpe210-v3 -+ - define Device/wbs210-v1 - $(Device/cpe510-520-v1) - DEVICE_TITLE := TP-LINK WBS210 v1 diff --git a/build_patches/openwrt/0201-wireguard-introduce-nohostroute-option.patch b/build_patches/openwrt/0201-wireguard-introduce-nohostroute-option.patch deleted file mode 100644 index 09d43dd..0000000 --- a/build_patches/openwrt/0201-wireguard-introduce-nohostroute-option.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Daniel Golle -Date: Tue, 19 Mar 2019 16:47:17 +0100 -Subject: wireguard: introduce 'nohostroute' option - -Use a new config option 'nohostroute' to explicitely prevent creation -of the route to the endpoint. - -Signed-off-by: Daniel Golle -[squashed with commit 1e8bb50, shorten commit message] -Signed-off-by: Adrian Schmutzler - -diff --git a/package/network/services/wireguard/files/wireguard.sh b/package/network/services/wireguard/files/wireguard.sh -index 96fa7215ff..fb781070d6 100644 ---- a/package/network/services/wireguard/files/wireguard.sh -+++ b/package/network/services/wireguard/files/wireguard.sh -@@ -114,6 +114,7 @@ proto_wireguard_setup() { - config_get mtu "${config}" "mtu" - config_get fwmark "${config}" "fwmark" - config_get ip6prefix "${config}" "ip6prefix" -+ config_get nohostroute "${config}" "nohostroute" - - # create interface - ip link del dev "${config}" 2>/dev/null -@@ -176,12 +177,14 @@ proto_wireguard_setup() { - done - - # endpoint dependency -- wg show "${config}" endpoints | \ -- sed -E 's/\[?([0-9.:a-f]+)\]?:([0-9]+)/\1 \2/' | \ -- while IFS=$'\t ' read -r key address port; do -- [ -n "${port}" ] || continue -- proto_add_host_dependency "${config}" "${address}" -- done -+ if [ "${nohostroute}" != "1" ]; then -+ wg show "${config}" endpoints | \ -+ sed -E 's/\[?([0-9.:a-f]+)\]?:([0-9]+)/\1 \2/' | \ -+ while IFS=$'\t ' read -r key address port; do -+ [ -n "${port}" ] || continue -+ proto_add_host_dependency "${config}" "${address}" -+ done -+ fi - - proto_send_update "${config}" - } --- -2.11.0 - diff --git a/build_patches/openwrt/0202-gre-introduce-nohostroute-option.patch b/build_patches/openwrt/0202-gre-introduce-nohostroute-option.patch deleted file mode 100644 index 9cb8e14..0000000 --- a/build_patches/openwrt/0202-gre-introduce-nohostroute-option.patch +++ /dev/null @@ -1,77 +0,0 @@ -From: Fabian Bläse -Date: Wed, 29 May 2019 21:08:01 +0200 -Subject: gre: introduce 'nohostroute' option - -It is not always necessary to add a host route for the gre peer address. - -This introduces a new config option 'nohostroute' (similar to the -option introduced for wireguard in d8e2e19) to allow to disable -the creation of those routes explicitely. - -Signed-off-by: Fabian Bläse -Signed-off-by: Hans Dedecker [PKG_RELEASE increase] -Signed-off-by: Adrian Schmutzler [backport] - -diff --git a/package/network/config/gre/files/gre.sh b/package/network/config/gre/files/gre.sh -index ca11e87cfd..b6131d0555 100755 ---- a/package/network/config/gre/files/gre.sh -+++ b/package/network/config/gre/files/gre.sh -@@ -57,7 +57,7 @@ gre_setup() { - local remoteip - - local ipaddr peeraddr -- json_get_vars df ipaddr peeraddr tunlink -+ json_get_vars df ipaddr peeraddr tunlink nohostroute - - [ -z "$peeraddr" ] && { - proto_notify_error "$cfg" "MISSING_PEER_ADDRESS" -@@ -77,7 +77,9 @@ gre_setup() { - break - done - -- ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" ) -+ if [ "${nohostroute}" != "1" ]; then -+ ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" ) -+ fi - - [ -z "$ipaddr" ] && { - local wanif="$tunlink" -@@ -134,7 +136,7 @@ grev6_setup() { - local remoteip6 - - local ip6addr peer6addr weakif -- json_get_vars ip6addr peer6addr tunlink weakif encaplimit -+ json_get_vars ip6addr peer6addr tunlink weakif encaplimit nohostroute - - [ -z "$peer6addr" ] && { - proto_notify_error "$cfg" "MISSING_PEER_ADDRESS" -@@ -154,7 +156,9 @@ grev6_setup() { - break - done - -- ( proto_add_host_dependency "$cfg" "$peer6addr" "$tunlink" ) -+ if [ "${nohostroute}" != "1" ]; then -+ ( proto_add_host_dependency "$cfg" "$peer6addr" "$tunlink" ) -+ fi - - [ -z "$ip6addr" ] && { - local wanif="$tunlink" -@@ -263,6 +267,7 @@ proto_gre_init_config() { - proto_config_add_string "ipaddr" - proto_config_add_string "peeraddr" - proto_config_add_boolean "df" -+ proto_config_add_boolean "nohostroute" - } - - proto_gretap_init_config() { -@@ -276,6 +281,7 @@ proto_grev6_init_config() { - proto_config_add_string "peer6addr" - proto_config_add_string "weakif" - proto_config_add_string "encaplimit" -+ proto_config_add_boolean "nohostroute" - } - - proto_grev6tap_init_config() { --- -2.11.0 - diff --git a/feed_patches/openwrt/0020-fastd_generate_key_from_urandom.patch b/feed_patches/openwrt/0020-fastd_generate_key_from_urandom.patch index 252af39..4b7beb1 100644 --- a/feed_patches/openwrt/0020-fastd_generate_key_from_urandom.patch +++ b/feed_patches/openwrt/0020-fastd_generate_key_from_urandom.patch @@ -1,4 +1,4 @@ -From 4a451ac5b17b1a7e8ce3d094067df7e21e61927d Mon Sep 17 00:00:00 2001 +From 8e7de199282ba76a94a1b4370ac7712325b81fc2 Mon Sep 17 00:00:00 2001 From: Robert Langhammer Date: Mon, 13 Nov 2017 21:04:55 +0100 Subject: [PATCH] fastd_generate_key_from_urandom @@ -10,7 +10,7 @@ Subject: [PATCH] fastd_generate_key_from_urandom diff --git a/net/fastd/patches/001-generate_key_from_urandom.patch b/net/fastd/patches/001-generate_key_from_urandom.patch new file mode 100644 -index 00000000..47280e52 +index 000000000..e06739a1e --- /dev/null +++ b/net/fastd/patches/001-generate_key_from_urandom.patch @@ -0,0 +1,14 @@ @@ -28,6 +28,6 @@ index 00000000..47280e52 + ecc_25519_gf_sanitize_secret(&secret_key, &secret_key); + + ecc_25519_work_t work; --- -2.11.0 +-- +2.25.1 diff --git a/feed_patches/routing/0001-Update-babeld-to-1.9.1.patch b/feed_patches/routing/0001-Update-babeld-to-1.9.1.patch deleted file mode 100644 index 10e5ed4..0000000 --- a/feed_patches/routing/0001-Update-babeld-to-1.9.1.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b58e2b95ffc83f73779619ea63777c0970398d13 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= -Date: Sun, 8 Sep 2019 23:19:33 +0200 -Subject: [PATCH] Update babeld to 1.9.1 - ---- - babeld/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/babeld/Makefile b/babeld/Makefile -index 972862c..d113d54 100644 ---- a/babeld/Makefile -+++ b/babeld/Makefile -@@ -8,12 +8,12 @@ - include $(TOPDIR)/rules.mk - - PKG_NAME:=babeld --PKG_VERSION:=1.8.5 -+PKG_VERSION:=1.9.1 - PKG_RELEASE:=1 - - PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=https://www.irif.fr/~jch/software/files/ --PKG_HASH:=202d99c275604507c6ce133710522f1ddfb62cb671c26f1ac2d3ab44af3d5bc4 -+PKG_HASH:=1e1b3c01dd929177bc8d027aff1494da75e1e567e1f60df3bb45a78d5f1ca0b4 - PKG_LICENSE:=MIT - - include $(INCLUDE_DIR)/package.mk --- -2.24.0 - diff --git a/feed_patches/routing/0002-Add-batman-adv-patch-to-remove-gw-mode-switch-messag.patch b/feed_patches/routing/0002-Add-batman-adv-patch-to-remove-gw-mode-switch-messag.patch index 3c4afe4..c272b6c 100644 --- a/feed_patches/routing/0002-Add-batman-adv-patch-to-remove-gw-mode-switch-messag.patch +++ b/feed_patches/routing/0002-Add-batman-adv-patch-to-remove-gw-mode-switch-messag.patch @@ -1,4 +1,4 @@ -From e775f12c11d425611ba490c98ab84fb6cf4f0c01 Mon Sep 17 00:00:00 2001 +From f8c90adf89a45d9cfd5e189f28d0250e06710764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Wed, 11 Jul 2018 13:39:06 +0200 Subject: [PATCH] Add batman-adv patch to remove gw mode switch message @@ -11,7 +11,7 @@ Signed-off-by: Fabian Bläse diff --git a/batman-adv/patches/0000-Remove-gw-mode-switch-message.patch b/batman-adv/patches/0000-Remove-gw-mode-switch-message.patch new file mode 100644 -index 0000000..3fcd99c +index 0000000..fb49d6c --- /dev/null +++ b/batman-adv/patches/0000-Remove-gw-mode-switch-message.patch @@ -0,0 +1,26 @@ @@ -41,7 +41,6 @@ index 0000000..3fcd99c + * a re-election the next time that this is needed. +-- +2.18.0 -+ -- -2.18.0 +2.25.1 diff --git a/feed_patches/routing/0011-babeld-Include-PKG_RELEASE-in-babeld-version.patch b/feed_patches/routing/0011-babeld-Include-PKG_RELEASE-in-babeld-version.patch index 4fee16c..b481d16 100644 --- a/feed_patches/routing/0011-babeld-Include-PKG_RELEASE-in-babeld-version.patch +++ b/feed_patches/routing/0011-babeld-Include-PKG_RELEASE-in-babeld-version.patch @@ -1,4 +1,4 @@ -From 6cc7f682ee04c6dab34e706b7fc2fbc701a257fb Mon Sep 17 00:00:00 2001 +From f114914490740247f2b6ca705f0f7055db9681ab Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 30 Sep 2019 17:09:10 +0200 Subject: [PATCH 1/2] babeld: Include PKG_RELEASE in babeld version @@ -14,7 +14,7 @@ Signed-off-by: Fabian Bläse 1 file changed, 5 insertions(+) diff --git a/babeld/Makefile b/babeld/Makefile -index d113d54..bd9cdb0 100644 +index 022d0b8..78fdf83 100644 --- a/babeld/Makefile +++ b/babeld/Makefile @@ -48,6 +48,11 @@ MAKE_FLAGS+= \ @@ -30,5 +30,5 @@ index d113d54..bd9cdb0 100644 $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/ -- -2.24.0 +2.25.1 diff --git a/feed_patches/routing/0012-babeld-Add-src_plen-patch.patch b/feed_patches/routing/0012-babeld-Add-src_plen-patch.patch index 5035285..98e3453 100644 --- a/feed_patches/routing/0012-babeld-Add-src_plen-patch.patch +++ b/feed_patches/routing/0012-babeld-Add-src_plen-patch.patch @@ -1,4 +1,4 @@ -From 74a1488696ccc375a57236f15bcbd90e1ec76b77 Mon Sep 17 00:00:00 2001 +From 20a7fa7bf33d47e8fbcbcb553d5bb8a542808fbf Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 30 Sep 2019 16:52:28 +0200 Subject: [PATCH 2/2] babeld: Add src_plen patch @@ -15,7 +15,7 @@ Signed-off-by: Adrian Schmutzler create mode 100644 babeld/patches/0001-Remove-src_plen-assignments-which-break-v4mapped-encoding.patch diff --git a/babeld/Makefile b/babeld/Makefile -index cc266ce..cc1598b 100644 +index 78fdf83..5a7b8cd 100644 --- a/babeld/Makefile +++ b/babeld/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk @@ -105,5 +105,5 @@ index 0000000..089e35f + debugf("Received unknown%s Route Request sub-TLV %d.\n", + ((type & 0x80) != 0) ? " mandatory" : "", type); -- -2.20.1 +2.25.1