From 61a9904cfa6648c418fe744b4dff95cd422b7ed9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 14 Mar 2014 15:51:19 +0100 Subject: [PATCH] fastd: update to v12 --- net/fastd/Makefile | 8 ++++---- net/fastd/files/fastd.config | 3 +++ net/fastd/files/fastd.init | 3 ++- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/net/fastd/Makefile b/net/fastd/Makefile index 659a1eb..e506762 100644 --- a/net/fastd/Makefile +++ b/net/fastd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fastd -PKG_VERSION:=11 -PKG_RELEASE:=3 +PKG_VERSION:=12 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/72 -PKG_MD5SUM:=bdd89fc171c4d961169ff231c1198f12 +PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/73 +PKG_MD5SUM:=1dadc61f4d712a10844afcb9b9f49a41 PKG_CONFIG_DEPENDS:=\ CONFIG_FASTD_ENABLE_METHOD_CIPHER_TEST \ diff --git a/net/fastd/files/fastd.config b/net/fastd/files/fastd.config index 258a037..b47cc65 100644 --- a/net/fastd/files/fastd.config +++ b/net/fastd/files/fastd.config @@ -55,6 +55,9 @@ config fastd sample_config # Disable for compatiblity with fastd v10 and older option secure_handshakes 1 + # Set a packet mark to filter for with iptables or ip rules +# option packet_mark 42 + # Limits the maximum number of connections, optional # option peer_limit 5 diff --git a/net/fastd/files/fastd.init b/net/fastd/files/fastd.init index c503b53..d55e6ff 100644 --- a/net/fastd/files/fastd.init +++ b/net/fastd/files/fastd.init @@ -75,6 +75,7 @@ config_string_forward='forward $(yes_no "$value");' config_string_hide_ip_addresses='hide ip addresses $(yes_no "$value");' config_string_hide_mac_addresses='hide mac addresses $(yes_no "$value");' config_string_secure_handshakes='secure handshakes $(yes_no "$value");' +config_string_packet_mark='packet mark $(guard_value "$value");' config_string_peer='peer $(escape_string "$value") {' config_string_peer_group='peer group $(escape_string "$value") {' @@ -230,7 +231,7 @@ generate_config() { append_options "$s" config \ config config_peer config_peer_dir bind method syslog_level mode interface mtu peer_limit \ - user group pmtu forward hide_ip_addresses hide_mac_addresses secure_handshakes + user group pmtu forward hide_ip_addresses hide_mac_addresses secure_handshakes packet_mark config_get mode "$s" mode