Browse Source

fastd: update to v14

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Matthias Schiffer 10 years ago
parent
commit
baa93d58d5
3 changed files with 24 additions and 5 deletions
  1. 5
    0
      net/fastd/Config.in
  2. 14
    5
      net/fastd/Makefile
  3. 5
    0
      net/fastd/files/fastd.init

+ 5
- 0
net/fastd/Config.in View File

@@ -79,4 +79,9 @@ config FASTD_WITH_CMDLINE_COMMANDS
79 79
 	depends on PACKAGE_fastd
80 80
 	default n
81 81
 
82
+config FASTD_WITH_VERIFY
83
+        bool "Include support for on-verify handlers"
84
+        depends on PACKAGE_fastd
85
+        default n
86
+
82 87
 endmenu

+ 14
- 5
net/fastd/Makefile View File

@@ -8,13 +8,13 @@
8 8
 include $(TOPDIR)/rules.mk
9 9
 
10 10
 PKG_NAME:=fastd
11
-PKG_VERSION:=12
11
+PKG_VERSION:=14
12 12
 PKG_RELEASE:=1
13 13
 
14 14
 PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
15 15
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
16
-PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/73
17
-PKG_MD5SUM:=1dadc61f4d712a10844afcb9b9f49a41
16
+PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/75
17
+PKG_MD5SUM:=34f6bdebd0410a1fba7c8fd06fff7a05
18 18
 
19 19
 PKG_CONFIG_DEPENDS:=\
20 20
 	CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
@@ -31,7 +31,8 @@ PKG_CONFIG_DEPENDS:=\
31 31
 	CONFIG_FASTD_WITH_CMDLINE_USER \
32 32
 	CONFIG_FASTD_WITH_CMDLINE_LOGGING \
33 33
 	CONFIG_FASTD_WITH_CMDLINE_OPERATION \
34
-	CONFIG_FASTD_WITH_CMDLINE_COMMANDS
34
+	CONFIG_FASTD_WITH_CMDLINE_COMMANDS \
35
+	CONFIG_FASTD_WITH_VERIFY
35 36
 
36 37
 
37 38
 PKG_BUILD_DEPENDS:=nacl libuecc
@@ -72,7 +73,11 @@ CMAKE_OPTIONS += \
72 73
 	-DWITH_CMDLINE_LOGGING:BOOL=FALSE \
73 74
 	-DWITH_CMDLINE_OPERATION:BOOL=FALSE \
74 75
 	-DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
75
-	-DWITH_CAPABILITIES:BOOL=FALSE
76
+	-DWITH_VERIFY:BOOL=FALSE \
77
+	-DWITH_CAPABILITIES:BOOL=FALSE \
78
+	-DENABLE_SYSTEMD:BOOL=FALSE \
79
+	-DENABLE_LIBSODIUM:BOOL=FALSE \
80
+	-DENABLE_LTO:BOOL=TRUE
76 81
 
77 82
 
78 83
 ifeq ($(CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST),y)
@@ -138,6 +143,10 @@ ifeq ($(CONFIG_FASTD_WITH_CMDLINE_COMMANDS),y)
138 143
 CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE
139 144
 endif
140 145
 
146
+ifeq ($(CONFIG_FASTD_WITH_VERIFY),y)
147
+CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE
148
+endif
149
+
141 150
 
142 151
 define Package/fastd/description
143 152
  Fast and secure tunneling daemon, which is optimized on small code size and few dependencies

+ 5
- 0
net/fastd/files/fastd.init View File

@@ -3,6 +3,8 @@
3 3
 
4 4
 START=95
5 5
 
6
+SERVICE_USE_PID=1
7
+
6 8
 EXTRA_COMMANDS="up down show_key generate_key"
7 9
 
8 10
 LIST_SEP="
@@ -359,16 +361,19 @@ reload_instance() {
359 361
 start() {
360 362
 	config_load 'fastd'
361 363
 	config_foreach start_instance 'fastd'
364
+	return 0
362 365
 }
363 366
 
364 367
 stop() {
365 368
 	config_load 'fastd'
366 369
 	config_foreach stop_instance 'fastd'
370
+	return 0
367 371
 }
368 372
 
369 373
 reload() {
370 374
 	config_load 'fastd'
371 375
 	config_foreach reload_instance 'fastd'
376
+	return 0
372 377
 }
373 378
 
374 379
 up() {