From 677492e02c75ba08b06805a4a241ebbe0274e090 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Sun, 8 Jan 2017 20:55:08 +0100 Subject: [PATCH] net/transmission: Refresh patches and minor tweaks Refresh patches Add patch to spoof git-version as release Switch to xz tarball Signed-off-by: Daniel Engberg --- net/transmission/Makefile | 3 ++- .../patches/020-use-internal-miniupnp.patch | 2 +- .../patches/030-fix-musl-build.patch | 8 +++--- .../patches/040-fix-for-mbedtls.patch | 6 ++--- .../patches/050-mask-as-release.patch | 26 +++++++++++++++++++ 5 files changed, 35 insertions(+), 10 deletions(-) create mode 100644 net/transmission/patches/050-mask-as-release.patch diff --git a/net/transmission/Makefile b/net/transmission/Makefile index 17bd68446..596b71e9e 100644 --- a/net/transmission/Makefile +++ b/net/transmission/Makefile @@ -15,7 +15,8 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/transmission/transmission.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=35fea28d1a37875ef7480ac061754df617805b19 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz +PKG_MIRROR_MD5SUM:=aeeb8dfd918bd2cf4fb6fbdf58bd822e9b509df1ba5ec408888edd161123ef8e PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/net/transmission/patches/020-use-internal-miniupnp.patch b/net/transmission/patches/020-use-internal-miniupnp.patch index 9a99fe87c..d3a2c8e53 100644 --- a/net/transmission/patches/020-use-internal-miniupnp.patch +++ b/net/transmission/patches/020-use-internal-miniupnp.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -378,7 +378,7 @@ dnl See if ANY version of miniupnpc is i +@@ -386,7 +386,7 @@ dnl See if ANY version of miniupnpc is i AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include ], [struct UPNPDev dev;])], diff --git a/net/transmission/patches/030-fix-musl-build.patch b/net/transmission/patches/030-fix-musl-build.patch index 1747402f5..f03aebc18 100644 --- a/net/transmission/patches/030-fix-musl-build.patch +++ b/net/transmission/patches/030-fix-musl-build.patch @@ -1,7 +1,7 @@ --- a/libtransmission/bitfield.c +++ b/libtransmission/bitfield.c -@@ -7,6 +7,8 @@ - * $Id: bitfield.c 14646 2015-12-31 05:22:42Z mikedld $ +@@ -6,6 +6,8 @@ + * */ +#define __NEED_ssize_t @@ -9,7 +9,7 @@ #include #include /* memset */ -@@ -14,6 +16,7 @@ +@@ -13,6 +15,7 @@ #include "bitfield.h" #include "utils.h" /* tr_new0 () */ @@ -19,7 +19,7 @@ /**** --- a/libtransmission/fdlimit.h +++ b/libtransmission/fdlimit.h -@@ -11,6 +11,8 @@ +@@ -10,6 +10,8 @@ #error only libtransmission should #include this header. #endif diff --git a/net/transmission/patches/040-fix-for-mbedtls.patch b/net/transmission/patches/040-fix-for-mbedtls.patch index 8a3788f8a..c76678685 100644 --- a/net/transmission/patches/040-fix-for-mbedtls.patch +++ b/net/transmission/patches/040-fix-for-mbedtls.patch @@ -1,10 +1,9 @@ --- a/configure.ac +++ b/configure.ac -@@ -153,25 +153,9 @@ - ]) +@@ -154,24 +154,8 @@ AS_IF([test "x$want_crypto" = "xauto" -o AS_IF([test "x$want_crypto" = "xauto" -o "x$want_crypto" = "xpolarssl"], [ 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], + [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 - #if defined (POLARSSL_VERSION_NUMBER) && POLARSSL_VERSION_NUMBER >= $POLARSSL_MINIMUM @@ -23,7 +22,6 @@ - [AS_IF([test "x$want_crypto" = "xpolarssl"], - [AC_MSG_ERROR([PolarSSL support requested, but headers not found.])] - )] -+ [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_MSG_ERROR([PolarSSL support requested, but library not found.])] )] diff --git a/net/transmission/patches/050-mask-as-release.patch b/net/transmission/patches/050-mask-as-release.patch new file mode 100644 index 000000000..7f2553585 --- /dev/null +++ b/net/transmission/patches/050-mask-as-release.patch @@ -0,0 +1,26 @@ +--- 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])