Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (187a162e00a70caab895722ac3aeb2b163ded637)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (187a162e00a70caab895722ac3aeb2b163ded637)
  • Date: Sat, 22 Oct 2016 18:57:05 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

libs/boost/0001-Fixed-OpenSSL-1.1.0-check-for-LibreSSL-as-well.patch | 70
++++++++++
libs/boost/HISTORY | 4
libs/boost/PRE_BUILD | 4
3 files changed, 76 insertions(+), 2 deletions(-)

New commits:
commit 187a162e00a70caab895722ac3aeb2b163ded637
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

libs/boost: converted sed fix for LibreSSL to patch

diff --git
a/libs/boost/0001-Fixed-OpenSSL-1.1.0-check-for-LibreSSL-as-well.patch
b/libs/boost/0001-Fixed-OpenSSL-1.1.0-check-for-LibreSSL-as-well.patch
new file mode 100644
index 0000000..80abbe6
--- /dev/null
+++ b/libs/boost/0001-Fixed-OpenSSL-1.1.0-check-for-LibreSSL-as-well.patch
@@ -0,0 +1,70 @@
+From a8f96d1077659bd97ee4e74e6dc2ab121533a73f Mon Sep 17 00:00:00 2001
+From: Pavel Vinogradov <vin.public AT gmail.com>
+Date: Sat, 22 Oct 2016 14:29:30 -0400
+Subject: [PATCH] Fixed OpenSSL 1.1.0 check for LibreSSL as well
+
+---
+ include/boost/asio/ssl/impl/context.ipp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/boost/asio/ssl/impl/context.ipp
b/include/boost/asio/ssl/impl/context.ipp
+index aea2cbd..84fca11 100644
+--- a/include/boost/asio/ssl/impl/context.ipp
++++ b/include/boost/asio/ssl/impl/context.ipp
+@@ -228,7 +228,7 @@ context::~context()
+ {
+ 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 @@ context::~context()
+ 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 @@ boost::system::error_code context::use_certificate_chain(
+ 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 @@ boost::system::error_code context::use_private_key(
+ {
+ ::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 @@ boost::system::error_code context::use_rsa_private_key(
+ {
+ ::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 @@ int context::verify_callback_function(int preverified,
X509_STORE_CTX* ctx)
+ 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)
+--
+2.10.1
+
diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 6e5ae23..6f98f55 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,7 @@
+2016-10-22 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD: sed -> patch
+ * 0001-Fixed-OpenSSL-1.1.0-check-for-LibreSSL-as-well.patch: added
+
2016-10-20 Pavel Vinogradov <public AT sourcemage.org>
* PRE_BUILD: added a fix for libressl in asio::ssl

diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index fa9df8a..acc44da 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -5,6 +5,6 @@ if is_depends_enabled $SPELL python3;then
fi &&
sed '/char\* next_in/s;s->next_in;const_cast<zlib::byte*>(&);' \
-i libs/iostreams/src/zlib.cpp &&
-sed -r "s;#if.*OPENSSL_VERSION_NUMBER.* >= 0x101.*L;& \&\&
\!defined(LIBRESSL_VERSION_NUMBER);" \
- -i boost/asio/ssl/impl/context.ipp &&
+patch -p2 < \
+
${SPELL_DIRECTORY}/0001-Fixed-OpenSSL-1.1.0-check-for-LibreSSL-as-well.patch
&&
message "patching done"



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (187a162e00a70caab895722ac3aeb2b163ded637), Pavel Vinogradov, 10/22/2016

Archive powered by MHonArc 2.6.24.

Top of Page