Skip to contentSkip to conversation

package/fastd: libcap is optional not mandatory

PATCH New Fabrice Fontaine 3 participants 4 messages Oct 31, 2020 – Nov 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/fastd: libcap is optional not mandatory

libcap is an optional dependency which is available since version 7:
https://github.com/NeoRaider/fastd/commit/eaac49427339a365aac2d3505f567572cfbdbb96

---
 package/fastd/Config.in | 1 -
 package/fastd/fastd.mk  | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
package/fastd/Config.in +0 -1
index c4f296dd63..5319d68503 100644
@@ -6,7 +6,6 @@ config BR2_PACKAGE_FASTD
 	select BR2_PACKAGE_LIBUECC
 	select BR2_PACKAGE_LIBSODIUM
 	select BR2_PACKAGE_LIBSODIUM_FULL
-	select BR2_PACKAGE_LIBCAP
 	help
 	  Fast and Secure Tunneling Daemon
 
package/fastd/fastd.mk +8 -1
index d556e2fbb1..43d3c242f3 100644
@@ -10,11 +10,18 @@ FASTD_SOURCE = fastd-$(FASTD_VERSION).tar.xz
 FASTD_LICENSE = BSD-2-Clause
 FASTD_LICENSE_FILES = COPYRIGHT
 FASTD_CONF_OPTS = -DENABLE_LIBSODIUM=ON
-FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium libcap
+FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium
 
 # 0002-receive-fix-buffer-leak-when-receiving-invalid-packets.patch
 FASTD_IGNORE_CVES += CVE-2020-27638
 
+ifeq ($(BR2_PACKAGE_LIBCAP),y)
+FASTD_CONF_OPTS += -DWITH_CAPABILITIES=ON
+FASTD_DEPENDENCIES += libcap
+else
+FASTD_CONF_OPTS += -DWITH_CAPABILITIES=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 FASTD_CONF_OPTS += -DENABLE_OPENSSL=ON
 FASTD_DEPENDENCIES += openssl
Signature · 1 line
2.28.0
#1 lore raw

PATCH 2/2 package/fastd: bump to version 21

- Switch to meson-package
- Drop first patch (not needed with meson)
- Drop second patch (already in version)

https://fastd.readthedocs.io/en/stable/releases/v20.html
https://fastd.readthedocs.io/en/stable/releases/v21.html

---
 ...ROCEDURAL_OPTIMIZATION-target-proper.patch | 69 -------------------
 ...-leak-when-receiving-invalid-packets.patch | 45 ------------
 package/fastd/fastd.hash                      |  2 +-
 package/fastd/fastd.mk                        | 28 ++++----
 4 files changed, 13 insertions(+), 131 deletions(-)
 delete mode 100644 package/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch
 delete mode 100644 package/fastd/0002-receive-fix-buffer-leak-when-receiving-invalid-packets.patch
