cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.42: improvements in peer management and bandwidth

Browse Source 
measurement and allocation.
This commit is contained in:
naddy 2008-12-27 15:54:43 +00:00
parent d2085d3540
commit 791c23f93b
10 changed files with 43 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/transmission/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2008/12/02 15:29:07 naddy Exp $
# $OpenBSD: Makefile,v 1.29 2008/12/27 15:54:43 naddy Exp $
COMMENT-main= lightweight BitTorrent command line and daemon client
COMMENT-gui= lightweight BitTorrent client with graphical interface
VER= 1.40
VER= 1.42
DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER}
PKGNAME-gui= transmission-gui-${VER}

10
net/transmission/distinfo
View File

@ -1,5 +1,5 @@
MD5 (transmission-1.40.tar.bz2) = SQ0TwUG6e0qWWCVB6oOkYQ==
RMD160 (transmission-1.40.tar.bz2) = T1voeO0iGowOpkQzD7vVvPWVtaQ=
SHA1 (transmission-1.40.tar.bz2) = RC8JLGpMPbzjl8oNimmaG8U3cE8=
SHA256 (transmission-1.40.tar.bz2) = lEq5z8/JpL1+/uzzLqYJ+mUXlwqXCMRO7m1XUMT/jgw=
SIZE (transmission-1.40.tar.bz2) = 4604462
MD5 (transmission-1.42.tar.bz2) = wIO9ywFCZGboDuM5vM2TUQ==
RMD160 (transmission-1.42.tar.bz2) = ++KhhaFpMBNu9rn1aCj2OHPmGIo=
SHA1 (transmission-1.42.tar.bz2) = EJ7xIbxNAyx4sU19OTTyCl7ZgDU=
SHA256 (transmission-1.42.tar.bz2) = 5+F/KaFmeUAXxtlDYhWTN/FACMQU0fjaX3wsHAXH1UM=
SIZE (transmission-1.42.tar.bz2) = 4630409

20
net/transmission/patches/patch-cli_cli_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-cli_cli_c,v 1.1 2008/12/02 15:29:07 naddy Exp $
--- cli/cli.c.orig Mon Nov 10 16:52:35 2008
+++ cli/cli.c Tue Dec 2 14:14:50 2008
@@ -211,6 +211,8 @@ scrapeDoneFunc( tr_session * session UNUSED,
(char*)host );
--leftToScrape;
+
+ tr_free( host );
}
static void
@@ -433,7 +435,6 @@ main( int argc,
tr_httpParseURL( scrape, -1, &host, NULL, NULL );
++leftToScrape;
tr_webRun( h, url, NULL, scrapeDoneFunc, host );
- tr_free( host );
tr_free( url );
}
}

38
net/transmission/patches/patch-daemon_remote_c
View File

