Changeset 2015

Timestamp:

22/09/11 09:26:18 (20 months ago)

Author:

matthijs

Message:

transmission: Update to version 2.33.

Also refresh and slightly update the 200-crypt patch, no actual changes were
made.

Interesting changes include:

• Fix bug converting torrent file text contents to UTF-8
• Better µTP support on systems running uClibc
• µTP support
• UDP tracker support
• Multiscrape support
• Download scarcest pieces first
• Peer and Network preferences

See  https://trac.transmissionbt.com/wiki/Changes#version-2.33 for a
complete list.

References: #1021, #1030

Location:

trunk/fon/transmission

Files:

• Makefile (modified) (1 diff)
• patches/200-crypt.patch (modified) (8 diffs)

trunk/fon/transmission/Makefile

@@ -9 +9 @@
 
 PKG_NAME:=transmission
-PKG_VERSION:=2.22
+PKG_VERSION:=2.33
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://mirrors.m0k.org/transmission/files
-PKG_MD5SUM:=6499986bf769276310b00bda1090090d
+PKG_MD5SUM:=082217a65713ac879410c622cbe6eb26
 
 PKG_FIXUP = libtool

trunk/fon/transmission/patches/200-crypt.patch

@@ -1 @@
-Index: transmission-1.72/libtransmission/rpc-server.c
+Index: transmission-2.33/libtransmission/rpc-server.c
 ===================================================================
---- transmission-1.72.orig/libtransmission/rpc-server.c 2009-07-16 15:24:04.000000000 +0200
-+++ transmission-1.72/libtransmission/rpc-server.c      2009-07-16 15:27:10.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <sys/stat.h>  /* open */
- #include <fcntl.h>     /* open */
+--- transmission-2.33.orig/libtransmission/rpc-server.c 2011-09-20 13:46:08.497053145 +0200
++++ transmission-2.33/libtransmission/rpc-server.c      2011-09-20 13:47:04.129394967 +0200
+@@ -16,6 +16,7 @@
+ #include <limits.h> /* INT_MAX */
+ 
  #include <unistd.h>    /* close */
 +#include <crypt.h>
@@ -11 +11 @@
  #ifdef HAVE_ZLIB
   #include <zlib.h>
-@@ -59,6 +60,7 @@
+@@ -56,6 +57,7 @@
  {
-     tr_bool            isEnabled;
-     tr_bool            isPasswordEnabled;
-+    tr_bool            isPasswordSystem;
-     tr_bool            isWhitelistEnabled;
+     bool               isEnabled;
+     bool               isPasswordEnabled;
++    bool               isPasswordSystem;
+     bool               isWhitelistEnabled;
      tr_port            port;
-     struct in_addr     bindAddress;
-@@ -551,6 +553,46 @@
+     char *             url;
+@@ -583,6 +585,46 @@
      return success;
  }
  