package/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch deleted +0 -69
deleted file mode 100644
index 489c7269f8..0000000000
@@ -1,69 +0,0 @@
-From: Alexander Dahl <[email protected]>
-Date: Wed, 28 Oct 2015 16:04:13 +0100
-Subject: [PATCH] cmake: use INTERPROCEDURAL_OPTIMIZATION target property
-
-Instead of hacking on compiler flags use the cmake way for handling
-interprocedural optimization. Tests showed cmake currently ignores this
-for gcc and clang, at least on Debian Wheezy and Jessie. This actually
-results in no interprocedural optimization for the moment. However it
-allows to compile fastd against a toolchain without LTO support, which
-was broken because of a hack included here for finding binutils.
-
-According to the upstream author of fastd the main reason for enabling
-LTO was binary size on an OpenWRT target for Freifunk Gluon, where they
-have very few space left on devices with only 4 MB flash memory.
-
-Signed-off-by: Alexander Dahl <[email protected]>
----
- cmake/checks.cmake | 14 --------------
- src/CMakeLists.txt |  9 +++++++++
- 2 files changed, 9 insertions(+), 14 deletions(-)
-
-diff --git a/cmake/checks.cmake b/cmake/checks.cmake
-index 27c073f..8a671a1 100644
---- a/cmake/checks.cmake
-+++ b/cmake/checks.cmake
-@@ -10,20 +10,6 @@ if(ARCH_X86 OR ARCH_X86_64)
- endif(ARCH_X86 OR ARCH_X86_64)
- 
- 
--
--if(ENABLE_LTO)
--  set(CFLAGS_LTO "-flto")
--  set(CFLAGS_NO_LTO "-fno-lto")
--
--  check_c_compiler_flag("-fwhole-program" HAVE_FLAG_WHOLE_PROGRAM)
--  if(HAVE_FLAG_WHOLE_PROGRAM)
--    set(LDFLAGS_LTO "-flto -fwhole-program")
--  else(HAVE_FLAG_WHOLE_PROGRAM)
--    set(LDFLAGS_LTO "-flto")
--  endif(HAVE_FLAG_WHOLE_PROGRAM)
--endif(ENABLE_LTO)
--
--
- check_c_source_compiles("
- #include <sys/types.h>
- #include <sys/socket.h>
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 829b3ab..7612b40 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -48,6 +48,15 @@ add_executable(fastd
- set_property(TARGET fastd PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}")
- set_property(TARGET fastd PROPERTY LINK_FLAGS "${PTHREAD_LDFLAGS} ${LIBUECC_LDFLAGS_OTHER} ${NACL_LDFLAGS_OTHER} ${JSON_C_LDFLAGS_OTHER} ${LDFLAGS_LTO}")
- set_property(TARGET fastd APPEND PROPERTY INCLUDE_DIRECTORIES ${LIBCAP_INCLUDE_DIR} ${NACL_INCLUDE_DIRS} ${JSON_C_INCLUDE_DIR})
-+if(ENABLE_LTO)
-+	set_target_properties(fastd PROPERTIES
-+		INTERPROCEDURAL_OPTIMIZATION ON
-+	)
-+else(ENABLE_LTO)
-+	set_target_properties(fastd PROPERTIES
-+		INTERPROCEDURAL_OPTIMIZATION OFF
-+	)
-+endif(ENABLE_LTO)
- target_link_libraries(fastd protocols methods ciphers macs ${RT_LIBRARY} ${LIBCAP_LIBRARY} ${LIBUECC_LIBRARIES} ${NACL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY} ${JSON_C_LIBRARIES})
- 
- add_dependencies(fastd version)
--- 
-2.1.4
-
package/fastd/0002-receive-fix-buffer-leak-when-receiving-invalid-packets.patch deleted +0 -45

45 lines not on this page · raw message

package/fastd/fastd.hash +1 -1
index 2c75ea09e9..b59085e0ee 100644
@@ -1,3 +1,3 @@
 # computed locally
-sha256  6054608e2103b634c9d19ecd1ae058d4ec694747047130719db180578729783a  fastd-19.tar.xz
+sha256  942f33bcd794bcb8e19da4c30c875bdfd4d0f1c24ec4dcdf51237791bbfb0d4c  fastd-21.tar.xz
 sha256  1f5acece57466eac89108f934a196be09b7676fa2d637e78d6657ee1a7d644ac  COPYRIGHT
package/fastd/fastd.mk +12 -16
index 43d3c242f3..bbec63d963 100644
@@ -4,48 +4,44 @@
 #
 ################################################################################
 
-FASTD_VERSION = 19
+FASTD_VERSION = 21
 FASTD_SITE = https://github.com/NeoRaider/fastd/releases/download/v$(FASTD_VERSION)
 FASTD_SOURCE = fastd-$(FASTD_VERSION).tar.xz
 FASTD_LICENSE = BSD-2-Clause
 FASTD_LICENSE_FILES = COPYRIGHT
-FASTD_CONF_OPTS = -DENABLE_LIBSODIUM=ON
 FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium
 
-# 0002-receive-fix-buffer-leak-when-receiving-invalid-packets.patch
-FASTD_IGNORE_CVES += CVE-2020-27638
-
 ifeq ($(BR2_PACKAGE_LIBCAP),y)
-FASTD_CONF_OPTS += -DWITH_CAPABILITIES=ON
+FASTD_CONF_OPTS += -Dcapabilities=enabled
 FASTD_DEPENDENCIES += libcap
 else
-FASTD_CONF_OPTS += -DWITH_CAPABILITIES=OFF
+FASTD_CONF_OPTS += -Dcapabilities=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
-FASTD_CONF_OPTS += -DENABLE_OPENSSL=ON
+FASTD_CONF_OPTS += -Dcipher_aes128-ctr=enabled
 FASTD_DEPENDENCIES += openssl
 else
-FASTD_CONF_OPTS += -DENABLE_OPENSSL=OFF
+FASTD_CONF_OPTS += -Dcipher_aes128-ctr=disabled
 endif
 
 ifeq ($(BR2_PACKAGE_FASTD_STATUS_SOCKET),y)
-FASTD_CONF_OPTS += -DWITH_STATUS_SOCKET=ON
+FASTD_CONF_OPTS += -Dstatus_socket=enabled
 FASTD_DEPENDENCIES += json-c
 else
-FASTD_CONF_OPTS += -DWITH_STATUS_SOCKET=OFF
+FASTD_CONF_OPTS += -Dstatus_socket=disabled
 endif
 
 ifeq ($(BR2_INIT_SYSTEMD),y)
-FASTD_CONF_OPTS += -DENABLE_SYSTEMD=ON
+FASTD_CONF_OPTS += -Dsystemd=enabled
 else
-FASTD_CONF_OPTS += -DENABLE_SYSTEMD=OFF
+FASTD_CONF_OPTS += -Dsystemd=disabled
 endif
 
 ifeq ($(BR2_GCC_ENABLE_LTO),y)
-FASTD_CONF_OPTS += -DENABLE_LTO=ON
+FASTD_CONF_OPTS += -Db_lto=true
 else
-FASTD_CONF_OPTS += -DENABLE_LTO=OFF
+FASTD_CONF_OPTS += -Db_lto=false
 endif
 
-$(eval $(cmake-package))
+$(eval $(meson-package))
Signature · 1 line
2.28.0
#2 lore raw

PATCH 1/2 package/fastd: libcap is optional not mandatory

In reply to Fabrice Fontaine
Quoted 8 lines · On Sat, 31 Oct 2020 22:07:06 +0100 Fabrice Fontaine…

libcap is an optional dependency which is available since version 7:
https://github.com/NeoRaider/fastd/commit/eaac49427339a365aac2d3505f567572cfbdbb96

---
 package/fastd/Config.in | 1 -
 package/fastd/fastd.mk  | 9 ++++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

Both applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/2 package/fastd: libcap is optional not mandatory

In reply to Fabrice Fontaine
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

libcap is an optional dependency which is available since version 7:
https://github.com/NeoRaider/fastd/commit/eaac49427339a365aac2d3505f567572cfbdbb96

Committed to 2020.02.x and 2020.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard