Hello community, here is the log from the commit of package transmission for openSUSE:Factory checked in at 2018-05-07 14:51:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/transmission (Old) and /work/SRC/openSUSE:Factory/.transmission.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "transmission" Mon May 7 14:51:14 2018 rev:84 rq:603102 version:2.94 Changes: -------- --- /work/SRC/openSUSE:Factory/transmission/transmission.changes 2018-03-24 16:11:12.936504876 +0100 +++ /work/SRC/openSUSE:Factory/.transmission.new/transmission.changes 2018-05-07 14:51:16.854529009 +0200 @@ -1,0 +2,15 @@ +Wed May 2 11:22:38 UTC 2018 - [email protected] + +- Update to version 2.94: + + All Platforms: + - Fix building against LibreSSL. + - Fix building against mbedTLS. + - Fix torrents ETA calculation. + - Fix cross-compilation issues caused by miniupnpc + configuration test. + + Qt Client: Fix bad downloaded percentage in DetailsDialog. + + Web Client: + - Fix tracker error XSS in inspector (CVE pending). + - Fix torrent name HTML-escaping in trackers inspector tab. + +------------------------------------------------------------------- Old: ---- transmission-2.93.tar.xz New: ---- transmission-2.94.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ transmission.spec ++++++ --- /var/tmp/diff_new_pack.IIaFdl/_old 2018-05-07 14:51:17.658503920 +0200 +++ /var/tmp/diff_new_pack.IIaFdl/_new 2018-05-07 14:51:17.662503795 +0200 @@ -17,7 +17,7 @@ Name: transmission -Version: 2.93 +Version: 2.94 Release: 0 Summary: A BitTorrent client with multiple UIs License: (GPL-2.0-only OR GPL-3.0-only) AND MIT ++++++ transmission-2.93.tar.xz -> transmission-2.94.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/CMakeLists.txt new/transmission-2.94/CMakeLists.txt --- old/transmission-2.93/CMakeLists.txt 2018-01-23 20:17:42.993774318 +0100 +++ new/transmission-2.94/CMakeLists.txt 2018-05-01 19:21:08.185549424 +0200 @@ -41,8 +41,8 @@ # "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.93") -set(TR_PEER_ID_PREFIX "-TR2930-") +set(TR_USER_AGENT_PREFIX "2.94") +set(TR_PEER_ID_PREFIX "-TR2940-") string(REGEX MATCH "^([0-9]+)\\.([0-9]+).*" TR_VERSION "${TR_USER_AGENT_PREFIX}") set(TR_VERSION_MAJOR "${CMAKE_MATCH_1}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/Makefile.in new/transmission-2.94/Makefile.in --- old/transmission-2.93/Makefile.in 2018-01-23 20:18:01.532822691 +0100 +++ new/transmission-2.94/Makefile.in 2018-05-01 19:21:29.940646115 +0200 @@ -307,6 +307,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/NEWS new/transmission-2.94/NEWS --- old/transmission-2.93/NEWS 2018-01-23 20:17:42.994774321 +0100 +++ new/transmission-2.94/NEWS 2018-05-01 19:21:08.187549433 +0200 @@ -1,4 +1,17 @@ -=== Transmission 2.93 (2018/01/xx) === +=== Transmission 2.94 (2018/05/01) === +[https://github.com/transmission/transmission/releases/tag/2.94 All tickets closed by this release] +==== All Platforms ==== + * Fix building against LibreSSL (#284, #486, #570) + * Fix building against mbedTLS (#115, #528) + * Fix torrents ETA calculation (#522) + * Fix cross-compilation issues caused by miniupnpc configuration test (#475) +==== Qt Client ==== + * Fix bad downloaded percentage in DetailsDialog (#547) +==== Web Client ==== + * Fix tracker error XSS in inspector (CVE pending) + * Fix torrent name HTML-escaping in trackers inspector tabTODO + +=== Transmission 2.93 (2018/01/23) === [https://github.com/transmission/transmission/releases/tag/2.93 All tickets closed by this release] ==== All Platforms ==== * Fix CVE-2018-5702 (#468) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/REVISION new/transmission-2.94/REVISION --- old/transmission-2.93/REVISION 2018-01-23 20:17:55.905808010 +0100 +++ new/transmission-2.94/REVISION 2018-05-01 19:21:24.157620409 +0200 @@ -1 +1 @@ -3c5870d4f52c91bf8f73846ef2b1da74bbb22693 +d8e60ee44f4295935bd98bf741f85ed19f5a7dfb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/Transmission.xcodeproj/project.pbxproj new/transmission-2.94/Transmission.xcodeproj/project.pbxproj --- old/transmission-2.93/Transmission.xcodeproj/project.pbxproj 2018-01-23 20:17:42.995774323 +0100 +++ new/transmission-2.94/Transmission.xcodeproj/project.pbxproj 2018-05-01 19:21:08.192549455 +0200 @@ -3435,7 +3435,7 @@ IBC_NOTICES = NO; IBC_WARNINGS = YES; INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist"; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC"; + INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h"; INFOPLIST_PREPROCESS = YES; LIBRARY_SEARCH_PATHS = ( @@ -3571,7 +3571,7 @@ IBC_NOTICES = NO; IBC_WARNINGS = YES; INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist"; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC"; + INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h"; INFOPLIST_PREPROCESS = YES; LIBRARY_SEARCH_PATHS = ( @@ -3648,7 +3648,7 @@ IBC_NOTICES = NO; IBC_WARNINGS = YES; INFOPLIST_FILE = "$(SRCROOT)/macosx/Info.plist"; - INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-CC"; + INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = "$(SRCROOT)/libtransmission/version.h"; INFOPLIST_PREPROCESS = YES; LIBRARY_SEARCH_PATHS = ( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/cli/Makefile.in new/transmission-2.94/cli/Makefile.in --- old/transmission-2.93/cli/Makefile.in 2018-01-23 20:18:01.565822778 +0100 +++ new/transmission-2.94/cli/Makefile.in 2018-05-01 19:21:29.979646289 +0200 @@ -306,6 +306,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/cmake/FindPolarSSL.cmake new/transmission-2.94/cmake/FindPolarSSL.cmake --- old/transmission-2.93/cmake/FindPolarSSL.cmake 2018-01-23 20:17:42.996774326 +0100 +++ new/transmission-2.94/cmake/FindPolarSSL.cmake 2018-05-01 19:21:08.195549469 +0200 @@ -8,21 +8,41 @@ 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}) +find_library(MBEDCRYPTO_LIBRARY NAMES mbedcrypto HINTS ${_MBEDTLS_LIBDIR}) +if(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY) + set(POLARSSL_INCLUDE_DIR ${MBEDTLS_INCLUDE_DIR}) + if(MBEDCRYPTO_LIBRARY) + set(POLARSSL_LIBRARY ${MBEDTLS_LIBRARY} ${MBEDCRYPTO_LIBRARY}) + else() + set(POLARSSL_LIBRARY ${MBEDTLS_LIBRARY}) + endif() + set(POLARSSL_VERSION ${_MBEDTLS_VERSION}) + set(POLARSSL_IS_MBEDTLS ON) +else() + if(UNIX) + pkg_check_modules(_POLARSSL QUIET polarssl) + endif() -if(POLARSSL_INCLUDE_DIR) - if(_POLARSSL_VERSION) - set(POLARSSL_VERSION ${_POLARSSL_VERSION}) + 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(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 +59,7 @@ POLARSSL_VERSION ) -mark_as_advanced(POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY) +mark_as_advanced(MBEDTLS_INCLUDE_DIR MBEDTLS_LIBRARY MBEDCRYPTO_LIBRARY POLARSSL_INCLUDE_DIR POLARSSL_LIBRARY) if(POLARSSL_PREFER_STATIC_LIB) set(CMAKE_FIND_LIBRARY_SUFFIXES ${POLARSSL_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/configure new/transmission-2.94/configure --- old/transmission-2.93/configure 2018-01-23 20:18:00.969821223 +0100 +++ new/transmission-2.94/configure 2018-05-01 19:21:29.345643471 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for transmission 2.93. +# Generated by GNU Autoconf 2.69 for transmission 2.94. # # Report bugs to <https://github.com/transmission/transmission>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='transmission' PACKAGE_TARNAME='transmission' -PACKAGE_VERSION='2.93' -PACKAGE_STRING='transmission 2.93' +PACKAGE_VERSION='2.94' +PACKAGE_STRING='transmission 2.94' PACKAGE_BUGREPORT='https://github.com/transmission/transmission' PACKAGE_URL='' @@ -733,12 +733,16 @@ CRYPTO_LIBS CRYPTO_CFLAGS CRYPTO_PKG +POLARSSL_IS_MBEDTLS_FALSE +POLARSSL_IS_MBEDTLS_TRUE CRYPTO_USE_POLARSSL_FALSE CRYPTO_USE_POLARSSL_TRUE CRYPTO_USE_CYASSL_FALSE CRYPTO_USE_CYASSL_TRUE CRYPTO_USE_OPENSSL_FALSE CRYPTO_USE_OPENSSL_TRUE +MBEDTLS_LIBS +MBEDTLS_CFLAGS CYASSL_LIBS CYASSL_CFLAGS WOLFSSL_LIBS @@ -950,6 +954,8 @@ WOLFSSL_LIBS CYASSL_CFLAGS CYASSL_LIBS +MBEDTLS_CFLAGS +MBEDTLS_LIBS SYSTEMD_DAEMON_CFLAGS SYSTEMD_DAEMON_LIBS GTK_CFLAGS @@ -1506,7 +1512,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures transmission 2.93 to adapt to many kinds of systems. +\`configure' configures transmission 2.94 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1577,7 +1583,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of transmission 2.93:";; + short | recursive ) echo "Configuration of transmission 2.94:";; esac cat <<\_ACEOF @@ -1666,6 +1672,10 @@ CYASSL_CFLAGS C compiler flags for CYASSL, overriding pkg-config CYASSL_LIBS linker flags for CYASSL, overriding pkg-config + MBEDTLS_CFLAGS + C compiler flags for MBEDTLS, overriding pkg-config + MBEDTLS_LIBS + linker flags for MBEDTLS, overriding pkg-config SYSTEMD_DAEMON_CFLAGS C compiler flags for SYSTEMD_DAEMON, overriding pkg-config SYSTEMD_DAEMON_LIBS @@ -1743,7 +1753,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -transmission configure 2.93 +transmission configure 2.94 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2279,7 +2289,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by transmission $as_me 2.93, which was +It was created by transmission $as_me 2.94, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2627,9 +2637,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -USERAGENT_PREFIX=2.93 +USERAGENT_PREFIX=2.94 -PEERID_PREFIX=-TR2930- +PEERID_PREFIX=-TR2940- # Check whether --enable-silent-rules was given. @@ -3151,7 +3161,7 @@ # Define the identity of the package. PACKAGE='transmission' - VERSION='2.93' + VERSION='2.94' cat >>confdefs.h <<_ACEOF @@ -18657,14 +18667,75 @@ fi if test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xpolarssl"; then : - ac_fn_c_check_header_mongrel "$LINENO" "polarssl/version.h" "ac_cv_header_polarssl_version_h" "$ac_includes_default" + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MBEDTLS" >&5 +$as_echo_n "checking for MBEDTLS... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$MBEDTLS_CFLAGS"; then + pkg_cv_MBEDTLS_CFLAGS="$MBEDTLS_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mbedtls >= \$POLARSSL_MINIMUM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mbedtls >= $POLARSSL_MINIMUM") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_MBEDTLS_CFLAGS=`$PKG_CONFIG --cflags "mbedtls >= $POLARSSL_MINIMUM" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$MBEDTLS_LIBS"; then + pkg_cv_MBEDTLS_LIBS="$MBEDTLS_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mbedtls >= \$POLARSSL_MINIMUM\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mbedtls >= $POLARSSL_MINIMUM") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_MBEDTLS_LIBS=`$PKG_CONFIG --libs "mbedtls >= $POLARSSL_MINIMUM" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + MBEDTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "mbedtls >= $POLARSSL_MINIMUM"` + else + MBEDTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "mbedtls >= $POLARSSL_MINIMUM"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MBEDTLS_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ac_fn_c_check_header_mongrel "$LINENO" "polarssl/version.h" "ac_cv_header_polarssl_version_h" "$ac_includes_default" if test "x$ac_cv_header_polarssl_version_h" = xyes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <polarssl/version.h> - #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM - version_ok - #endif + #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM + version_ok + #endif _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | $EGREP "version_ok" >/dev/null 2>&1; then : @@ -18733,6 +18804,91 @@ +elif test $pkg_failed = untried; then + ac_fn_c_check_header_mongrel "$LINENO" "polarssl/version.h" "ac_cv_header_polarssl_version_h" "$ac_includes_default" +if test "x$ac_cv_header_polarssl_version_h" = xyes; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <polarssl/version.h> + #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM + version_ok + #endif +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "version_ok" >/dev/null 2>&1; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dhm_calc_secret in -lpolarssl" >&5 +$as_echo_n "checking for dhm_calc_secret in -lpolarssl... " >&6; } +if ${ac_cv_lib_polarssl_dhm_calc_secret+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpolarssl $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char dhm_calc_secret (); +int +main () +{ +return dhm_calc_secret (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_polarssl_dhm_calc_secret=yes +else + ac_cv_lib_polarssl_dhm_calc_secret=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_polarssl_dhm_calc_secret" >&5 +$as_echo "$ac_cv_lib_polarssl_dhm_calc_secret" >&6; } +if test "x$ac_cv_lib_polarssl_dhm_calc_secret" = xyes; then : + want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS=""; CRYPTO_LIBS="-lpolarssl" +else + if test "x$want_crypto" = "xpolarssl"; then : + as_fn_error $? "PolarSSL support requested, but library not found." "$LINENO" 5 + +fi + +fi + +else + if test "x$want_crypto" = "xpolarssl"; then : + as_fn_error $? "PolarSSL support requested, but version not suitable." "$LINENO" 5 + +fi + +fi +rm -f conftest* + +else + if test "x$want_crypto" = "xpolarssl"; then : + as_fn_error $? "PolarSSL support requested, but headers not found." "$LINENO" 5 + +fi + +fi + + + +else + MBEDTLS_CFLAGS=$pkg_cv_MBEDTLS_CFLAGS + MBEDTLS_LIBS=$pkg_cv_MBEDTLS_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS="$MBEDTLS_CFLAGS"; CRYPTO_LIBS="$MBEDTLS_LIBS"; POLARSSL_IS_MBEDTLS=yes +fi + fi # we should have found the library by now if test "x$CRYPTO_PKG" = "x"; then : @@ -18769,6 +18925,14 @@ CRYPTO_USE_POLARSSL_FALSE= fi + if test "x$POLARSSL_IS_MBEDTLS" = "xyes"; then + POLARSSL_IS_MBEDTLS_TRUE= + POLARSSL_IS_MBEDTLS_FALSE='#' +else + POLARSSL_IS_MBEDTLS_TRUE='#' + POLARSSL_IS_MBEDTLS_FALSE= +fi + @@ -19465,12 +19629,6 @@ conftest$ac_exeext conftest.$ac_ext if test "x$upnp_version" = "xunknown" ; then - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdlib.h> @@ -19478,24 +19636,19 @@ int main () { -#ifdef MINIUPNPC_API_VERSION - return EXIT_SUCCESS; - #else - return EXIT_FAILURE; +#ifndef MINIUPNPC_API_VERSION + #error MINIUPNPC_API_VERSION undefined #endif ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO"; then : upnp_version=">= 1.7" fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi if test "x$upnp_version" = "xunknown" ; then @@ -21546,6 +21699,10 @@ as_fn_error $? "conditional \"CRYPTO_USE_POLARSSL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${POLARSSL_IS_MBEDTLS_TRUE}" && test -z "${POLARSSL_IS_MBEDTLS_FALSE}"; then + as_fn_error $? "conditional \"POLARSSL_IS_MBEDTLS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${USE_INOTIFY_TRUE}" && test -z "${USE_INOTIFY_FALSE}"; then as_fn_error $? "conditional \"USE_INOTIFY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21995,7 +22152,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by transmission $as_me 2.93, which was +This file was extended by transmission $as_me 2.94, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22052,7 +22209,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -transmission config.status 2.93 +transmission config.status 2.94 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/configure.ac new/transmission-2.94/configure.ac --- old/transmission-2.93/configure.ac 2018-01-23 20:17:42.996774326 +0100 +++ new/transmission-2.94/configure.ac 2018-05-01 19:21:08.196549473 +0200 @@ -3,8 +3,8 @@ 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.93]) -m4_define([peer_id_prefix],[-TR2930-]) +m4_define([user_agent_prefix],[2.94]) +m4_define([peer_id_prefix],[-TR2940-]) AC_INIT([transmission],[user_agent_prefix],[https://github.com/transmission/transmission]) AC_SUBST(USERAGENT_PREFIX,[user_agent_prefix]) @@ -149,23 +149,26 @@ ) ]) AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xpolarssl"], [ - AC_CHECK_HEADER([polarssl/version.h], - [AC_EGREP_CPP([version_ok], [#include <polarssl/version.h> - #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM - version_ok - #endif], - [AC_CHECK_LIB([polarssl], [dhm_calc_secret], - [want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS=""; CRYPTO_LIBS="-lpolarssl"], + PKG_CHECK_MODULES(MBEDTLS, [mbedtls >= $POLARSSL_MINIMUM], + [want_crypto="polarssl"; CRYPTO_PKG="polarssl"; CRYPTO_CFLAGS="$MBEDTLS_CFLAGS"; CRYPTO_LIBS="$MBEDTLS_LIBS"; POLARSSL_IS_MBEDTLS=yes], + [AC_CHECK_HEADER([polarssl/version.h], + [AC_EGREP_CPP([version_ok], [#include <polarssl/version.h> + #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM + version_ok + #endif], + [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"], + [AC_MSG_ERROR([PolarSSL support requested, but library not found.])] + )] + )], [AS_IF([test "x$want_crypto" = "xpolarssl"], - [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 @@ 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) @@ -386,14 +390,12 @@ dnl MINIUPNPC_API_VERSION and we won't have to figure dnl it out on our own if test "x$upnp_version" = "xunknown" ; then - AC_RUN_IFELSE( + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [#include <stdlib.h> #include <miniupnpc/miniupnpc.h>], - [#ifdef MINIUPNPC_API_VERSION - return EXIT_SUCCESS; - #else - return EXIT_FAILURE; + [#ifndef MINIUPNPC_API_VERSION + #error MINIUPNPC_API_VERSION undefined #endif] )], [upnp_version=">= 1.7"] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/daemon/Makefile.in new/transmission-2.94/daemon/Makefile.in --- old/transmission-2.93/daemon/Makefile.in 2018-01-23 20:18:01.596822858 +0100 +++ new/transmission-2.94/daemon/Makefile.in 2018-05-01 19:21:30.011646431 +0200 @@ -326,6 +326,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/extras/Makefile.in new/transmission-2.94/extras/Makefile.in --- old/transmission-2.93/extras/Makefile.in 2018-01-23 20:18:01.614822906 +0100 +++ new/transmission-2.94/extras/Makefile.in 2018-05-01 19:21:30.030646515 +0200 @@ -221,6 +221,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/gtk/Makefile.in new/transmission-2.94/gtk/Makefile.in --- old/transmission-2.93/gtk/Makefile.in 2018-01-23 20:18:01.648822994 +0100 +++ new/transmission-2.94/gtk/Makefile.in 2018-05-01 19:21:30.066646675 +0200 @@ -370,6 +370,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/gtk/icons/Makefile.in new/transmission-2.94/gtk/icons/Makefile.in --- old/transmission-2.93/gtk/icons/Makefile.in 2018-01-23 20:18:01.675823065 +0100 +++ new/transmission-2.94/gtk/icons/Makefile.in 2018-05-01 19:21:30.088646774 +0200 @@ -223,6 +223,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/libtransmission/CMakeLists.txt new/transmission-2.94/libtransmission/CMakeLists.txt --- old/transmission-2.93/libtransmission/CMakeLists.txt 2018-01-23 20:17:43.007774354 +0100 +++ new/transmission-2.94/libtransmission/CMakeLists.txt 2018-05-01 19:21:08.215549558 +0200 @@ -194,6 +194,10 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/libtransmission/Makefile.am new/transmission-2.94/libtransmission/Makefile.am --- old/transmission-2.93/libtransmission/Makefile.am 2018-01-23 20:17:43.007774354 +0100 +++ new/transmission-2.94/libtransmission/Makefile.am 2018-05-01 19:21:08.216549562 +0200 @@ -102,6 +102,9 @@ 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/libtransmission/Makefile.in new/transmission-2.94/libtransmission/Makefile.in --- old/transmission-2.93/libtransmission/Makefile.in 2018-01-23 20:18:01.762823292 +0100 +++ new/transmission-2.94/libtransmission/Makefile.in 2018-05-01 19:21:30.178647173 +0200 @@ -99,6 +99,7 @@ @CRYPTO_USE_OPENSSL_TRUE@am__append_7 = crypto-utils-openssl.c @CRYPTO_USE_CYASSL_TRUE@am__append_8 = crypto-utils-cyassl.c @CRYPTO_USE_POLARSSL_TRUE@am__append_9 = crypto-utils-polarssl.c +@CRYPTO_USE_POLARSSL_TRUE@@POLARSSL_IS_MBEDTLS_TRUE@am__append_10 = -DPOLARSSL_IS_MBEDTLS TESTS = bitfield-test$(EXEEXT) blocklist-test$(EXEEXT) \ clients-test$(EXEEXT) crypto-test$(EXEEXT) error-test$(EXEEXT) \ file-test$(EXEEXT) history-test$(EXEEXT) json-test$(EXEEXT) \ @@ -727,6 +728,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ @@ -835,7 +838,7 @@ transmissionlocaledir = @transmissionlocaledir@ AM_CPPFLAGS = -I$(top_srcdir) -D__TRANSMISSION__ \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" $(am__append_2) \ - $(am__append_4) + $(am__append_4) $(am__append_10) AM_CFLAGS = \ @DHT_CFLAGS@ \ @LIBB64_CFLAGS@ \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/libtransmission/crypto-utils-openssl.c new/transmission-2.94/libtransmission/crypto-utils-openssl.c --- old/transmission-2.93/libtransmission/crypto-utils-openssl.c 2018-01-23 20:17:43.009774360 +0100 +++ new/transmission-2.94/libtransmission/crypto-utils-openssl.c 2018-05-01 19:21:08.219549575 +0200 @@ -15,6 +15,7 @@ #include <assert.h> #include <openssl/bn.h> +#include <openssl/crypto.h> #include <openssl/dh.h> #include <openssl/err.h> #include <openssl/evp.h> @@ -49,7 +50,12 @@ static bool strings_loaded = false; if (!strings_loaded) { +#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) ERR_load_crypto_strings (); +#else + OPENSSL_init_crypto (OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); +#endif + strings_loaded = true; } #endif @@ -230,7 +236,8 @@ **** ***/ -#if OPENSSL_VERSION_NUMBER < 0x10100000 +#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000) + static inline int DH_set0_pqg (DH * dh, BIGNUM * p, @@ -238,28 +245,29 @@ BIGNUM * g) { /* If the fields p and g in d are NULL, the corresponding input - * parameters MUST be non-NULL. q may remain NULL. + * parameters MUST be non-NULL. q may remain NULL. */ - if ((dh->p == NULL && p == NULL) - || (dh->g == NULL && g == NULL)) + if ((dh->p == NULL && p == NULL) || (dh->g == NULL && g == NULL)) return 0; - if (p != NULL) { - BN_free (dh->p); - dh->p = p; - } - if (q != NULL) { - BN_free (dh->q); - dh->q = q; - } - if (g != NULL) { - BN_free (dh->g); - dh->g = g; - } + if (p != NULL) + { + BN_free (dh->p); + dh->p = p; + } + if (q != NULL) + { + BN_free (dh->q); + dh->q = q; + } + if (g != NULL) + { + BN_free (dh->g); + dh->g = g; + } - if (q != NULL) { + if (q != NULL) dh->length = BN_num_bits (q); - } return 1; } @@ -268,8 +276,8 @@ DH_set_length (DH * dh, long length) { - dh->length = length; - return 1; + dh->length = length; + return 1; } static inline void @@ -296,12 +304,11 @@ assert (prime_num != NULL); assert (generator_num != NULL); + p = BN_bin2bn (prime_num, prime_num_length, NULL); g = BN_bin2bn (generator_num, generator_num_length, NULL); - if (!check_pointer (p) || - !check_pointer (g) || - !DH_set0_pqg (handle, p, NULL, g)) + if (!check_pointer (p) || !check_pointer (g) || !DH_set0_pqg (handle, p, NULL, g)) { BN_free (p); BN_free (g); @@ -329,20 +336,19 @@ { DH * handle = raw_handle; int dh_size, my_public_key_length; - const BIGNUM * hand_pub_key; + const BIGNUM * my_public_key; assert (handle != NULL); assert (public_key != NULL); - DH_set_length(handle, private_key_length * 8); if (!check_result (DH_generate_key (handle))) return false; - DH_get0_key (handle, &hand_pub_key, NULL); + DH_get0_key (handle, &my_public_key, NULL); - my_public_key_length = BN_bn2bin (hand_pub_key, public_key); + my_public_key_length = BN_bn2bin (my_public_key, public_key); dh_size = DH_size (handle); tr_dh_align_key (public_key, my_public_key_length, dh_size); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/libtransmission/crypto-utils-polarssl.c new/transmission-2.94/libtransmission/crypto-utils-polarssl.c --- old/transmission-2.93/libtransmission/crypto-utils-polarssl.c 2018-01-23 20:17:43.009774360 +0100 +++ new/transmission-2.94/libtransmission/crypto-utils-polarssl.c 2018-05-01 19:21:08.219549575 +0200 @@ -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 @@ { 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 @@ } } -#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 @@ 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 @@ 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 @@ assert (data != NULL); - sha1_update (handle, data, data_length); + API (sha1_update) (handle, data, data_length); return true; } @@ -151,11 +168,11 @@ { 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_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 @@ 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 @@ assert (handle != NULL); assert (key != NULL); - arc4_setup (handle, key, key_length); + API (arc4_setup) (handle, key, key_length); } void @@ -213,7 +230,7 @@ assert (input != NULL); assert (output != NULL); - arc4_crypt (handle, length, input, output); + API (arc4_crypt) (handle, length, input, output); } /*** @@ -226,19 +243,19 @@ 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 @@ if (handle == NULL) return; - dhm_free (handle); + API (dhm_free) (handle); } bool @@ -262,7 +279,7 @@ 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 @@ 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 @@ 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 @@ 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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/libtransmission/torrent.c new/transmission-2.94/libtransmission/torrent.c --- old/transmission-2.93/libtransmission/torrent.c 2018-01-23 20:17:43.017774381 +0100 +++ new/transmission-2.94/libtransmission/torrent.c 2018-05-01 19:21:08.229549620 +0200 @@ -1324,10 +1324,10 @@ case TR_STATUS_DOWNLOAD: if ((tor->etaDLSpeedCalculatedAt + 800) < now) { - tor->etaDLSpeedCalculatedAt = now; tor->etaDLSpeed_Bps = ((tor->etaDLSpeedCalculatedAt + 4000) < now) ? pieceDownloadSpeed_Bps /* if no recent previous speed, no need to smooth */ : ((tor->etaDLSpeed_Bps*4.0) + pieceDownloadSpeed_Bps)/5.0; /* smooth across 5 readings */ + tor->etaDLSpeedCalculatedAt = now; } if ((s->leftUntilDone > s->desiredAvailable) && (tor->info.webseedCount < 1)) @@ -1349,10 +1349,10 @@ { if ((tor->etaULSpeedCalculatedAt + 800) < now) { - tor->etaULSpeedCalculatedAt = now; tor->etaULSpeed_Bps = ((tor->etaULSpeedCalculatedAt + 4000) < now) ? pieceUploadSpeed_Bps /* if no recent previous speed, no need to smooth */ : ((tor->etaULSpeed_Bps*4.0) + pieceUploadSpeed_Bps)/5.0; /* smooth across 5 readings */ + tor->etaULSpeedCalculatedAt = now; } if (tor->etaULSpeed_Bps == 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/libtransmission/version.h new/transmission-2.94/libtransmission/version.h --- old/transmission-2.93/libtransmission/version.h 2018-01-23 20:17:55.906808013 +0100 +++ new/transmission-2.94/libtransmission/version.h 2018-05-01 19:21:24.159620418 +0200 @@ -1,12 +1,13 @@ #pragma once -#define PEERID_PREFIX "-TR2930-" -#define USERAGENT_PREFIX "2.93" -#define VCS_REVISION "3c5870d4f5" -#define VCS_REVISION_NUM 3c5870d4f5 -#define SHORT_VERSION_STRING "2.93" -#define LONG_VERSION_STRING "2.93 (3c5870d4f5)" -#define VERSION_STRING_INFOPLIST 2.93 +#define PEERID_PREFIX "-TR2940-" +#define USERAGENT_PREFIX "2.94" +#define VCS_REVISION "d8e60ee44f" +#define VCS_REVISION_NUM d8e60ee44f +#define SHORT_VERSION_STRING "2.94" +#define LONG_VERSION_STRING "2.94 (d8e60ee44f)" +#define VERSION_STRING_INFOPLIST 2.94 +#define BUILD_STRING_INFOPLIST 14714.2.94 #define MAJOR_VERSION 2 -#define MINOR_VERSION 93 +#define MINOR_VERSION 94 #define TR_STABLE_RELEASE 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/libtransmission/version.h.in new/transmission-2.94/libtransmission/version.h.in --- old/transmission-2.93/libtransmission/version.h.in 2018-01-23 20:17:43.020774388 +0100 +++ new/transmission-2.94/libtransmission/version.h.in 2018-05-01 19:21:08.232549633 +0200 @@ -7,6 +7,7 @@ #define SHORT_VERSION_STRING "${TR_USER_AGENT_PREFIX}" #define LONG_VERSION_STRING "${TR_USER_AGENT_PREFIX} (${TR_VCS_REVISION})" #define VERSION_STRING_INFOPLIST ${TR_USER_AGENT_PREFIX} +#define BUILD_STRING_INFOPLIST 14714.${TR_VERSION_MAJOR}.${TR_VERSION_MINOR} #define MAJOR_VERSION ${TR_VERSION_MAJOR} #define MINOR_VERSION ${TR_VERSION_MINOR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/macosx/AboutWindowController.m new/transmission-2.94/macosx/AboutWindowController.m --- old/transmission-2.93/macosx/AboutWindowController.m 2018-01-23 20:17:43.021774391 +0100 +++ new/transmission-2.94/macosx/AboutWindowController.m 2018-05-01 19:21:08.233549637 +0200 @@ -24,6 +24,8 @@ #import "AboutWindowController.h" +#include "version.h" + @implementation AboutWindowController AboutWindowController * fAboutBoxInstance = nil; @@ -36,9 +38,7 @@ - (void) awakeFromNib { - NSDictionary * info = [[NSBundle mainBundle] infoDictionary]; - [fVersionField setStringValue: [NSString stringWithFormat: @"%@ (%@)", - [info objectForKey: @"CFBundleShortVersionString"], [info objectForKey: (NSString *)kCFBundleVersionKey]]]; + [fVersionField setStringValue: @(LONG_VERSION_STRING)]; [fCopyrightField setStringValue: [[NSBundle mainBundle] localizedStringForKey: @"NSHumanReadableCopyright" value: nil table: @"InfoPlist"]]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/macosx/Info.plist new/transmission-2.94/macosx/Info.plist --- old/transmission-2.93/macosx/Info.plist 2018-01-23 20:17:43.033774422 +0100 +++ new/transmission-2.94/macosx/Info.plist 2018-05-01 19:21:08.246549695 +0200 @@ -59,7 +59,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>VCS_REVISION_NUM</string> + <string>BUILD_STRING_INFOPLIST</string> <key>LSApplicationCategoryType</key> <string>public.app-category.utilities</string> <key>LSMinimumSystemVersion</key> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/macosx/Makefile.in new/transmission-2.94/macosx/Makefile.in --- old/transmission-2.93/macosx/Makefile.in 2018-01-23 20:18:01.785823352 +0100 +++ new/transmission-2.94/macosx/Makefile.in 2018-05-01 19:21:30.203647284 +0200 @@ -221,6 +221,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/qt/DetailsDialog.cc new/transmission-2.94/qt/DetailsDialog.cc --- old/transmission-2.93/qt/DetailsDialog.cc 2018-01-23 20:17:43.084774555 +0100 +++ new/transmission-2.94/qt/DetailsDialog.cc 2018-05-01 19:21:08.302549944 +0200 @@ -442,7 +442,7 @@ } } - const double d = 100.0 * (sizeWhenDone ? (sizeWhenDone - leftUntilDone) / sizeWhenDone : 1); + const double d = sizeWhenDone ? 100.0 * (sizeWhenDone - leftUntilDone) / sizeWhenDone : 100.0; QString pct = Formatter::percentToString (d); if (!haveUnverified && !leftUntilDone) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/third-party/Makefile.in new/transmission-2.94/third-party/Makefile.in --- old/transmission-2.93/third-party/Makefile.in 2018-01-23 20:18:01.806823406 +0100 +++ new/transmission-2.94/third-party/Makefile.in 2018-05-01 19:21:30.225647383 +0200 @@ -281,6 +281,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/third-party/dht/Makefile.in new/transmission-2.94/third-party/dht/Makefile.in --- old/transmission-2.93/third-party/dht/Makefile.in 2018-01-23 20:18:01.834823479 +0100 +++ new/transmission-2.94/third-party/dht/Makefile.in 2018-05-01 19:21:30.254647511 +0200 @@ -279,6 +279,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/third-party/libb64/Makefile.in new/transmission-2.94/third-party/libb64/Makefile.in --- old/transmission-2.93/third-party/libb64/Makefile.in 2018-01-23 20:18:01.862823553 +0100 +++ new/transmission-2.94/third-party/libb64/Makefile.in 2018-05-01 19:21:30.283647640 +0200 @@ -280,6 +280,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/third-party/libnatpmp/Makefile.in new/transmission-2.94/third-party/libnatpmp/Makefile.in --- old/transmission-2.93/third-party/libnatpmp/Makefile.in 2018-01-23 20:18:01.892823631 +0100 +++ new/transmission-2.94/third-party/libnatpmp/Makefile.in 2018-05-01 19:21:30.312647769 +0200 @@ -280,6 +280,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/third-party/libutp/Makefile.in new/transmission-2.94/third-party/libutp/Makefile.in --- old/transmission-2.93/third-party/libutp/Makefile.in 2018-01-23 20:18:01.920823704 +0100 +++ new/transmission-2.94/third-party/libutp/Makefile.in 2018-05-01 19:21:30.341647898 +0200 @@ -279,6 +279,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/third-party/miniupnp/Makefile.in new/transmission-2.94/third-party/miniupnp/Makefile.in --- old/transmission-2.93/third-party/miniupnp/Makefile.in 2018-01-23 20:18:01.951823785 +0100 +++ new/transmission-2.94/third-party/miniupnp/Makefile.in 2018-05-01 19:21:30.371648031 +0200 @@ -284,6 +284,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/update-version-h.sh new/transmission-2.94/update-version-h.sh --- old/transmission-2.93/update-version-h.sh 2018-01-23 20:17:43.122774655 +0100 +++ new/transmission-2.94/update-version-h.sh 2018-05-01 19:21:08.344550131 +0200 @@ -54,6 +54,7 @@ #define SHORT_VERSION_STRING "${user_agent_prefix}" #define LONG_VERSION_STRING "${user_agent_prefix} (${vcs_revision})" #define VERSION_STRING_INFOPLIST ${user_agent_prefix} +#define BUILD_STRING_INFOPLIST 14714.${major_version}.${minor_version} #define MAJOR_VERSION ${major_version} #define MINOR_VERSION ${minor_version} EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/utils/Makefile.in new/transmission-2.94/utils/Makefile.in --- old/transmission-2.93/utils/Makefile.in 2018-01-23 20:18:01.988823881 +0100 +++ new/transmission-2.94/utils/Makefile.in 2018-05-01 19:21:30.404648178 +0200 @@ -321,6 +321,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/Makefile.in new/transmission-2.94/web/Makefile.in --- old/transmission-2.93/web/Makefile.in 2018-01-23 20:18:02.011823941 +0100 +++ new/transmission-2.94/web/Makefile.in 2018-05-01 19:21:30.426648276 +0200 @@ -312,6 +312,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/images/Makefile.in new/transmission-2.94/web/images/Makefile.in --- old/transmission-2.93/web/images/Makefile.in 2018-01-23 20:18:02.036824007 +0100 +++ new/transmission-2.94/web/images/Makefile.in 2018-05-01 19:21:30.447648369 +0200 @@ -252,6 +252,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/javascript/Makefile.in new/transmission-2.94/web/javascript/Makefile.in --- old/transmission-2.93/web/javascript/Makefile.in 2018-01-23 20:18:02.063824077 +0100 +++ new/transmission-2.94/web/javascript/Makefile.in 2018-05-01 19:21:30.469648467 +0200 @@ -312,6 +312,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/javascript/inspector.js new/transmission-2.94/web/javascript/inspector.js --- old/transmission-2.93/web/javascript/inspector.js 2018-01-23 20:17:43.124774660 +0100 +++ new/transmission-2.94/web/javascript/inspector.js 2018-05-01 19:21:08.346550140 +0200 @@ -716,7 +716,7 @@ html.push ('<div class="inspector_group">'); if (torrents.length > 1) - html.push('<div class="inspector_torrent_label">', tor.getName(), '</div>'); + html.push('<div class="inspector_torrent_label">', sanitizeText(tor.getName()), '</div>'); tier = -1; trackers = tor.getTrackers(); @@ -742,9 +742,9 @@ html.push('<li class="inspector_tracker_entry ', parity, '"><div class="tracker_host" title="', sanitizeText(tracker.announce), '">', sanitizeText(tracker.host || tracker.announce), '</div>', '<div class="tracker_activity">', - '<div>', lastAnnounceStatusHash['label'], ': ', lastAnnounceStatusHash['value'], '</div>', + '<div>', lastAnnounceStatusHash['label'], ': ', sanitizeText(lastAnnounceStatusHash['value']), '</div>', '<div>', announceState, '</div>', - '<div>', lastScrapeStatusHash['label'], ': ', lastScrapeStatusHash['value'], '</div>', + '<div>', lastScrapeStatusHash['label'], ': ', sanitizeText(lastScrapeStatusHash['value']), '</div>', '</div><table class="tracker_stats">', '<tr><th>Seeders:</th><td>', (tracker.seederCount > -1 ? tracker.seederCount : na), '</td></tr>', '<tr><th>Leechers:</th><td>', (tracker.leecherCount > -1 ? tracker.leecherCount : na), '</td></tr>', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/javascript/jquery/Makefile.in new/transmission-2.94/web/javascript/jquery/Makefile.in --- old/transmission-2.93/web/javascript/jquery/Makefile.in 2018-01-23 20:18:02.082824127 +0100 +++ new/transmission-2.94/web/javascript/jquery/Makefile.in 2018-05-01 19:21:30.489648556 +0200 @@ -252,6 +252,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/style/Makefile.in new/transmission-2.94/web/style/Makefile.in --- old/transmission-2.93/web/style/Makefile.in 2018-01-23 20:18:02.103824181 +0100 +++ new/transmission-2.94/web/style/Makefile.in 2018-05-01 19:21:30.510648649 +0200 @@ -281,6 +281,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/style/jqueryui/Makefile.in new/transmission-2.94/web/style/jqueryui/Makefile.in --- old/transmission-2.93/web/style/jqueryui/Makefile.in 2018-01-23 20:18:02.126824241 +0100 +++ new/transmission-2.94/web/style/jqueryui/Makefile.in 2018-05-01 19:21:30.533648752 +0200 @@ -312,6 +312,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/style/jqueryui/images/Makefile.in new/transmission-2.94/web/style/jqueryui/images/Makefile.in --- old/transmission-2.93/web/style/jqueryui/images/Makefile.in 2018-01-23 20:18:02.149824301 +0100 +++ new/transmission-2.94/web/style/jqueryui/images/Makefile.in 2018-05-01 19:21:30.554648845 +0200 @@ -252,6 +252,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/style/transmission/Makefile.in new/transmission-2.94/web/style/transmission/Makefile.in --- old/transmission-2.93/web/style/transmission/Makefile.in 2018-01-23 20:18:02.173824364 +0100 +++ new/transmission-2.94/web/style/transmission/Makefile.in 2018-05-01 19:21:30.576648943 +0200 @@ -312,6 +312,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/style/transmission/images/Makefile.in new/transmission-2.94/web/style/transmission/images/Makefile.in --- old/transmission-2.93/web/style/transmission/images/Makefile.in 2018-01-23 20:18:02.200824434 +0100 +++ new/transmission-2.94/web/style/transmission/images/Makefile.in 2018-05-01 19:21:30.598649041 +0200 @@ -312,6 +312,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/transmission-2.93/web/style/transmission/images/buttons/Makefile.in new/transmission-2.94/web/style/transmission/images/buttons/Makefile.in --- old/transmission-2.93/web/style/transmission/images/buttons/Makefile.in 2018-01-23 20:18:02.221824489 +0100 +++ new/transmission-2.94/web/style/transmission/images/buttons/Makefile.in 2018-05-01 19:21:30.619649134 +0200 @@ -252,6 +252,8 @@ LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ +MBEDTLS_CFLAGS = @MBEDTLS_CFLAGS@ +MBEDTLS_LIBS = @MBEDTLS_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@
