diff options
| author | Michael Gmelin <grembo@FreeBSD.org> | 2016-10-12 17:23:57 +0000 |
|---|---|---|
| committer | Michael Gmelin <grembo@FreeBSD.org> | 2016-10-12 17:23:57 +0000 |
| commit | ca88d4185442d186287d9694a0b5c4c8ae793b47 (patch) | |
| tree | a868f7556ba059bce352402316515733238a5f3e /devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp | |
| parent | Fix default command (diff) | |
Update ice ports to 3.6.3
A few critical patches got merged upstream, a few new were required
to maintain LibreSSL support and fix other new issues. Note that slice2py
moved from devel/py-ice to devel/ice.
Approved by: mentors (implicit)
Notes
Notes:
svn path=/head/; revision=423875
Diffstat (limited to 'devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp')
| -rw-r--r-- | devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp index 316888270243..8c6178639dd4 100644 --- a/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp +++ b/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp @@ -1,18 +1,22 @@ ---- cpp/test/IceSSL/configuration/AllTests.cpp.orig 2015-06-23 15:30:20.000000000 +0000 -+++ cpp/test/IceSSL/configuration/AllTests.cpp 2015-09-15 00:15:34.865304987 +0000 -@@ -3164,6 +3184,7 @@ +--- cpp/test/IceSSL/configuration/AllTests.cpp.orig 2016-10-05 16:59:08.000000000 +0200 ++++ cpp/test/IceSSL/configuration/AllTests.cpp 2016-10-12 01:57:47.897380902 +0200 +@@ -27,7 +27,7 @@ + // + // With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers + // +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + const string anonCiphers = "ADH:@SECLEVEL=0"; + # else + const string anonCiphers = "ADH"; +@@ -3215,9 +3215,7 @@ #endif } +-#ifndef _AIX +- // On AIX 6.1, the default root certificates don't validate demo.zeroc.com +- +#if 0 // we don't want to talk to zeroc while building cout << "testing system CAs... " << flush; { InitializationData initData; -@@ -3208,6 +3229,7 @@ - comm->destroy(); - } - cout << "ok" << endl; -+#endif - - if(shutdown) - { |