Update to 1.00. Changes:

* The GUI has been extended.
* The CLI client has changed its name back to "transmissioncli" (no
hyphen) and has regained the scrape feature.
* Bug fixes.
This commit is contained in:
naddy 2008-01-11 18:15:00 +00:00
parent b252b251ad
commit 2d0e0d02b5
9 changed files with 105 additions and 40 deletions

View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.13 2007/11/27 20:30:19 naddy Exp $
# $OpenBSD: Makefile,v 1.14 2008/01/11 18:15:00 naddy Exp $
COMMENT-main= lightweight BitTorrent command line and daemon client
COMMENT-gui= lightweight BitTorrent client with graphical interface
VER= 0.93
VER= 1.00
DISTNAME= transmission-${VER}
PKGNAME-main= transmission-${VER}
PKGNAME-gui= transmission-gui-${VER}
CATEGORIES= net
HOMEPAGE= http://transmission.m0k.org/
HOMEPAGE= http://www.transmissionbt.com/
MAINTAINER= Christian Weisgerber <naddy@openbsd.org>
@ -56,9 +56,4 @@ RUN_DEPENDS-gui=:${PKGNAME-main}:net/transmission,-main ${RUN_DEPENDS}
USE_X11= Yes
.endif
NO_REGRESS= Yes
post-install:
@cd ${PREFIX}/man/man1 && mv transmissioncli.1 transmission-cli.1
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (transmission-0.93.tar.bz2) = hgHSVpNpPe2X+0J0KLdftA==
RMD160 (transmission-0.93.tar.bz2) = c0HdynjqIVwU2L4aMIbypCHb7s4=
SHA1 (transmission-0.93.tar.bz2) = XF6F8XBvNwUSMqcZGKg9RBrOf64=
SHA256 (transmission-0.93.tar.bz2) = thHklFAXcfwUb8By6qaDrcQuPXVAoILqPb4sSKmT/F0=
SIZE (transmission-0.93.tar.bz2) = 2689601
MD5 (transmission-1.00.tar.bz2) = YWNiAZTlcgn0tjAOBnzgAA==
RMD160 (transmission-1.00.tar.bz2) = pAWXpTSI2wDK4DWgHbj7LG6NZ7A=
SHA1 (transmission-1.00.tar.bz2) = TdnBlZdf9DNYigubHBtuwqfgN0Q=
SHA256 (transmission-1.00.tar.bz2) = O6OVZoBf7SLsUDCH30vN9fQ1cbnQMwQGS1wXdPobkL0=
SIZE (transmission-1.00.tar.bz2) = 4071532

View File

@ -1,20 +0,0 @@
$OpenBSD: patch-cli_transmissioncli_1,v 1.4 2007/11/27 20:30:19 naddy Exp $
--- cli/transmissioncli.1.orig Thu Nov 22 19:44:56 2007
+++ cli/transmissioncli.1 Thu Nov 22 19:45:35 2007
@@ -14,13 +14,13 @@
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
.Dd April 18, 2007
-.Dt TRANSMISSIONCLI 1
+.Dt TRANSMISSION-CLI 1
.Os
.Sh NAME
-.Nm transmissioncli
+.Nm transmission-cli
.Nd a bittorrent client
.Sh SYNOPSIS
-.Nm transmissioncli
+.Nm transmission-cli
.Bk -words
.Fl h
.Nm

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2007/11/27 20:30:19 naddy Exp $
--- configure.orig Mon Nov 12 22:07:36 2007
+++ configure Thu Nov 22 17:51:26 2007
@@ -20783,10 +20783,6 @@ else
$OpenBSD: patch-configure,v 1.5 2008/01/11 18:15:00 naddy Exp $
--- configure.orig Sat Jan 5 01:18:29 2008
+++ configure Sat Jan 5 19:53:04 2008
@@ -20782,10 +20782,6 @@ else
fi

View File

