diff --git a/common/shlibs b/common/shlibs index 2de79bdf2b9..ae6ad78d099 100644 --- a/common/shlibs +++ b/common/shlibs @@ -580,37 +580,38 @@ libnm-glib.so.4 libnm-0.9.1.90_1 libnm-glib-vpn.so.1 libnm-0.9.1.90_1 libnm.so.0 libnm-1.0.0_1 libpanel-applet-4.so.0 gnome-panel-3.3.92_1 -libboost_context.so.1.58.0 boost-1.58<1.59_1 -libboost_coroutine.so.1.58.0 boost-1.58<1.59_1 -libboost_container.so.1.58.0 boost-1.58<1.59_1 -libboost_prg_exec_monitor.so.1.58.0 boost-1.58<1.59_1 -libboost_signals.so.1.58.0 boost-1.58<1.59_1 -libboost_timer.so.1.58.0 boost-1.58<1.59_1 -libboost_random.so.1.58.0 boost-1.58<1.59_1 -libboost_filesystem.so.1.58.0 boost-1.58<1.59_1 -libboost_unit_test_framework.so.1.58.0 boost-1.58<1.59_1 -libboost_math_c99f.so.1.58.0 boost-1.58<1.59_1 -libboost_math_tr1f.so.1.58.0 boost-1.58<1.59_1 -libboost_regex.so.1.58.0 boost-1.58<1.59_1 -libboost_serialization.so.1.58.0 boost-1.58<1.59_1 -libboost_chrono.so.1.58.0 boost-1.58<1.59_1 -libboost_wserialization.so.1.58.0 boost-1.58<1.59_1 -libboost_graph.so.1.58.0 boost-1.58<1.59_1 -libboost_log.so.1.58.0 boost-1.58<1.59_1 -libboost_locale.so.1.58.0 boost-1.58<1.59_1 -libboost_math_tr1l.so.1.58.0 boost-1.58<1.59_1 -libboost_program_options.so.1.58.0 boost-1.58<1.59_1 -libboost_iostreams.so.1.58.0 boost-1.58<1.59_1 -libboost_system.so.1.58.0 boost-1.58<1.59_1 -libboost_thread.so.1.58.0 boost-1.58<1.59_1 -libboost_log_setup.so.1.58.0 boost-1.58<1.59_1 -libboost_date_time.so.1.58.0 boost-1.58<1.59_1 -libboost_math_c99.so.1.58.0 boost-1.58<1.59_1 -libboost_wave.so.1.58.0 boost-1.58<1.59_1 -libboost_math_tr1.so.1.58.0 boost-1.58<1.59_1 -libboost_atomic.so.1.58.0 boost-1.58<1.59_1 -libboost_math_c99l.so.1.58.0 boost-1.58<1.59_1 -libboost_python.so.1.58.0 boost-python-1.58<1.59_1 +libboost_context.so.1.62.0 boost-1.62<1.63_1 +libboost_coroutine.so.1.62.0 boost-1.62<1.63_1 +libboost_container.so.1.62.0 boost-1.62<1.63_1 +libboost_prg_exec_monitor.so.1.62.0 boost-1.62<1.63_1 +libboost_signals.so.1.62.0 boost-1.62<1.63_1 +libboost_timer.so.1.62.0 boost-1.62<1.63_1 +libboost_random.so.1.62.0 boost-1.62<1.63_1 +libboost_filesystem.so.1.62.0 boost-1.62<1.63_1 +libboost_unit_test_framework.so.1.62.0 boost-1.62<1.63_1 +libboost_math_c99f.so.1.62.0 boost-1.62<1.63_1 +libboost_math_tr1f.so.1.62.0 boost-1.62<1.63_1 +libboost_regex.so.1.62.0 boost-1.62<1.63_1 +libboost_serialization.so.1.62.0 boost-1.62<1.63_1 +libboost_chrono.so.1.62.0 boost-1.62<1.63_1 +libboost_wserialization.so.1.62.0 boost-1.62<1.63_1 +libboost_graph.so.1.62.0 boost-1.62<1.63_1 +libboost_log.so.1.62.0 boost-1.62<1.63_1 +libboost_locale.so.1.62.0 boost-1.62<1.63_1 +libboost_math_tr1l.so.1.62.0 boost-1.62<1.63_1 +libboost_program_options.so.1.62.0 boost-1.62<1.63_1 +libboost_iostreams.so.1.62.0 boost-1.62<1.63_1 +libboost_system.so.1.62.0 boost-1.62<1.63_1 +libboost_thread.so.1.62.0 boost-1.62<1.63_1 +libboost_log_setup.so.1.62.0 boost-1.62<1.63_1 +libboost_date_time.so.1.62.0 boost-1.62<1.63_1 +libboost_math_c99.so.1.62.0 boost-1.62<1.63_1 +libboost_wave.so.1.62.0 boost-1.62<1.63_1 +libboost_math_tr1.so.1.62.0 boost-1.62<1.63_1 +libboost_atomic.so.1.62.0 boost-1.62<1.63_1 +libboost_math_c99l.so.1.62.0 boost-1.62<1.63_1 +libboost_type_erasure.so.1.62.0 boost-1.62<1.63_1 +libboost_python.so.1.62.0 boost-python-1.62<1.63_1 libexempi.so.3 exempi-2.1.1_1 libatasmart.so.4 libatasmart-0.17_1 libsgutils2.so.2 libsgutils-1.42_1 diff --git a/srcpkgs/boost/patches/libressl-2.3.patch b/srcpkgs/boost/patches/libressl-2.3.patch deleted file mode 100644 index bfb523e0bf1..00000000000 --- a/srcpkgs/boost/patches/libressl-2.3.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- boost/asio/ssl/impl/context.ipp.orig 2016-03-30 12:59:18.922289572 +0200 -+++ boost/asio/ssl/impl/context.ipp 2016-03-30 13:01:04.776294357 +0200 -@@ -89,6 +89,14 @@ - handle_ = ::SSL_CTX_new(::SSLv2_server_method()); - break; - #endif // defined(OPENSSL_NO_SSL2) -+#if defined(OPENSSL_NO_SSL3) -+ case context::sslv3: -+ case context::sslv3_client: -+ case context::sslv3_server: -+ boost::asio::detail::throw_error( -+ boost::asio::error::invalid_argument, "context"); -+ break; -+#else // defined(OPENSSL_NO_SSL3) - case context::sslv3: - handle_ = ::SSL_CTX_new(::SSLv3_method()); - break; -@@ -98,6 +106,7 @@ - case context::sslv3_server: - handle_ = ::SSL_CTX_new(::SSLv3_server_method()); - break; -+#endif // defined(OPENSSL_NO_SSL3) - case context::tlsv1: - handle_ = ::SSL_CTX_new(::TLSv1_method()); - break; diff --git a/srcpkgs/boost/patches/libressl.patch b/srcpkgs/boost/patches/libressl.patch new file mode 100644 index 00000000000..9b93e206102 --- /dev/null +++ b/srcpkgs/boost/patches/libressl.patch @@ -0,0 +1,56 @@ +--- boost/asio/ssl/impl/context.ipp.orig 2016-09-29 11:44:54.479184454 +0200 ++++ boost/asio/ssl/impl/context.ipp 2016-09-29 11:44:56.838184575 +0200 +@@ -228,7 +228,7 @@ + { + if (handle_) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); + #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) + void* cb_userdata = handle_->default_passwd_callback_userdata; +@@ -239,7 +239,7 @@ + static_cast<detail::password_callback_base*>( + cb_userdata); + delete callback; +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + ::SSL_CTX_set_default_passwd_cb_userdata(handle_, 0); + #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) + handle_->default_passwd_callback_userdata = 0; +@@ -578,7 +578,7 @@ + bio_cleanup bio = { make_buffer_bio(chain) }; + if (bio.p) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); + void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); + #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) +@@ -682,7 +682,7 @@ + { + ::ERR_clear_error(); + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); + void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); + #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) +@@ -749,7 +749,7 @@ + { + ::ERR_clear_error(); + +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + pem_password_cb* callback = ::SSL_CTX_get_default_passwd_cb(handle_); + void* cb_userdata = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); + #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) +@@ -988,7 +988,7 @@ + boost::system::error_code context::do_set_password_callback( + detail::password_callback_base* callback, boost::system::error_code& ec) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER) + void* old_callback = ::SSL_CTX_get_default_passwd_cb_userdata(handle_); + ::SSL_CTX_set_default_passwd_cb_userdata(handle_, callback); + #else // (OPENSSL_VERSION_NUMBER >= 0x10100000L) diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template index f11f6da9e48..3e6e53573a7 100644 --- a/srcpkgs/boost/template +++ b/srcpkgs/boost/template @@ -1,7 +1,7 @@ # Template file for 'boost' pkgname=boost -version=1.58.0 -revision=10 +version=1.62.0 +revision=1 wrksrc="${pkgname}_${version//\./_}" hostmakedepends="bzip2-devel icu-devel python-devel" makedepends="zlib-devel bzip2-devel icu-devel python-devel" @@ -10,7 +10,9 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>" homepage="http://www.boost.org/" license="Boost Software License 1.0" distfiles="${SOURCEFORGE_SITE}/$pkgname/${pkgname}_${version//\./_}.tar.bz2" -checksum=fdfc204fc33ec79c99b9a74944c3e54bd78be4f7f15e260c0e2700a36dc7d3e5 +checksum=bce80293052e2d6230f1bec9b7524b33412e4fb26e9723460a0f362ac15b7acb + +CXXFLAGS="-std=c++11" case "$XBPS_TARGET_MACHINE" in i686*) _arch=x86; _toolset="gcc-i386"; _abi=sysv ;;