diff -Nru libtorrent-rasterbar-0.16.17/bindings/Makefile.in libtorrent-rasterbar-0.16.18/bindings/Makefile.in --- libtorrent-rasterbar-0.16.17/bindings/Makefile.in 2014-06-21 18:03:17.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/Makefile.in 2014-10-16 05:45:34.000000000 +0000 @@ -261,7 +261,6 @@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ -PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ PYTHON_INSTALL_PARAMS = @PYTHON_INSTALL_PARAMS@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/Makefile.in libtorrent-rasterbar-0.16.18/bindings/python/Makefile.in --- libtorrent-rasterbar-0.16.17/bindings/python/Makefile.in 2014-06-21 18:03:17.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/Makefile.in 2014-10-16 05:45:34.000000000 +0000 @@ -202,7 +202,6 @@ PYTHON = @PYTHON@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ -PYTHON_EXTRA_LDFLAGS = @PYTHON_EXTRA_LDFLAGS@ PYTHON_EXTRA_LIBS = @PYTHON_EXTRA_LIBS@ PYTHON_INSTALL_PARAMS = @PYTHON_INSTALL_PARAMS@ PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/setup.py libtorrent-rasterbar-0.16.18/bindings/python/setup.py --- libtorrent-rasterbar-0.16.17/bindings/python/setup.py 2014-06-21 18:03:28.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/setup.py 2014-10-16 05:45:44.000000000 +0000 @@ -43,12 +43,12 @@ except: pass shutil.copyfile(r'bin\msvc-9.0\release\boost-source\geoip-static\link-static\optimization-space\threading-multi\libtorrent.pyd', r'.\build\lib\libtorrent.pyd') setup( name='python-libtorrent', - version='0.16.17', + version='0.16.18', author = 'Arvid Norberg', - author_email='arvid@rasterbar.com', + author_email='arvid@libtorrent.org', description = 'Python bindings for libtorrent-rasterbar', long_description = 'Python bindings for libtorrent-rasterbar', - url = 'http://www.rasterbar.com/products/libtorrent/index.html', + url = 'http://www.libtorrent.org', platforms = 'Windows', license = 'Boost Software License - Version 1.0 - August 17th, 2003', packages = ['libtorrent'], @@ -67,12 +67,12 @@ extra_cmd = ' -DTORRENT_USE_OPENSSL -DWITH_SHIPPED_GEOIP_H -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 -DBOOST_EXCEPTION_DISABLE -DBOOST_ASIO_ENABLE_CANCELIO -DBOOST_ASIO_DYN_LINK -DTORRENT_LINKING_SHARED -I/opt/local/include -lboost_system-mt -lboost_python-mt -lssl -lcrypto -L/opt/local/lib -I/opt/local/include ' setup( name='python-libtorrent', - version='0.16.17', + version='0.16.18', author = 'Arvid Norberg', - author_email='arvid@rasterbar.com', + author_email='arvid@libtorrent.org', description = 'Python bindings for libtorrent-rasterbar', long_description = 'Python bindings for libtorrent-rasterbar', - url = 'http://www.rasterbar.com/products/libtorrent/index.html', + url = 'http://www.libtorrent.org', platforms = 'any', license = 'Boost Software License - Version 1.0 - August 17th, 2003', ext_modules = [Extension('libtorrent', diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/setup.py.in libtorrent-rasterbar-0.16.18/bindings/python/setup.py.in --- libtorrent-rasterbar-0.16.17/bindings/python/setup.py.in 2012-07-16 01:06:15.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/setup.py.in 2014-10-13 01:05:42.000000000 +0000 @@ -48,7 +48,7 @@ author_email='@PACKAGE_BUGREPORT@', description = 'Python bindings for libtorrent-rasterbar', long_description = 'Python bindings for libtorrent-rasterbar', - url = 'http://www.rasterbar.com/products/libtorrent/index.html', + url = 'http://www.libtorrent.org', platforms = 'Windows', license = 'Boost Software License - Version 1.0 - August 17th, 2003', packages = ['libtorrent'], @@ -72,7 +72,7 @@ author_email='@PACKAGE_BUGREPORT@', description = 'Python bindings for libtorrent-rasterbar', long_description = 'Python bindings for libtorrent-rasterbar', - url = 'http://www.rasterbar.com/products/libtorrent/index.html', + url = 'http://www.libtorrent.org', platforms = 'any', license = 'Boost Software License - Version 1.0 - August 17th, 2003', ext_modules = [Extension('libtorrent', diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/src/alert.cpp libtorrent-rasterbar-0.16.18/bindings/python/src/alert.cpp --- libtorrent-rasterbar-0.16.17/bindings/python/src/alert.cpp 2014-01-30 07:50:44.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/src/alert.cpp 2014-08-24 19:37:31.000000000 +0000 @@ -396,6 +396,11 @@ .add_property("status", &get_status_from_update_alert) ; + class_, noncopyable>( + "i2p_alert", no_init) + .add_property("error", &i2p_alert::error) + ; + class_, noncopyable>( "dht_reply_alert", no_init) .def_readonly("num_peers", &dht_reply_alert::num_peers) diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/src/big_number.cpp libtorrent-rasterbar-0.16.18/bindings/python/src/big_number.cpp --- libtorrent-rasterbar-0.16.17/bindings/python/src/big_number.cpp 2013-02-06 18:14:26.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/src/big_number.cpp 2014-09-15 05:27:28.000000000 +0000 @@ -4,6 +4,19 @@ #include #include +#include "bytes.hpp" + +long get_hash(boost::python::object o) +{ + using namespace boost::python; + return PyObject_Hash(str(o).ptr()); +} + +using namespace libtorrent; + +bytes big_number_bytes(const big_number& bn) { + return bytes(bn.to_string()); +} void bind_big_number() { @@ -18,8 +31,8 @@ .def(init()) .def("clear", &big_number::clear) .def("is_all_zeros", &big_number::is_all_zeros) - .def("to_string", &big_number::to_string) -// .def("__getitem__", &big_number::opreator[]) + .def("to_bytes", big_number_bytes) + .def("__hash__", get_hash) ; } diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/src/create_torrent.cpp libtorrent-rasterbar-0.16.18/bindings/python/src/create_torrent.cpp --- libtorrent-rasterbar-0.16.17/bindings/python/src/create_torrent.cpp 2014-03-23 00:24:42.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/src/create_torrent.cpp 2014-09-15 05:27:28.000000000 +0000 @@ -6,20 +6,21 @@ #include #include #include "libtorrent/intrusive_ptr_base.hpp" +#include "bytes.hpp" using namespace boost::python; using namespace libtorrent; namespace { - void set_hash(create_torrent& c, int p, char const* hash) + void set_hash(create_torrent& c, int p, bytes const& b) { - c.set_hash(p, sha1_hash(hash)); + c.set_hash(p, sha1_hash(b.arr)); } - void set_file_hash(create_torrent& c, int f, char const* hash) + void set_file_hash(create_torrent& c, int f, bytes const& b) { - c.set_file_hash(f, sha1_hash(hash)); + c.set_file_hash(f, sha1_hash(b.arr)); } void call_python_object(boost::python::object const& obj, int i) diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/src/entry.cpp libtorrent-rasterbar-0.16.18/bindings/python/src/entry.cpp --- libtorrent-rasterbar-0.16.17/bindings/python/src/entry.cpp 2013-05-11 19:01:08.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/src/entry.cpp 2014-09-15 05:27:28.000000000 +0000 @@ -4,6 +4,7 @@ #include #include +#include "bytes.hpp" using namespace boost::python; using namespace libtorrent; @@ -27,7 +28,7 @@ dict result; for (entry::dictionary_type::const_iterator i(d.begin()), e(d.end()); i != e; ++i) - result[i->first] = i->second; + result[bytes(i->first)] = i->second; return result; } @@ -39,7 +40,7 @@ case entry::int_t: return object(e.integer()); case entry::string_t: - return object(e.string()); + return object(bytes(e.string())); case entry::list_t: return convert(e.list()); case entry::dictionary_t: @@ -87,12 +88,24 @@ for (std::size_t i = 0; i < length; ++i) { - result.dict().insert( - std::make_pair( - extract(items[i][0])() - , construct0(items[i][1]) - ) - ); + if (extract(items[i][0]).check()) + { + result.dict().insert( + std::make_pair( + extract(items[i][0])().arr, + construct0(items[i][1]) + ) + ); + } + else + { + result.dict().insert( + std::make_pair( + extract(items[i][0])(), + construct0(items[i][1]) + ) + ); + } } return result; @@ -111,9 +124,13 @@ return result; } + else if (extract(e).check()) + { + return entry(extract(e)().arr); + } else if (extract(e).check()) { - return entry(extract(e)()); + return entry(extract(e)()); } else if (extract(e).check()) { diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/src/session.cpp libtorrent-rasterbar-0.16.18/bindings/python/src/session.cpp --- libtorrent-rasterbar-0.16.17/bindings/python/src/session.cpp 2013-10-10 05:11:45.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/src/session.cpp 2014-09-15 05:27:28.000000000 +0000 @@ -22,6 +22,7 @@ #include #include "gil.hpp" +#include "bytes.hpp" using namespace boost::python; using namespace libtorrent; @@ -89,7 +90,7 @@ bencode_map_entry* map; int len; boost::tie(map, len) = aux::settings_map(); - + session_settings sett; for (int i = 0; i < len; ++i) { @@ -185,7 +186,7 @@ p.ti = extract >(params["ti"]); if (params.has_key("info_hash")) - p.info_hash = extract(params["info_hash"]); + p.info_hash = sha1_hash(bytes(extract(params["info_hash"])).arr); if (params.has_key("name")) p.name = extract(params["name"]); p.save_path = extract(params["save_path"]); @@ -431,8 +432,9 @@ return ret; } - list get_cache_info(session& ses, sha1_hash ih) + list get_cache_info(session& ses, bytes const& b) { + sha1_hash ih(b.arr); std::vector ret; { diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/src/torrent_info.cpp libtorrent-rasterbar-0.16.18/bindings/python/src/torrent_info.cpp --- libtorrent-rasterbar-0.16.17/bindings/python/src/torrent_info.cpp 2013-10-10 05:19:09.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/src/torrent_info.cpp 2014-09-15 05:27:28.000000000 +0000 @@ -6,6 +6,7 @@ #include #include "libtorrent/intrusive_ptr_base.hpp" #include "libtorrent/session_settings.hpp" +#include "bytes.hpp" using namespace boost::python; using namespace libtorrent; @@ -72,7 +73,7 @@ for (std::vector::const_iterator i = mt.begin() , end(mt.end()); i != end; ++i) { - ret.append(i->to_string()); + ret.append(bytes(i->to_string())); } return ret; } @@ -81,7 +82,7 @@ { std::vector h; for (int i = 0, e = len(hashes); i < e; ++i) - h.push_back(sha1_hash(extract(hashes[i]))); + h.push_back(sha1_hash(bytes(extract(hashes[i])).arr)); ti.set_merkle_tree(h); } diff -Nru libtorrent-rasterbar-0.16.17/bindings/python/src/utility.cpp libtorrent-rasterbar-0.16.18/bindings/python/src/utility.cpp --- libtorrent-rasterbar-0.16.17/bindings/python/src/utility.cpp 2013-05-11 19:01:08.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/bindings/python/src/utility.cpp 2014-09-15 05:27:28.000000000 +0000 @@ -5,30 +5,84 @@ #include #include #include +#include "bytes.hpp" using namespace boost::python; using namespace libtorrent; +struct bytes_to_python +{ + static PyObject* convert(bytes const& p) + { +#if PY_MAJOR_VERSION >= 3 + PyObject *ret = PyBytes_FromStringAndSize(p.arr.c_str(), p.arr.size()); +#else + PyObject *ret = PyString_FromStringAndSize(p.arr.c_str(), p.arr.size()); +#endif + return ret; + } +}; + +struct bytes_from_python +{ + bytes_from_python() + { + converter::registry::push_back( + &convertible, &construct, type_id()); + } + + static void* convertible(PyObject* x) + { +#if PY_MAJOR_VERSION >= 3 + return PyBytes_Check(x) ? x : NULL; +#else + return PyString_Check(x) ? x : NULL; +#endif + } + + static void construct(PyObject* x, converter::rvalue_from_python_stage1_data* data) + { +#if PY_MAJOR_VERSION >= 3 + void* storage = ((converter::rvalue_from_python_storage*)data)->storage.bytes; + bytes* ret = new (storage) bytes(); + ret->arr.resize(PyBytes_Size(x)); + memcpy(&ret->arr[0], PyBytes_AsString(x), ret->arr.size()); + data->convertible = storage; +#else + void* storage = ((converter::rvalue_from_python_storage*)data)->storage.bytes; + bytes* ret = new (storage) bytes(); + ret->arr.resize(PyString_Size(x)); + memcpy(&ret->arr[0], PyString_AsString(x), ret->arr.size()); + data->convertible = storage; +#endif + } +}; + + object client_fingerprint_(peer_id const& id) { boost::optional result = client_fingerprint(id); return result ? object(*result) : object(); } -entry bdecode_(std::string const& data) +entry bdecode_(bytes const& data) { - return bdecode(data.begin(), data.end()); + return bdecode(data.arr.begin(), data.arr.end()); } -std::string bencode_(entry const& e) +bytes bencode_(entry const& e) { - std::string result; - bencode(std::back_inserter(result), e); + bytes result; + bencode(std::back_inserter(result.arr), e); return result; } void bind_utility() { + // TODO: it would be nice to install converters for sha1_hash as well + to_python_converter(); + bytes_from_python(); + def("identify_client", &libtorrent::identify_client); def("client_fingerprint", &client_fingerprint_); def("bdecode", &bdecode_); diff -Nru libtorrent-rasterbar-0.16.17/ChangeLog libtorrent-rasterbar-0.16.18/ChangeLog --- libtorrent-rasterbar-0.16.17/ChangeLog 2014-06-16 03:45:30.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/ChangeLog 2014-10-04 07:19:29.000000000 +0000 @@ -1,3 +1,22 @@ +0.16.18 release + + * fix uninitialized values in DHT DOS mitigation + * fix error handling in file::phys_offset + * fix bug in HTTP scrape response parsing + * enable TCP keepalive for socks5 connection for UDP associate + * fix python3 support + * fix bug in lt_donthave extension + * expose i2p_alert to python. cleaning up of i2p connection code + * fixed overflow and download performance issue when downloading at high rates + * fixed bug in add_torrent_alert::message for magnet links + * disable optimistic disconnects when connection limit is low + * improved error handling of session::listen_on + * suppress initial 'completed' announce to trackers added with replace_trackers + after becoming a seed + * SOCKS4 fix for trying to connect over IPv6 + * fix saving resume data when removing all trackers + * fix bug in udp_socket when changing socks5 proxy quickly + 0.16.17 release * don't fall back on wildcard port in UPnP diff -Nru libtorrent-rasterbar-0.16.17/CMakeLists.txt libtorrent-rasterbar-0.16.18/CMakeLists.txt --- libtorrent-rasterbar-0.16.17/CMakeLists.txt 2014-06-16 03:45:42.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/CMakeLists.txt 2014-10-15 03:44:25.000000000 +0000 @@ -232,7 +232,7 @@ endif(MSVC) add_definitions(-D_FILE_OFFSET_BITS=64) -add_definitions(-DBOOST_DISABLE_EXCEPTION) +add_definitions(-DBOOST_EXCEPTION_DISABLE) add_definitions(-DBOOST_ASIO_ENABLE_CANCELIO) if (tcmalloc) @@ -245,7 +245,7 @@ SOVERSION 1 VERSION 1) -set (VERSION "0.16.17") +set (VERSION "0.16.18") get_property (COMPILETIME_OPTIONS_LIST DIRECTORY ${CMAKE_CURRENT_SOURCE_DIRECTORY} diff -Nru libtorrent-rasterbar-0.16.17/configure libtorrent-rasterbar-0.16.18/configure --- libtorrent-rasterbar-0.16.17/configure 2014-06-21 18:03:15.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/configure 2014-10-16 05:45:33.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libtorrent-rasterbar 0.16.17. +# Generated by GNU Autoconf 2.69 for libtorrent-rasterbar 0.16.18. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -275,7 +275,7 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: arvid@rasterbar.com about your system, including any +$0: arvid@libtorrent.org about your system, including any $0: error possibly output before this message. Then install $0: a modern shell, or manually run the script under such a $0: shell if you do have one." @@ -590,9 +590,9 @@ # Identity of this package. PACKAGE_NAME='libtorrent-rasterbar' PACKAGE_TARNAME='libtorrent-rasterbar' -PACKAGE_VERSION='0.16.17' -PACKAGE_STRING='libtorrent-rasterbar 0.16.17' -PACKAGE_BUGREPORT='arvid@rasterbar.com' +PACKAGE_VERSION='0.16.18' +PACKAGE_STRING='libtorrent-rasterbar 0.16.18' +PACKAGE_BUGREPORT='arvid@libtorrent.org' PACKAGE_URL='http://www.libtorrent.org' ac_unique_file="src/torrent.cpp" @@ -657,7 +657,6 @@ GEOIP_LIBS GEOIP_CFLAGS BOOST_PYTHON_LIB -PYTHON_EXTRA_LDFLAGS PYTHON_EXTRA_LIBS PYTHON_SITE_PKG PYTHON_LDFLAGS @@ -1400,7 +1399,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libtorrent-rasterbar 0.16.17 to adapt to many kinds of systems. +\`configure' configures libtorrent-rasterbar 0.16.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1472,7 +1471,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libtorrent-rasterbar 0.16.17:";; + short | recursive ) echo "Configuration of libtorrent-rasterbar 0.16.18:";; esac cat <<\_ACEOF @@ -1575,7 +1574,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . libtorrent-rasterbar home page: . _ACEOF ac_status=$? @@ -1639,7 +1638,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libtorrent-rasterbar configure 0.16.17 +libtorrent-rasterbar configure 0.16.18 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2105,9 +2104,9 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ---------------------------------- ## -## Report this to arvid@rasterbar.com ## -## ---------------------------------- ##" +( $as_echo "## ----------------------------------- ## +## Report this to arvid@libtorrent.org ## +## ----------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -2129,7 +2128,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libtorrent-rasterbar $as_me 0.16.17, which was +It was created by libtorrent-rasterbar $as_me 0.16.18, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4752,7 +4751,7 @@ # Define the identity of the package. PACKAGE='libtorrent-rasterbar' - VERSION='0.16.17' + VERSION='0.16.18' cat >>confdefs.h <<_ACEOF @@ -8305,7 +8304,7 @@ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) + 10.[012][,.]*) _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; 10.*) _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; @@ -18492,7 +18491,7 @@ doesn't work properly with versions of Python before 2.1.0. You may need to re-run configure, setting the variables PYTHON_CPPFLAGS, PYTHON_LDFLAGS, PYTHON_SITE_PKG, -PYTHON_EXTRA_LIBS and PYTHON_EXTRA_LDFLAGS by hand. +PYTHON_EXTRA_LIBS by hand. Moreover, to disable this check, set PYTHON_NOVERSIONCHECK to something else than an empty string. @@ -18535,7 +18534,7 @@ # { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5 $as_echo_n "checking for the distutils Python package... " >&6; } - ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` + ac_distutils_result=`$PYTHON -c "import distutils" >/dev/null 2>&1` if test -z "$ac_distutils_result"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -18685,20 +18684,6 @@ # - # linking flags needed when embedding - # - { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5 -$as_echo_n "checking python extra linking flags... " >&6; } - if test -z "$PYTHON_EXTRA_LDFLAGS"; then - PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ - conf = distutils.sysconfig.get_config_var; \ - print (conf('LINKFORSHARED'))"` - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5 -$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } - - - # # final check to see if everything compiles alright # { $as_echo "$as_me:${as_lineno-$LINENO}: checking consistency of all components of python development environment" >&5 @@ -18706,7 +18691,7 @@ # save current global flags ac_save_LIBS="$LIBS" ac_save_CPPFLAGS="$CPPFLAGS" - LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LDFLAGS $PYTHON_EXTRA_LIBS" + LIBS="$ac_save_LIBS $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS" CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -20522,7 +20507,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libtorrent-rasterbar $as_me 0.16.17, which was +This file was extended by libtorrent-rasterbar $as_me 0.16.18, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20573,14 +20558,14 @@ Configuration commands: $config_commands -Report bugs to . +Report bugs to . libtorrent-rasterbar home page: ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libtorrent-rasterbar config.status 0.16.17 +libtorrent-rasterbar config.status 0.16.18 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru libtorrent-rasterbar-0.16.17/configure.ac libtorrent-rasterbar-0.16.18/configure.ac --- libtorrent-rasterbar-0.16.17/configure.ac 2014-06-16 03:46:36.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/configure.ac 2014-10-15 03:44:25.000000000 +0000 @@ -1,11 +1,11 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -# $Id: configure.ac 10007 2014-06-16 03:46:31Z arvidn $ +# $Id: configure.ac 10391 2014-10-13 06:10:34Z arvidn $ AC_PREREQ([2.63]) -AC_INIT([libtorrent-rasterbar],[0.16.17],[arvid@rasterbar.com], +AC_INIT([libtorrent-rasterbar],[0.16.18],[arvid@libtorrent.org], [libtorrent-rasterbar],[http://www.libtorrent.org]) AC_CONFIG_SRCDIR([src/torrent.cpp]) AC_CONFIG_AUX_DIR([build-aux]) diff -Nru libtorrent-rasterbar-0.16.17/debian/changelog libtorrent-rasterbar-0.16.18/debian/changelog --- libtorrent-rasterbar-0.16.17/debian/changelog 2014-06-22 17:05:29.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/debian/changelog 2014-10-18 17:49:25.000000000 +0000 @@ -1,18 +1,21 @@ -libtorrent-rasterbar (0.16.17-1ubuntu2) utopic; urgency=medium +libtorrent-rasterbar (0.16.18-1) unstable; urgency=medium - * Make sure repatch target is actually called. - * Build against Boost 1.55. + * New upstream version. + - fix string handling in python3 bindings (Closes: #756503). + * debian/patches: + - fix-python-dbg-build.patch: drop, fixed upstream. + - fix-html-docs.patch: refresh. + - fix-python-build-missing-byteshpp.patch: new, fix missing file + from upstream tarball. - -- Andrew Starr-Bochicchio Sun, 22 Jun 2014 13:05:14 -0400 + -- Cristian Greco Sat, 18 Oct 2014 19:47:37 +0200 -libtorrent-rasterbar (0.16.17-1ubuntu1) utopic; urgency=medium +libtorrent-rasterbar (0.16.17-2) unstable; urgency=medium - * Reapply ppc64el delta. - - Use dh-autoreconf for ppc64el. - - Add repatch target to debian/rules to work around autoreconf - regenerating the patched configure script. + * debian/control: switch back to unversioned {build-,}depends + for boost libraries. (Closes: #759387) - -- Andrew Starr-Bochicchio Sun, 22 Jun 2014 12:27:10 -0400 + -- Cristian Greco Tue, 02 Sep 2014 22:48:17 +0200 libtorrent-rasterbar (0.16.17-1) unstable; urgency=medium diff -Nru libtorrent-rasterbar-0.16.17/debian/control libtorrent-rasterbar-0.16.18/debian/control --- libtorrent-rasterbar-0.16.17/debian/control 2014-06-22 17:04:53.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/debian/control 2014-10-18 17:49:25.000000000 +0000 @@ -1,14 +1,12 @@ Source: libtorrent-rasterbar Section: libs Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Cristian Greco +Maintainer: Cristian Greco Uploaders: Andrew Starr-Bochicchio Build-Depends: debhelper (>= 7.4.10), dpkg-dev (>= 1.16.1~), - dh-autoreconf, - libboost-system1.55-dev | libboost-system-dev, - libboost-python1.55-dev | libboost-python-dev, + libboost-system-dev, + libboost-python-dev, libssl-dev, libgeoip-dev, pkg-config, @@ -48,7 +46,7 @@ Pre-Depends: dpkg (>= 1.15.6~) Depends: ${misc:Depends}, libtorrent-rasterbar7 (= ${binary:Version}), - libboost-system1.55-dev | libboost-system-dev, + libboost-system-dev, libssl-dev, libgeoip-dev, pkg-config diff -Nru libtorrent-rasterbar-0.16.17/debian/patches/fix-html-docs.patch libtorrent-rasterbar-0.16.18/debian/patches/fix-html-docs.patch --- libtorrent-rasterbar-0.16.17/debian/patches/fix-html-docs.patch 2014-02-24 18:52:00.000000000 +0000 +++ libtorrent-rasterbar-0.16.18/debian/patches/fix-html-docs.patch 2014-10-18 17:49:25.000000000 +0000 @@ -5,10 +5,8 @@ Origin: vendor Author: Cristian Greco -Index: libtorrent-rasterbar/docs/template.txt -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libtorrent-rasterbar/docs/template.txt 2014-02-24 13:35:46.747128562 -0500 +--- /dev/null ++++ b/docs/template.txt @@ -0,0 +1,29 @@ +%(head_prefix)s +%(head)s @@ -39,10 +37,8 @@ + + +%(body_suffix)s -Index: libtorrent-rasterbar/docs/makefile -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libtorrent-rasterbar/docs/makefile 2014-02-24 13:35:46.747128562 -0500 +--- /dev/null ++++ b/docs/makefile @@ -0,0 +1,34 @@ +#!/usr/bin/make -f +# Upstream Author: Arvid Norberg - Modified by: Cristian Greco @@ -78,10 +74,8 @@ + +clean: + @rm -f $(TARGETS:=.html) -Index: libtorrent-rasterbar/docs/css/base.css -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libtorrent-rasterbar/docs/css/base.css 2014-02-24 13:35:46.747128562 -0500 +--- /dev/null ++++ b/docs/css/base.css @@ -0,0 +1,136 @@ +/* Page template */ + @@ -219,10 +213,8 @@ + +p, ul, ol, img {margin-bottom: 1em;} + -Index: libtorrent-rasterbar/docs/css/rst.css -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libtorrent-rasterbar/docs/css/rst.css 2014-02-24 13:35:46.747128562 -0500 +--- /dev/null ++++ b/docs/css/rst.css @@ -0,0 +1,245 @@ +.document { + margin-left: 10px; @@ -469,11 +461,9 @@ +* html #table-of-contents ul ul { height: 1%; } +/* End hide from IE-mac */ + -Index: libtorrent-rasterbar/docs/index.rst -=================================================================== ---- libtorrent-rasterbar.orig/docs/index.rst 2014-02-24 13:35:46.751128562 -0500 -+++ libtorrent-rasterbar/docs/index.rst 2014-02-24 13:47:12.763143144 -0500 -@@ -83,7 +83,7 @@ +--- a/docs/index.rst ++++ b/docs/index.rst +@@ -85,7 +85,7 @@ .. _`ruby bindings`: http://libtorrent-ruby.rubyforge.org/ .. _`python bindings`: python_binding.html @@ -482,7 +472,7 @@ libtorrent is a feature complete C++ bittorrent implementation focusing on efficiency and scalability. It runs on embedded devices as well as -@@ -103,13 +103,9 @@ +@@ -105,13 +105,9 @@ Donate ====== @@ -498,7 +488,7 @@ Feedback -@@ -152,13 +148,10 @@ +@@ -154,13 +150,10 @@ __ http://www.cs.umu.se @@ -513,12 +503,10 @@ .. |copy| unicode:: 0xA9 .. copyright sign .. raw:: html -Index: libtorrent-rasterbar/docs/hacking.html -=================================================================== ---- libtorrent-rasterbar.orig/docs/hacking.html 2014-02-24 12:28:09.643042324 -0500 -+++ libtorrent-rasterbar/docs/hacking.html 2014-02-24 13:37:18.643130516 -0500 +--- a/docs/hacking.html ++++ b/docs/hacking.html @@ -8,17 +8,6 @@ - + -