fastd: update to v16

2014-11-15 18:51:02 +01:00 · 2014-11-15 18:51:02 +01:00 · 246f6751b7
parent a889b1276d
commit 246f6751b7
1 changed files with 100 additions and 0 deletions
--- a/patches/packages/openwrt/0002-fastd-update-to-v16.patch
+++ b/patches/packages/openwrt/0002-fastd-update-to-v16.patch
@ -0,0 +1,100 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sat, 15 Nov 2014 18:50:34 +0100
+Subject: fastd: update to v16
+
+diff --git a/net/fastd/Config.in b/net/fastd/Config.in
+index ca4045c..8292245 100644
+--- a/net/fastd/Config.in
+++ b/net/fastd/Config.in
+@@ -80,8 +80,14 @@ config FASTD_WITH_CMDLINE_COMMANDS
+ 	default n
+ 
+ config FASTD_WITH_VERIFY
+-        bool "Include support for on-verify handlers"
+-        depends on PACKAGE_fastd
+-        default n
+	bool "Include support for on-verify handlers"
+	depends on PACKAGE_fastd
+	default n
+
+config FASTD_WITH_STATUS_SOCKET
+	bool "Include support for status sockets"
+	depends on PACKAGE_fastd
+	default y
+
+ 
+ endmenu
+diff --git a/net/fastd/Makefile b/net/fastd/Makefile
+index 0629cd7..acf973b 100644
+--- a/net/fastd/Makefile
+++ b/net/fastd/Makefile
+@@ -8,13 +8,16 @@
+ include $(TOPDIR)/rules.mk
+ 
+ PKG_NAME:=fastd
+-PKG_VERSION:=14
+PKG_VERSION:=16
+ PKG_RELEASE:=1
+ 
+ PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+-PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/75
+-PKG_MD5SUM:=34f6bdebd0410a1fba7c8fd06fff7a05
+PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/78
+PKG_MD5SUM:=135b3083d2743e335738de3bd4bb0c3c
+
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILE:=COPYRIGHT
+ 
+ PKG_CONFIG_DEPENDS:=\
+ 	CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
+@@ -32,7 +35,8 @@ PKG_CONFIG_DEPENDS:=\
+ 	CONFIG_FASTD_WITH_CMDLINE_LOGGING \
+ 	CONFIG_FASTD_WITH_CMDLINE_OPERATION \
+ 	CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
+-	CONFIG_FASTD_WITH_VERIFY
+	CONFIG_FASTD_WITH_VERIFY \
+	CONFIG_FASTD_WITH_STATUS_SOCKET
+ 
+ 
+ PKG_BUILD_DEPENDS:=nacl libuecc
+@@ -43,7 +47,7 @@ include $(INCLUDE_DIR)/cmake.mk
+ define Package/fastd
+   SECTION:=net
+   CATEGORY:=Network
+-  DEPENDS:=+kmod-tun +librt +libpthread
+  DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c
+   TITLE:=Fast and Secure Tunneling Daemon
+   URL:=https://projects.universe-factory.net/projects/fastd
+   SUBMENU:=VPN
+@@ -74,6 +78,7 @@ CMAKE_OPTIONS += \
+ 	-DWITH_CMDLINE_OPERATION:BOOL=FALSE \
+ 	-DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
+ 	-DWITH_VERIFY:BOOL=FALSE \
+	-DWITH_STATUS_SOCKET:BOOL=FALSE \
+ 	-DWITH_CAPABILITIES:BOOL=FALSE \
+ 	-DENABLE_SYSTEMD:BOOL=FALSE \
+ 	-DENABLE_LIBSODIUM:BOOL=FALSE \
+@@ -147,6 +152,10 @@ ifeq ($(CONFIG_FASTD_WITH_VERIFY),y)
+ CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE
+ endif
+ 
+ifeq ($(CONFIG_FASTD_WITH_STATUS_SOCKET),y)
+CMAKE_OPTIONS += -DWITH_STATUS_SOCKET:BOOL=TRUE
+endif
+
+ 
+ define Package/fastd/description
+  Fast and secure tunneling daemon, which is optimized on small code size and few dependencies
+@@ -161,9 +170,9 @@ define Package/fastd/install
+ 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fastd $(1)/usr/bin/
+ 
+ 	$(INSTALL_DIR) $(1)/etc/init.d/
+-	$(INSTALL_BIN) files/fastd.init $(1)/etc/init.d/fastd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/doc/examples/openwrt/fastd.init $(1)/etc/init.d/fastd
+ 	$(INSTALL_DIR) $(1)/etc/config
+-	$(INSTALL_CONF) files/fastd.config $(1)/etc/config/fastd
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/examples/openwrt/fastd.config $(1)/etc/config/fastd
+ 	$(INSTALL_DIR) $(1)/etc/fastd
+ 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+ 	$(INSTALL_DATA) files/fastd.upgrade $(1)/lib/upgrade/keep.d/fastd