Changeset 14019


Ignorieren:
Zeitstempel:
08.01.2017 23:34:47 (vor 3 Monaten)
Autor:
er13
Nachricht:

OpenSSL:

  • now that we have only one 1.x version, drop LTS suffix from the menuconfig symbol name
Ort:
trunk/make/openssl
Dateien:
3 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/make/openssl/Config.in

    r13760 r14019  
    1212    bool "With trace output support" 
    1313    depends on FREETZ_PACKAGE_OPENSSL 
    14     depends on FREETZ_OPENSSL_VERSION_1_LTS 
     14    depends on FREETZ_OPENSSL_VERSION_1 
    1515    default n 
    1616    help 
  • trunk/make/openssl/Config.in.libs

    r14018 r14019  
    4242    depends on FREETZ_OPENSSL_VERSION_PROMPT 
    4343    prompt "OpenSSL version" 
    44     default FREETZ_OPENSSL_VERSION_1_LTS 
     44    default FREETZ_OPENSSL_VERSION_1 
    4545 
    4646    config FREETZ_OPENSSL_VERSION_0 
     
    5454        - contains no assembler optimized code 
    5555 
    56     config FREETZ_OPENSSL_VERSION_1_LTS 
     56    config FREETZ_OPENSSL_VERSION_1 
    5757    bool "1.0.2" 
    5858    help 
     
    6767    string 
    6868    default "0.9.8" if FREETZ_OPENSSL_VERSION_0 
    69     default "1.0.0" if FREETZ_OPENSSL_VERSION_1_LTS 
     69    default "1.0.0" if FREETZ_OPENSSL_VERSION_1 
    7070 
    7171 
  • trunk/make/openssl/openssl.mk

    r14018 r14019  
    2525$(PKG)_REBUILD_SUBOPTS += FREETZ_LIB_libcrypto_WITH_RC4 
    2626$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_VERSION_0 
    27 $(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_VERSION_1_LTS 
     27$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_VERSION_1 
    2828$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SMALL_FOOTPRINT 
    2929$(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_CONFIG_DIR 
     
    3636$(PKG)_OPTIONS    += $(if $(FREETZ_LIB_libcrypto_WITH_EC),,no-ec) 
    3737$(PKG)_OPTIONS    += $(if $(FREETZ_OPENSSL_VERSION_0),no-perlasm no-cms) 
    38 $(PKG)_OPTIONS    += $(if $(FREETZ_OPENSSL_VERSION_1_LTS),no-ec_nistp_64_gcc_128 no-sctp no-srp no-store no-whirlpool) 
     38$(PKG)_OPTIONS    += $(if $(FREETZ_OPENSSL_VERSION_1),no-ec_nistp_64_gcc_128 no-sctp no-srp no-store no-whirlpool) 
    3939$(PKG)_OPTIONS    += $(if $(FREETZ_PACKAGE_OPENSSL_TRACE),enable-ssl-trace) 
    4040 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.