-+static tr_bool
++static bool
 +authRPCUser( struct tr_rpc_server * server, const char *user, const char *pass)
 +{
@@ -66 +66 @@
  handle_request( struct evhttp_request * req, void * arg )
  {
-@@ -575,6 +617,7 @@
+@@ -607,6 +649,7 @@
                  *pass++ = '\0';
              }
@@ -74 +74 @@
          if( !isAddressAllowed( server, req->remote_host ) )
          {
-@@ -584,10 +627,7 @@
+@@ -616,10 +659,7 @@
                  "<p>If you're editing settings.json, see the 'rpc-whitelist' and 'rpc-whitelist-enabled' entries.</p>"
-                 "<p>If you're still using ACLs, use a whitelist instead.  See the transmission-daemon manpage for details.</p>" );
+                 "<p>If you're still using ACLs, use a whitelist instead. See the transmission-daemon manpage for details.</p>" );
          }
 -        else if( server->isPasswordEnabled
@@ -86 +86 @@
              evhttp_add_header( req->output_headers,
                                 "WWW-Authenticate",
-@@ -905,6 +945,10 @@
-     assert( found );
-     s->isPasswordEnabled = boolVal;
+@@ -963,6 +1003,12 @@
+     else
+         tr_rpcSetPasswordEnabled( s, boolVal );
  
-+    found = tr_bencDictFindBool( settings, TR_PREFS_KEY_RPC_AUTH_SYS, &boolVal );
-+    assert( found );
-+    s->isPasswordSystem = boolVal;
++    key = TR_PREFS_KEY_RPC_AUTH_SYS;
++    if( !tr_bencDictFindBool( settings, key, &boolVal ) )
++        tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
++    else
++        s->isPasswordSystem = boolVal;
 +
-     found = tr_bencDictFindStr( settings, TR_PREFS_KEY_RPC_WHITELIST, &str );
-     assert( found );
-     tr_rpcSetWhitelist( s, str ? str : "127.0.0.1" );
-Index: transmission-1.72/libtransmission/transmission.h
+     key = TR_PREFS_KEY_RPC_WHITELIST;
+     if( !tr_bencDictFindStr( settings, key, &str ) && str )
+         tr_nerr( MY_NAME, _( "Couldn't find settings key \"%s\"" ), key );
+Index: transmission-2.33/libtransmission/transmission.h
 ===================================================================
---- transmission-1.72.orig/libtransmission/transmission.h       2009-07-16 15:24:04.000000000 +0200
-+++ transmission-1.72/libtransmission/transmission.h    2009-07-16 15:24:05.000000000 +0200
+--- transmission-2.33.orig/libtransmission/transmission.h       2011-09-20 13:46:08.497053145 +0200
++++ transmission-2.33/libtransmission/transmission.h    2011-09-20 13:46:51.441317065 +0200
 @@ -194,6 +194,7 @@
- #define TR_PREFS_KEY_RATIO_ENABLED                 "ratio-limit-enabled"
- #define TR_PREFS_KEY_RENAME_PARTIAL_FILES          "rename-partial-files"
- #define TR_PREFS_KEY_RPC_AUTH_REQUIRED             "rpc-authentication-required"
-+#define TR_PREFS_KEY_RPC_AUTH_SYS                  "rpc-authentication-system" 
- #define TR_PREFS_KEY_RPC_BIND_ADDRESS              "rpc-bind-address"
- #define TR_PREFS_KEY_RPC_ENABLED                   "rpc-enabled"
- #define TR_PREFS_KEY_RPC_PASSWORD                  "rpc-password"
-Index: transmission-1.72/daemon/daemon.c
+ #define TR_PREFS_KEY_RATIO_ENABLED                "ratio-limit-enabled"
+ #define TR_PREFS_KEY_RENAME_PARTIAL_FILES         "rename-partial-files"
+ #define TR_PREFS_KEY_RPC_AUTH_REQUIRED            "rpc-authentication-required"
++#define TR_PREFS_KEY_RPC_AUTH_SYS                 "rpc-authentication-system"
+ #define TR_PREFS_KEY_RPC_BIND_ADDRESS             "rpc-bind-address"
+ #define TR_PREFS_KEY_RPC_ENABLED                  "rpc-enabled"
+ #define TR_PREFS_KEY_RPC_PASSWORD                 "rpc-password"
+Index: transmission-2.33/daemon/daemon.c
 ===================================================================
---- transmission-1.72.orig/daemon/daemon.c      2009-07-16 15:24:04.000000000 +0200
-+++ transmission-1.72/daemon/daemon.c   2009-07-16 15:24:05.000000000 +0200
-@@ -74,6 +74,7 @@
+--- transmission-2.33.orig/daemon/daemon.c      2011-09-20 13:46:08.497053145 +0200
++++ transmission-2.33/daemon/daemon.c   2011-09-20 13:48:34.397948261 +0200
+@@ -98,6 +98,7 @@
      { 'T', "no-auth", "Don't require authentication", "T", 0, NULL },
      { 'u', "username", "Set username for authentication", "u", 1, "<username>" },
@@ -119 +121 @@
 +    { 'X', "sysauth", "Authenticate against /etc/passwd", "X", 0, NULL },
      { 'V', "version", "Show version number and exit", "V", 0, NULL },
-     { 'w', "download-dir", "Where to save downloaded data", "w", 1, "<path>" },
-     { 800, "paused", "Pause all torrents on startup", NULL, 0, NULL },
-@@ -258,6 +259,9 @@
+     { 810, "log-error", "Show error messages", NULL, 0, NULL },
+     { 811, "log-info", "Show error and info messages", NULL, 0, NULL },
+@@ -398,6 +399,9 @@
                        break;
-             case 'T': tr_bencDictAddBool( &settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, FALSE );
+             case 'T': tr_bencDictAddBool( &settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, false );
                        break;
-+            case 'X': tr_bencDictAddBool( &settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, TRUE );
-+                                         tr_bencDictAddBool( &settings, TR_PREFS_KEY_RPC_AUTH_SYS, TRUE );
++            case 'X': tr_bencDictAddBool( &settings, TR_PREFS_KEY_RPC_AUTH_REQUIRED, true );
++                                         tr_bencDictAddBool( &settings, TR_PREFS_KEY_RPC_AUTH_SYS, true );
 +                      break;
              case 'u': tr_bencDictAddStr( &settings, TR_PREFS_KEY_RPC_USERNAME, optarg );
                        break;
              case 'v': tr_bencDictAddStr( &settings, TR_PREFS_KEY_RPC_PASSWORD, optarg );
-Index: transmission-2.04/daemon/Makefile.in
+Index: transmission-2.33/utils/Makefile.in
 ===================================================================
---- transmission-2.04.orig/daemon/Makefile.in   2010-08-16 16:24:16.000000000 +0200
-+++ transmission-2.04/daemon/Makefile.in        2010-08-16 16:24:50.000000000 +0200
-@@ -333,6 +333,7 @@
+--- transmission-2.33.orig/utils/Makefile.in    2011-09-20 13:46:08.497053145 +0200
++++ transmission-2.33/utils/Makefile.in 2011-09-20 13:46:51.441317065 +0200
+@@ -336,6 +336,7 @@
+     $(top_builddir)/libtransmission/libtransmission.a \
+     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
++    -lcrypt \
+     @INTLLIBS@ \
+     @DHT_LIBS@ \
+     @LIBUTP_LIBS@ \
+Index: transmission-2.33/cli/Makefile.in
+===================================================================
+--- transmission-2.33.orig/cli/Makefile.in      2011-09-20 13:46:08.497053145 +0200
++++ transmission-2.33/cli/Makefile.in   2011-09-20 13:46:51.441317065 +0200
+@@ -317,6 +317,7 @@
+     $(top_builddir)/libtransmission/libtransmission.a \
+     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
+     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
++    -lcrypt \
+     @DHT_LIBS@ \
+     @LIBUTP_LIBS@ \
+     @LIBEVENT_LIBS@ \
+Index: transmission-2.33/daemon/Makefile.in
+===================================================================
+--- transmission-2.33.orig/daemon/Makefile.in   2011-09-20 13:46:08.497053145 +0200
++++ transmission-2.33/daemon/Makefile.in        2011-09-20 13:46:51.445317089 +0200
+@@ -332,6 +332,7 @@
      $(top_builddir)/libtransmission/libtransmission.a \
      $(top_builddir)/third-party/miniupnp/libminiupnp.a \
@@ -141 +167 @@
 +    -lcrypt \
      @DHT_LIBS@ \
+     @LIBUTP_LIBS@ \
      @LIBEVENT_LIBS@ \
-     @LIBCURL_LIBS@ \
-Index: transmission-2.04/cli/Makefile.in
+Index: transmission-2.33/libtransmission/Makefile.in
 ===================================================================
---- transmission-2.04.orig/cli/Makefile.in      2010-08-16 16:35:03.000000000 +0200
-+++ transmission-2.04/cli/Makefile.in   2010-08-16 16:35:27.000000000 +0200
-@@ -318,6 +318,7 @@
-     $(top_builddir)/libtransmission/libtransmission.a \
-     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
-+    -lcrypt \
-     @DHT_LIBS@ \
-     @LIBEVENT_LIBS@ \
-     @LIBCURL_LIBS@ \
-Index: transmission-2.04/libtransmission/Makefile.in
-===================================================================
---- transmission-2.04.orig/libtransmission/Makefile.in  2010-08-16 16:35:33.000000000 +0200
-+++ transmission-2.04/libtransmission/Makefile.in       2010-08-16 16:35:41.000000000 +0200
-@@ -506,6 +506,7 @@
+--- transmission-2.33.orig/libtransmission/Makefile.in  2011-09-20 13:46:08.497053145 +0200
++++ transmission-2.33/libtransmission/Makefile.in       2011-09-20 13:46:51.445317089 +0200
+@@ -512,6 +512,7 @@
      ./libtransmission.a  \
      $(top_builddir)/third-party/miniupnp/libminiupnp.a \
@@ -166 +180 @@
      @INTLLIBS@ \
      @DHT_LIBS@ \
-     @LIBCURL_LIBS@ \
-Index: transmission-2.11/utils/Makefile.in
-===================================================================
---- transmission-2.11/utils/Makefile.in 2010-10-25 20:35:08.000000000 +0200
-+++ transmission-2.11/utils/Makefile.in 2010-10-25 20:35:50.000000000 +0200
-@@ -338,6 +338,7 @@
-     $(top_builddir)/libtransmission/libtransmission.a \
-     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
-     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
-+    -lcrypt \
-     @INTLLIBS@ \
-     @DHT_LIBS@ \
-     @LIBEVENT_LIBS@ \
+     @LIBUTP_LIBS@ \