@ -1,22 +1,22 @@
$OpenBSD: patch-daemon_remote_c,v 1.1 2008/12/02 15:29:07 naddy Exp $
--- daemon/remote.c.orig Mon Nov 10 16:52:35 2008
+++ daemon/remote.c Thu Nov 27 22:33:20 2008
@@ -572,11 +572,11 @@ strlratio( char * buf,
{
const double ratio = numerator / denominator;
if( ratio < 10.0 )
- tr_snprintf( buf, buflen, "%'.2f", ratio );
+ tr_snprintf( buf, buflen, "%.2f", ratio );
else if( ratio < 100.0 )
- tr_snprintf( buf, buflen, "%'.1f", ratio );
+ tr_snprintf( buf, buflen, "%.1f", ratio );
else
- tr_snprintf( buf, buflen, "%'.0f", ratio );
+ tr_snprintf( buf, buflen, "%.0f", ratio );
}
else if( numerator )
tr_strlcpy( buf, "Infinity", buflen );
@@ -593,24 +593,24 @@ strlsize( char * buf,
$OpenBSD: patch-daemon_remote_c,v 1.2 2008/12/27 15:54:43 naddy Exp $
--- daemon/remote.c.orig Wed Dec 3 00:44:08 2008
+++ daemon/remote.c Thu Dec 4 17:58:32 2008
@@ -575,11 +575,11 @@ strlratio2( char * buf, double ratio, size_t buflen )
else if( (int)ratio == TR_RATIO_INF )
tr_strlcpy( buf, "Inf", buflen );
else if( ratio < 10.0 )
- tr_snprintf( buf, buflen, "%'.2f", ratio );
+ tr_snprintf( buf, buflen, "%.2f", ratio );
else if( ratio < 100.0 )
- tr_snprintf( buf, buflen, "%'.1f", ratio );
+ tr_snprintf( buf, buflen, "%.1f", ratio );
else
- tr_snprintf( buf, buflen, "%'.0f", ratio );
+ tr_snprintf( buf, buflen, "%.0f", ratio );
return buf;
}
@@ -609,24 +609,24 @@ strlsize( char * buf,
if( !size )
tr_strlcpy( buf, "None", buflen );
else if( size < (int64_t)KILOBYTE_FACTOR )

10
net/transmission/patches/patch-gtk_details_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_details_c,v 1.3 2008/12/02 15:29:07 naddy Exp $
--- gtk/details.c.orig Mon Nov 10 16:52:26 2008
+++ gtk/details.c Thu Nov 27 22:33:20 2008
@@ -500,7 +500,7 @@ fmtpeercount( GtkWidget * l,
$OpenBSD: patch-gtk_details_c,v 1.4 2008/12/27 15:54:43 naddy Exp $
--- gtk/details.c.orig Wed Dec 3 00:43:55 2008
+++ gtk/details.c Thu Dec 4 18:09:25 2008
@@ -497,7 +497,7 @@ fmtpeercount( GtkWidget * l,
else
{
char str[16];
@ -10,7 +10,7 @@ $OpenBSD: patch-gtk_details_c,v 1.3 2008/12/02 15:29:07 naddy Exp $
gtk_label_set_text( GTK_LABEL( l ), str );
}
}
@@ -907,7 +907,7 @@ info_page_new( tr_torrent * tor )
@@ -908,7 +908,7 @@ info_page_new( tr_torrent * tor )
hig_workarea_add_section_title ( t, &row, _( "Details" ) );
g_snprintf( countStr, sizeof( countStr ),

8
net/transmission/patches/patch-gtk_tr-window_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gtk_tr-window_c,v 1.3 2008/12/02 15:29:07 naddy Exp $
--- gtk/tr-window.c.orig Mon Nov 10 16:52:26 2008
+++ gtk/tr-window.c Thu Nov 27 22:33:20 2008
@@ -706,13 +706,13 @@ updateTorrentCount( PrivateData * p )
$OpenBSD: patch-gtk_tr-window_c,v 1.4 2008/12/27 15:54:43 naddy Exp $
--- gtk/tr-window.c.orig Tue Dec 9 02:39:03 2008
+++ gtk/tr-window.c Tue Dec 9 15:46:57 2008
@@ -705,13 +705,13 @@ updateTorrentCount( PrivateData * p )
if( torrentCount != visibleCount )
g_snprintf( buf, sizeof( buf ),

12
net/transmission/patches/patch-gtk_util_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-gtk_util_h,v 1.1 2008/12/02 15:29:07 naddy Exp $
--- gtk/util.h.orig Thu Nov 27 22:13:20 2008
+++ gtk/util.h Thu Nov 27 22:13:46 2008
@@ -41,7 +41,7 @@ typedef void ( *callbackfunc_t )( void* );
/* return a human-readable string for the size given in bytes. */
char* tr_strlsize( char * buf,
- uint64_t size,
+ guint64 size,
size_t buflen );
/* return a human-readable string for the transfer rate given in bytes. */

8
net/transmission/patches/patch-libtransmission_blocklist_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-libtransmission_blocklist_c,v 1.1 2008/12/02 15:29:07 naddy Exp $
--- libtransmission/blocklist.c.orig Mon Nov 10 16:52:25 2008
+++ libtransmission/blocklist.c Thu Nov 27 22:33:18 2008
$OpenBSD: patch-libtransmission_blocklist_c,v 1.2 2008/12/27 15:54:43 naddy Exp $
--- libtransmission/blocklist.c.orig Tue Dec 9 02:39:03 2008
+++ libtransmission/blocklist.c Tue Dec 9 15:46:57 2008
@@ -105,7 +105,7 @@ blocklistLoad( tr_blocklist * b )
{
@ -10,7 +10,7 @@ $OpenBSD: patch-libtransmission_blocklist_c,v 1.1 2008/12/02 15:29:07 naddy Exp
tr_free( base );
}
}
@@ -293,7 +293,7 @@ _tr_blocklistSetContent( tr_blocklist * b,
@@ -297,7 +297,7 @@ _tr_blocklistSetContent( tr_blocklist * b,
{
char * base = tr_basename( b->filename );

62
net/transmission/patches/patch-libtransmission_tracker_c
View File

@ -1,62 +0,0 @@
$OpenBSD: patch-libtransmission_tracker_c,v 1.3 2008/12/02 15:29:07 naddy Exp $
--- libtransmission/tracker.c.orig Mon Nov 10 16:52:25 2008
+++ libtransmission/tracker.c Mon Dec 1 22:39:45 2008
@@ -444,7 +444,7 @@ onTrackerResponse( tr_session * session,
if( bencLoaded )
tr_bencFree( &benc );
}
- else
+ else if( responseCode )
{
/* %1$ld - http status code, such as 404
* %2$s - human-readable explanation of the http status code */
@@ -457,19 +457,20 @@ onTrackerResponse( tr_session * session,
retry = updateAddresses( t, success );
- /**
- ***
- **/
-
- if( retry )
+ if( responseCode && retry )
responseCode = 300;
- if( 200 <= responseCode && responseCode <= 299 )
+ if( responseCode == 0 )
{
+ dbgmsg( t->name, "No response from tracker... retrying in two minutes." );
+ t->manualAnnounceAllowedAt = ~(time_t)0;
+ t->reannounceAt = time( NULL ) + t->randOffset + 120;
+ }
+ else if( 200 <= responseCode && responseCode <= 299 )
+ {
const int interval = t->announceIntervalSec + t->randOffset;
const time_t now = time ( NULL );
- dbgmsg( t->name, "request succeeded. reannouncing in %d seconds",
- interval );
+ dbgmsg( t->name, "request succeeded. reannouncing in %d seconds", interval );
/* if the announce response was a superset of the scrape response,
treat this as both a successful announce AND scrape. */
@@ -499,8 +500,7 @@ onTrackerResponse( tr_session * session,
const int interval = 5;
dbgmsg( t->name, "got a redirect. retrying in %d seconds", interval );
t->reannounceAt = time( NULL ) + interval;
- t->manualAnnounceAllowedAt = time( NULL ) +
- t->announceMinIntervalSec;
+ t->manualAnnounceAllowedAt = time( NULL ) + t->announceMinIntervalSec;
}
else if( 400 <= responseCode && responseCode <= 499 )
{
@@ -524,9 +524,7 @@ onTrackerResponse( tr_session * session,
else
{
/* WTF did we get?? */
- dbgmsg(
- t->name,
- "Invalid response from tracker... retrying in two minutes." );
+ dbgmsg( t->name, "Invalid response from tracker... retrying in two minutes." );
t->manualAnnounceAllowedAt = ~(time_t)0;
t->reannounceAt = time( NULL ) + t->randOffset + 120;
}

5
net/transmission/pkg/PLIST-gui
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-gui,v 1.12 2008/12/02 15:29:07 naddy Exp $
@comment $OpenBSD: PLIST-gui,v 1.13 2008/12/27 15:54:43 naddy Exp $
@bin bin/transmission
@man man/man1/transmission.1
share/applications/transmission.desktop
@ -94,6 +94,9 @@ share/locale/ro/LC_MESSAGES/transmission.mo
share/locale/ru/LC_MESSAGES/transmission.mo
share/locale/sk/LC_MESSAGES/transmission.mo
share/locale/sl/LC_MESSAGES/transmission.mo
share/locale/sq/
share/locale/sq/LC_MESSAGES/
share/locale/sq/LC_MESSAGES/transmission.mo
share/locale/sr/LC_MESSAGES/transmission.mo
share/locale/sv/LC_MESSAGES/transmission.mo
share/locale/te/