From: Markus Wigge <mwigge@marcant.net>
Date: Wed, 18 Feb 2009 17:35:21 +0000 (+0000)
Subject: upgrade to 2.1rc15 releases which work fine in our productive
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fc8f7ee35fb4c53040aeca5bb16c207beaa953d9;p=openwrt%2Fsvn-archive%2Farchive.git

upgrade to 2.1rc15 releases which work fine in our productive
environment.
We are using 2.1 for several years now without sigificant trouble


SVN-Revision: 14550
---

diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 55bf4f56a1..4bd6dbd64d 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
-PKG_VERSION:=2.0.9
+PKG_VERSION:=2.1_rc15
 PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://openvpn.net/release @SF/openvpn
-PKG_MD5SUM:=60745008b90b7dbe25fe8337c550fec6
+PKG_MD5SUM:=14a35b05c5a16292d149592d1dad0302
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/openvpn/files/openvpn.init b/net/openvpn/files/openvpn.init
index 9a548cd3f2..3dcd4cfd74 100644
--- a/net/openvpn/files/openvpn.init
+++ b/net/openvpn/files/openvpn.init
@@ -68,34 +68,35 @@ start_service() {
 
 	# append flags
 	append_bools "$s" \
-		auth_nocache ccd_exclusive client client_cert_not_required \
+		auth_nocache auth_retry auth_user_pass_optional bind ccd_exclusive client client_cert_not_required \
 		client_disconnect client_to_client comp_lzo comp_noadapt disable \
 		disable_occ down_pre duplicate_cn fast_io float http_proxy_retry \
-		ifconfig_noexec ifconfig_nowarn ifconfig_pool_linear management_hold \
-		management_query_passwords mktun mlock mtu_test mute_replay_warnings \
-		nobind no_iv no_replay passtos persist_key persist_local_ip \
+		ifconfig_noexec ifconfig_nowarn ifconfig_pool_linear management_forget_disconnect management_hold \
+		management_query_passwords management_signal mktun mlock mtu_test multihome mute_replay_warnings \
+		nobind no_iv no_name_remapping no_replay opt_verify passtos persist_key persist_local_ip \
 		persist_remote_ip persist_tun ping_timer_rem pull push_reset \
-		remote_random rmtun route_noexec single_session socks_proxy_retry \
-		suppress_timestamps test_crypto tls_client tls_exit tls_server \
+		remote_random rmtun route_noexec route_nopull single_session socks_proxy_retry \
+		suppress_timestamps tcp_nodelay test_crypto tls_client tls_exit tls_server \
 		tun_ipv6 up_delay up_restart username_as_common_name
 
 	# append params
 	append_params "$s" \
-		auth auth_user_pass auth_user_pass_verify bcast_buffers ca cd cert \
+		askpass auth auth_user_pass auth_user_pass_verify bcast_buffers ca cd cert \
 		chroot cipher client_config_dir client_connect config connect_freq \
-		connect_retry crl_verify cryptoapicert dev dev_node dev_type dh down \
+		connect_retry connect_timeout connect_retry_max crl_verify dev dev_node dev_type dh down \
 		echo engine explicit_exit_notify fragment group hand_window hash_size \
 		http_proxy http_proxy_option http_proxy_timeout ifconfig ifconfig_pool \
 		ifconfig_pool_persist ifconfig_push inactive ipchange iroute keepalive \
-		key key_method keysize learn_address link_mtu local log log_append \
+		key key_method keysize learn_address link_mtu lladdr local log log_append \
 		lport management management_log_cache max_clients \
 		max_routes_per_client mode mssfix mtu_disc mute nice ns_cert_type ping \
-		ping_exit ping_restart pkcs12 plugin port proto rcvbuf \
-		redirect_gateway remap_usr1 remote reneg_bytes reneg_pkts reneg_sec \
+		ping_exit ping_restart pkcs12 plugin port port_share prng proto rcvbuf \
+		redirect_gateway remap_usr1 remote remote_cert_eku remote_cert_ku remote_cert_tls \
+		reneg_bytes reneg_pkts reneg_sec \
 		replay_persist replay_window resolv_retry route route_delay route_gateway \
-		route_up rport secret server server_bridge setenv shaper sndbuf \
+		route_metric route_up rport script_security secret server server_bridge setenv shaper sndbuf \
 		socks_proxy status status_version syslog tcp_queue_limit tls_auth \
-		tls_cipher tls_remote tls_timeout tls_verify tmp_dir tran_window \
+		tls_cipher tls_remote tls_timeout tls_verify tmp_dir topology tran_window \
 		tun_mtu tun_mtu_extra txqueuelen up user verb
 
 	# append multi-value params