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 <daniel.engberg.lists@pyret.net>

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 17bd68446bc362ba8a37258de781ac46dd5b3229..596b71e9ed3ed813c3945845457a7499abf060ab 100644 (file)
--- 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 9a99fe87c8f64c4128d921b7bb2a07afa4055e5c..d3a2c8e535ec5fce1e32353f09a25700a70afb77 100644 (file)
--- 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 <miniupnpc/miniupnpc.h>],
                     [struct UPNPDev dev;])],

diff --git a/net/transmission/patches/030-fix-musl-build.patch b/net/transmission/patches/030-fix-musl-build.patch
index 1747402f54bce01041f89516dcafa6033cdddf61..f03aebc18b7e82e8b088c95d10101a3f8ccb38cb 100644 (file)
--- 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 <assert.h>
  #include <string.h> /* 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 8a3788f8a1381fdb12f7a0d92f19c821b0a300de..c766786854cdc154db6bb65d0fa182e597783d3e 100644 (file)
--- 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 <polarssl/version.h>
 -                                         #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 (file)
index 0000000..7f25535
--- /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])