From 044b05fc04f546de938cde4ec720840ff92854e1 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 28 Dec 2020 18:42:29 -0800 Subject: [PATCH] transmission: do not use wolfSSL There's some kind of crash internally in wolfSSL. It doesn't seem like anyone knows how to fix it. Just disable it for now. Signed-off-by: Rosen Penev --- net/transmission/Makefile | 6 +++--- net/transmission/patches/010-no-intltool.patch | 2 +- net/transmission/patches/020-mbedcrypto.patch | 2 +- net/transmission/patches/080-disable-webseeding.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/transmission/Makefile b/net/transmission/Makefile index 28c106a0bd..d6fa8ada68 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=transmission PKG_VERSION:=3.00 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GITHUB/transmission/transmission-releases/master @@ -40,7 +40,7 @@ define Package/transmission/template CATEGORY:=Network TITLE:=BitTorrent client URL:=https://www.transmissionbt.com - DEPENDS:=+libcurl +libevent2 +libminiupnpc +libnatpmp +libpthread +librt +zlib +LIBCURL_NOSSL:libmbedtls +LIBCURL_GNUTLS:libmbedtls $(ICONV_DEPENDS) + DEPENDS:=+libcurl +libevent2 +libminiupnpc +libnatpmp +libpthread +librt +zlib +LIBCURL_NOSSL:libmbedtls +LIBCURL_GNUTLS:libmbedtls +LIBCURL_WOLFSSL:libmbedtls $(ICONV_DEPENDS) endef define Package/transmission-daemon @@ -104,7 +104,7 @@ CONFIGURE_ARGS += \ $(if $(CONFIG_LIBCURL_GNUTLS),--with-crypto=polarssl) \ $(if $(CONFIG_LIBCURL_MBEDTLS),--with-crypto=polarssl) \ $(if $(CONFIG_LIBCURL_OPENSSL),--with-crypto=openssl) \ - $(if $(CONFIG_LIBCURL_WOLFSSL),--with-crypto=cyassl) + $(if $(CONFIG_LIBCURL_WOLFSSL),--with-crypto=polarssl) define Package/transmission-daemon/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/net/transmission/patches/010-no-intltool.patch b/net/transmission/patches/010-no-intltool.patch index a82c62f6c3..ba59092bc5 100644 --- a/net/transmission/patches/010-no-intltool.patch +++ b/net/transmission/patches/010-no-intltool.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -555,9 +555,6 @@ dnl it should be safe to re-edit 0.40 back down to 0.23 +@@ -555,9 +555,6 @@ dnl it should be safe to re-edit 0.40 ba use_nls=no if test "x$enable_nls" = "xyes" ; then use_nls=yes diff --git a/net/transmission/patches/020-mbedcrypto.patch b/net/transmission/patches/020-mbedcrypto.patch index da0874fe19..18c33f5b7c 100644 --- a/net/transmission/patches/020-mbedcrypto.patch +++ b/net/transmission/patches/020-mbedcrypto.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -152,8 +152,8 @@ AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xcyassl"], [ +@@ -152,8 +152,8 @@ AS_IF([test "x$want_crypto" = "xauto" -o ) ]) AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xpolarssl"], [ diff --git a/net/transmission/patches/080-disable-webseeding.patch b/net/transmission/patches/080-disable-webseeding.patch index a850b3563b..f63d78d3e3 100644 --- a/net/transmission/patches/080-disable-webseeding.patch +++ b/net/transmission/patches/080-disable-webseeding.patch @@ -1,6 +1,6 @@ --- a/libtransmission/webseed.c +++ b/libtransmission/webseed.c -@@ -510,8 +510,6 @@ static void webseed_timer_func(evutil_socket_t foo UNUSED, short bar UNUSED, voi +@@ -510,8 +510,6 @@ static void webseed_timer_func(evutil_so ++w->retry_tickcount; } -- 2.30.2