Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5526 from neheb/mbedtls

Browse source 
transmission: Update to 2.93 + fixes [v2]
This commit is contained in:
Hannu Nyman 2018-01-28 20:51:48 +02:00 committed by GitHub
commit b3710f578a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 440 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
net/transmission/Makefile
View file

@ -8,22 +8,22 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=transmission PKG_NAME:=transmission
PKG_VERSION:=2.92+git PKG_VERSION:=2.93
PKG_RELEASE:=5 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/transmission/transmission.git PKG_SOURCE_URL:=https://github.com/transmission/transmission-releases/raw/master
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_HASH:=8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b
PKG_SOURCE_VERSION:=5b29fe15561d40c40cbee635446df6b33e18d2c2 PKG_MAINTAINER:=Rosen Penev <rosenp@gmail.com>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_MIRROR_HASH:=f99982ae68564da9bf6ad4407285aff2e29508e4fd801ff56f86a8b3dae01819
PKG_LICENSE:=GPL-2.0+
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/transmission/template define Package/transmission/template

1
net/transmission/files/transmission.config
View file

@ -49,6 +49,7 @@ config transmission
option rpc_authentication_required false option rpc_authentication_required false
option rpc_bind_address '0.0.0.0' option rpc_bind_address '0.0.0.0'
option rpc_enabled true option rpc_enabled true
option rpc_host_whitelist_enabled false
option rpc_password '' option rpc_password ''
option rpc_port 9091 option rpc_port 9091
option rpc_url '/transmission/' option rpc_url '/transmission/'

3
net/transmission/files/transmission.init
View file

@ -95,7 +95,7 @@ transmission() {
speed_limit_down speed_limit_down_enabled speed_limit_up \ speed_limit_down speed_limit_down_enabled speed_limit_up \
speed_limit_up_enabled start_added_torrents trash_original_torrent_files \ speed_limit_up_enabled start_added_torrents trash_original_torrent_files \
umask upload_slots_per_torrent utp_enabled scrape_paused_torrents \ umask upload_slots_per_torrent utp_enabled scrape_paused_torrents \
watch_dir_enabled watch_dir_enabled rpc_host_whitelist_enabled
append_params_quotes "$cfg" \ append_params_quotes "$cfg" \
blocklist_url bind_address_ipv4 bind_address_ipv6 download_dir incomplete_dir \ blocklist_url bind_address_ipv4 bind_address_ipv6 download_dir incomplete_dir \
@ -113,6 +113,7 @@ transmission() {
procd_set_param command $cmdline procd_set_param command $cmdline
procd_set_param respawn retry=60 procd_set_param respawn retry=60
procd_set_param user "$user" procd_set_param user "$user"
procd_set_param group "$user"
procd_set_param nice "$nice" procd_set_param nice "$nice"
if test -z "$USE";then if test -z "$USE";then
procd_set_param limits core="0 0" procd_set_param limits core="0 0"

4
net/transmission/patches/020-use-internal-miniupnp.patch
View file

@ -1,6 +1,8 @@
diff --git a/configure.ac b/configure.ac
index aff673b..7e109af 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -386,7 +386,7 @@ dnl See if ANY version of miniupnpc is i @@ -378,7 +378,7 @@ dnl See if ANY version of miniupnpc is installed
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([#include <miniupnpc/miniupnpc.h>], [AC_LANG_PROGRAM([#include <miniupnpc/miniupnpc.h>],
[struct UPNPDev dev;])], [struct UPNPDev dev;])],

447
net/transmission/patches/040-fix-for-mbedtls.patch
View file

