Changeset 14694


Ignorieren:
Zeitstempel:
19.05.2018 18:53:33 (vor 5 Monaten)
Autor:
er13
Nachricht:

transmission: use mbed TLS instead of (deprecated/unmaintained) PolarSSL-1.3

Ort:
trunk/make
Dateien:
3 bearbeitet

Legende:

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

    r14571 r14694  
    2929    config FREETZ_LIB_libcurl_WITH_POLARSSL 
    3030        bool "PolarSSL" 
     31        depends on !FREETZ_PACKAGE_TRANSMISSION 
    3132 
    3233    config FREETZ_LIB_libcurl_WITH_MBEDTLS 
    3334        bool "mbed TLS" 
    34         # TODO: remove this dependency as soon as transmission supports mbed TLS (current git version already does) 
    35         depends on !FREETZ_PACKAGE_TRANSMISSION 
    3635endchoice 
    3736 
  • trunk/make/transmission/Config.in

    r14693 r14694  
    44    # 
    55    select FREETZ_PACKAGE_TRANSMISSION_WITH_OPENSSL  if FREETZ_LIB_libcurl_WITH_OPENSSL  || !FREETZ_LIB_libcurl_WITH_SSL 
    6     select FREETZ_PACKAGE_TRANSMISSION_WITH_POLARSSL if FREETZ_LIB_libcurl_WITH_POLARSSL 
     6    select FREETZ_PACKAGE_TRANSMISSION_WITH_MBEDTLS  if FREETZ_LIB_libcurl_WITH_MBEDTLS 
    77    # 
    88    select FREETZ_LIB_libcurl    if !FREETZ_PACKAGE_TRANSMISSION_STATIC 
     
    2525    select FREETZ_LIB_libcrypto_WITH_RC4 
    2626 
    27 config FREETZ_PACKAGE_TRANSMISSION_WITH_POLARSSL 
     27config FREETZ_PACKAGE_TRANSMISSION_WITH_MBEDTLS 
    2828    bool 
    2929    default n 
    30     select FREETZ_LIB_libpolarssl13      if !FREETZ_PACKAGE_TRANSMISSION_STATIC 
     30    select FREETZ_LIB_libmbedcrypto      if !FREETZ_PACKAGE_TRANSMISSION_STATIC 
    3131 
    3232config FREETZ_PACKAGE_TRANSMISSION_CLIENT 
  • trunk/make/transmission/transmission.mk

    r14693 r14694  
    44$(PKG)_SITE:=https://github.com/transmission/transmission-releases/raw/master 
    55 
    6 $(PKG)_PATCH_POST_CMDS += $(call POLARSSL_HARDCODE_VERSION,13,configure libtransmission/crypto-utils-polarssl.c cmake/FindPolarSSL.cmake) 
    7 $(PKG)_PATCH_POST_CMDS += $(SED) -i -r -e 's,<polarssl/x>,<polarssl13/x>,g' libtransmission/crypto-utils-polarssl.c; 
    86 
    97$(PKG)_BINARIES_ALL_SHORT     := cli  daemon  remote  create  edit   show 
     
    2624$(PKG)_DEPENDS_ON += zlib curl libevent 
    2725$(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_TRANSMISSION_WITH_OPENSSL),openssl) 
    28 $(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_TRANSMISSION_WITH_POLARSSL),polarssl13) 
     26$(PKG)_DEPENDS_ON += $(if $(FREETZ_PACKAGE_TRANSMISSION_WITH_MBEDTLS),mbedtls) 
    2927 
    3028$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_TRANSMISSION_WITH_OPENSSL $(if $(FREETZ_PACKAGE_TRANSMISSION_WITH_OPENSSL),FREETZ_OPENSSL_SHLIB_VERSION) 
    31 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_TRANSMISSION_WITH_POLARSSL 
     29$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_TRANSMISSION_WITH_MBEDTLS 
    3230$(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_IPV6_SUPPORT 
    3331$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_TRANSMISSION_STATIC 
     
    4139endif 
    4240 
     41$(PKG)_CONFIGURE_OPTIONS += --cache-file=/dev/null 
     42ifeq ($(strip $(FREETZ_PACKAGE_TRANSMISSION_WITH_MBEDTLS)),y) 
     43$(PKG)_CONFIGURE_ENV += MBEDTLS_CFLAGS="-D_MBEDTLS_DUMMY_" 
     44$(PKG)_CONFIGURE_ENV += MBEDTLS_LIBS="-lmbedcrypto" 
     45endif 
     46 
    4347$(PKG)_CONFIGURE_OPTIONS += --enable-cli 
    4448$(PKG)_CONFIGURE_OPTIONS += --disable-mac 
     
    4751$(PKG)_CONFIGURE_OPTIONS += --enable-lightweight 
    4852$(PKG)_CONFIGURE_OPTIONS += --enable-utp 
    49 $(PKG)_CONFIGURE_OPTIONS += --with-crypto=$(if $(FREETZ_PACKAGE_TRANSMISSION_WITH_OPENSSL),openssl)$(if $(FREETZ_PACKAGE_TRANSMISSION_WITH_POLARSSL),polarssl) 
     53$(PKG)_CONFIGURE_OPTIONS += --with-crypto=$(if $(FREETZ_PACKAGE_TRANSMISSION_WITH_OPENSSL),openssl)$(if $(FREETZ_PACKAGE_TRANSMISSION_WITH_MBEDTLS),polarssl) 
    5054 
    5155# add EXTRA_(C|LD)FLAGS 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.