Add patch to fix the tests complementing the CVE patch. Remove no longer used patch from filesdir.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

5 files changed, 36 insertions, 27 deletions

diff --git a/net-libs/rb_libtorrent/ChangeLog b/net-libs/rb_libtorrent/ChangeLog
index 2f2943e89ed6..ac13d513af90 100644
--- a/net-libs/rb_libtorrent/ChangeLog
+++ b/net-libs/rb_libtorrent/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/rb_libtorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.61 2009/06/29 00:06:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/ChangeLog,v 1.62 2009/06/29 19:34:59 yngwin Exp $
+
+  29 Jun 2009; Ben de Groot <yngwin@gentoo.org>
+  rb_libtorrent-0.13-r1.ebuild,
+  +files/rb_libtorrent-0.13-CVE-2009-1760-test-fix.patch,
+  -files/rb_libtorrent-0.14.1-ax_python_path.patch:
+  Add patch to fix the tests complementing the CVE patch. Remove no longer
+  used patch from filesdir.
 
   29 Jun 2009; Ben de Groot <yngwin@gentoo.org>
   rb_libtorrent-0.13-r1.ebuild, -rb_libtorrent-0.14.4.ebuild:
diff --git a/net-libs/rb_libtorrent/Manifest b/net-libs/rb_libtorrent/Manifest
index e20cf8282867..5872baf388c8 100644
--- a/net-libs/rb_libtorrent/Manifest
+++ b/net-libs/rb_libtorrent/Manifest
@@ -1,11 +1,11 @@
+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
-AUX rb_libtorrent-0.14.1-ax_python_path.patch 1084 RMD160 13f8d86ced91b9c617c3d5cd256056c9ae799dd3 SHA1 38165920f011971146d20feeb801df48e9fe664e SHA256 689cbb500e2bc7bd2a0ca7d48a84916497a7cba1cc65689b492e2d3dfddcaa20
 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
-EBUILD rb_libtorrent-0.13-r1.ebuild 1609 RMD160 584aa68a8e7f6d4a2e5989a54eaaf6f6a271fc1a SHA1 2e83902c8c10686c236c789d035ee7564dc3403e SHA256 d0486a816dc724a898cd219b514579417a2e1fb5682fe3d0ec14cecaf7153acd
+EBUILD rb_libtorrent-0.13-r1.ebuild 1610 RMD160 7bb28f73c96da5f3ea870b65c6f76b6d9ce25c02 SHA1 788c46420daffe62e9338f80ae21b9ab7a043f72 SHA256 aaab9122dd838c2eb8a9e9c0bc0ba728677094e2027c7f1213ebe782374d3197
 EBUILD rb_libtorrent-0.13.ebuild 1375 RMD160 29fd7fa11063e4ec0a35b5734a44f82c59c56958 SHA1 b37474a18317328f8821ae276802264736004ce0 SHA256 5addf2c16e9589528a57e0842e9e220888293f8b19a685b4ea218d8f45f4850a
 EBUILD rb_libtorrent-0.14.4-r1.ebuild 1774 RMD160 7391833176f2bb4880f15fba467eeb40a86d7605 SHA1 cb9745e3e6ac1c102d17c6acaa5c1d9ac1f879ea SHA256 0135cbddf46cf0e29fca597dc73e93d3178e16d79d064f684cd2cbeedcbecd54
-MISC ChangeLog 10551 RMD160 e9cca36028a1543242cb7c1c6f6e3b40535c6f49 SHA1 87b3944aebb301eb69f0c431519754d8f377173e SHA256 07a4ba80bf0fccd040e9da7489bd9b6312518b3f17454e3fc638327d37d22137
+MISC ChangeLog 10845 RMD160 47e01acdcc8a3e7b816ef7827c002f272095e61c SHA1 5fa0e53b0534221ea35b572183d05260a12c5de1 SHA256 de29a1dc8de1e508526171da000b27c6e7ab9756b2ff708558cf789daeefe1a4
 MISC metadata.xml 180 RMD160 b3fdae264805d1dbe224d18e30b43cc9379b48c0 SHA1 3ece90b24dcd1ecd3e833660e8094afa809d2d93 SHA256 d4bbc70ee1028611e44086fc0b56d097b6945f22c66750538034bca5bf699f5c
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
new file mode 100644
index 000000000000..9ab1ea80e210
--- /dev/null
+++ b/net-libs/rb_libtorrent/files/rb_libtorrent-0.13-CVE-2009-1760-test-fix.patch
@@ -0,0 +1,23 @@
+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.14.1-ax_python_path.patch b/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.1-ax_python_path.patch
deleted file mode 100644
index 0d1f48ef5310..000000000000
--- a/net-libs/rb_libtorrent/files/rb_libtorrent-0.14.1-ax_python_path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Source: Santiago M. Mola <coldwind@gentoo.org>
-Upstream: The 'locate' part is merged.
-Reason: Support Python 2.6 and stop using locate to find Python headers.
---- libtorrent-rasterbar-0.14.1.orig/m4/ax_python.m4	2008-12-28 15:07:42.000000000 +0100
-+++ libtorrent-rasterbar-0.14.1/m4/ax_python.m4	2008-12-28 18:48:54.000000000 +0100
-@@ -58,13 +58,13 @@
- AC_DEFUN([AX_PYTHON],
- [AC_MSG_CHECKING(for python build information)
- AC_MSG_RESULT([])
--for python in python2.5 python2.4 python2.3 python2.2 python2.1 python; do
-+for python in python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do
- AC_CHECK_PROGS(PYTHON_BIN, [$python])
- ax_python_bin=$PYTHON_BIN
- if test x$ax_python_bin != x; then
-    AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
-    AC_CHECK_HEADER([$ax_python_bin/Python.h],
--   [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
-+   [[ax_python_header=/usr/include/$ax_python_bin]],
-    ax_python_header=no)
-    if test $ax_python_lib != no; then
-      if test $ax_python_header != no; then
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild
index 5b0e78265026..23b5f34af855 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild
@@ -1,11 +1,10 @@
 # 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.2 2009/06/29 00:06:04 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/rb_libtorrent/rb_libtorrent-0.13-r1.ebuild,v 1.3 2009/06/29 19:34:59 yngwin Exp $
 
 EAPI="2"
 inherit eutils flag-o-matic
 
-RESTRICT="test"  # tests break due to the CVE patch :(
 MY_P=${P/rb_/}
 S=${WORKDIR}/${MY_P}
 
@@ -25,6 +24,7 @@ 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
 }