From 598d4baa02d312d2bc68739a1f2f1f2cb3c91051 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 22 May 2020 21:09:21 +0200 Subject: [PATCH] fastd: update to v19 Signed-off-by: Matthias Schiffer --- net/fastd/Config.in | 10 ------ net/fastd/Makefile | 18 +++------- ...-segmentation-fault-with-musl-1.1.20.patch | 35 ------------------- ...nwrt-fix-init-script-wasn-t-working-.patch | 29 --------------- 4 files changed, 4 insertions(+), 88 deletions(-) delete mode 100644 net/fastd/patches/0001-resolve-fix-segmentation-fault-with-musl-1.1.20.patch delete mode 100644 net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch diff --git a/net/fastd/Config.in b/net/fastd/Config.in index 3350eb309..e6440075e 100644 --- a/net/fastd/Config.in +++ b/net/fastd/Config.in @@ -36,16 +36,6 @@ config FASTD_ENABLE_METHOD_NULL depends on PACKAGE_fastd default y -config FASTD_ENABLE_METHOD_XSALSA20_POLY1305 - bool "Enable xsalsa20-poly1305 method" - depends on PACKAGE_fastd - default n - - -config FASTD_ENABLE_CIPHER_AES128_CTR - bool "Enable the AES128-CTR cipher" - depends on PACKAGE_fastd - default n config FASTD_ENABLE_CIPHER_NULL bool "Enable the null cipher" diff --git a/net/fastd/Makefile b/net/fastd/Makefile index 44b37b6ca..8eabc34db 100644 --- a/net/fastd/Makefile +++ b/net/fastd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fastd -PKG_VERSION:=18 -PKG_RELEASE:=4 +PKG_VERSION:=19 +PKG_RELEASE:=1 PKG_MAINTAINER:=Matthias Schiffer PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd/releases/download/v$(PKG_VERSION) -PKG_HASH:=714ff09d7bd75f79783f744f6f8c5af2fe456c8cf876feaa704c205a73e043c9 +PKG_HASH:=6054608e2103b634c9d19ecd1ae058d4ec694747047130719db180578729783a PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=COPYRIGHT @@ -27,8 +27,6 @@ PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \ CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC \ CONFIG_FASTD_ENABLE_METHOD_NULL \ - CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \ - CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \ CONFIG_FASTD_ENABLE_CIPHER_NULL \ CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \ CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \ @@ -44,6 +42,7 @@ PKG_CONFIG_DEPENDS:=\ PKG_BUILD_DEPENDS:=nacl +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk @@ -73,7 +72,6 @@ CMAKE_OPTIONS += \ -DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \ -DWITH_METHOD_GENERIC_UMAC:BOOL=FALSE \ -DWITH_METHOD_NULL:BOOL=FALSE \ - -DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \ -DWITH_CIPHER_AES128_CTR:BOOL=FALSE \ -DWITH_CIPHER_NULL:BOOL=FALSE \ -DWITH_CIPHER_SALSA20:BOOL=FALSE \ @@ -120,14 +118,6 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y) CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE endif -ifeq ($(CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305),y) -CMAKE_OPTIONS += -DWITH_METHOD_XSALSA20_POLY1305:BOOL=TRUE -endif - - -ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR),y) -CMAKE_OPTIONS += -DWITH_CIPHER_AES128_CTR:BOOL=TRUE -endif ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_NULL),y) CMAKE_OPTIONS += -DWITH_CIPHER_NULL:BOOL=TRUE diff --git a/net/fastd/patches/0001-resolve-fix-segmentation-fault-with-musl-1.1.20.patch b/net/fastd/patches/0001-resolve-fix-segmentation-fault-with-musl-1.1.20.patch deleted file mode 100644 index 52c191740..000000000 --- a/net/fastd/patches/0001-resolve-fix-segmentation-fault-with-musl-1.1.20.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 9710132c04cd378bd36f16a2a3d98d9c4c5fdbac Mon Sep 17 00:00:00 2001 -From: David Bauer -Date: Thu, 25 Jul 2019 18:51:25 +0200 -Subject: [PATCH] resolve: fix segmentation fault with musl >1.1.20 - -When compiled with musl >1.1.20, fastd will crash in case it can't -resolve a peers hostname. This is due to a changed implementation of -freeaddrinfo in musl 1.1.21 onwards. - -This segfault is fixed by not calling freeaddrinfo in case the supplied -pointer is null. - -Signed-off-by: David Bauer ---- - src/resolve.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/resolve.c b/src/resolve.c -index 9bdfa1c..bfd2a59 100644 ---- a/src/resolve.c -+++ b/src/resolve.c -@@ -104,7 +104,9 @@ static void * resolve_peer(void *varg) { - - fastd_async_enqueue(ASYNC_TYPE_RESOLVE_RETURN, ret, sizeof(fastd_async_resolve_return_t) + n_addr*sizeof(fastd_peer_address_t)); - -- freeaddrinfo(res); -+ if (res) -+ freeaddrinfo(res); -+ - free(arg->hostname); - free(arg); - --- -2.20.1 - diff --git a/net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch b/net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch deleted file mode 100644 index b576a9873..000000000 --- a/net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c29b4b0e3cc5bf68129fd0f94f424950b7888deb Mon Sep 17 00:00:00 2001 -Message-Id: -From: Wilfried Klaebe -Date: Sat, 31 Aug 2019 21:44:13 +0200 -Subject: [PATCH] doc: examples/openwrt: fix init script, wasn't working with - two VPNs - -If two VPNs were configured via uci, the init script complained about -the peer group of its peers not matching its net. ---- - doc/examples/openwrt/fastd.init | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/examples/openwrt/fastd.init b/doc/examples/openwrt/fastd.init -index 15737b403ec2..4ba69ece9887 100644 ---- a/doc/examples/openwrt/fastd.init -+++ b/doc/examples/openwrt/fastd.init -@@ -233,7 +233,7 @@ generate_peer_group_config() { - config_get group_parent "$group" parent - [ "$parent" = "$group_parent" ] || return 0 - -- if [ "$net" != "$peer_net" ]; then -+ if [ "$net" != "$group_net" ]; then - [ -z "$parent" ] || error "warning: the parent of peer group '$group' doesn't match its net, the peer group will be ignored" - return 0 - fi --- -2.23.0 -