From 93f7c5a1ef3c6d7ae01daafb833fadb19496edd4 Mon Sep 17 00:00:00 2001 From: Michael Gmelin Date: Mon, 22 Jan 2018 23:05:51 +0000 Subject: Update devel/ice, devel/py-ice, devel/php5-ice to version 3.6.4 PR: 222291 Submitted by: Andreas Sommer --- devel/ice/files/Make.rules.FreeBSD | 2 + devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp | 35 ---- .../files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp | 84 ---------- devel/ice/files/patch-cpp-src-IceSSL-Util.cpp | 29 ---- devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp | 11 -- ...atch-cpp-test-IceSSL-configuration-AllTests.cpp | 9 + devel/ice/files/patch-php-config-Make.rules.php | 32 ++-- .../files/patch-python-modules-IcePy-Operation.cpp | 186 --------------------- devel/ice/files/patch-scripts-TestUtil.py | 9 + 9 files changed, 36 insertions(+), 361 deletions(-) delete mode 100644 devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp delete mode 100644 devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp delete mode 100644 devel/ice/files/patch-cpp-src-IceSSL-Util.cpp delete mode 100644 devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp delete mode 100644 devel/ice/files/patch-python-modules-IcePy-Operation.cpp (limited to 'devel/ice/files') diff --git a/devel/ice/files/Make.rules.FreeBSD b/devel/ice/files/Make.rules.FreeBSD index 0ae319159239..55e0c00d09d2 100644 --- a/devel/ice/files/Make.rules.FreeBSD +++ b/devel/ice/files/Make.rules.FreeBSD @@ -1,4 +1,6 @@ mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) +mkplugin = $(CXX) -shared $(LDFLAGS) -o $(1) $(3) $(4) + BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib %%ICONV_LIB%% LIBS = -lIce $(BASELIBS) diff --git a/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp b/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp deleted file mode 100644 index 128820ca8e00..000000000000 --- a/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp +++ /dev/null @@ -1,35 +0,0 @@ ---- cpp/src/IceGrid/ServerI.cpp.orig 2016-11-15 12:22:54.201742997 +0100 -+++ cpp/src/IceGrid/ServerI.cpp 2017-09-07 12:48:01.409625996 +0100 -@@ -341,7 +341,22 @@ - { - assert(_p->first.find("config_") == 0); - const string service = _p->first.substr(7); -- facet = "IceBox.Service." + service + ".Properties"; -+ bool useSharedCommunicator = false; -+ for (PropertyDescriptorSeq::const_iterator d = _properties.at("config").begin(); d != _properties.at("config").end(); ++d) -+ { -+ if (d->name == "IceBox.UseSharedCommunicator." + service) -+ { -+ useSharedCommunicator = (atoi(d->value.c_str()) > 0); -+ } -+ } -+ if (useSharedCommunicator) -+ { -+ facet = "IceBox.SharedCommunicator.Properties"; -+ } -+ else -+ { -+ facet = "IceBox.Service." + service + ".Properties"; -+ } - if(_traceLevels->server > 1) - { - const string id = _server->getId(); -@@ -1232,7 +1232,7 @@ ServerI::load(const AMD_Node_loadServerPtr& amdCB, const InternalServerDescripto - updateRevision(desc->uuid, desc->revision); - } - -- if(!_desc) -+ if(!_desc || (_load && descriptorUpdated(_load->getInternalServerDescriptor(), _desc))) - { - _load->addCallback(amdCB); - return 0; diff --git a/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp b/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp deleted file mode 100644 index 82af12b7bd8a..000000000000 --- a/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp +++ /dev/null @@ -1,84 +0,0 @@ ---- cpp/src/IceSSL/OpenSSLEngine.cpp.orig 2016-10-05 16:59:08.000000000 +0200 -+++ cpp/src/IceSSL/OpenSSLEngine.cpp 2016-10-12 01:59:40.150375902 +0200 -@@ -43,7 +43,7 @@ - int instanceCount = 0; - bool initOpenSSL = false; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - IceUtil::Mutex* locks = 0; - #endif - -@@ -62,7 +62,7 @@ - // OpenSSL 1.1.0 introduces a new thread API and removes - // the need to use a custom thread callback. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - CRYPTO_set_locking_callback(0); - CRYPTO_set_id_callback(0); - -@@ -87,7 +87,7 @@ - // OpenSSL 1.1.0 introduces a new thread API and removes - // the need to use a custom thread callback. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // - // OpenSSL mutex callback. - // -@@ -158,7 +158,7 @@ - DH* - IceSSL_opensslDHCallback(SSL* ssl, int /*isExport*/, int keyLength) - { --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_CTX* ctx = SSL_get_SSL_CTX(ssl); - # else - SSL_CTX* ctx = ssl->ctx; -@@ -219,7 +219,7 @@ - // - // OpenSSL 1.1.0 remove the need for library initialization and cleanup. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // - // Create the mutexes and set the callbacks. - // -@@ -292,7 +292,9 @@ - string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon"); - if(!entropyDaemon.empty()) - { -+# ifndef OPENSSL_NO_EGD - if(RAND_egd(entropyDaemon.c_str()) <= 0) -+# endif - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: EGD failure using file " + entropyDaemon); -@@ -326,7 +328,7 @@ - // - // OpenSSL 1.1.0 remove the need for library initialization and cleanup. - // --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - // - // Clean up OpenSSL resources. - // -@@ -399,7 +401,7 @@ - "IceSSL: unable to create SSL context:\n" + sslErrors()); - } - --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - int securityLevel = properties->getPropertyAsIntWithDefault(propPrefix + "SecurityLevel", -1); - if(securityLevel != -1) - { -@@ -954,7 +956,7 @@ - SSL_METHOD* - OpenSSLEngine::getMethod(int /*protocols*/) - { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - SSL_METHOD* meth = const_cast(TLS_method()); - #else - // diff --git a/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp b/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp deleted file mode 100644 index 0a772332d0a0..000000000000 --- a/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- cpp/src/IceSSL/Util.cpp~ 2016-10-05 16:59:08.000000000 +0200 -+++ cpp/src/IceSSL/Util.cpp 2016-10-12 01:55:08.517427902 +0200 -@@ -110,7 +110,7 @@ - { - - # ifndef OPENSSL_NO_DH --# if OPENSSL_VERSION_NUMBER < 0x10100000L -+# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) - - // The following arrays are predefined Diffie Hellman group parameters. - // These are known strong primes, distributed with the OpenSSL library -@@ -338,7 +338,7 @@ - // - // Convert a predefined parameter set into a DH value. - // --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - static DH* - convertDH(const unsigned char* buf, int len) - { -@@ -428,7 +428,7 @@ - // No match found. Use one of the predefined parameter sets instead. - // - IceUtil::Mutex::Lock sync(*this); --# if OPENSSL_VERSION_NUMBER >= 0x10100000L -+# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) - if(keyLength >= 4096) - { - if(!_dh4096) diff --git a/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp b/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp deleted file mode 100644 index 33b46439eb5e..000000000000 --- a/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- cpp/src/IceUtil/Cond.cpp.orig 2016-10-12 00:34:17.622732906 +0200 -+++ cpp/src/IceUtil/Cond.cpp 2016-10-12 00:34:40.133725906 +0200 -@@ -332,7 +332,7 @@ - throw ThreadSyscallException(__FILE__, __LINE__, rc); - } - --#if !defined(__hppa) && !defined(__APPLE__) && !defined(__FreeBSD__) -+#if !defined(__hppa) && !defined(__APPLE__) - rc = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); - if(rc != 0) - { 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 8c6178639dd4..a2cda471654e 100644 --- a/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp +++ b/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp @@ -9,6 +9,15 @@ const string anonCiphers = "ADH:@SECLEVEL=0"; # else const string anonCiphers = "ADH"; +@@ -2048,7 +2048,7 @@ + // + // No DSA support in Secure Transport / AIX 7.1 / SChannel + // +-#if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL) ++#if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL) && !defined(LIBRESSL_VERSION_NUMBER) + { + // + // DSA PEM keys are not supported with SChannel. Since Windows 10 @@ -3215,9 +3215,7 @@ #endif } diff --git a/devel/ice/files/patch-php-config-Make.rules.php b/devel/ice/files/patch-php-config-Make.rules.php index 076ca9c421f0..5e25546e3686 100644 --- a/devel/ice/files/patch-php-config-Make.rules.php +++ b/devel/ice/files/patch-php-config-Make.rules.php @@ -1,22 +1,22 @@ ---- php/config/Make.rules.php.orig 2015-06-23 15:30:20.000000000 +0000 -+++ php/config/Make.rules.php 2015-06-27 19:48:31.900063596 +0000 -@@ -108,13 +108,8 @@ +--- php/config/Make.rules.php.orig 2017-09-13 13:20:00.000000000 +0200 ++++ php/config/Make.rules.php 2017-09-13 13:20:00.000000000 +0200 +@@ -81,13 +81,8 @@ ifeq ($(findstring /php/test/,$(abspath $(MAKEFILE_LIST))),) + $(error $(PHP_CONFIG) not found review your PHP installation and ensure $(PHP_CONFIG) is in your PATH) + endif - libdir = $(top_srcdir)/lib - --ifndef usr_dir_install -- install_phpdir = $(prefix)/php -- install_libdir = $(prefix)/php --else -- install_phpdir = $(prefix)/share/php -- install_libdir = $(shell $(PHP_CONFIG) --extension-dir) --endif -+install_phpdir = $(prefix)/share/pear -+install_libdir = $(prefix)/lib/php/$(PHP_EXT_DIR) +- ifndef usr_dir_install +- install_phpdir = $(prefix)/php +- install_libdir = $(prefix)/php +- else +- install_phpdir = $(prefix)/share/php +- install_libdir = $(shell $(PHP_CONFIG) --extension-dir) +- endif ++ install_phpdir = $(prefix)/share/pear ++ install_libdir = $(prefix)/lib/php/$(PHP_EXT_DIR) + endif ifdef ice_src_dist - RPATH_DIR = $(LOADER_PATH)/../../cpp/$(libsubdir) -@@ -172,7 +167,8 @@ +@@ -145,7 +140,8 @@ else endif ifeq ($(installphplib),) diff --git a/devel/ice/files/patch-python-modules-IcePy-Operation.cpp b/devel/ice/files/patch-python-modules-IcePy-Operation.cpp deleted file mode 100644 index b4694a468c48..000000000000 --- a/devel/ice/files/patch-python-modules-IcePy-Operation.cpp +++ /dev/null @@ -1,186 +0,0 @@ ---- python/modules/IcePy/Operation.cpp.orig 2017-01-29 22:23:51.186130998 +0100 -+++ python/modules/IcePy/Operation.cpp 2017-01-29 22:24:55.929130998 +0100 -@@ -1682,11 +1682,11 @@ - } - else - { -- if(PyTuple_SET_ITEM(results.get(), info->pos, Unset) < 0) -+ if(PyTuple_SetItem(results.get(), info->pos, Unset) < 0) - { - return 0; - } -- Py_INCREF(Unset); // PyTuple_SET_ITEM steals a reference. -+ Py_INCREF(Unset); // PyTuple_SetItem steals a reference. - } - } - -@@ -2546,7 +2546,7 @@ - throwPythonException(); - } - -- if(PyTuple_SET_ITEM(result.get(), 0, ok ? incTrue() : incFalse()) < 0) -+ if(PyTuple_SetItem(result.get(), 0, ok ? incTrue() : incFalse()) < 0) - { - throwPythonException(); - } -@@ -2586,11 +2586,11 @@ - } - #endif - -- if(PyTuple_SET_ITEM(result.get(), 1, op.get()) < 0) -+ if(PyTuple_SetItem(result.get(), 1, op.get()) < 0) - { - throwPythonException(); - } -- op.release(); // PyTuple_SET_ITEM steals a reference. -+ op.release(); // PyTuple_SetItem steals a reference. - - return result.release(); - } -@@ -2827,7 +2827,7 @@ - return 0; - } - -- if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0) -+ if(PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse()) < 0) - { - return 0; - } -@@ -2867,11 +2867,11 @@ - memcpy(buf, results.first, sz); - #endif - -- if(PyTuple_SET_ITEM(args.get(), 1, op.get()) < 0) -+ if(PyTuple_SetItem(args.get(), 1, op.get()) < 0) - { - return 0; - } -- op.release(); // PyTuple_SET_ITEM steals a reference. -+ op.release(); // PyTuple_SetItem steals a reference. - - return args.release(); - } -@@ -2910,7 +2910,7 @@ - return; - } - -- if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0) -+ if(PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse()) < 0) - { - assert(PyErr_Occurred()); - PyErr_Print(); -@@ -2958,13 +2958,13 @@ - memcpy(buf, results.first, sz); - #endif - -- if(PyTuple_SET_ITEM(args.get(), 1, op.get()) < 0) -+ if(PyTuple_SetItem(args.get(), 1, op.get()) < 0) - { - assert(PyErr_Occurred()); - PyErr_Print(); - return; - } -- op.release(); // PyTuple_SET_ITEM steals a reference. -+ op.release(); // PyTuple_SetItem steals a reference. - - PyObjectHandle tmp = PyObject_Call(_response, args.get(), 0); - if(PyErr_Occurred()) -@@ -3126,7 +3126,7 @@ - return; - } - -- if(PyTuple_SET_ITEM(args.get(), 0, ok ? incTrue() : incFalse()) < 0) -+ if(PyTuple_SetItem(args.get(), 0, ok ? incTrue() : incFalse()) < 0) - { - assert(PyErr_Occurred()); - PyErr_Print(); -@@ -3174,13 +3174,13 @@ - memcpy(buf, results.first, sz); - #endif - -- if(PyTuple_SET_ITEM(args.get(), 1, op.get()) < 0) -+ if(PyTuple_SetItem(args.get(), 1, op.get()) < 0) - { - assert(PyErr_Occurred()); - PyErr_Print(); - return; - } -- op.release(); // PyTuple_SET_ITEM steals a reference. -+ op.release(); // PyTuple_SetItem steals a reference. - - const string methodName = "ice_response"; - if(!PyObject_HasAttrString(_callback, STRCAST(methodName.c_str()))) -@@ -3302,11 +3302,11 @@ - } - else - { -- if(PyTuple_SET_ITEM(args.get(), info->pos + offset, Unset) < 0) -+ if(PyTuple_SetItem(args.get(), info->pos + offset, Unset) < 0) - { - throwPythonException(); - } -- Py_INCREF(Unset); // PyTuple_SET_ITEM steals a reference. -+ Py_INCREF(Unset); // PyTuple_SetItem steals a reference. - } - } - -@@ -3329,11 +3329,11 @@ - // Create an object to represent Ice::Current. We need to append this to the argument tuple. - // - PyObjectHandle curr = createCurrent(current); -- if(PyTuple_SET_ITEM(args.get(), PyTuple_GET_SIZE(args.get()) - 1, curr.get()) < 0) -+ if(PyTuple_SetItem(args.get(), PyTuple_GET_SIZE(args.get()) - 1, curr.get()) < 0) - { - throwPythonException(); - } -- curr.release(); // PyTuple_SET_ITEM steals a reference. -+ curr.release(); // PyTuple_SetItem steals a reference. - - if(_op->amd) - { -@@ -3347,7 +3347,7 @@ - } - obj->upcall = new UpcallPtr(this); - obj->encoding = current.encoding; -- if(PyTuple_SET_ITEM(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SET_ITEM steals a reference. -+ if(PyTuple_SetItem(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SetItem steals a reference. - { - Py_DECREF(obj); - throwPythonException(); -@@ -3698,23 +3698,23 @@ - } - #endif - -- if(PyTuple_SET_ITEM(args.get(), start, ip.get()) < 0) -+ if(PyTuple_SetItem(args.get(), start, ip.get()) < 0) - { - throwPythonException(); - } - ++start; -- ip.release(); // PyTuple_SET_ITEM steals a reference. -+ ip.release(); // PyTuple_SetItem steals a reference. - - // - // Create an object to represent Ice::Current. We need to append - // this to the argument tuple. - // - PyObjectHandle curr = createCurrent(current); -- if(PyTuple_SET_ITEM(args.get(), start, curr.get()) < 0) -+ if(PyTuple_SetItem(args.get(), start, curr.get()) < 0) - { - throwPythonException(); - } -- curr.release(); // PyTuple_SET_ITEM steals a reference. -+ curr.release(); // PyTuple_SetItem steals a reference. - - string dispatchName = "ice_invoke"; - if(_amd) -@@ -3730,7 +3730,7 @@ - } - obj->upcall = new UpcallPtr(this); - obj->encoding = current.encoding; -- if(PyTuple_SET_ITEM(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SET_ITEM steals a reference. -+ if(PyTuple_SetItem(args.get(), 0, (PyObject*)obj) < 0) // PyTuple_SetItem steals a reference. - { - Py_DECREF(obj); - throwPythonException(); diff --git a/devel/ice/files/patch-scripts-TestUtil.py b/devel/ice/files/patch-scripts-TestUtil.py index c2c83ba3424e..f9fa9e29b201 100644 --- a/devel/ice/files/patch-scripts-TestUtil.py +++ b/devel/ice/files/patch-scripts-TestUtil.py @@ -35,6 +35,15 @@ x64 = True elif line == "armv7l": armv7l = True +@@ -879,7 +898,7 @@ + os.remove(filePath) + passwords = open(filePath, "a") + +- command = '"%s" "%s"' % (sys.executable, ++ command = '"%s" "%s" 2>/dev/null' % (sys.executable, + os.path.abspath(os.path.join(os.path.dirname(__file__), "icehashpassword.py"))) + + # @@ -2013,7 +2032,7 @@ addLdPath(getCppLibDir(lang), env) elif isAIX(): -- cgit v1.2.3