Changeset 1849

Timestamp:

06/01/11 14:45:34 (2 years ago)

Author:

matthijs

Message:

transmission: Update to version 2.11.

This also updates some patches so they still apply and updates the
torrent plugin version as well.

Closes: #564

Location:

trunk/fon

Files:

• plugins/plugin-torrent/Makefile (modified) (1 diff)
• transmission/Makefile (modified) (2 diffs)
• transmission/patches/200-crypt.patch (modified) (1 diff)
• transmission/patches/400-remote.patch (modified) (4 diffs)

trunk/fon/plugins/plugin-torrent/Makefile

@@ -9 +9 @@
 
 PKG_NAME:=plugin-torrent
-PKG_VERSION:=2.04
+PKG_VERSION:=2.11
 PKG_RELEASE:=1
 # Build a .fmg plugin

trunk/fon/transmission/Makefile

@@ -9 +9 @@
 
 PKG_NAME:=transmission
-PKG_VERSION:=2.04
+PKG_VERSION:=2.11
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://mirrors.m0k.org/transmission/files
-PKG_MD5SUM:=84fe15eb7e000fdc369def513299358b
+PKG_MD5SUM:=ef2b40ddc2c17a57c47bfe15b1f23cc4
 
 PKG_FIXUP = libtool
@@ -79 +79 @@
 define Package/transmission-cli/install
         $(INSTALL_DIR) $(1)/sbin
-        $(INSTALL_BIN) $(PKG_BUILD_DIR)/cli/transmissioncli $(1)/sbin/
+        $(INSTALL_BIN) $(PKG_BUILD_DIR)/cli/transmission-cli $(1)/sbin/
         $(INSTALL_BIN) $(PKG_BUILD_DIR)/daemon/transmission-remote $(1)/sbin/
 endef

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

@@ -167 +167 @@
      @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 \
+     @DHT_LIBS@ \
+     @LIBEVENT_LIBS@ \
+     @LIBCURL_LIBS@ \

trunk/fon/transmission/patches/400-remote.patch

@@ -1 @@
-Index: transmission-1.72/daemon/remote.c
+Index: transmission-2.11/daemon/remote.c
 ===================================================================
---- transmission-1.72.orig/daemon/remote.c      2009-07-16 15:33:45.000000000 +0200
-+++ transmission-1.72/daemon/remote.c   2009-07-16 15:38:54.000000000 +0200
+--- transmission-2.11.orig/daemon/remote.c      2010-10-25 18:21:35.000000000 +0200
++++ transmission-2.11/daemon/remote.c   2010-10-25 18:22:31.000000000 +0200
 @@ -1,3 +1,4 @@
 +
  /*
-  * This file Copyright (C) 2008-2009 Charles Kerr <charles@transmissionbt.com>
+  * This file Copyright (C) 2008-2010 Mnemosyne LLC
   *
-@@ -1247,10 +1248,10 @@
-         int64_t total_up = 0, total_down = 0, total_size = 0;
+@@ -1195,10 +1196,10 @@
+         double total_up=0, total_down=0;
          char haveStr[32];
  
@@ -21 +21 @@
          {
              int64_t      id, eta, status, up, down;
-@@ -1291,14 +1292,13 @@
+@@ -1239,14 +1240,13 @@
                  else
                      errorMark = ' ';
@@ -32 +32 @@
                      haveStr,
                      etaStr,
-                     up / 1024.0,
-                     down / 1024.0,
+                     up/(double)tr_speed_K,
+                     down/(double)tr_speed_K,
 -                    strlratio2( ratioStr, ratio, sizeof( ratioStr ) ),
                      getStatusString( d, statusStr, sizeof( statusStr ) ),
                      name );
  
-@@ -1308,10 +1308,10 @@
+@@ -1256,10 +1256,10 @@
              }
          }
@@ -45 +45 @@
 +/*        printf( "Sum:         %9s            %6.1f  %6.1f\n",
                  strlsize( haveStr, total_size, sizeof( haveStr ) ),
-                 total_up / 1024.0,
--                total_down / 1024.0 );
-+                total_down / 1024.0 );*/
+                 total_up/(double)tr_speed_K,
+-                total_down/(double)tr_speed_K );
++                total_down/(double)tr_speed_K );*/
      }
  }