git: f4180be00992 - main - devel/ice,devel/py-ice: Update to 3.6.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Jan 2022 19:26:54 UTC
The branch main has been updated by grembo:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f4180be009923b1738b7d6a2ea3d9eb569eed7b1
commit f4180be009923b1738b7d6a2ea3d9eb569eed7b1
Author: Michael Gmelin <grembo@FreeBSD.org>
AuthorDate: 2022-01-15 19:23:08 +0000
Commit: Michael Gmelin <grembo@FreeBSD.org>
CommitDate: 2022-01-15 19:23:08 +0000
devel/ice,devel/py-ice: Update to 3.6.5
---
devel/ice/Makefile | 35 ++++++++------------
devel/ice/distinfo | 8 +++--
devel/ice/files/patch-config-Make.common.rules | 19 ++++++-----
devel/ice/files/patch-cpp-Makefile | 8 ++---
devel/ice/files/patch-cpp-allTests.py | 10 +++---
devel/ice/files/patch-cpp-config-Make.rules | 8 ++---
.../files/patch-cpp-include-Ice-FactoryTableInit.h | 16 ++++-----
devel/ice/files/patch-cpp-include-IceUtil-Config.h | 28 ++++++++--------
.../patch-cpp-include-IceUtil-ScannerConfig.h | 4 +--
...rmissionsVerifier-CryptPermissionsVerifierI.cpp | 6 ++--
devel/ice/files/patch-cpp-src-Ice-ProxyFactory.cpp | 6 ++--
.../files/patch-cpp-src-IceGrid-PluginFacadeI.cpp | 6 ++--
.../ice/files/patch-cpp-src-IceGrid-RegistryI.cpp | 8 ++---
devel/ice/files/patch-cpp-src-IceSSL-Makefile | 8 ++---
.../files/patch-cpp-test-Glacier2-ssl-Server.cpp | 8 ++---
.../patch-cpp-test-Glacier2-staticFiltering-run.py | 11 +++----
.../files/patch-cpp-test-Ice-background-Makefile | 10 ++++++
.../ice/files/patch-cpp-test-Ice-info-AllTests.cpp | 8 ++---
.../files/patch-cpp-test-Ice-metrics-AllTests.cpp | 12 +++----
.../ice/files/patch-cpp-test-Ice-objects-Makefile | 8 ++---
.../ice/files/patch-cpp-test-Ice-properties-run.py | 10 +++---
.../ice/files/patch-cpp-test-IceGrid-admin-run.py | 6 ++--
.../patch-cpp-test-IceGrid-deployer-AllTests.cpp | 18 +++++-----
.../files/patch-cpp-test-IceGrid-deployer-Makefile | 6 ++--
...patch-cpp-test-IceGrid-deployer-application.xml | 6 ++--
...atch-cpp-test-IceGrid-distribution-AllTests.cpp | 8 ++---
...h-cpp-test-IceGrid-distribution-application.xml | 4 +--
.../patch-cpp-test-IceGrid-distribution-run.py | 6 ++--
.../files/patch-cpp-test-IceGrid-session-run.py | 6 ++--
...atch-cpp-test-IceSSL-configuration-AllTests.cpp | 10 +++---
.../patch-cpp-test-IceSSL-configuration-run.py | 8 ++---
.../ice/files/patch-cpp-test-Slice-headers-run.py | 18 +++++-----
.../files/patch-cpp-test-Slice-unicodePaths-run.py | 6 ++--
.../ice/files/patch-cpp-test-include-TestCommon.h | 10 +++---
devel/ice/files/patch-php-Makefile | 8 ++---
devel/ice/files/patch-php-config-Make.rules.php | 6 ++--
devel/ice/files/patch-php-lib-Makefile | 6 ++--
devel/ice/files/patch-python-Makefile | 6 ++--
devel/ice/files/patch-python-config-Make.rules | 23 ++++++-------
.../ice/files/patch-python-modules-IcePy-Types.cpp | 32 +++++++++---------
devel/ice/files/patch-python-modules-IcePy-Types.h | 38 +++++++++++-----------
devel/ice/files/patch-python-python-Makefile | 8 ++---
.../files/patch-python-test-Ice-info-AllTests.py | 12 +++----
.../files/patch-python-test-Ice-properties-run.py | 10 +++---
.../patch-python-test-Ice-timeout-AllTests.py | 14 ++++++++
.../patch-python-test-Slice-unicodePaths-run.py | 6 ++--
devel/ice/files/patch-scripts-Expect.py | 6 ++--
devel/ice/files/patch-scripts-IceGridAdmin.py | 6 ++--
devel/ice/files/patch-scripts-TestUtil.py | 28 ++++++++--------
devel/ice/pkg-plist | 30 ++++++++---------
50 files changed, 302 insertions(+), 286 deletions(-)
diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index 3923208b815f..567c23f2eb9c 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -1,7 +1,7 @@
# Created by: Stefan Ehmann <shoesoft@gmx.net>
PORTNAME= Ice
-PORTVERSION= 3.6.4
+PORTVERSION= 3.6.5
DISTVERSIONPREFIX= v
CATEGORIES= devel
@@ -27,24 +27,22 @@ PLIST_SUB+= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
OPTIONS_DEFINE?= DEBUG TEST
-.include <bsd.port.options.mk>
-
-USES+= iconv gmake
-
-.if ${PORT_OPTIONS:MTEST} && ${SLAVE_PORT} == "no"
-USES+= python:build
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR}
-.endif
-
-USES+= bdb:5
+USES+= bdb:5 iconv gmake
INVALID_BDB_VER= 48 6
USE_LDCONFIG= yes
BUILD_WRKSRC?= ${WRKSRC}/cpp
INSTALL_WRKSRC?= ${WRKSRC}/cpp
PORTSCOUT= limit:^3\.6\.
USE_GITHUB= yes
-GH_ACCOUNT= zeroc-ice
-GH_PROJECT= ice
+GH_TUPLE= zeroc-ice:ice:${DISTVERSIONFULL}
+TEST_GH_TUPLE= zeroc-ice:ice:v3.7.6:CERTS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTEST} && ${SLAVE_PORT} == "no"
+USES+= python:build
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR}
+.endif
CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
@@ -73,15 +71,6 @@ PYSITEDIR= ${PREFIX}${PYTHON_SITELIBDIR:S|^${LOCALBASE}||}
PYSITEDIR= ${PYTHON_SITELIBDIR}
.endif
-.if ${PORT_OPTIONS:MNAMESPACES}
-MAKE_ARGS+= USE_NAMESPACES=yes
-PLIST_SUB+= NAMESPACES=""
-PLIST_SUB+= NONAMESPACES="@comment "
-.else
-PLIST_SUB+= NAMESPACES="@comment "
-PLIST_SUB+= NONAMESPACES=""
-.endif
-
post-patch:
@${SED} 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g; \
s|%%DATADIR%%|${STAGEDIR}${DATADIR}|g; \
@@ -121,6 +110,8 @@ post-patch:
s|%%LOCALBASE%%|${LOCALBASE}|g;' ${WRKSRC}/php/config/Make.rules.php
do-test-TEST-on:
+ @${RM} -r ${WRKSRC}/certs
+ @${CP} -r ${WRKSRC_CERTS}/certs ${WRKSRC}/certs
@cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
.if ${SLAVE_PORT} == "no"
diff --git a/devel/ice/distinfo b/devel/ice/distinfo
index f34ef6f6040c..83544c339e6d 100644
--- a/devel/ice/distinfo
+++ b/devel/ice/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1505206779
-SHA256 (zeroc-ice-ice-v3.6.4_GH0.tar.gz) = 4f5cc5e09586eab7de7745bbdc5fbf383c59f8fdc561264d4010bba19afdde2a
-SIZE (zeroc-ice-ice-v3.6.4_GH0.tar.gz) = 5523841
+TIMESTAMP = 1642268179
+SHA256 (zeroc-ice-ice-v3.6.5_GH0.tar.gz) = 5c308c24c9721dd614d28cf5a5fa9ac19736f7a8ab894f9fd05fe5b9ac0be4fe
+SIZE (zeroc-ice-ice-v3.6.5_GH0.tar.gz) = 5505499
+SHA256 (zeroc-ice-ice-v3.7.6_GH0.tar.gz) = 75b18697c0c74f363bd0b85943f15638736e859c26778337cbfe72d31f5cfb47
+SIZE (zeroc-ice-ice-v3.7.6_GH0.tar.gz) = 10652936
diff --git a/devel/ice/files/patch-config-Make.common.rules b/devel/ice/files/patch-config-Make.common.rules
index f96952a70867..55e8290fc036 100644
--- a/devel/ice/files/patch-config-Make.common.rules
+++ b/devel/ice/files/patch-config-Make.common.rules
@@ -1,6 +1,6 @@
---- config/Make.common.rules.orig 2016-10-05 16:59:08.000000000 +0200
-+++ config/Make.common.rules 2016-10-11 22:39:50.774367911 +0200
-@@ -19,7 +19,8 @@
+--- config/Make.common.rules.orig 2019-08-12 19:54:18 UTC
++++ config/Make.common.rules
+@@ -19,7 +19,8 @@ VERSION = 3.6.5
SHORT_VERSION = 3.6
SOVERSION = 36
@@ -10,17 +10,13 @@
INSTALL_PROGRAM = ${INSTALL}
INSTALL_LIBRARY = ${INSTALL}
INSTALL_DATA = ${INSTALL}
-@@ -53,13 +54,13 @@
+@@ -53,14 +54,14 @@ endif
#
# usr_dir_install means we want to install with a /usr style layout.
#
-ifeq ($(prefix), /usr)
- usr_dir_install = 1
-endif
--
--ifeq ($(prefix), /usr/local)
-- usr_dir_install = 1
--endif
+#ifeq ($(prefix), /usr)
+# usr_dir_install = 1
+#endif
@@ -29,9 +25,14 @@
+# usr_dir_install = 1
+#endif
+-ifeq ($(prefix), /usr/local)
+- usr_dir_install = 1
+-endif
+-
#
# A /usr style layout can be forced by setting USR_DIR_INSTALL=yes.
-@@ -507,12 +508,12 @@
+ #
+@@ -507,12 +508,12 @@ install-common::
fi ; \
fi
diff --git a/devel/ice/files/patch-cpp-Makefile b/devel/ice/files/patch-cpp-Makefile
index d361a1d8898d..68510120c1c6 100644
--- a/devel/ice/files/patch-cpp-Makefile
+++ b/devel/ice/files/patch-cpp-Makefile
@@ -1,6 +1,6 @@
---- cpp/Makefile.orig 2015-06-23 15:30:20.000000000 +0000
-+++ cpp/Makefile 2015-06-27 09:35:22.892599446 +0000
-@@ -13,8 +13,8 @@
+--- cpp/Makefile.orig 2019-08-12 19:54:18 UTC
++++ cpp/Makefile
+@@ -13,8 +13,8 @@ include $(top_srcdir)/config/Make.rules
SUBDIRS = config src include
@@ -10,4 +10,4 @@
+ SUBDIRS := $(SUBDIRS) test
endif
- INSTALL_SUBDIRS = $(install_bindir) $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) \
+ ifeq ($(NOTEST),yes)
diff --git a/devel/ice/files/patch-cpp-allTests.py b/devel/ice/files/patch-cpp-allTests.py
index eec93b1523d5..e3131349173f 100644
--- a/devel/ice/files/patch-cpp-allTests.py
+++ b/devel/ice/files/patch-cpp-allTests.py
@@ -1,6 +1,6 @@
---- cpp/allTests.py.orig 2015-06-23 15:30:20.000000000 +0000
-+++ cpp/allTests.py 2015-06-27 22:16:43.703450842 +0000
-@@ -66,7 +66,7 @@
+--- cpp/allTests.py.orig 2019-08-12 19:54:18 UTC
++++ cpp/allTests.py
+@@ -68,7 +68,7 @@ tests = [
("Ice/servantLocator", ["core"]),
("Ice/interceptor", ["core"]),
("Ice/stringConverter", ["core"]),
@@ -9,7 +9,7 @@
("Ice/defaultServant", ["core"]),
("Ice/defaultValue", ["core"]),
("Ice/invoke", ["core"]),
-@@ -90,11 +90,11 @@
+@@ -92,11 +92,11 @@ tests = [
("IceStorm/federation2", ["service", "novc100", "nomingw"]),
("IceStorm/stress", ["service", "stress", "novc100", "nomingw"]), # Too slow with appverifier.
("IceStorm/rep1", ["service", "novc100", "nomingw"]),
@@ -23,7 +23,7 @@
("IceGrid/simple", ["service", "novc100", "nomingw"]),
("IceGrid/fileLock", ["service", "novc100", "nomingw"]),
("IceGrid/deployer", ["service", "novc100", "nomingw"]),
-@@ -123,8 +123,8 @@
+@@ -125,8 +125,8 @@ tests = [
#
if TestUtil.isWin32() or os.getuid() == 0:
tests += [
diff --git a/devel/ice/files/patch-cpp-config-Make.rules b/devel/ice/files/patch-cpp-config-Make.rules
index ad17eeb8a61c..6a65f805dc06 100644
--- a/devel/ice/files/patch-cpp-config-Make.rules
+++ b/devel/ice/files/patch-cpp-config-Make.rules
@@ -1,6 +1,6 @@
---- cpp/config/Make.rules.orig 2015-06-23 15:30:20.000000000 +0000
-+++ cpp/config/Make.rules 2015-09-14 21:31:28.253993994 +0000
-@@ -203,11 +201,11 @@
+--- cpp/config/Make.rules.orig 2019-08-12 19:54:18 UTC
++++ cpp/config/Make.rules
+@@ -201,11 +201,11 @@ ifeq ($(DEFAULT_MUTEX_PROTOCOL), PrioInherit)
ICEUTIL_FLAGS = -DICE_PRIO_INHERIT
endif
@@ -15,7 +15,7 @@
ifeq ($(SSL_OS_LIBS),)
SSL_OS_LIBS = $(OPENSSL_LIBS)
-@@ -240,7 +240,9 @@
+@@ -238,7 +238,9 @@ else
DB_FLAGS = -I/usr/local/include/db53
DB_LIBS = -L/usr/local/$(libsubdir)/db53 -ldb_cxx
else
diff --git a/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h b/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h
index e3211f25aa2f..a96b1e8f692e 100644
--- a/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h
+++ b/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h
@@ -1,6 +1,6 @@
---- cpp/include/Ice/FactoryTableInit.h.orig 2015-06-23 15:30:20.000000000 +0000
-+++ cpp/include/Ice/FactoryTableInit.h 2015-06-27 14:51:48.188288621 +0000
-@@ -48,6 +55,9 @@
+--- cpp/include/Ice/FactoryTableInit.h.orig 2019-08-12 19:54:18 UTC
++++ cpp/include/Ice/FactoryTableInit.h
+@@ -48,6 +48,9 @@ class DefaultUserExceptionFactoryInit (public)
DefaultUserExceptionFactoryInit(const char* typeId) :
_typeId(typeId)
@@ -10,7 +10,7 @@
{
factoryTable->addExceptionFactory(_typeId, new DefaultUserExceptionFactory<E>(_typeId));
}
-@@ -55,10 +65,16 @@
+@@ -55,10 +58,16 @@ class DefaultUserExceptionFactoryInit (public)
~DefaultUserExceptionFactoryInit()
{
factoryTable->removeExceptionFactory(_typeId);
@@ -27,19 +27,17 @@
};
template<class O>
-@@ -67,7 +83,10 @@
- public:
+@@ -68,6 +77,9 @@ class DefaultObjectFactoryInit (public)
DefaultObjectFactoryInit(const char* typeId) :
-- _typeId(typeId)
-+ _typeId(typeId)
+ _typeId(typeId)
+#if defined(ICE_BROKEN_ATEXIT)
+ , _ftableInit(new IceInternal::FactoryTableInit)
+#endif
{
factoryTable->addObjectFactory(_typeId, new DefaultObjectFactory<O>(_typeId));
}
-@@ -75,11 +94,16 @@
+@@ -75,11 +87,16 @@ class DefaultObjectFactoryInit (public)
~DefaultObjectFactoryInit()
{
factoryTable->removeObjectFactory(_typeId);
diff --git a/devel/ice/files/patch-cpp-include-IceUtil-Config.h b/devel/ice/files/patch-cpp-include-IceUtil-Config.h
index 677e339779ae..6a07f92986fe 100644
--- a/devel/ice/files/patch-cpp-include-IceUtil-Config.h
+++ b/devel/ice/files/patch-cpp-include-IceUtil-Config.h
@@ -1,5 +1,5 @@
---- cpp/include/IceUtil/Config.h.orig 2016-10-05 16:59:08.000000000 +0200
-+++ cpp/include/IceUtil/Config.h 2017-01-30 22:11:08.235308977 +0100
+--- cpp/include/IceUtil/Config.h.orig 2019-08-12 19:54:18 UTC
++++ cpp/include/IceUtil/Config.h
@@ -80,13 +80,15 @@
//
# include <stdint.h>
@@ -11,27 +11,27 @@
+# elif (__cplusplus >= 201103L) && defined(__WORDSIZE) && (__WORDSIZE == 32)
# define ICE_32
# elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64)) || \
- defined(__linux) && defined(__x86_64) || \
+ defined(__linux__) && defined(__x86_64) || \
defined(__APPLE__) && defined(__x86_64) || \
+ defined(__FreeBSD__) && defined(__x86_64) || \
+ defined(__FreeBSD__) && defined(__LP64__) || \
defined(__hppa) && defined(__LP64__) || \
defined(_ARCH_COM) && defined(__64BIT__) || \
defined(__alpha__) || \
-@@ -98,6 +100,16 @@
- #endif
-
- //
+@@ -94,6 +96,16 @@
+ # define ICE_64
+ # else
+ # define ICE_32
++# endif
++#endif
++
++//
+// FreeBSD 10.0-RELEASE had a broken atexit handler
+// (affects the order of static destruction)
+#if defined(__FreeBSD__)
+#include <sys/param.h>
+# if __FreeBSD_version < 1000700
+# define ICE_BROKEN_ATEXIT = 1
-+# endif
-+#endif
-+
-+//
- // Check for C++ 11 support
- //
- // For GCC, we recognize --std=c++0x only for GCC version 4.5 and greater,
+ # endif
+ #endif
+
diff --git a/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h b/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h
index e3f45c54716a..7d85204fe3a0 100644
--- a/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h
+++ b/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h
@@ -1,5 +1,5 @@
---- cpp/include/IceUtil/ScannerConfig.h.orig 2015-06-27 11:31:57.336119105 +0000
-+++ cpp/include/IceUtil/ScannerConfig.h 2015-06-27 11:42:15.630073945 +0000
+--- cpp/include/IceUtil/ScannerConfig.h.orig 2019-08-12 19:54:18 UTC
++++ cpp/include/IceUtil/ScannerConfig.h
@@ -29,7 +29,7 @@
// Clang++ >= 5.1 deprecate 'register' storage class specifier
// used by lex generated Scanners.
diff --git a/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp b/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
index 68883e884abe..2a7b7f5deb59 100644
--- a/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
+++ b/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
@@ -1,6 +1,6 @@
---- cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp~ 2016-10-05 16:59:08.000000000 +0200
-+++ cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp 2016-10-11 23:40:30.829983908 +0200
-@@ -200,7 +200,7 @@
+--- cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp
+@@ -272,7 +272,7 @@ CryptPermissionsVerifierI::checkPermissions(const stri
return p->second == crypt_r(password.c_str(), salt.c_str(), &data);
# else
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_staticMutex);
diff --git a/devel/ice/files/patch-cpp-src-Ice-ProxyFactory.cpp b/devel/ice/files/patch-cpp-src-Ice-ProxyFactory.cpp
index 6580d5600ac2..a1fa57273517 100644
--- a/devel/ice/files/patch-cpp-src-Ice-ProxyFactory.cpp
+++ b/devel/ice/files/patch-cpp-src-Ice-ProxyFactory.cpp
@@ -1,6 +1,6 @@
---- cpp.orig/src/Ice/ProxyFactory.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ cpp/src/Ice/ProxyFactory.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -229,6 +229,7 @@
+--- cpp/src/Ice/ProxyFactory.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/src/Ice/ProxyFactory.cpp
+@@ -242,6 +242,7 @@ IceInternal::ProxyFactory::checkRetryAfterException(co
}
else if(cnt > static_cast<int>(_retryIntervals.size()))
{
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp b/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
index fa3ead836a70..4d2271f4ccca 100644
--- a/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
+++ b/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
@@ -1,6 +1,6 @@
---- cpp/src/IceGrid/PluginFacadeI.cpp.orig 2015-07-03 17:38:27.734242982 +0200
-+++ cpp/src/IceGrid/PluginFacadeI.cpp 2015-07-03 17:42:42.990740982 +0200
-@@ -34,10 +34,16 @@
+--- cpp/src/IceGrid/PluginFacadeI.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/src/IceGrid/PluginFacadeI.cpp
+@@ -34,10 +34,16 @@ class Init (public)
IceGrid::setRegistryPluginFacade(new RegistryPluginFacadeI);
}
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp b/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp
index 4b23cd594964..46403f4345d7 100644
--- a/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp
+++ b/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp
@@ -1,6 +1,6 @@
---- cpp/src/IceGrid/RegistryI.cpp.orig 2015-07-03 17:43:25.231459982 +0200
-+++ cpp/src/IceGrid/RegistryI.cpp 2015-07-03 17:46:57.991198982 +0200
-@@ -48,6 +48,13 @@
+--- cpp/src/IceGrid/RegistryI.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/src/IceGrid/RegistryI.cpp
+@@ -46,6 +46,13 @@ using namespace std;
using namespace Ice;
using namespace IceGrid;
@@ -14,7 +14,7 @@
namespace
{
-@@ -159,6 +166,7 @@
+@@ -157,6 +164,7 @@ RegistryI::RegistryI(const CommunicatorPtr& communicat
RegistryI::~RegistryI()
{
diff --git a/devel/ice/files/patch-cpp-src-IceSSL-Makefile b/devel/ice/files/patch-cpp-src-IceSSL-Makefile
index 30968acf84e3..5d94d4968ece 100644
--- a/devel/ice/files/patch-cpp-src-IceSSL-Makefile
+++ b/devel/ice/files/patch-cpp-src-IceSSL-Makefile
@@ -1,7 +1,7 @@
---- cpp/src/IceSSL/Makefile.orig 2015-09-14 22:49:55.236652991 +0000
-+++ cpp/src/IceSSL/Makefile 2015-09-14 22:50:11.419995991 +0000
-@@ -55,7 +55,7 @@
- CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS)
+--- cpp/src/IceSSL/Makefile.orig 2019-08-12 19:54:18 UTC
++++ cpp/src/IceSSL/Makefile
+@@ -55,7 +55,7 @@ include $(top_srcdir)/config/Make.rules
+ CPPFLAGS := -I.. $(CPPFLAGS) -DICE_SSL_API_EXPORTS $(OPENSSL_FLAGS)
SLICE2CPPFLAGS := --ice --include-dir IceSSL --dll-export ICE_SSL_API $(SLICE2CPPFLAGS)
-LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(SSL_OS_LIBS) $(CXXLIBS)
diff --git a/devel/ice/files/patch-cpp-test-Glacier2-ssl-Server.cpp b/devel/ice/files/patch-cpp-test-Glacier2-ssl-Server.cpp
index 979a1400c3e2..12bda6b15bb7 100644
--- a/devel/ice/files/patch-cpp-test-Glacier2-ssl-Server.cpp
+++ b/devel/ice/files/patch-cpp-test-Glacier2-ssl-Server.cpp
@@ -1,6 +1,6 @@
---- cpp.orig/test/Glacier2/ssl/Server.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ cpp/test/Glacier2/ssl/Server.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -31,9 +31,15 @@
+--- cpp/test/Glacier2/ssl/Server.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/Glacier2/ssl/Server.cpp
+@@ -31,9 +31,15 @@ void testContext(bool ssl, const Ice::Context& context
test(ctx["_con.type"] == "ssl");
test(ctx["_con.localPort"] == "12348");
}
@@ -18,7 +18,7 @@
}
}
-@@ -133,8 +139,11 @@
+@@ -125,8 +131,11 @@ class SSLSessionManagerI : public Glacier2::SSLSession
{
testContext(true, current.ctx);
diff --git a/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py b/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py
index da0b3013acf2..71276c3d9cb5 100644
--- a/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py
+++ b/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py
@@ -1,5 +1,5 @@
---- cpp/test/Glacier2/staticFiltering/run.py.orig 2015-06-23 17:30:20.000000000 +0200
-+++ cpp/test/Glacier2/staticFiltering/run.py 2015-09-22 16:23:30.270288987 +0200
+--- cpp/test/Glacier2/staticFiltering/run.py.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/Glacier2/staticFiltering/run.py
@@ -8,7 +8,7 @@
#
# **********************************************************************
@@ -9,7 +9,7 @@
path = [ ".", "..", "../..", "../../..", "../../../.." ]
head = os.path.dirname(sys.argv[0])
-@@ -99,12 +99,26 @@
+@@ -99,11 +99,25 @@ try:
hostname = "127.0.0.1"
fqdn = ""
domainname = ""
@@ -29,10 +29,9 @@
hostname = "127.0.0.1"
fqdn = ""
domainname = ""
-
++
+if limitedTests:
+ print("Running limited tests")
-+
+
testcases = [
('testing category filter',
- ('', '', '', 'foo "a cat with spaces"', '', ''),
diff --git a/devel/ice/files/patch-cpp-test-Ice-background-Makefile b/devel/ice/files/patch-cpp-test-Ice-background-Makefile
new file mode 100644
index 000000000000..3facb2569fe4
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-Ice-background-Makefile
@@ -0,0 +1,10 @@
+--- cpp/test/Ice/background/Makefile.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/Ice/background/Makefile
+@@ -47,6 +47,7 @@ include $(top_srcdir)/config/Make.rules
+
+ CPPFLAGS := -I. -I../../include -I../../../src $(CPPFLAGS) $(NO_DEPRECATED_FLAGS)
+ LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil
++LDFLAGS := $(LDFLAGS) -Wl,-E
+
+ $(CLIENT): $(COBJS)
+ rm -f $@
diff --git a/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp b/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp
index a361893586eb..437d4659f564 100644
--- a/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp
@@ -1,6 +1,6 @@
---- cpp.orig/test/Ice/info/AllTests.cpp 2015-01-23 12:42:09.819774063 +0000
-+++ cpp/test/Ice/info/AllTests.cpp 2015-01-23 12:42:59.341774435 +0000
-@@ -157,7 +157,7 @@
+--- cpp/test/Ice/info/AllTests.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/Ice/info/AllTests.cpp
+@@ -170,7 +170,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
test(info->adapterName.empty());
test(info->localPort > 0);
test(info->remotePort == 12010);
@@ -9,7 +9,7 @@
{
test(info->remoteAddress == defaultHost);
test(info->localAddress == defaultHost);
-@@ -182,7 +182,7 @@
+@@ -234,7 +234,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
test(info->adapterName.empty());
test(info->localPort > 0);
test(info->remotePort == 12010);
diff --git a/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp b/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
index 5a81f47eb21c..a238c69b0abd 100644
--- a/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
@@ -1,6 +1,6 @@
---- cpp/test/Ice/metrics/AllTests.cpp.orig 2015-06-23 15:30:20.000000000 +0000
-+++ cpp/test/Ice/metrics/AllTests.cpp 2015-06-27 19:16:18.877197646 +0000
-@@ -639,9 +639,12 @@
+--- cpp/test/Ice/metrics/AllTests.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/Ice/metrics/AllTests.cpp
+@@ -639,9 +639,12 @@ allTests(const Ice::CommunicatorPtr& communicator, con
testAttribute(clientMetrics, clientProps, update, "Connection", "incoming", "false");
testAttribute(clientMetrics, clientProps, update, "Connection", "adapterName", "");
testAttribute(clientMetrics, clientProps, update, "Connection", "connectionId", "Con1");
@@ -15,7 +15,7 @@
testAttribute(clientMetrics, clientProps, update, "Connection", "remotePort", "12010");
testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "");
testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "");
-@@ -726,7 +729,7 @@
+@@ -726,7 +729,7 @@ allTests(const Ice::CommunicatorPtr& communicator, con
bool dnsException = false;
try
{
@@ -24,7 +24,7 @@
test(false);
}
catch(const Ice::DNSException&)
-@@ -739,7 +742,7 @@
+@@ -739,7 +742,7 @@ allTests(const Ice::CommunicatorPtr& communicator, con
}
test(clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"].size() == 2);
m1 = clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"][1];
@@ -33,7 +33,7 @@
(!dnsException || m1->failures == 2));
if(dnsException)
{
-@@ -871,9 +874,12 @@
+@@ -871,9 +874,12 @@ allTests(const Ice::CommunicatorPtr& communicator, con
testAttribute(serverMetrics, serverProps, update, "Dispatch", "incoming", "true", op);
testAttribute(serverMetrics, serverProps, update, "Dispatch", "adapterName", "TestAdapter", op);
testAttribute(serverMetrics, serverProps, update, "Dispatch", "connectionId", "", op);
diff --git a/devel/ice/files/patch-cpp-test-Ice-objects-Makefile b/devel/ice/files/patch-cpp-test-Ice-objects-Makefile
index 9c6290068e67..c06178671e1f 100644
--- a/devel/ice/files/patch-cpp-test-Ice-objects-Makefile
+++ b/devel/ice/files/patch-cpp-test-Ice-objects-Makefile
@@ -1,6 +1,6 @@
---- cpp/test/Ice/objects/Makefile.orig 2016-10-05 16:59:08.000000000 +0200
-+++ cpp/test/Ice/objects/Makefile 2016-10-11 23:05:25.082085910 +0200
-@@ -12,7 +12,7 @@
+--- cpp/test/Ice/objects/Makefile.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/Ice/objects/Makefile
+@@ -12,7 +12,7 @@ top_srcdir = ../../..
CLIENT = $(call mktestname,client)
SERVER = $(call mktestname,server)
COLLOCATED = $(call mktestname,collocated)
@@ -9,7 +9,7 @@
TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) $(TESTLIBNAME)
-@@ -47,11 +47,11 @@
+@@ -47,11 +47,11 @@ LDFLAGS := -L. $(LDFLAGS)
$(TESTLIBNAME): $(SLICE_OBJS)
rm -f $@
diff --git a/devel/ice/files/patch-cpp-test-Ice-properties-run.py b/devel/ice/files/patch-cpp-test-Ice-properties-run.py
index 944c89292688..cf8ab194fa2e 100644
--- a/devel/ice/files/patch-cpp-test-Ice-properties-run.py
+++ b/devel/ice/files/patch-cpp-test-Ice-properties-run.py
@@ -1,6 +1,6 @@
---- cpp/test/Ice/properties/run.py.orig 2015-12-27 03:21:09.629772970 +0100
-+++ cpp/test/Ice/properties/run.py 2015-12-27 03:21:20.836761970 +0100
-@@ -28,10 +28,10 @@
+--- cpp/test/Ice/properties/run.py.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/Ice/properties/run.py
+@@ -35,10 +35,10 @@ if TestUtil.isAIX():
#
if sys.version_info[0] == 2:
configPath = "./config/\xe4\xb8\xad\xe5\x9b\xbd_client.config"
@@ -11,5 +11,5 @@
- decodedPath = configPath # No need to decode with Python3, strings are already Unicode
+ decodedPath = configPath.encode("utf-8", "ignore") # No need to decode with Python3, strings are already Unicode
- TestUtil.createConfig(decodedPath,
- ["# Automatically generated by Ice test driver.",
+ TestUtil.createFile(decodedPath,
+ ["# Automatically generated by Ice test driver.",
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py b/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py
index 5ad69760f28f..51c4a11b2fae 100644
--- a/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py
+++ b/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py
@@ -1,6 +1,6 @@
---- cpp/test/IceGrid/admin/run.py.orig 2015-07-03 19:05:40.084004978 +0200
-+++ cpp/test/IceGrid/admin/run.py 2015-07-03 19:19:36.550643978 +0200
-@@ -20,11 +20,14 @@
+--- cpp/test/IceGrid/admin/run.py.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceGrid/admin/run.py
+@@ -20,11 +20,14 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil, IceGridAdmin
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
index a42d617e4145..492a55f90991 100644
--- a/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
@@ -1,6 +1,6 @@
---- cpp/test/IceGrid/deployer/AllTests.cpp.orig 2016-10-05 16:59:08.000000000 +0200
-+++ cpp/test/IceGrid/deployer/AllTests.cpp 2016-10-11 23:09:05.053078910 +0200
-@@ -126,21 +126,21 @@
+--- cpp/test/IceGrid/deployer/AllTests.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceGrid/deployer/AllTests.cpp
+@@ -126,21 +126,21 @@ logTests(const Ice::CommunicatorPtr& comm, const Admin
//
// Test with empty file.
//
@@ -26,7 +26,7 @@
test(it->read(1024, lines) && lines.empty());
test(it->read(1024, lines) && lines.empty());
it->destroy();
-@@ -156,29 +156,29 @@
+@@ -156,29 +156,29 @@ logTests(const Ice::CommunicatorPtr& comm, const Admin
//
// Test with log file with one line with no EOL on last line.
//
@@ -61,7 +61,7 @@
test(it->read(1024, lines) && lines.size() == 1);
test(lines[0] == "one line file with no EOL on last line");
test(it->read(1024, lines) && lines.empty());
-@@ -195,37 +195,37 @@
+@@ -195,37 +195,37 @@ logTests(const Ice::CommunicatorPtr& comm, const Admin
//
// Test with log file with one line with EOL on last line.
//
@@ -105,7 +105,7 @@
test(it->read(1024, lines) && lines.size() == 2);
test(lines[0] == "one line file with EOL on last line");
test(lines[1].empty());
-@@ -242,14 +242,14 @@
+@@ -242,14 +242,14 @@ logTests(const Ice::CommunicatorPtr& comm, const Admin
//
// Test with log file with multiple lines
//
@@ -122,7 +122,7 @@
test(it->read(1024, lines) && lines.size() == 4);
test(lines[0] == "line 1");
test(lines[1] == "line 2");
-@@ -258,25 +258,25 @@
+@@ -258,25 +258,25 @@ logTests(const Ice::CommunicatorPtr& comm, const Admin
test(it->read(1024, lines) && lines.empty());
it->destroy();
@@ -152,7 +152,7 @@
test(it->read(1024, lines) && lines.size() == 4);
test(lines[0] == "line 1");
test(lines[1] == "line 2");
-@@ -292,11 +292,11 @@
+@@ -292,11 +292,11 @@ logTests(const Ice::CommunicatorPtr& comm, const Admin
try
{
@@ -166,7 +166,7 @@
test(it->read(1024, lines) && lines.empty());
os << "started a line" << flush;
-@@ -347,18 +347,18 @@
+@@ -347,18 +347,18 @@ logTests(const Ice::CommunicatorPtr& comm, const Admin
it->destroy();
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile b/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile
index be56bc005ca5..ed0e22b9cc94 100644
--- a/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile
+++ b/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile
@@ -1,6 +1,6 @@
---- cpp/test/IceGrid/deployer/Makefile.orig 2015-07-04 13:29:31.867378996 +0200
-+++ cpp/test/IceGrid/deployer/Makefile 2015-07-04 13:29:39.896414996 +0200
-@@ -53,5 +53,5 @@
+--- cpp/test/IceGrid/deployer/Makefile.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceGrid/deployer/Makefile
+@@ -53,5 +53,5 @@ $(SVCFILENAME): $(SERVICE_OBJS)
$(call mkshlib,$@,$(SVCSONAME),$(SERVICE_OBJS), $(DB_RPATH_LINK) -lFreeze $(LINKWITH))
clean::
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml b/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml
index 58582e10d732..db7d64228d42 100644
--- a/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml
+++ b/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml
@@ -1,7 +1,7 @@
---- cpp/test/IceGrid/deployer/application.xml.orig 2015-07-04 13:28:10.449020996 +0200
-+++ cpp/test/IceGrid/deployer/application.xml 2015-07-04 13:28:22.486946996 +0200
+--- cpp/test/IceGrid/deployer/application.xml.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceGrid/deployer/application.xml
@@ -178,10 +178,10 @@
- <object identity="${server}" type="::Test"/>
+ <object identity="${server}" type="::TestLog"/>
</adapter>
- <log path="${test.dir}/log1.txt"/>
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp
index 3573bd1b8e01..3be6eff5eb9a 100644
--- a/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp
@@ -1,6 +1,6 @@
---- cpp/test/IceGrid/distribution/AllTests.cpp.orig 2015-07-04 13:40:02.746382995 +0200
-+++ cpp/test/IceGrid/distribution/AllTests.cpp 2015-07-04 13:40:20.588960995 +0200
-@@ -123,7 +123,7 @@
+--- cpp/test/IceGrid/distribution/AllTests.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceGrid/distribution/AllTests.cpp
+@@ -123,7 +123,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
ApplicationUpdateDescriptor update;
update.name = "Test";
@@ -9,7 +9,7 @@
admin->updateApplication(update);
admin->startServer("Test.IcePatch2");
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
ApplicationDescriptor app = admin->getApplicationInfo("Test").descriptor;
admin->removeApplication("Test");
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml b/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml
index c49341debb8f..d1ffa42b0c7f 100644
--- a/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml
+++ b/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml
@@ -1,5 +1,5 @@
---- cpp/test/IceGrid/distribution/application.xml.orig 2015-07-04 13:40:31.916391995 +0200
-+++ cpp/test/IceGrid/distribution/application.xml 2015-07-04 13:40:54.916616995 +0200
+--- cpp/test/IceGrid/distribution/application.xml.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceGrid/distribution/application.xml
@@ -1,7 +1,7 @@
<icegrid>
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py b/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py
index 176aa0ce5e2c..e67578416bf2 100644
--- a/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py
+++ b/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py
@@ -1,6 +1,6 @@
---- cpp/test/IceGrid/distribution/run.py.orig 2015-07-04 13:42:32.436390995 +0200
-+++ cpp/test/IceGrid/distribution/run.py 2015-07-04 13:42:42.506606995 +0200
-@@ -25,7 +25,7 @@
+--- cpp/test/IceGrid/distribution/run.py.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceGrid/distribution/run.py
+@@ -25,7 +25,7 @@ def icepatch2Calc(datadir, dirname):
commandProc = TestUtil.spawn('"%s" "%s"' % (icePatch2Calc, os.path.join(datadir, dirname)))
commandProc.waitTestSuccess()
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-session-run.py b/devel/ice/files/patch-cpp-test-IceGrid-session-run.py
index 7146c9f3d719..86af8814ae55 100644
--- a/devel/ice/files/patch-cpp-test-IceGrid-session-run.py
+++ b/devel/ice/files/patch-cpp-test-IceGrid-session-run.py
@@ -1,6 +1,6 @@
---- cpp/test/IceGrid/session/run.py.orig 2015-07-03 19:05:11.680636978 +0200
-+++ cpp/test/IceGrid/session/run.py 2015-07-03 19:18:59.590608978 +0200
-@@ -20,11 +20,14 @@
+--- cpp/test/IceGrid/session/run.py.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceGrid/session/run.py
+@@ -20,11 +20,14 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil, IceGridAdmin
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 a2cda471654e..7d8d2148847b 100644
--- a/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
@@ -1,6 +1,6 @@
---- 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 @@
+--- cpp/test/IceSSL/configuration/AllTests.cpp.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceSSL/configuration/AllTests.cpp
+@@ -27,7 +27,7 @@ using namespace Ice;
//
// With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers
//
@@ -9,7 +9,7 @@
const string anonCiphers = "ADH:@SECLEVEL=0";
# else
const string anonCiphers = "ADH";
-@@ -2048,7 +2048,7 @@
+@@ -2060,7 +2060,7 @@ allTests(const CommunicatorPtr& communicator, const st
//
// No DSA support in Secure Transport / AIX 7.1 / SChannel
//
@@ -18,7 +18,7 @@
{
//
// DSA PEM keys are not supported with SChannel. Since Windows 10
-@@ -3215,9 +3215,7 @@
+@@ -3231,9 +3231,7 @@ allTests(const CommunicatorPtr& communicator, const st
#endif
}
diff --git a/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py b/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py
index 2a766f33aba5..bfcf20490442 100644
--- a/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py
+++ b/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py
@@ -1,6 +1,6 @@
---- cpp/test/IceSSL/configuration/run.py.orig 2015-06-23 15:30:20.000000000 +0000
-+++ cpp/test/IceSSL/configuration/run.py 2015-09-16 18:16:01.933879982 +0000
-@@ -33,7 +33,7 @@
+--- cpp/test/IceSSL/configuration/run.py.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/IceSSL/configuration/run.py
+@@ -33,7 +33,7 @@ def cleanup():
elif TestUtil.isLinux():
for c in ["cacert1.pem", "cacert2.pem"]:
pem = os.path.join(certsPath, c)
@@ -9,7 +9,7 @@
cleanup()
atexit.register(cleanup)
-@@ -51,6 +51,6 @@
+@@ -51,6 +51,6 @@ elif TestUtil.iceUseOpenSSL():
#
for c in ["cacert1.pem", "cacert2.pem"]:
pem = os.path.join(certsPath, c)
diff --git a/devel/ice/files/patch-cpp-test-Slice-headers-run.py b/devel/ice/files/patch-cpp-test-Slice-headers-run.py
index fd97246651bc..5f1c85ca956b 100644
--- a/devel/ice/files/patch-cpp-test-Slice-headers-run.py
+++ b/devel/ice/files/patch-cpp-test-Slice-headers-run.py
@@ -1,6 +1,6 @@
---- cpp/test/Slice/headers/run.py.orig 2015-06-27 12:14:37.106940921 +0000
-+++ cpp/test/Slice/headers/run.py 2015-06-27 12:20:37.900915579 +0000
-@@ -20,6 +20,9 @@
+--- cpp/test/Slice/headers/run.py.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/Slice/headers/run.py
+@@ -20,6 +20,9 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
@@ -10,7 +10,7 @@
def clean():
for f in ["iceslices",
"linktoslices",
-@@ -28,7 +31,7 @@
+@@ -28,7 +31,7 @@ def clean():
os.path.join("slices", "dir1", "linktoa3.ice")]:
if os.path.exists(f):
os.unlink(f)
@@ -19,7 +19,7 @@
clean()
os.symlink("slices", "linktoslices")
-@@ -43,7 +46,7 @@
+@@ -44,7 +47,7 @@ slicedir = TestUtil.getSliceDir()
os.symlink(slicedir, "iceslices")
def runTest(cmd):
@@ -28,7 +28,7 @@
f = open("b.h")
if not re.search('#include <dir1\/a1\.h>\n'
'#include <linktodir1\/a2\.h>\n'
-@@ -71,9 +74,9 @@
+@@ -72,9 +75,9 @@ if os.path.exists("SLICES"):
#
# Slice files are symlinks, include dir is a regular directory
#
@@ -41,7 +41,7 @@
f = open("project1/git/services.settings.slices/A.ice", "w")
f.write("// dumy file")
-@@ -82,7 +85,7 @@
+@@ -83,7 +86,7 @@ f = open("project1/git/services.settings.slices/B.ice"
f.write("#include <services/settings/slices/A.ice>")
f.close()
@@ -50,7 +50,7 @@
f = open("project1/B.h")
if not re.search(re.escape('#include <services/settings/slices/A.h>'), f.read()):
-@@ -94,16 +97,16 @@
+@@ -95,16 +98,16 @@ clean()
#
# Slice file is regular file, include dir is a symlink to a second symlink
#
@@ -72,7 +72,7 @@
f = open("project1/A.h")
if not re.search(re.escape('#include <Ice/Identity.h>'), f.read()):
print("failed!")
-@@ -114,16 +117,16 @@
+@@ -115,16 +118,16 @@ clean()
#
# Typical Ice install with symlink Ice-x.y -> Ice-x.y.z
#
diff --git a/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py b/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py
index 7c90ab73a7e5..c1beff55b3e2 100644
--- a/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py
+++ b/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py
@@ -1,6 +1,6 @@
---- cpp/test/Slice/unicodePaths/run.py.orig 2016-10-05 16:59:08.000000000 +0200
-+++ cpp/test/Slice/unicodePaths/run.py 2016-10-12 12:01:29.065901876 +0200
-@@ -26,7 +26,7 @@
+--- cpp/test/Slice/unicodePaths/run.py.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/Slice/unicodePaths/run.py
+@@ -26,7 +26,7 @@ def test(b):
print("failed!")
sys.exit(1)
diff --git a/devel/ice/files/patch-cpp-test-include-TestCommon.h b/devel/ice/files/patch-cpp-test-include-TestCommon.h
index c703fca87fbd..02f40971feaf 100644
--- a/devel/ice/files/patch-cpp-test-include-TestCommon.h
+++ b/devel/ice/files/patch-cpp-test-include-TestCommon.h
@@ -1,7 +1,7 @@
---- cpp.orig/test/include/TestCommon.h 2011-06-15 21:43:59.000000000 +0200
-+++ cpp/test/include/TestCommon.h 2012-03-04 20:14:53.000000000 +0100
-@@ -17,6 +17,22 @@
- #include <stdlib.h>
+--- cpp/test/include/TestCommon.h.orig 2019-08-12 19:54:18 UTC
++++ cpp/test/include/TestCommon.h
+@@ -18,6 +18,22 @@
+ # include <Ice/LocalException.h>
#endif
+#if defined(__FreeBSD__)
@@ -21,5 +21,5 @@
+#endif
+
void
- inline testFailed(const char* expr, const char* file, unsigned int line)
+ inline print(const std::string& msg)
{
diff --git a/devel/ice/files/patch-php-Makefile b/devel/ice/files/patch-php-Makefile
index 84e8c66df005..d75a5efac8e6 100644
--- a/devel/ice/files/patch-php-Makefile
+++ b/devel/ice/files/patch-php-Makefile
@@ -1,7 +1,7 @@
---- php/Makefile.orig 2013-10-04 15:48:15.000000000 +0000
*** 649 LINES SKIPPED ***