@ -0,0 +1,43 @@
$OpenBSD: patch-libtransmission_fastresume_c,v 1.1 2008/01/11 18:15:00 naddy Exp $
--- libtransmission/fastresume.c.orig Fri Jan 4 06:51:00 2008
+++ libtransmission/fastresume.c Tue Jan 8 17:00:29 2008
@@ -430,15 +430,15 @@ parseProgress( tr_torrent * tor,
/* compare file mtimes */
tr_time_t * curMTimes = getMTimes( tor, &n );
const uint8_t * walk = buf;
- const tr_time_t * oldMTimes = (const tr_time_t *) walk;
+ tr_time_t mtime;
for( i=0; i<n; ++i ) {
- if ( curMTimes[i] == oldMTimes[i] )
+ readBytes( &mtime, &walk, sizeof(tr_time_t) );
+ if ( curMTimes[i] == mtime )
tr_torrentSetFileChecked( tor, i, TRUE );
else
tr_dbg( "File '%s' recheck needed", tor->info.files[i].name );
}
free( curMTimes );
- walk += n * sizeof(tr_time_t);
/* get the completion bitfield */
memset( &bitfield, 0, sizeof bitfield );
@@ -548,11 +548,16 @@ parsePeers( tr_torrent * tor, const uint8_t * buf, uin
if( !tor->info.isPrivate )
{
+ int i;
const int count = len / sizeof(tr_pex);
- tr_peerMgrAddPex( tor->handle->peerMgr,
- tor->info.hash,
- TR_PEER_FROM_CACHE,
- (tr_pex*)buf, count );
+
+ for( i=0; i<count; ++i )
+ {
+ tr_pex pex;
+ readBytes( &pex, &buf, sizeof( tr_pex ) );
+ tr_peerMgrAddPex( tor->handle->peerMgr, tor->info.hash, TR_PEER_FROM_CACHE, &pex );
+ }
+
tr_dbg( "found %i peers in resume file", count );
ret = TR_FR_PEERS;
}

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-libtransmission_natpmp_c,v 1.1 2008/01/11 18:15:00 naddy Exp $
--- libtransmission/natpmp.c.orig Sat Jan 5 20:52:20 2008
+++ libtransmission/natpmp.c Sat Jan 5 20:52:43 2008
@@ -16,6 +16,7 @@
#include <inttypes.h>
#include <string.h> /* strerror */
+#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-libtransmission_peer-mgr_c,v 1.1 2008/01/11 18:15:00 naddy Exp $
--- libtransmission/peer-mgr.c.orig Tue Jan 8 16:56:34 2008
+++ libtransmission/peer-mgr.c Tue Jan 8 16:57:36 2008
@@ -1095,17 +1095,14 @@ void
tr_peerMgrAddPex( tr_peerMgr * manager,
const uint8_t * torrentHash,
uint8_t from,
- const tr_pex * pex,
- int pexCount )
+ const tr_pex * pex )
{
Torrent * t;
- const tr_pex * end;
managerLock( manager );
t = getExistingTorrent( manager, torrentHash );
- for( end=pex+pexCount; pex!=end; ++pex )
- ensureAtomExists( t, &pex->in_addr, pex->port, pex->flags, from );
+ ensureAtomExists( t, &pex->in_addr, pex->port, pex->flags, from );
managerUnlock( manager );
}

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-libtransmission_peer-mgr_h,v 1.1 2008/01/11 18:15:00 naddy Exp $
--- libtransmission/peer-mgr.h.orig Tue Jan 8 16:55:40 2008
+++ libtransmission/peer-mgr.h Tue Jan 8 16:56:15 2008
@@ -50,8 +50,7 @@ void tr_peerMgrAddPeers( tr_peerMgr * manager,
void tr_peerMgrAddPex( tr_peerMgr * manager,
const uint8_t * torrentHash,
uint8_t from,
- const tr_pex * pex,
- int pexCount );
+ const tr_pex * pex );
void tr_peerMgrSetBlame( tr_peerMgr * manager,
const uint8_t * torrentHash,

View File

@ -1,13 +1,13 @@
@comment $OpenBSD: PLIST-main,v 1.4 2007/11/27 20:30:19 naddy Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2008/01/11 18:15:00 naddy Exp $
@pkgpath net/transmission
bin/transmission-cli
bin/transmission-daemon
bin/transmission-proxy
bin/transmission-remote
@man man/man1/transmission-cli.1
bin/transmissioncli
@man man/man1/transmission-daemon.1
@man man/man1/transmission-proxy.1
@man man/man1/transmission-remote.1
@man man/man1/transmissioncli.1
@comment share/locale/
@comment share/locale/de/
@comment share/locale/de/LC_MESSAGES/