Changeset 13998


Ignorieren:
Zeitstempel:
07.01.2017 15:03:54 (vor 4 Monaten)
Autor:
er13
Nachricht:

openvpn:

Ort:
trunk
Dateien:
6 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r13995 r13998  
    151151    * openssh 7.4p1 
    152152    * openssl 0.9.8zh/1.0.1u/1.0.2j 
    153     * openvpn 2.3.13 
     153    * openvpn 2.3.14 
    154154    * pcre 8.39 
    155155    * pcscd 1.8.12 
  • trunk/make/openvpn/Config.in

    r13997 r13998  
    1313 
    1414    config FREETZ_PACKAGE_OPENVPN_VERSION_2_3 
    15     bool "2.3.13" 
     15    bool "2.3.14" 
    1616 
    1717#   config FREETZ_PACKAGE_OPENVPN_VERSION_2_4 
  • trunk/make/openvpn/openvpn.mk

    r13997 r13998  
    1 $(call PKG_INIT_BIN, 2.3.13) 
    2 $(PKG)_SOURCE_MD5_2.3.13:=4051af7925a5e6dc34be7f76efa81621 
     1$(call PKG_INIT_BIN, 2.3.14) 
     2$(PKG)_SOURCE_MD5_2.3.14:=70fc1e9c74ba2e6d7f7e320313dc3a7b 
    33$(PKG)_SOURCE_MD5:=$($(PKG)_SOURCE_MD5_$($(PKG)_VERSION)) 
    4 $(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.gz 
     4$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz 
    55$(PKG)_SITE:=http://swupdate.openvpn.net/community/releases 
    66 
  • trunk/make/openvpn/patches/2.3/100-tun-tcp-inetd-nowait.patch

    r13997 r13998  
    2727--- src/openvpn/options.c 
    2828+++ src/openvpn/options.c 
    29 @@ -1878,8 +1878,10 @@ 
     29@@ -1881,8 +1881,10 @@ 
    3030       ) 
    3131     msg (M_USAGE, "--inetd nowait can only be used in TLS mode"); 
    3232  
    33 +/* 
     33+#if 0 
    3434   if (options->inetd == INETD_NOWAIT && dev != DEV_TYPE_TAP) 
    3535     msg (M_USAGE, "--inetd nowait only makes sense in --dev tap mode"); 
    36 +*/ 
     36+#endif 
    3737  
    3838  
    3939   if (options->lladdr && dev != DEV_TYPE_TAP) 
    40 @@ -2062,8 +2064,10 @@ 
     40@@ -2065,8 +2067,10 @@ 
    4141 #endif 
    4242       if (options->shaper) 
     
    4949    msg (M_USAGE, "--ipchange cannot be used with --mode server (use --client-connect instead)"); 
    5050       if (!(proto_is_dgram(ce->proto) || ce->proto == PROTO_TCPv4_SERVER 
    51 @@ -2452,8 +2456,10 @@ 
     51@@ -2457,8 +2461,10 @@ 
    5252    * In forking TCP server mode, you don't need to ifconfig 
    5353    * the tap device (the assumption is that it will be bridged). 
    5454    */ 
    55 +/* 
     55+#if 0 
    5656   if (options->inetd == INETD_NOWAIT) 
    5757     options->ifconfig_noexec = true; 
    58 +*/ 
     58+#endif 
    5959  
    6060 #ifdef WIN32 
     
    6666          || sock->info.proto == PROTO_TCPv6_SERVER 
    6767         ); 
    68 +/* 
     68+#if 0 
    6969       ASSERT (!sock->inetd); 
    70 +*/ 
     70+#endif 
    7171       sock->sd = accept_from->sd; 
    7272     } 
  • trunk/make/openvpn/patches/2.3/110-omit_configure_params.patch

    r13997 r13998  
    11--- src/openvpn/options.c 
    22+++ src/openvpn/options.c 
    3 @@ -3535,7 +3535,7 @@ 
     3@@ -3540,7 +3540,7 @@ 
    44 #endif 
    55   msg (M_INFO|M_NOPREFIX, "Originally developed by James Yonan"); 
    6    msg (M_INFO|M_NOPREFIX, "Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>"); 
     6   msg (M_INFO|M_NOPREFIX, "Copyright (C) 2002-2016 OpenVPN Technologies, Inc. <sales@openvpn.net>"); 
    77-#ifndef ENABLE_SMALL 
    88+#if 0 
  • trunk/make/openvpn/patches/2.3/obfuscation/300-xor_scramble.patch

    r13967 r13998  
    1313   if (socket_connection_reset (c->c2.link_socket, status)) 
    1414     { 
    15 @@ -1151,7 +1154,10 @@ 
     15@@ -1223,7 +1226,10 @@ 
    1616        /* Send packet */ 
    1717        size = link_socket_write (c->c2.link_socket, 
     
    2727--- src/openvpn/options.c 
    2828+++ src/openvpn/options.c 
    29 @@ -792,6 +792,9 @@ 
     29@@ -794,6 +794,9 @@ 
    3030   o->max_routes = MAX_ROUTES_DEFAULT; 
    3131   o->resolve_retry_seconds = RESOLV_RETRY_INFINITE; 
     
    3737   o->occ = true; 
    3838 #endif 
    39 @@ -908,6 +911,9 @@ 
     39@@ -911,6 +914,9 @@ 
    4040   setenv_int_i (es, "local_port", e->local_port, i); 
    4141   setenv_str_i (es, "remote", e->remote, i); 
     
    4747 #ifdef ENABLE_HTTP_PROXY 
    4848   if (e->http_proxy_options) 
    49 @@ -1367,6 +1373,9 @@ 
     49@@ -1370,6 +1376,9 @@ 
    5050   SHOW_INT (connect_retry_seconds); 
    5151   SHOW_INT (connect_timeout); 
     
    5757 #ifdef ENABLE_HTTP_PROXY 
    5858   if (o->http_proxy_options) 
    59 @@ -5138,6 +5147,35 @@ 
     59@@ -5145,6 +5154,35 @@ 
    6060       options->proto_force = proto_force; 
    6161       options->force_connection_list = true; 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.