@ -1,29 +1,430 @@
From bad7f584eb11076ae37fd51cdb21842935c6ea57 Mon Sep 17 00:00:00 2001
From: Mike Gelfand <mikedld@mikedld.com>
Date: Wed, 26 Oct 2016 20:37:10 +0300
Subject: [PATCH] Add support for mbedtls (formely polarssl)
---
cmake/FindPolarSSL.cmake | 37 +++++++----
configure.ac | 28 ++++----
libtransmission/CMakeLists.txt | 4 ++
libtransmission/Makefile.am | 3 +
libtransmission/crypto-utils-polarssl.c | 112 +++++++++++++++++++-------------
5 files changed, 115 insertions(+), 69 deletions(-)
diff --git a/cmake/FindPolarSSL.cmake b/cmake/FindPolarSSL.cmake
index 0a958e0..e4e1ac6 100644
--- a/cmake/FindPolarSSL.cmake
+++ b/cmake/FindPolarSSL.cmake
@@ -8,21 +8,36 @@ if(POLARSSL_PREFER_STATIC_LIB)
endif()
if(UNIX)
- find_package(PkgConfig QUIET)
- pkg_check_modules(_POLARSSL QUIET polarssl)
+ find_package(PkgConfig QUIET)
+ pkg_check_modules(_MBEDTLS QUIET mbedtls)
endif()
-find_path(POLARSSL_INCLUDE_DIR NAMES polarssl/version.h HINTS ${_POLARSSL_INCLUDEDIR})
-find_library(POLARSSL_LIBRARY NAMES polarssl HINTS ${_POLARSSL_LIBDIR})
+find_path(MBEDTLS_INCLUDE_DIR NAMES mbedtls/version.h HINTS ${_MBEDTLS_INCLUDEDIR})
+find_library(MBEDTLS_LIBRARY NAMES mbedtls HINTS ${_MBEDTLS_LIBDIR})
+if(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY)
+ set(POLARSSL_INCLUDE_DIR ${MBEDTLS_INCLUDE_DIR})
+ set(POLARSSL_LIBRARY ${MBEDTLS_LIBRARY})
+ set(POLARSSL_VERSION ${_MBEDTLS_VERSION})
+ set(POLARSSL_IS_MBEDTLS ON)
+else()
+ if(UNIX)
+ pkg_check_modules(_POLARSSL QUIET polarssl)
+ endif()
+
+ find_path(POLARSSL_INCLUDE_DIR NAMES polarssl/version.h HINTS ${_POLARSSL_INCLUDEDIR})
+ find_library(POLARSSL_LIBRARY NAMES polarssl HINTS ${_POLARSSL_LIBDIR})
+ set(POLARSSL_VERSION ${_POLARSSL_VERSION})
+ set(POLARSSL_IS_MBEDTLS OFF)
+endif()
-if(POLARSSL_INCLUDE_DIR)
- if(_POLARSSL_VERSION)
- set(POLARSSL_VERSION ${_POLARSSL_VERSION})
+if(NOT POLARSSL_VERSION AND POLARSSL_INCLUDE_DIR)
+ if(POLARSSL_IS_MBEDTLS)
+ file(STRINGS "${POLARSSL_INCLUDE_DIR}/mbedtls/version.h" POLARSSL_VERSION_STR REGEX "^#define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"[^\"]+\"")
else()
file(STRINGS "${POLARSSL_INCLUDE_DIR}/polarssl/version.h" POLARSSL_VERSION_STR REGEX "^#define[\t ]+POLARSSL_VERSION_STRING[\t ]+\"[^\"]+\"")
- if(POLARSSL_VERSION_STR MATCHES "\"([^\"]+)\"")
- set(POLARSSL_VERSION "${CMAKE_MATCH_1}")
- endif()
+ endif()
+ if(POLARSSL_VERSION_STR MATCHES "\"([^\"]+)\"")
+ set(POLARSSL_VERSION "${CMAKE_MATCH_1}")
endif()
endif()
@@ -39,7 +54,7 @@ find_package_handle_standard_args(PolarSSL
POLARSSL_VERSION
)
-mark_as_advanced(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
+mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY)
if(POLARSSL_PREFER_STATIC_LIB)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${POLARSSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
diff --git a/configure.ac b/configure.ac
index aff673b..cb026df 100644
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -154,24 +154,8 @@ AS_IF([test "x$want_crypto" = "xauto" -o @@ -149,23 +149,26 @@ AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xcyassl"], [
)
])
AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xpolarssl"], [ AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xpolarssl"], [
PKG_CHECK_MODULES(MBEDTLS, [mbedtls >= $POLARSSL_MINIMUM], - AC_CHECK_HEADER([polarssl/version.h],
[want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS="$MBEDTLS_CFLAGS"; CRYPTO_LIBS="$MBEDTLS_LIBS"; POLARSSL_IS_MBEDTLS=yes], - [AC_EGREP_CPP([version_ok], [#include <polarssl/version.h>
- [AC_CHECK_HEADER([polarssl/version.h], - #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM
- [AC_EGREP_CPP([version_ok], [#include <polarssl/version.h> - version_ok
- #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM - #endif],
- version_ok - [AC_CHECK_LIB([polarssl], [dhm_calc_secret],
- #endif], - [want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS=""; CRYPTO_LIBS="-lpolarssl"],
- [AC_CHECK_LIB([polarssl], [dhm_calc_secret], + PKG_CHECK_MODULES(MBEDTLS, [mbedtls >= $POLARSSL_MINIMUM],
- [want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS=""; CRYPTO_LIBS="-lpolarssl"], + [want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS="$MBEDTLS_CFLAGS"; CRYPTO_LIBS="$MBEDTLS_LIBS"; POLARSSL_IS_MBEDTLS=yes],
- [AS_IF([test "x$want_crypto" = "xpolarssl"], + [AC_CHECK_HEADER([polarssl/version.h],
- [AC_MSG_ERROR([PolarSSL support requested, but library not found.])] + [AC_EGREP_CPP([version_ok], [#include <polarssl/version.h>
- )] + #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM
- )], + version_ok
- [AS_IF([test "x$want_crypto" = "xpolarssl"], + #endif],
- [AC_MSG_ERROR([PolarSSL support requested, but version not suitable.])] + [AC_CHECK_LIB([polarssl], [dhm_calc_secret],
- )] + [want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS=""; CRYPTO_LIBS="-lpolarssl"],
- )], + [AS_IF([test "x$want_crypto" = "xpolarssl"],
- [AS_IF([test "x$want_crypto" = "xpolarssl"], + [AC_MSG_ERROR([PolarSSL support requested, but library not found.])]
- [AC_MSG_ERROR([PolarSSL support requested, but headers not found.])] + )]
- )] + )],
+ [AS_IF([test "x$want_crypto" = "xpolarssl"], [AS_IF([test "x$want_crypto" = "xpolarssl"],
+ [AC_MSG_ERROR([PolarSSL support requested, but library not found.])] - [AC_MSG_ERROR([PolarSSL support requested, but library not found.])]
+ [AC_MSG_ERROR([PolarSSL support requested, but version not suitable.])]
)]
)],
[AS_IF([test "x$want_crypto" = "xpolarssl"],
- [AC_MSG_ERROR([PolarSSL support requested, but version not suitable.])]
+ [AC_MSG_ERROR([PolarSSL support requested, but headers not found.])]
)]
- )],
- [AS_IF([test "x$want_crypto" = "xpolarssl"],
- [AC_MSG_ERROR([PolarSSL support requested, but headers not found.])]
)] )]
) )
]) ])
@@ -180,6 +183,7 @@ AS_IF([test "x$CRYPTO_PKG" = "x"], [
AM_CONDITIONAL([CRYPTO_USE_OPENSSL],[test "x$CRYPTO_PKG" = "xopenssl"])
AM_CONDITIONAL([CRYPTO_USE_CYASSL],[test "x$CRYPTO_PKG" = "xcyassl"])
AM_CONDITIONAL([CRYPTO_USE_POLARSSL],[test "x$CRYPTO_PKG" = "xpolarssl"])
+AM_CONDITIONAL([POLARSSL_IS_MBEDTLS],[test "x$POLARSSL_IS_MBEDTLS" = "xyes"])
AC_SUBST(CRYPTO_PKG)
AC_SUBST(CRYPTO_CFLAGS)
AC_SUBST(CRYPTO_LIBS)
diff --git a/libtransmission/CMakeLists.txt b/libtransmission/CMakeLists.txt
index 4865dee..b5230b9 100644
--- a/libtransmission/CMakeLists.txt
+++ b/libtransmission/CMakeLists.txt
@@ -194,6 +194,10 @@ if(USE_SYSTEM_B64)
add_definitions(-DUSE_SYSTEM_B64)
endif()
+if(POLARSSL_IS_MBEDTLS)
+ add_definitions(-DPOLARSSL_IS_MBEDTLS)
+endif()
+
include_directories(
${PROJECT_SOURCE_DIR}
${PROJECT_BINARY_DIR}
diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index f91769a..4d7e85a 100644
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -102,6 +102,9 @@ libtransmission_a_SOURCES += crypto-utils-cyassl.c
endif
if CRYPTO_USE_POLARSSL
libtransmission_a_SOURCES += crypto-utils-polarssl.c
+if POLARSSL_IS_MBEDTLS
+AM_CPPFLAGS += -DPOLARSSL_IS_MBEDTLS
+endif
endif
noinst_HEADERS = \
diff --git a/libtransmission/crypto-utils-polarssl.c b/libtransmission/crypto-utils-polarssl.c
index 1c59a7f..e98c13d 100644
--- a/libtransmission/crypto-utils-polarssl.c
+++ b/libtransmission/crypto-utils-polarssl.c
@@ -1,5 +1,5 @@
/*
- * This file Copyright (C) 2014-2015 Mnemosyne LLC
+ * This file Copyright (C) 2014-2016 Mnemosyne LLC
*
* It may be used under the GNU GPL versions 2 or 3
* or any future license endorsed by Mnemosyne LLC.
@@ -7,15 +7,25 @@
* $Id$
*/
+#if defined (POLARSSL_IS_MBEDTLS)
+ #define API_HEADER(x) <mbedtls/x>
+ #define API(x) mbedtls_##x
+ #define API_VERSION_NUMBER MBEDTLS_VERSION_NUMBER
+#else
+ #define API_HEADER(x) <polarssl/x>
+ #define API(x) x
+ #define API_VERSION_NUMBER POLARSSL_VERSION_NUMBER
+#endif
+
#include <assert.h>
-#include <polarssl/arc4.h>
-#include <polarssl/base64.h>
-#include <polarssl/ctr_drbg.h>
-#include <polarssl/dhm.h>
-#include <polarssl/error.h>
-#include <polarssl/sha1.h>
-#include <polarssl/version.h>
+#include API_HEADER (arc4.h)
+#include API_HEADER (base64.h)
+#include API_HEADER (ctr_drbg.h)
+#include API_HEADER (dhm.h)
+#include API_HEADER (error.h)
+#include API_HEADER (sha1.h)
+#include API_HEADER (version.h)
#include "transmission.h"
#include "crypto-utils.h"
@@ -41,7 +51,9 @@ log_polarssl_error (int error_code,
{
char error_message[256];
-#if POLARSSL_VERSION_NUMBER >= 0x01030000
+#if defined (POLARSSL_IS_MBEDTLS)
+ mbedtls_strerror (error_code, error_message, sizeof (error_message));
+#elif API_VERSION_NUMBER >= 0x01030000
polarssl_strerror (error_code, error_message, sizeof (error_message));
#else
error_strerror (error_code, error_message, sizeof (error_message));
@@ -51,7 +63,7 @@ log_polarssl_error (int error_code,
}
}
-#define log_error(error_code) log_polarssl_error(error_code, __FILE__, __LINE__)
+#define log_error(error_code) log_polarssl_error ((error_code), __FILE__, __LINE__)
static bool
check_polarssl_result (int result,
@@ -83,15 +95,20 @@ my_rand (void * context UNUSED, unsigned char * buffer, size_t buffer_size)
return 0;
}
-static ctr_drbg_context *
+static API (ctr_drbg_context) *
get_rng (void)
{
- static ctr_drbg_context rng;
+ static API (ctr_drbg_context) rng;
static bool rng_initialized = false;
if (!rng_initialized)
{
- if (!check_result (ctr_drbg_init (&rng, &my_rand, NULL, NULL, 0)))
+#if API_VERSION_NUMBER >= 0x02000000
+ API (ctr_drbg_init) (&rng);
+ if (!check_result (API (ctr_drbg_seed) (&rng, &my_rand, NULL, NULL, 0)))
+#else
+ if (!check_result (API (ctr_drbg_init) (&rng, &my_rand, NULL, NULL, 0)))
+#endif
return NULL;
rng_initialized = true;
}
@@ -117,13 +134,13 @@ get_rng_lock (void)
tr_sha1_ctx_t
tr_sha1_init (void)
{
- sha1_context * handle = tr_new0 (sha1_context, 1);
+ API (sha1_context) * handle = tr_new0 (API (sha1_context), 1);
-#if POLARSSL_VERSION_NUMBER >= 0x01030800
- sha1_init (handle);
+#if API_VERSION_NUMBER >= 0x01030800
+ API (sha1_init) (handle);
#endif
- sha1_starts (handle);
+ API (sha1_starts) (handle);
return handle;
}
@@ -139,7 +156,7 @@ tr_sha1_update (tr_sha1_ctx_t handle,
assert (data != NULL);
- sha1_update (handle, data, data_length);
+ API (sha1_update) (handle, data, data_length);
return true;
}
@@ -151,11 +168,11 @@ tr_sha1_final (tr_sha1_ctx_t handle,
{
assert (handle != NULL);
- sha1_finish (handle, hash);
+ API (sha1_finish) (handle, hash);
}
-#if POLARSSL_VERSION_NUMBER >= 0x01030800
- sha1_free (handle);
+#if API_VERSION_NUMBER >= 0x01030800
+ API (sha1_free) (handle);
#endif
tr_free (handle);
@@ -169,10 +186,10 @@ tr_sha1_final (tr_sha1_ctx_t handle,
tr_rc4_ctx_t
tr_rc4_new (void)
{
- arc4_context * handle = tr_new0 (arc4_context, 1);
+ API (arc4_context) * handle = tr_new0 (API (arc4_context), 1);
-#if POLARSSL_VERSION_NUMBER >= 0x01030800
- arc4_init (handle);
+#if API_VERSION_NUMBER >= 0x01030800
+ API (arc4_init) (handle);
#endif
return handle;
@@ -181,8 +198,8 @@ tr_rc4_new (void)
void
tr_rc4_free (tr_rc4_ctx_t handle)
{
-#if POLARSSL_VERSION_NUMBER >= 0x01030800
- arc4_free (handle);
+#if API_VERSION_NUMBER >= 0x01030800
+ API (arc4_free) (handle);
#endif
tr_free (handle);
@@ -196,7 +213,7 @@ tr_rc4_set_key (tr_rc4_ctx_t handle,
assert (handle != NULL);
assert (key != NULL);
- arc4_setup (handle, key, key_length);
+ API (arc4_setup) (handle, key, key_length);
}
void
@@ -213,7 +230,7 @@ tr_rc4_process (tr_rc4_ctx_t handle,
assert (input != NULL);
assert (output != NULL);
- arc4_crypt (handle, length, input, output);
+ API (arc4_crypt) (handle, length, input, output);
}
/***
@@ -226,19 +243,19 @@ tr_dh_new (const uint8_t * prime_num,
const uint8_t * generator_num,
size_t generator_num_length)
{
- dhm_context * handle = tr_new0 (dhm_context, 1);
+ API (dhm_context) * handle = tr_new0 (API (dhm_context), 1);
assert (prime_num != NULL);
assert (generator_num != NULL);
-#if POLARSSL_VERSION_NUMBER >= 0x01030800
- dhm_init (handle);
+#if API_VERSION_NUMBER >= 0x01030800
+ API (dhm_init) (handle);
#endif
- if (!check_result (mpi_read_binary (&handle->P, prime_num, prime_num_length)) ||
- !check_result (mpi_read_binary (&handle->G, generator_num, generator_num_length)))
+ if (!check_result (API (mpi_read_binary) (&handle->P, prime_num, prime_num_length)) ||
+ !check_result (API (mpi_read_binary) (&handle->G, generator_num, generator_num_length)))
{
- dhm_free (handle);
+ API (dhm_free) (handle);
return NULL;
}
@@ -253,7 +270,7 @@ tr_dh_free (tr_dh_ctx_t handle)
if (handle == NULL)
return;
- dhm_free (handle);
+ API (dhm_free) (handle);
}
bool
@@ -262,7 +279,7 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle,
uint8_t * public_key,
size_t * public_key_length)
{
- dhm_context * handle = raw_handle;
+ API (dhm_context) * handle = raw_handle;
assert (handle != NULL);
assert (public_key != NULL);
@@ -270,8 +287,8 @@ tr_dh_make_key (tr_dh_ctx_t raw_handle,
if (public_key_length != NULL)
*public_key_length = handle->len;
- return check_result (dhm_make_public (handle, private_key_length, public_key,
- handle->len, my_rand, NULL));
+ return check_result (API (dhm_make_public) (handle, private_key_length, public_key,
+ handle->len, my_rand, NULL));
}
tr_dh_secret_t
@@ -279,26 +296,29 @@ tr_dh_agree (tr_dh_ctx_t raw_handle,
const uint8_t * other_public_key,
size_t other_public_key_length)
{
- dhm_context * handle = raw_handle;
+ API (dhm_context) * handle = raw_handle;
struct tr_dh_secret * ret;
size_t secret_key_length;
assert (handle != NULL);
assert (other_public_key != NULL);
- if (!check_result (dhm_read_public (handle, other_public_key,
- other_public_key_length)))
+ if (!check_result (API (dhm_read_public )(handle, other_public_key,
+ other_public_key_length)))
return NULL;
ret = tr_dh_secret_new (handle->len);
secret_key_length = handle->len;
-#if POLARSSL_VERSION_NUMBER >= 0x01030000
- if (!check_result (dhm_calc_secret (handle, ret->key,
- &secret_key_length, my_rand, NULL)))
+#if API_VERSION_NUMBER >= 0x02000000
+ if (!check_result (API (dhm_calc_secret) (handle, ret->key, secret_key_length,
+ &secret_key_length, my_rand, NULL)))
+#elif API_VERSION_NUMBER >= 0x01030000
+ if (!check_result (API (dhm_calc_secret) (handle, ret->key,
+ &secret_key_length, my_rand, NULL)))
#else
- if (!check_result (dhm_calc_secret (handle, ret->key, &secret_key_length)))
+ if (!check_result (API (dhm_calc_secret) (handle, ret->key, &secret_key_length)))
#endif
{
tr_dh_secret_free (ret);
@@ -324,7 +344,7 @@ tr_rand_buffer (void * buffer,
assert (buffer != NULL);
tr_lockLock (rng_lock);
- ret = check_result (ctr_drbg_random (get_rng (), buffer, length));
+ ret = check_result (API (ctr_drbg_random) (get_rng (), buffer, length));
tr_lockUnlock (rng_lock);
return ret;
--
2.7.4

26
net/transmission/patches/050-mask-as-release.patch
View file

@ -1,26 +0,0 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,8 +42,8 @@ set(TR_NAME ${PROJECT_NAME})
# "Z" for unsupported trunk builds,
# "0" for stable, supported releases
# these should be the only two lines you need to change
-set(TR_USER_AGENT_PREFIX "2.92+")
-set(TR_PEER_ID_PREFIX "-TR292Z-")
+set(TR_USER_AGENT_PREFIX "2.92")
+set(TR_PEER_ID_PREFIX "-TR2920-")
string(REGEX MATCH "^([0-9]+)\\.([0-9]+).*" TR_VERSION "${TR_USER_AGENT_PREFIX}")
set(TR_VERSION_MAJOR "${CMAKE_MATCH_1}")
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ dnl STATUS: "X" for prerelease beta buil
dnl "Z" for unsupported trunk builds,
dnl "0" for stable, supported releases
dnl these should be the only two lines you need to change
-m4_define([user_agent_prefix],[2.92+])
-m4_define([peer_id_prefix],[-TR292Z-])
+m4_define([user_agent_prefix],[2.92])
+m4_define([peer_id_prefix],[-TR2920-])
AC_INIT([transmission],[user_agent_prefix],[https://trac.transmissionbt.com/newticket])
AC_SUBST(USERAGENT_PREFIX,[user_agent_prefix])

30
net/transmission/patches/060-fix-foreground-syslog.patch
View file

@ -1,30 +0,0 @@
diff --git a/daemon/daemon.c b/daemon/daemon.c
index 7b2a3b425..5b19d105a 100644
--- a/daemon/daemon.c
+++ b/daemon/daemon.c
@@ -715,12 +715,7 @@ static int daemon_start(void* raw_arg, bool foreground)
}
#ifdef HAVE_SYSLOG
-
- if (!foreground)
- {
- openlog(MY_NAME, LOG_CONS | LOG_PID, LOG_DAEMON);
- }
-
+ openlog(MY_NAME, LOG_CONS | LOG_PID, LOG_DAEMON);
#endif
/* Create new timer event to report daemon status */
@@ -772,11 +767,8 @@ cleanup:
/* shutdown */
#ifdef HAVE_SYSLOG
- if (!foreground)
- {
syslog(LOG_INFO, "%s", "Closing session");
closelog();
- }
#endif