update to libtorrent 0.11.1/rtorrent 0.7.1

This commit is contained in:
naddy 2007-01-14 23:37:52 +00:00
parent 53e6084bfe
commit f14801bacd
6 changed files with 16 additions and 49 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2006/12/21 19:13:07 naddy Exp $
# $OpenBSD: Makefile,v 1.12 2007/01/14 23:37:52 naddy Exp $
COMMENT= "BitTorrent library written in C++"
DISTNAME= libtorrent-0.11.0
SHARED_LIBS += torrent 11.0 # .10.0
DISTNAME= libtorrent-0.11.1
SHARED_LIBS += torrent 11.1 # .10.1
CATEGORIES= net devel
HOMEPAGE= http://libtorrent.rakshasa.no/
@ -17,6 +17,7 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}downloads/
WANTLIB= crypto
LIB_DEPENDS= sigc-2.0:libsigc++-2.*:devel/libsigc++-2
USE_LIBTOOL= Yes

View File

@ -1,4 +1,4 @@
MD5 (libtorrent-0.11.0.tar.gz) = 1dd6d6c7cbb8a44810452c924f27c104
RMD160 (libtorrent-0.11.0.tar.gz) = a67017ac522d4acf303fa5e13bfdede03815d47b
SHA1 (libtorrent-0.11.0.tar.gz) = d2a18ed35d0e6cd573ee284a6fe14574b85c86c4
SIZE (libtorrent-0.11.0.tar.gz) = 475919
MD5 (libtorrent-0.11.1.tar.gz) = d1a98c0bd93839071b8c214453aa4e5c
RMD160 (libtorrent-0.11.1.tar.gz) = f28327d0ebb2a608e3fa3f6f3414db150cc2d000
SHA1 (libtorrent-0.11.1.tar.gz) = 870f63f9a7eda597dbdb4be791ad0d29ea4902e2
SIZE (libtorrent-0.11.1.tar.gz) = 477557

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2006/12/21 19:13:07 naddy Exp $
@comment $OpenBSD: PLIST,v 1.6 2007/01/14 23:37:52 naddy Exp $
%%SHARED%%
include/torrent/
include/torrent/bitfield.h
@ -11,6 +11,7 @@ include/torrent/data/block_list.h
include/torrent/data/block_transfer.h
include/torrent/data/file.h
include/torrent/data/file_list.h
include/torrent/data/file_list_iterator.h
include/torrent/data/file_utils.h
include/torrent/data/piece.h
include/torrent/data/transfer_list.h

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2006/12/23 19:39:47 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2007/01/14 23:37:52 naddy Exp $
COMMENT= "Ncurses BitTorrent Client based on LibTorrent"
DISTNAME= rtorrent-0.7.0
PKGNAME= ${DISTNAME}p0
DISTNAME= rtorrent-0.7.1
CATEGORIES= net
HOMEPAGE= http://libtorrent.rakshasa.no/

View File

@ -1,4 +1,4 @@
MD5 (rtorrent-0.7.0.tar.gz) = 26758f948874e1ee9732628772483b7b
RMD160 (rtorrent-0.7.0.tar.gz) = 8e0d598de52530d9483fc48096522019add75c5c
SHA1 (rtorrent-0.7.0.tar.gz) = 2a6b99725f36dcd2fb439aae5a372245bfda5ec9
SIZE (rtorrent-0.7.0.tar.gz) = 413247
MD5 (rtorrent-0.7.1.tar.gz) = 98b97730c36828e662a2355cb2b11309
RMD160 (rtorrent-0.7.1.tar.gz) = 01b42bc520abe7a6cae0b31e9b72dd65d4ae6a90
SHA1 (rtorrent-0.7.1.tar.gz) = cb41c013f82f12dec4962f68a7677eb0b00785cd
SIZE (rtorrent-0.7.1.tar.gz) = 414447

View File

@ -1,34 +0,0 @@
$OpenBSD: patch-src_core_download_list_cc,v 1.1 2006/12/23 19:39:47 naddy Exp $
--- src/core/download_list.cc.orig Sat Dec 23 18:16:03 2006
+++ src/core/download_list.cc Sat Dec 23 18:18:24 2006
@@ -95,10 +95,17 @@ DownloadList::create(std::istream* str,
try {
*str >> *object;
- // Catch, delete.
- if (str->fail())
- throw torrent::input_error("Could not create download, the input is not a valid torrent.");
+ // Don't throw input_error from here as gcc-3.3.5 produces bad
+ // code.
+ if (str->fail()) {
+ delete object;
+ if (printLog)
+ control->core()->push_log("Could not create download, the input is not a valid torrent.");
+
+ return NULL;
+ }
+
download = torrent::download_add(object);
} catch (torrent::local_error& e) {
@@ -389,9 +396,6 @@ DownloadList::check_hash(Download* downl
void
DownloadList::hash_done(Download* download) {
check_contains(download);
-
- if (!download->is_open())
- throw torrent::internal_error("DownloadList::hash_done(...) !download->is_open().");
if (download->is_hash_checking() || download->is_active())
throw torrent::internal_error("DownloadList::hash_done(...) download in invalid state.");