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
 	depends on PACKAGE_fastd
79
 	depends on PACKAGE_fastd
80
 	default n
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
 endmenu
87
 endmenu

+ 14
- 5
net/fastd/Makefile View File

8
 include $(TOPDIR)/rules.mk
8
 include $(TOPDIR)/rules.mk
9
 
9
 
10
 PKG_NAME:=fastd
10
 PKG_NAME:=fastd
11
-PKG_VERSION:=12
11
+PKG_VERSION:=14
12
 PKG_RELEASE:=1
12
 PKG_RELEASE:=1
13
 
13
 
14
 PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
14
 PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
15
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
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
 PKG_CONFIG_DEPENDS:=\
19
 PKG_CONFIG_DEPENDS:=\
20
 	CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
20
 	CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \
31
 	CONFIG_FASTD_WITH_CMDLINE_USER \
31
 	CONFIG_FASTD_WITH_CMDLINE_USER \
32
 	CONFIG_FASTD_WITH_CMDLINE_LOGGING \
32
 	CONFIG_FASTD_WITH_CMDLINE_LOGGING \
33
 	CONFIG_FASTD_WITH_CMDLINE_OPERATION \
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
 PKG_BUILD_DEPENDS:=nacl libuecc
38
 PKG_BUILD_DEPENDS:=nacl libuecc
72
 	-DWITH_CMDLINE_LOGGING:BOOL=FALSE \
73
 	-DWITH_CMDLINE_LOGGING:BOOL=FALSE \
73
 	-DWITH_CMDLINE_OPERATION:BOOL=FALSE \
74
 	-DWITH_CMDLINE_OPERATION:BOOL=FALSE \
74
 	-DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
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
 ifeq ($(CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST),y)
83
 ifeq ($(CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST),y)
138
 CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE
143
 CMAKE_OPTIONS += -DWITH_CMDLINE_COMMANDS:BOOL=TRUE
139
 endif
144
 endif
140
 
145
 
146
+ifeq ($(CONFIG_FASTD_WITH_VERIFY),y)
147
+CMAKE_OPTIONS += -DWITH_VERIFY:BOOL=TRUE
148
+endif
149
+
141
 
150
 
142
 define Package/fastd/description
151
 define Package/fastd/description
143
  Fast and secure tunneling daemon, which is optimized on small code size and few dependencies
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
 
3
 
4
 START=95
4
 START=95
5
 
5
 
6
+SERVICE_USE_PID=1
7
+
6
 EXTRA_COMMANDS="up down show_key generate_key"
8
 EXTRA_COMMANDS="up down show_key generate_key"
7
 
9
 
8
 LIST_SEP="
10
 LIST_SEP="
359
 start() {
361
 start() {
360
 	config_load 'fastd'
362
 	config_load 'fastd'
361
 	config_foreach start_instance 'fastd'
363
 	config_foreach start_instance 'fastd'
364
+	return 0
362
 }
365
 }
363
 
366
 
364
 stop() {
367
 stop() {
365
 	config_load 'fastd'
368
 	config_load 'fastd'
366
 	config_foreach stop_instance 'fastd'
369
 	config_foreach stop_instance 'fastd'
370
+	return 0
367
 }
371
 }
368
 
372
 
369
 reload() {
373
 reload() {
370
 	config_load 'fastd'
374
 	config_load 'fastd'
371
 	config_foreach reload_instance 'fastd'
375
 	config_foreach reload_instance 'fastd'
376
+	return 0
372
 }
377
 }
373
 
378
 
374
 up() {
379
 up() {