From baa93d58d5cd7030ed8827f9fa3ce03ab6ea5faf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 30 Jun 2014 23:03:54 +0200
Subject: [PATCH] fastd: update to v14

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 net/fastd/Config.in        |  5 +++++
 net/fastd/Makefile         | 19 ++++++++++++++-----
 net/fastd/files/fastd.init |  5 +++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/net/fastd/Config.in b/net/fastd/Config.in
index 7d7c80cdb5..ca4045c5c5 100644
--- a/net/fastd/Config.in
+++ b/net/fastd/Config.in
@@ -79,4 +79,9 @@ config FASTD_WITH_CMDLINE_COMMANDS
 	depends on PACKAGE_fastd
 	default n
 
+config FASTD_WITH_VERIFY
+        bool "Include support for on-verify handlers"
+        depends on PACKAGE_fastd
+        default n
+
 endmenu
diff --git a/net/fastd/Makefile b/net/fastd/Makefile
index 873ace8232..0629cd7b6d 100644
--- a/net/fastd/Makefile
+++ b/net/fastd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fastd
-PKG_VERSION:=12
+PKG_VERSION:=14
 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/73
-PKG_MD5SUM:=1dadc61f4d712a10844afcb9b9f49a41
+PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/75
+PKG_MD5SUM:=34f6bdebd0410a1fba7c8fd06fff7a05
 
 PKG_CONFIG_DEPENDS:=\
 	CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
@@ -31,7 +31,8 @@ PKG_CONFIG_DEPENDS:=\
 	CONFIG_FASTD_WITH_CMDLINE_USER \
 	CONFIG_FASTD_WITH_CMDLINE_LOGGING \
 	CONFIG_FASTD_WITH_CMDLINE_OPERATION \
-	CONFIG_FASTD_WITH_CMDLINE_COMMANDS
+	CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
+	CONFIG_FASTD_WITH_VERIFY
 
 
 PKG_BUILD_DEPENDS:=nacl libuecc
@@ -72,7 +73,11 @@ CMAKE_OPTIONS += \
 	-DWITH_CMDLINE_LOGGING:BOOL=FALSE \
 	-DWITH_CMDLINE_OPERATION:BOOL=FALSE \
 	-DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
-	-DWITH_CAPABILITIES:BOOL=FALSE
+	-DWITH_VERIFY:BOOL=FALSE \
+	-DWITH_CAPABILITIES:BOOL=FALSE \
+	-DENABLE_SYSTEMD:BOOL=FALSE \
+	-DENABLE_LIBSODIUM:BOOL=FALSE \
+	-DENABLE_LTO:BOOL=TRUE
 
 
 ifeq ($(CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST),y)
@@ -138,6 +143,10 @@ ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y)
 CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE
 endif
 
+ifeq ($(CONFIG_FASTD_WITH_VERIFY),y)
+CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE
+endif
+
 
 define Package/fastd/description
  Fast and secure tunneling daemon, which is optimized on small code size and few dependencies
diff --git a/net/fastd/files/fastd.init b/net/fastd/files/fastd.init
index d55e6ffef2..3a209223e2 100644
--- a/net/fastd/files/fastd.init
+++ b/net/fastd/files/fastd.init
@@ -3,6 +3,8 @@
 
 START=95
 
+SERVICE_USE_PID=1
+
 EXTRA_COMMANDS="up down show_key generate_key"
 
 LIST_SEP="
@@ -359,16 +361,19 @@ reload_instance() {
 start() {
 	config_load 'fastd'
 	config_foreach start_instance 'fastd'
+	return 0
 }
 
 stop() {
 	config_load 'fastd'
 	config_foreach stop_instance 'fastd'
+	return 0
 }
 
 reload() {
 	config_load 'fastd'
 	config_foreach reload_instance 'fastd'
+	return 0
 }
 
 up() {