[pkg-boost-commits] r14664 - boost/trunk/debian/patches
Steven Michael Robbins
smr at alioth.debian.org
Mon Nov 7 07:37:53 UTC 2011
Author: smr
Date: 2011-11-07 07:37:53 +0000 (Mon, 07 Nov 2011)
New Revision: 14664
Removed:
boost/trunk/debian/patches/changeset_71050.diff
boost/trunk/debian/patches/date_time_date_formatting_hpp.patch
boost/trunk/debian/patches/fusion-name-qual.patch
boost/trunk/debian/patches/openssl-no-ssl2.patch
Modified:
boost/trunk/debian/patches/series
Log:
Update patch set for Boost 1.48.
Deleted: boost/trunk/debian/patches/changeset_71050.diff
===================================================================
--- boost/trunk/debian/patches/changeset_71050.diff 2011-11-07 07:34:23 UTC (rev 14663)
+++ boost/trunk/debian/patches/changeset_71050.diff 2011-11-07 07:37:53 UTC (rev 14664)
@@ -1,16 +0,0 @@
-Upstream: https://svn.boost.org/trac/boost/ticket/4994
-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622021
-Description: Python 3.2 compatibility, based on patch by Matthew Bradbury.
-
---- boost1.46-1.46.1.orig/libs/python/src/converter/builtin_converters.cpp
-+++ boost1.46-1.46.1/libs/python/src/converter/builtin_converters.cpp
-@@ -432,5 +432,8 @@
- {
- int err = PyUnicode_AsWideChar(
-- (PyUnicodeObject *)intermediate
-+#if PY_VERSION_HEX < 0x03020000
-+ (PyUnicodeObject *)
-+#endif
-+ intermediate
- , &result[0]
- , result.size());
Deleted: boost/trunk/debian/patches/date_time_date_formatting_hpp.patch
===================================================================
--- boost/trunk/debian/patches/date_time_date_formatting_hpp.patch 2011-11-07 07:34:23 UTC (rev 14663)
+++ boost/trunk/debian/patches/date_time_date_formatting_hpp.patch 2011-11-07 07:37:53 UTC (rev 14664)
@@ -1,19 +0,0 @@
-# Fix for http://bugs.debian.org/cgi-bin/bugreport.cgi?archive=yes&bug=473177
-# Upstream http://svn.boost.org/trac/boost/ticket/1726
-
---- trunk.orig/boost/date_time/date_formatting.hpp
-+++ trunk/boost/date_time/date_formatting.hpp
-@@ -79,7 +79,13 @@
- {
- typedef typename ymd_type::month_type month_type;
- std::basic_ostringstream<charT> ss;
-+
-+ // Temporarily switch to classic locale to prevent possible formatting
-+ // of year with comma or other character (for example 2,008).
-+ ss.imbue(std::locale::classic());
- ss << ymd.year;
-+ ss.imbue(std::locale());
-+
- if (format_type::has_date_sep_chars()) {
- ss << format_type::month_sep_char();
- }
Deleted: boost/trunk/debian/patches/fusion-name-qual.patch
===================================================================
--- boost/trunk/debian/patches/fusion-name-qual.patch 2011-11-07 07:34:23 UTC (rev 14663)
+++ boost/trunk/debian/patches/fusion-name-qual.patch 2011-11-07 07:37:53 UTC (rev 14664)
@@ -1,22 +0,0 @@
---- boost1.42-1.42.0.orig/boost/fusion/container/map/detail/deref_data_impl.hpp
-+++ boost1.42-1.42.0/boost/fusion/container/map/detail/deref_data_impl.hpp
-@@ -39,7 +39,7 @@
- static type
- call(It const& it)
- {
-- return deref(it).second;
-+ return boost::fusion::deref(it).second;
- }
- };
- };
---- boost1.42-1.42.0.orig/boost/fusion/container/map/detail/deref_impl.hpp
-+++ boost1.42-1.42.0/boost/fusion/container/map/detail/deref_impl.hpp
-@@ -36,7 +36,7 @@
- static type
- call(It const& it)
- {
-- return at<typename It::index>(it.seq->get_data());
-+ return boost::fusion::at<typename It::index>(it.seq->get_data());
- }
- };
- };
Deleted: boost/trunk/debian/patches/openssl-no-ssl2.patch
===================================================================
--- boost/trunk/debian/patches/openssl-no-ssl2.patch 2011-11-07 07:34:23 UTC (rev 14663)
+++ boost/trunk/debian/patches/openssl-no-ssl2.patch 2011-11-07 07:37:53 UTC (rev 14664)
@@ -1,40 +0,0 @@
-Description: Enable building when OpenSSL has disabled SSLv2
- Throw exception if SSLv2 connection requested but OPENSSL_NO_SSL2 defined.
- Fall back to returning invalid state if exceptions are disabled.
-Author: Lubo-B¹ Dole¾el <lubos at dolezel.info>-A
-Bug: 621402, 622027, 622070
-Forwarded: no
-
---- boost1.46-1.46.1.orig/boost/asio/ssl/detail/openssl_context_service.hpp
-+++ boost1.46-1.46.1/boost/asio/ssl/detail/openssl_context_service.hpp
-@@ -19,6 +19,7 @@
- #include <boost/asio/detail/config.hpp>
- #include <cstring>
- #include <string>
-+#include <stdexcept>
- #include <boost/function.hpp>
- #include <boost/asio/error.hpp>
- #include <boost/asio/io_service.hpp>
-@@ -66,6 +67,14 @@
- {
- switch (m)
- {
-+#if defined(OPENSSL_NO_SSL2)
-+ case context_base::sslv2:
-+ case context_base::sslv2_client:
-+ case context_base::sslv2_server:
-+ boost::throw_exception(std::runtime_error("SSLv2 is not supported in your OpenSSL"));
-+ impl = ::SSL_CTX_new(0); // if exceptions are disabled
-+ break;
-+#else
- case context_base::sslv2:
- impl = ::SSL_CTX_new(::SSLv2_method());
- break;
-@@ -75,6 +84,7 @@
- case context_base::sslv2_server:
- impl = ::SSL_CTX_new(::SSLv2_server_method());
- break;
-+#endif
- case context_base::sslv3:
- impl = ::SSL_CTX_new(::SSLv3_method());
- break;
Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series 2011-11-07 07:34:23 UTC (rev 14663)
+++ boost/trunk/debian/patches/series 2011-11-07 07:37:53 UTC (rev 14664)
@@ -1,13 +1,9 @@
-openssl-no-ssl2.patch
mips-asm.patch
boost-python-examples.patch
endian.patch
python2.5-elementtree.patch
-date_time_date_formatting_hpp.patch
sh4.patch
hurd-ellint_rd.patch
hurd-execution_monitor.patch
kfreebsd-thread.patch
-fusion-name-qual.patch
boost-1.44-py3.1.patch
-changeset_71050.diff
More information about the pkg-boost-commits
mailing list