fastd: update to v14

This commit is contained in:
Matthias Schiffer 2014-06-30 23:08:01 +02:00
parent 5206c0e0b7
commit 1f9922d16e
3 changed files with 26 additions and 6 deletions

View File

@ -79,4 +79,9 @@ config FASTD_WITH_CMDLINE_COMMANDS
depends on PACKAGE_fastd depends on PACKAGE_fastd
default n default n
config FASTD_WITH_VERIFY
bool "Include support for on-verify handlers"
depends on PACKAGE_fastd
default n
endmenu endmenu

View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2012 OpenWrt.org # Copyright (C) 2012-2014 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,12 +8,13 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fastd PKG_NAME:=fastd
PKG_VERSION:=12 PKG_VERSION:=14
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/73 PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/75
PKG_MD5SUM:=1dadc61f4d712a10844afcb9b9f49a41 PKG_MD5SUM:=34f6bdebd0410a1fba7c8fd06fff7a05
PKG_CONFIG_DEPENDS:=\ PKG_CONFIG_DEPENDS:=\
CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \ CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
@ -30,7 +31,8 @@ PKG_CONFIG_DEPENDS:=\
CONFIG_FASTD_WITH_CMDLINE_USER \ CONFIG_FASTD_WITH_CMDLINE_USER \
CONFIG_FASTD_WITH_CMDLINE_LOGGING \ CONFIG_FASTD_WITH_CMDLINE_LOGGING \
CONFIG_FASTD_WITH_CMDLINE_OPERATION \ CONFIG_FASTD_WITH_CMDLINE_OPERATION \
CONFIG_FASTD_WITH_CMDLINE_COMMANDS CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
CONFIG_FASTD_WITH_VERIFY
PKG_BUILD_DEPENDS:=nacl libuecc PKG_BUILD_DEPENDS:=nacl libuecc
@ -71,7 +73,11 @@ CMAKE_OPTIONS += \
-DWITH_CMDLINE_LOGGING:BOOL=FALSE \ -DWITH_CMDLINE_LOGGING:BOOL=FALSE \
-DWITH_CMDLINE_OPERATION:BOOL=FALSE \ -DWITH_CMDLINE_OPERATION:BOOL=FALSE \
-DWITH_CMDLINE_COMMANDS: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) ifeq ($(CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST),y)
@ -137,6 +143,10 @@ ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y)
CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE
endif endif
ifeq ($(CONFIG_FASTD_WITH_VERIFY),y)
CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE
endif
define Package/fastd/description define Package/fastd/description
Fast and secure tunneling daemon, which is optimized on small code size and few dependencies Fast and secure tunneling daemon, which is optimized on small code size and few dependencies

View File

@ -3,6 +3,8 @@
START=95 START=95
SERVICE_USE_PID=1
EXTRA_COMMANDS="up down show_key generate_key" EXTRA_COMMANDS="up down show_key generate_key"
LIST_SEP=" LIST_SEP="
@ -359,16 +361,19 @@ reload_instance() {
start() { start() {
config_load 'fastd' config_load 'fastd'
config_foreach start_instance 'fastd' config_foreach start_instance 'fastd'
return 0
} }
stop() { stop() {
config_load 'fastd' config_load 'fastd'
config_foreach stop_instance 'fastd' config_foreach stop_instance 'fastd'
return 0
} }
reload() { reload() {
config_load 'fastd' config_load 'fastd'
config_foreach reload_instance 'fastd' config_foreach reload_instance 'fastd'
return 0
} }
up() { up() {