0004-fastd-update-to-v18.patch 2.9 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Tue, 29 Mar 2016 00:24:00 +0200
  3. Subject: fastd: update to v18
  4. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  5. diff --git a/net/fastd/Config.in b/net/fastd/Config.in
  6. index 5820b9796562cd11826f8bbefbb02806fe516c61..3350eb3099a26c870d70373c0712a8b59881ee5c 100644
  7. --- a/net/fastd/Config.in
  8. +++ b/net/fastd/Config.in
  9. @@ -74,6 +74,12 @@ config FASTD_ENABLE_MAC_UHASH
  10. default y
  11. +config FASTD_WITH_CAPABILITIES
  12. + bool "Enable POSIX capability support"
  13. + depends on PACKAGE_fastd
  14. + default n
  15. +
  16. +
  17. config FASTD_WITH_CMDLINE_USER
  18. bool "Include support for setting user/group related options on the command line"
  19. depends on PACKAGE_fastd
  20. diff --git a/net/fastd/Makefile b/net/fastd/Makefile
  21. index 027f5491d2f6b066affe08e846b1967900c391e1..5c550d8a5f4669d4f018dde23b622376bc8d0b06 100644
  22. --- a/net/fastd/Makefile
  23. +++ b/net/fastd/Makefile
  24. @@ -8,13 +8,13 @@
  25. include $(TOPDIR)/rules.mk
  26. PKG_NAME:=fastd
  27. -PKG_VERSION:=17
  28. +PKG_VERSION:=18
  29. PKG_RELEASE:=1
  30. PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
  31. PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
  32. -PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/81
  33. -PKG_MD5SUM:=bad4f1948702f418b799578f83a0edb8
  34. +PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/86
  35. +PKG_MD5SUM:=e53236d3049f64f7955ad9556da099eb
  36. PKG_LICENSE:=BSD-2-Clause
  37. PKG_LICENSE_FILES:=COPYRIGHT
  38. @@ -34,6 +34,7 @@ PKG_CONFIG_DEPENDS:=\
  39. CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \
  40. CONFIG_FASTD_ENABLE_MAC_GHASH \
  41. CONFIG_FASTD_ENABLE_MAC_UHASH \
  42. + CONFIG_FASTD_WITH_CAPABILITIES \
  43. CONFIG_FASTD_WITH_CMDLINE_USER \
  44. CONFIG_FASTD_WITH_CMDLINE_LOGGING \
  45. CONFIG_FASTD_WITH_CMDLINE_OPERATION \
  46. @@ -50,7 +51,7 @@ include $(INCLUDE_DIR)/cmake.mk
  47. define Package/fastd
  48. SECTION:=net
  49. CATEGORY:=Network
  50. - DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c
  51. + DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c +FASTD_WITH_CAPABILITIES:libcap
  52. TITLE:=Fast and Secure Tunneling Daemon
  53. URL:=https://projects.universe-factory.net/projects/fastd
  54. SUBMENU:=VPN
  55. @@ -79,13 +80,13 @@ CMAKE_OPTIONS += \
  56. -DWITH_CIPHER_SALSA2012:BOOL=FALSE \
  57. -DWITH_MAC_GHASH:BOOL=FALSE \
  58. -DWITH_MAC_UHASH:BOOL=FALSE \
  59. + -DWITH_CAPABILITIES:BOOL=FALSE \
  60. -DWITH_CMDLINE_USER:BOOL=FALSE \
  61. -DWITH_CMDLINE_LOGGING:BOOL=FALSE \
  62. -DWITH_CMDLINE_OPERATION:BOOL=FALSE \
  63. -DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
  64. -DWITH_DYNAMIC_PEERS:BOOL=FALSE \
  65. -DWITH_STATUS_SOCKET:BOOL=FALSE \
  66. - -DWITH_CAPABILITIES:BOOL=FALSE \
  67. -DENABLE_SYSTEMD:BOOL=FALSE \
  68. -DENABLE_LIBSODIUM:BOOL=FALSE \
  69. -DENABLE_LTO:BOOL=TRUE
  70. @@ -150,6 +151,11 @@ CMAKE_OPTIONS += -DWITH_MAC_UHASH:BOOL=TRUE
  71. endif
  72. +ifeq ($(CONFIG_FASTD_WITH_CAPABILITIES),y)
  73. +CMAKE_OPTIONS += -DWITH_CAPABILITIES:BOOL=TRUE
  74. +endif
  75. +
  76. +
  77. ifeq ($(CONFIG_FASTD_WITH_CMDLINE_USER),y)
  78. CMAKE_OPTIONS += -DWITH_CMDLINE_USER:BOOL=TRUE
  79. endif