diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-19 22:19:44 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-12-19 22:19:44 +0000 |
commit | 4953475d1cd096dad9c7d2fb7dd7815c6cb78cfa (patch) | |
tree | 5d5a2eb50ae3973f832c53455d32835c02b66ae7 /net-libs/rb_libtorrent | |
parent | Version bump. Set SUPPORT_PYTHON_ABIS. (diff) | |
download | gentoo-2-4953475d1cd096dad9c7d2fb7dd7815c6cb78cfa.tar.gz gentoo-2-4953475d1cd096dad9c7d2fb7dd7815c6cb78cfa.tar.bz2 gentoo-2-4953475d1cd096dad9c7d2fb7dd7815c6cb78cfa.zip |
old
(Portage version: 2.2_rc59/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/rb_libtorrent')
8 files changed, 0 insertions, 320 deletions
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest index 3f7538b0e22e..3f4d7f034d70 100644 --- a/net-libs/rb_libtorrent/Manifest +++ b/net-libs/rb_libtorrent/Manifest @@ -1,16 +1,6 @@ AUX 0.14.6-configure-ldflags-fix.patch 364 RMD160 e637a5c5116892fc7b27d5245abb913c876d2781 SHA1 ef62a4a94119d219c1c93a61c449dafe9c550ecb SHA256 38582ae08e589848fd09cefe5295da74abc3a296c1f6954037caf4a6deef8933 -AUX rb_libtorrent-0.13-CVE-2009-1760-test-fix.patch 710 RMD160 42b171fa60ed4e1af3d08dcc6b58a5fece888876 SHA1 7744d8f827bbf74b888e4297ed6d98d22752c4eb SHA256 41242b68d0e50329cd7056d57ab9681d7f9f9d368eb20b8026b4b291e9d9da10 -AUX rb_libtorrent-0.13-CVE-2009-1760.patch 2436 RMD160 0121d5e8e3c0f1a5c56f699bac317dd2a1f60fbf SHA1 8429c9be191af5a995f0e6a2f8a15761402cd74f SHA256 d0402cb71e97609e56f56376dc36d62531a244c40a267c7bdfd40cb728bbd16a -AUX rb_libtorrent-0.13-boost-1.37.patch 519 RMD160 3126c253c5b330a99b93bcadb803145a751df248 SHA1 9745aee26b0ad9801c517086805ee064a3d82a95 SHA256 1f6d979590f8873717c78cdf5fe0214f4f7f8ccd5b0e417b1de233e6875367f8 -AUX rb_libtorrent-0.13-gcc44.patch 290 RMD160 04399530320a6457dfbda2e6ff4cbf8afc10357f SHA1 4916a56e3fc44089e8e1dda8fddcfce765e550e5 SHA256 7ffd5c9a4a1f1c2bfb75e7631faa7566da86524bbdbbe1ea1ad2e55ddba9681a -DIST libtorrent-0.13.tar.gz 1502517 RMD160 40b97552ca2b664facf864e48cc09a0cf4d84809 SHA1 010c02e350dc68263bb791bc8c37df341301e9bb SHA256 b187e6af2d2adc90417f991431fab5b0d6e61d71d0164345fad940a79cc45ee2 -DIST libtorrent-rasterbar-0.14.4.tar.gz 1990752 RMD160 6fdb4afb5895e426883a1a6947c04dffed3a5178 SHA1 3494f610ea0a329d33c03d031043476453897acd SHA256 759be15068a9b2186876f3d0c781a63ccb42ad7b959dbd11756c903287cae53c -DIST libtorrent-rasterbar-0.14.5.tar.gz 1992627 RMD160 e9fad2cac8d054d4da86d591b027e8447a005c2f SHA1 ce19fddad4165502d3fcd9f1fc120ad2fad8bcd6 SHA256 4253ad5002e81d95ed8b3ff4116113f1ce7812f6eaf15a1ceef8cad9eecaaad8 DIST libtorrent-rasterbar-0.14.6.tar.gz 1995813 RMD160 454bb4550e1c8b782017214375c15add42c23a39 SHA1 2e3829a8c266c5a4ecd2d31bac223a1a60d644b9 SHA256 98540fe765163e6f22d53462694aee4e4213606179974470ebe1d8adc02b5f56 DIST libtorrent-rasterbar-0.14.7.tar.gz 1938654 RMD160 54e0f756f9b8d9a55f4c004292089c8171d5eb36 SHA1 a7765748b6bb9385eb65185702244418dab9098b SHA256 1ff89795c8433dfd9ba94d45f21048abcb73cf9f8b56eff9bdf34b5e3b41694b -EBUILD rb_libtorrent-0.13-r1.ebuild 1608 RMD160 6f8d1fa1e1516b167b3a3c3329d65ad164a26ff7 SHA1 3fbc89c53f0448656f22d5945c96572f087f97c5 SHA256 93cf7f8c6d96c737e7937c599848d7f2366387f3a110b6d9f09480f70296c51e -EBUILD rb_libtorrent-0.14.4-r1.ebuild 1774 RMD160 7391833176f2bb4880f15fba467eeb40a86d7605 SHA1 cb9745e3e6ac1c102d17c6acaa5c1d9ac1f879ea SHA256 0135cbddf46cf0e29fca597dc73e93d3178e16d79d064f684cd2cbeedcbecd54 -EBUILD rb_libtorrent-0.14.5.ebuild 1771 RMD160 f239ad06e464c685eb085251b13b5c7d9c4501a1 SHA1 f7182d7adfe5dca9fc30eea5c8ea87e809559bba SHA256 09171fdbf03965cad1dd00b5af58489312bc4c2d15e8d45a2a9fc11900cbdb15 EBUILD rb_libtorrent-0.14.6.ebuild 1933 RMD160 264d27b46b26ceb2d30439e8b647e8c2130fbef0 SHA1 1aeec25590b63e7ee7fb80a016a01d44968d20f4 SHA256 afcfb483c64baf68d539c3b55cca5a080e2d5ed6b15ef501cc0611df3335ee08 EBUILD rb_libtorrent-0.14.7.ebuild 1936 RMD160 6eb6225b7a6ea21cbe4c4e5f0abe3be3daabb52d SHA1 5fe24963688473021aa789056e91caa0d00b42a7 SHA256 da5f7442b4ae5338bfb11a881d753d8dbc1b6ddf0c3a17c3f412328fd69d1b3c MISC ChangeLog 12105 RMD160 384eafa903ab914918ab74dec65074f2f571fa48 SHA1 9742085b260c8a6810a11a83dce0d89b774989bc SHA256 41bceb6f0a0fa1d9dceb7fd0ce7b86f8928eb4e65bc42d99bb19b9ad4153fcd1 diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760-test-fix.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760-test-fix.patch deleted file mode 100644 index 9ab1ea80e210..000000000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760-test-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/test/test_primitives.cpp b/test/test_primitives.cpp -index 22efb0a..b0d11d1 100644 ---- a/test/test_primitives.cpp -+++ b/test/test_primitives.cpp -@@ -17,6 +17,9 @@ - using namespace libtorrent; - using namespace boost::tuples; - using boost::bind; -+namespace libtorrent { -+ fs::path sanitize_path(fs::path const& p); -+} - - tuple<int, int> feed_bytes(http_parser& parser, char const* str) - { -@@ -255,7 +258,7 @@ int test_main() - torrent["info"] = info; - torrent_info ti2(torrent); - std::cerr << ti2.name() << std::endl; -- TEST_CHECK(ti2.name() == "test3"); -+ TEST_CHECK(ti2.name() == "test1/test2/test3"); - - info["name.utf-8"] = "test2/../test3/.././../../test4"; - torrent["info"] = info; diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760.patch deleted file mode 100644 index d91e20689bd3..000000000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 160ea4fe2beb1d433c96fc432772fd0122421c95 Mon Sep 17 00:00:00 2001 -From: Robert Buchholz <rbu@gentoo.org> -Date: Mon, 8 Jun 2009 12:04:41 +0200 -Subject: [PATCH] backport CVE-2009-1760 fix from r3621 - ---- - src/torrent_info.cpp | 47 ++++++++++++++++++++++++++++------------------- - 1 files changed, 28 insertions(+), 19 deletions(-) - -diff --git a/src/torrent_info.cpp b/src/torrent_info.cpp -index 57c8a97..fc6d284 100755 ---- a/src/torrent_info.cpp -+++ b/src/torrent_info.cpp -@@ -39,6 +39,7 @@ POSSIBILITY OF SUCH DAMAGE. - #include <iterator> - #include <algorithm> - #include <set> -+#include <string> - - #ifdef _MSC_VER - #pragma warning(push, 1) -@@ -74,6 +75,29 @@ namespace - str += 0x80 | (chr & 0x3f); - } - -+ bool valid_path_element(std::string const& element) -+ { -+ if (element.empty() -+ || element == "." || element == ".." -+ || element[0] == '/' || element[0] == '\\' -+ || element[element.size()-1] == ':') -+ return false; -+ return true; -+ } -+ -+ fs::path sanitize_path(fs::path const& p) -+ { -+ fs::path new_path; -+ for (fs::path::const_iterator i = p.begin(); i != p.end(); ++i) -+ { -+ if (!valid_path_element(*i)) continue; -+ std::string pe = *i; -+ new_path /= pe; -+ } -+ TORRENT_ASSERT(!new_path.is_complete()); -+ return new_path; -+ } -+ - void verify_encoding(file_entry& target) - { - std::string tmp_path; -@@ -184,9 +208,9 @@ namespace - for (entry::list_type::const_iterator i = list->begin(); - i != list->end(); ++i) - { -- if (i->string() != "..") -- target.path /= i->string(); -+ target.path /= i->string(); - } -+ target.path = sanitize_path(target.path); - verify_encoding(target); - if (target.path.is_complete()) throw std::runtime_error("torrent contains " - "a file with an absolute path: '" -@@ -349,23 +373,8 @@ namespace libtorrent - else - { m_name = info["name"].string(); } - -- fs::path tmp = m_name; -- if (tmp.is_complete()) -- { -- m_name = tmp.leaf(); -- } -- else if (tmp.has_branch_path()) -- { -- fs::path p; -- for (fs::path::iterator i = tmp.begin() -- , end(tmp.end()); i != end; ++i) -- { -- if (*i == "." || *i == "..") continue; -- p /= *i; -- } -- m_name = p.string(); -- } -- if (m_name == ".." || m_name == ".") -+ m_name = sanitize_path(m_name).string(); -+ if (!valid_path_element(m_name)) - throw std::runtime_error("invalid 'name' of torrent (possible exploit attempt)"); - - // extract file list --- -1.6.3.1 - diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-boost-1.37.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-boost-1.37.patch deleted file mode 100644 index f1b95d8d6050..000000000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-boost-1.37.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur libtorrent-0.13.orig/include/libtorrent/disk_io_thread.hpp libtorrent-0.13/include/libtorrent/disk_io_thread.hpp ---- libtorrent-0.13.orig/include/libtorrent/disk_io_thread.hpp 2009-05-27 10:45:06.000000000 +0200 -+++ libtorrent-0.13/include/libtorrent/disk_io_thread.hpp 2009-05-27 11:33:50.000000000 +0200 -@@ -38,6 +38,7 @@ - #endif - - #include "libtorrent/storage.hpp" -+#include <boost/thread/condition.hpp> - #include <boost/thread/thread.hpp> - #include <boost/function.hpp> - #include <boost/thread/mutex.hpp> diff --git a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-gcc44.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-gcc44.patch deleted file mode 100644 index e89c19c85fdc..000000000000 --- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-gcc44.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libtorrent-0.13/src/identify_client.cpp.orig 2009-06-28 01:11:36.000000000 +0200 -+++ libtorrent-0.13/src/identify_client.cpp 2009-06-28 01:12:33.000000000 +0200 -@@ -34,6 +34,7 @@ - - #include <cctype> - #include <algorithm> -+#include <cstdio> - - #ifdef _MSC_VER - #pragma warning(push, 1) diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild deleted file mode 100644 index dd62a49752f8..000000000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild,v 1.5 2009/10/04 14:33:14 ssuominen Exp $ - -EAPI="2" -inherit eutils flag-o-matic - -MY_P=${P/rb_/} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="A C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd" -IUSE="debug doc" - -DEPEND="|| ( >=dev-libs/boost-1.34.1 - ~dev-libs/boost-1.33.1[threads] ) - !net-libs/libtorrent" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2009-1760.patch # bug 273156 - epatch "${FILESDIR}"/${P}-CVE-2009-1760-test-fix.patch - epatch "${FILESDIR}"/${P}-boost-1.37.patch # bug 270447 - epatch "${FILESDIR}"/${P}-gcc44.patch -} - -src_configure() { - append-ldflags -pthread - - # fails with as-needed, bug 271818 - append-ldflags $(no-as-needed) - - # use multi-threaded boost libs - local BOOST_LIBS="--with-boost-date-time=boost_date_time-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-regex=boost_regex-mt \ - --with-boost-program_options=boost_program_options-mt" - - econf $(use_enable debug) ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc ChangeLog AUTHORS NEWS README || die "dodoc failed" - if use doc ; then - dohtml docs/* || die "Could not install HTML documentation" - fi -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.4-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.4-r1.ebuild deleted file mode 100644 index e02dca2b1065..000000000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.4-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.14.4-r1.ebuild,v 1.1 2009/06/28 14:50:42 yngwin Exp $ - -EAPI="2" -inherit eutils flag-o-matic - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="debug doc examples python test" - -DEPEND="!net-libs/libtorrent - || ( >=dev-libs/boost-1.35 - ( ~dev-libs/boost-1.34.1 dev-cpp/asio ) ) - python? ( || ( >=dev-libs/boost-1.35.0-r5[python] - =dev-libs/boost-1.35.0-r2 ) ) - sys-libs/zlib" -RDEPEND="${DEPEND}" - -src_configure() { - append-ldflags -pthread - - #use multi-threading versions of boost libs - local BOOST_LIBS="--with-boost-system=boost_system-mt \ - --with-boost-asio=boost_system-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-regex=boost_regex-mt \ - --with-boost-python=boost_python-mt \ - --with-boost-program_options=boost_program_options-mt" - - local LOGGING - use debug && LOGGING="--with-logging=verbose" - - econf $(use_enable debug) \ - $(use_enable test tests) \ - $(use_enable examples) \ - $(use_enable python python-binding) \ - --with-zlib=system \ - --with-asio=system \ - ${LOGGING} \ - ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install || die 'emake install failed' - dodoc ChangeLog AUTHORS NEWS README || die 'dodoc failed' - if use doc ; then - dohtml docs/* || die "Could not install HTML documentation" - fi -} diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.14.5.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.14.5.ebuild deleted file mode 100644 index 70ce6a5c08dd..000000000000 --- a/net-libs/rb_libtorrent/rb_libtorrent-0.14.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.14.5.ebuild,v 1.1 2009/08/15 23:29:06 yngwin Exp $ - -EAPI="2" -inherit eutils flag-o-matic - -MY_P=${P/rb_/} -MY_P=${MY_P/torrent/torrent-rasterbar} -S=${WORKDIR}/${MY_P} - -DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability" -HOMEPAGE="http://www.rasterbar.com/products/libtorrent/" -SRC_URI="mirror://sourceforge/libtorrent/${MY_P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="debug doc examples python test" - -DEPEND="!net-libs/libtorrent - || ( >=dev-libs/boost-1.35 - ( ~dev-libs/boost-1.34.1 dev-cpp/asio ) ) - python? ( || ( >=dev-libs/boost-1.35.0-r5[python] - =dev-libs/boost-1.35.0-r2 ) ) - sys-libs/zlib" -RDEPEND="${DEPEND}" - -src_configure() { - append-ldflags -pthread - - #use multi-threading versions of boost libs - local BOOST_LIBS="--with-boost-system=boost_system-mt \ - --with-boost-asio=boost_system-mt \ - --with-boost-filesystem=boost_filesystem-mt \ - --with-boost-thread=boost_thread-mt \ - --with-boost-regex=boost_regex-mt \ - --with-boost-python=boost_python-mt \ - --with-boost-program_options=boost_program_options-mt" - - local LOGGING - use debug && LOGGING="--with-logging=verbose" - - econf $(use_enable debug) \ - $(use_enable test tests) \ - $(use_enable examples) \ - $(use_enable python python-binding) \ - --with-zlib=system \ - --with-asio=system \ - ${LOGGING} \ - ${BOOST_LIBS} -} - -src_install() { - emake DESTDIR="${D}" install || die 'emake install failed' - dodoc ChangeLog AUTHORS NEWS README || die 'dodoc failed' - if use doc ; then - dohtml docs/* || die "Could not install HTML documentation" - fi -} |