Changeset 14696


Ignorieren:
Zeitstempel:
19.05.2018 19:57:36 (vor 3 Monaten)
Autor:
er13
Nachricht:

openvpn: drop support for version 2.3.x

Ort:
trunk
Dateien:
1 gelöscht
3 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/CHANGELOG

    r14693 r14696  
    163163    * openssh 7.7p1 
    164164    * openssl 0.9.8zh/1.0.2o 
    165     * openvpn 2.3.18/2.4.6 
     165    * openvpn 2.4.6 
    166166    * pcre 8.41 
    167167    * pcscd 1.8.12 
  • trunk/make/openvpn/Config.in

    r14625 r14696  
    11config FREETZ_PACKAGE_OPENVPN 
    2     bool "OpenVPN" 
     2    bool "OpenVPN 2.4.6" 
    33    select FREETZ_BUSYBOX_BRCTL if ! FREETZ_PACKAGE_BRIDGE_UTILS 
    44    select FREETZ_MODULE_tun    if ! FREETZ_AVM_HAS_TUN_BUILTIN 
     
    77    help 
    88        VPN Server 
    9  
    10 choice 
    11     depends on FREETZ_PACKAGE_OPENVPN 
    12     prompt "Version" 
    13     default FREETZ_PACKAGE_OPENVPN_VERSION_2_4 
    14  
    15     config FREETZ_PACKAGE_OPENVPN_VERSION_2_3 
    16     bool "2.3.18 - DEPRECATED" 
    17  
    18     config FREETZ_PACKAGE_OPENVPN_VERSION_2_4 
    19     bool "2.4.6" 
    20 endchoice 
    219 
    2210choice 
     
    3119        select FREETZ_LIB_libssl    if ! FREETZ_PACKAGE_OPENVPN_STATIC 
    3220 
    33     config FREETZ_PACKAGE_OPENVPN_POLARSSL 
    34         bool "PolarSSL" 
    35         depends on FREETZ_PACKAGE_OPENVPN_VERSION_2_3 
    36         select FREETZ_LIB_libpolarssl13 if ! FREETZ_PACKAGE_OPENVPN_STATIC 
    37         help 
    38             Leads to smaller binaries, but lacks support for some openssl features. 
    39  
    4021    config FREETZ_PACKAGE_OPENVPN_MBEDTLS 
    4122        bool "mbed TLS" 
    42         depends on FREETZ_PACKAGE_OPENVPN_VERSION_2_4 
    4323        select FREETZ_LIB_libmbedcrypto if ! FREETZ_PACKAGE_OPENVPN_STATIC 
    4424        select FREETZ_LIB_libmbedtls    if ! FREETZ_PACKAGE_OPENVPN_STATIC 
     
    5030 
    5131config FREETZ_PACKAGE_OPENVPN_FORCE_BLOWFISH 
    52     bool "Include cipher blowfish in PolarSSL/mbedTLS" 
    53     depends on FREETZ_PACKAGE_OPENVPN && (FREETZ_PACKAGE_OPENVPN_POLARSSL || FREETZ_PACKAGE_OPENVPN_MBEDTLS) 
    54     select FREETZ_LIB_libpolarssl13_WITH_BLOWFISH if FREETZ_PACKAGE_OPENVPN_POLARSSL 
     32    bool "Include cipher blowfish in mbedTLS" 
     33    depends on FREETZ_PACKAGE_OPENVPN && FREETZ_PACKAGE_OPENVPN_MBEDTLS 
    5534    select FREETZ_LIB_libmbedcrypto_WITH_BLOWFISH if FREETZ_PACKAGE_OPENVPN_MBEDTLS 
    5635    default n 
    5736    help 
    58         Compile PolarSSL/mbedTLS with support for OpenVPN default cipher "blowfish" (BF-CBC). 
     37        Compile mbedTLS with support for OpenVPN default cipher "blowfish" (BF-CBC). 
    5938        Library/Binary size will increase approx. 7k (uncompressed). 
    6039 
     
    6241    bool 
    6342    depends on FREETZ_PACKAGE_OPENVPN_OPENSSL \ 
    64         || (FREETZ_PACKAGE_OPENVPN_POLARSSL && FREETZ_LIB_libpolarssl13_WITH_BLOWFISH) \ 
    6543        || (FREETZ_PACKAGE_OPENVPN_MBEDTLS  && FREETZ_LIB_libmbedcrypto_WITH_BLOWFISH) 
    6644    default y 
     
    8361config FREETZ_PACKAGE_OPENVPN_WITH_LZ4 
    8462    bool "With LZ4 compression" 
    85     depends on FREETZ_PACKAGE_OPENVPN && FREETZ_PACKAGE_OPENVPN_VERSION_2_4 
     63    depends on FREETZ_PACKAGE_OPENVPN 
    8664    select FREETZ_LIB_liblz4 if ! FREETZ_PACKAGE_OPENVPN_STATIC 
    8765    default n 
  • trunk/make/openvpn/openvpn.mk

    r14625 r14696  
    1 $(call PKG_INIT_BIN, $(if $(FREETZ_PACKAGE_OPENVPN_VERSION_2_4),2.4.6,2.3.18)) 
    2 $(PKG)_SOURCE_SHA256_2.3.18:=5ed3c79c367794dc52a7561869ec3031c649861940c906e739d5a0f5f7901fce 
    3 $(PKG)_SOURCE_SHA256_2.4.6 :=4f6434fa541cc9e363434ea71a16a62cf2615fb2f16af5b38f43ab5939998c26 
    4 $(PKG)_SOURCE_SHA256:=$($(PKG)_SOURCE_SHA256_$($(PKG)_VERSION)) 
     1$(call PKG_INIT_BIN, 2.4.6) 
     2$(PKG)_SOURCE_SHA256:=4f6434fa541cc9e363434ea71a16a62cf2615fb2f16af5b38f43ab5939998c26 
    53$(PKG)_SOURCE:=$(pkg)-$($(PKG)_VERSION).tar.xz 
    64$(PKG)_SITE:=https://swupdate.openvpn.net/community/releases,http://build.openvpn.net/downloads/releases 
     
    119endif 
    1210 
    13 ifeq ($(strip $(FREETZ_PACKAGE_OPENVPN_VERSION_2_3)),y) 
    14 $(PKG)_PATCH_POST_CMDS += $(call POLARSSL_HARDCODE_VERSION,13,configure include/*.h src/openvpn/*.h src/openvpn/*.c) 
    15 endif 
    16  
    1711$(PKG)_BINARY:=$($(PKG)_DIR)/src/openvpn/openvpn 
    1812$(PKG)_TARGET_BINARY:=$($(PKG)_DEST_DIR)/usr/sbin/openvpn 
     
    2115 
    2216$(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_OPENVPN_OPENSSL),openssl) 
    23 $(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_OPENVPN_POLARSSL),polarssl13) 
    2417$(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_OPENVPN_MBEDTLS),mbedtls) 
    2518$(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_OPENVPN_WITH_LZO),lzo) 
    2619$(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_OPENVPN_WITH_LZ4),lz4) 
    2720 
    28 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_VERSION_2_3 
    29 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_VERSION_2_4 
    3021$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_OPENSSL 
    3122$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION 
    32 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_POLARSSL 
    3323$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_MBEDTLS 
    3424$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_WITH_LZO 
     
    4030$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_OPENVPN_STATIC 
    4131$(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_IPV6_SUPPORT 
    42 $(PKG)_REBUILD_SUBOPTS += $(if $(FREETZ_PACKAGE_OPENVPN_POLARSSL),FREETZ_LIB_libpolarssl13_WITH_BLOWFISH) 
    4332$(PKG)_REBUILD_SUBOPTS += $(if $(FREETZ_PACKAGE_OPENVPN_MBEDTLS),FREETZ_LIB_libmbedcrypto_WITH_BLOWFISH) 
    4433 
    4534$(PKG)_CONFIGURE_OPTIONS += --disable-http-proxy 
    4635$(PKG)_CONFIGURE_PRE_CMDS += $(call PKG_PREVENT_RPATH_HARDCODING,./configure) 
    47 $(PKG)_CONFIGURE_PRE_CMDS += $(call PKG_MAKE_AC_VARIABLES_PACKAGE_SPECIFIC,lib_polarssl_ssl_init lib_polarssl_aes_crypt_cbc) 
    4836$(PKG)_CONFIGURE_PRE_CMDS += $(call PKG_MAKE_AC_VARIABLES_PACKAGE_SPECIFIC,lib_mbedtls_mbedtls_ssl_init) 
    4937# don't cache any pkg_cv_* variable 
     
    6351$(PKG)_CONFIGURE_OPTIONS += --sysconfdir=/mod/etc/openvpn 
    6452$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_OPENVPN_WITH_LZO),--enable-lzo,--disable-lzo) 
    65 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_OPENVPN_VERSION_2_4),$(if $(FREETZ_PACKAGE_OPENVPN_WITH_LZ4),--enable-lz4,--disable-lz4)) 
     53$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_OPENVPN_WITH_LZ4),--enable-lz4,--disable-lz4) 
    6654$(PKG)_CONFIGURE_OPTIONS += --disable-debug 
    6755$(PKG)_CONFIGURE_OPTIONS += --disable-multihome 
     
    7260$(PKG)_CONFIGURE_OPTIONS += --disable-socks 
    7361$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_OPENVPN_OPENSSL),--with-crypto-library=openssl) 
    74 $(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_OPENVPN_POLARSSL),--with-crypto-library=polarssl) 
    7562$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_OPENVPN_MBEDTLS),--with-crypto-library=mbedtls) 
    7663$(PKG)_CONFIGURE_OPTIONS += $(if $(FREETZ_PACKAGE_OPENVPN_USE_IPROUTE),--enable-iproute2) 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.