diff options
| author | Michael Gmelin <grembo@FreeBSD.org> | 2022-01-15 19:23:08 +0000 |
|---|---|---|
| committer | Michael Gmelin <grembo@FreeBSD.org> | 2022-01-15 19:23:08 +0000 |
| commit | f4180be009923b1738b7d6a2ea3d9eb569eed7b1 (patch) | |
| tree | ea8d5faa8d7cd3967a4656964e62fa7665130bcf | |
| parent | ed8ff2ab00cb384fdff03fc5ae1dc115b5b1a622 (diff) | |
| download | ports-f4180be009923b1738b7d6a2ea3d9eb569eed7b1.tar.gz ports-f4180be009923b1738b7d6a2ea3d9eb569eed7b1.zip | |
devel/ice,devel/py-ice: Update to 3.6.5
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 -+++ php/Makefile 2013-12-01 21:19:31.863489109 +0000 -@@ -14,7 +14,7 @@ - SUBDIRS = src lib demo test +--- php/Makefile.orig 2019-08-12 19:54:18 UTC ++++ php/Makefile +@@ -23,7 +23,7 @@ endif + INSTALL_SUBDIRS = $(install_phpdir) $(install_libdir) -install:: install-common diff --git a/devel/ice/files/patch-php-config-Make.rules.php b/devel/ice/files/patch-php-config-Make.rules.php index 5e25546e3686..5b589e114f35 100644 --- a/devel/ice/files/patch-php-config-Make.rules.php +++ b/devel/ice/files/patch-php-config-Make.rules.php @@ -1,6 +1,6 @@ ---- 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))),) +--- php/config/Make.rules.php.orig 2019-08-12 19:54:18 UTC ++++ php/config/Make.rules.php +@@ -81,13 +81,8 @@ ifeq ($(findstring /php/test/,$(abspath $(MAKEFILE_LIS $(error $(PHP_CONFIG) not found review your PHP installation and ensure $(PHP_CONFIG) is in your PATH) endif diff --git a/devel/ice/files/patch-php-lib-Makefile b/devel/ice/files/patch-php-lib-Makefile index 33344eec336c..3fdfa1d4d653 100644 --- a/devel/ice/files/patch-php-lib-Makefile +++ b/devel/ice/files/patch-php-lib-Makefile @@ -1,6 +1,6 @@ ---- php/lib/Makefile.orig 2013-06-02 12:11:06.451195440 +0000 -+++ php/lib/Makefile 2013-06-02 12:16:29.249191742 +0000 -@@ -167,7 +167,8 @@ +--- php/lib/Makefile.orig 2019-08-12 19:54:18 UTC ++++ php/lib/Makefile +@@ -164,7 +164,8 @@ install:: $(ALL_SRCS) @echo "Installing generated code" @for i in $(MODULES) ; \ do \ diff --git a/devel/ice/files/patch-python-Makefile b/devel/ice/files/patch-python-Makefile index ce6642471df7..0dac22dc94f5 100644 --- a/devel/ice/files/patch-python-Makefile +++ b/devel/ice/files/patch-python-Makefile @@ -1,6 +1,6 @@ ---- python/Makefile.orig 2013-10-04 15:48:15.000000000 +0000 -+++ python/Makefile 2013-12-01 16:37:09.381657035 +0000 -@@ -15,7 +15,7 @@ +--- python/Makefile.orig 2019-08-12 19:54:18 UTC ++++ python/Makefile +@@ -19,7 +19,7 @@ SUBDIRS = modules python INSTALL_SUBDIRS = $(install_pythondir) $(install_libdir) diff --git a/devel/ice/files/patch-python-config-Make.rules b/devel/ice/files/patch-python-config-Make.rules index 5c02b88cf666..dd036811dd2d 100644 --- a/devel/ice/files/patch-python-config-Make.rules +++ b/devel/ice/files/patch-python-config-Make.rules @@ -1,5 +1,5 @@ ---- python/config/Make.rules.orig 2016-04-05 22:33:01.425700968 +0200 -+++ python/config/Make.rules 2016-04-05 22:29:23.200712968 +0200 +--- python/config/Make.rules.orig 2019-08-12 19:54:18 UTC ++++ python/config/Make.rules @@ -11,7 +11,8 @@ # Select an installation base directory. The directory will be created # if it does not exist. @@ -10,7 +10,7 @@ # # The "root directory" for runpath embedded in executables. Can be set -@@ -50,7 +51,7 @@ +@@ -50,7 +51,7 @@ embedded_runpath ?= yes # version used for building the Ice extension, then set PYTHON to # the specific to the location of the python interpreter. # @@ -19,7 +19,7 @@ PYTHON_VERSION ?= python$(shell $(PYTHON) -c "import sys; import distutils.sysconfig as ds; sys.stdout.write(ds.get_python_version())") -@@ -105,16 +106,16 @@ +@@ -105,16 +106,16 @@ endif libdir = $(top_srcdir)/python @@ -43,7 +43,7 @@ ifeq ($(UNAME),SunOS) ifeq ($(LP64),yes) -@@ -123,14 +124,10 @@ +@@ -123,15 +124,11 @@ ifeq ($(UNAME),SunOS) endif endif @@ -54,15 +54,16 @@ - ICE_LIB_DIR = -L$(ice_dir)/$(libsubdir) - ICE_FLAGS = -I$(ice_dir)/include -endif --ICE_LIBS = $(ICE_LIB_DIR) -lIceSSL -lIce -lSlice -lIceUtil -+ +-ICE_LIBS = $(ICE_LIB_DIR) -lIceLocatorDiscovery -lIceDiscovery -lIceSSL -lIce -lSlice -lIceUtil + +ICE_LIB_DIR = -L%%LOCALBASE%%/$(libsubdir) +ICE_FLAGS = -I%%LOCALBASE%%/include -+ICE_LIBS = $(ICE_LIB_DIR) -lIceSSL -lIce -lSlice -lIceUtil %%ICONV_LIB%% - ++ICE_LIBS = $(ICE_LIB_DIR) -lIceLocatorDiscovery -lIceDiscovery -lIceSSL -lIce -lSlice -lIceUtil %%ICONV_LIB%% ++ CPPFLAGS = ICECPPFLAGS = -I$(slicedir) -@@ -139,10 +136,7 @@ + SLICE2PYFLAGS = $(ICECPPFLAGS) +@@ -143,10 +140,7 @@ endif ifdef ice_src_dist SLICE2PY = $(PYTHON) $(top_srcdir)/config/s2py.py @@ -74,7 +75,7 @@ else ifeq ($(UNAME),Darwin) SLICE2PY = /usr/local/bin/slice2py -@@ -167,7 +161,7 @@ +@@ -177,7 +171,7 @@ EVERYTHING = all depend clean install all:: $(SRCS) diff --git a/devel/ice/files/patch-python-modules-IcePy-Types.cpp b/devel/ice/files/patch-python-modules-IcePy-Types.cpp index 6d401ef5fd70..32dd1294738c 100644 --- a/devel/ice/files/patch-python-modules-IcePy-Types.cpp +++ b/devel/ice/files/patch-python-modules-IcePy-Types.cpp @@ -1,6 +1,6 @@ ---- python/modules/IcePy/Types.cpp.orig 2015-01-18 15:25:00.277654935 +0100 -+++ python/modules/IcePy/Types.cpp 2015-01-18 15:24:52.737609935 +0100 -@@ -915,7 +915,7 @@ +--- python/modules/IcePy/Types.cpp.orig 2019-08-12 19:54:18 UTC ++++ python/modules/IcePy/Types.cpp +@@ -994,7 +994,7 @@ IcePy::PrimitiveInfo::unmarshal(const Ice::InputStream } void @@ -9,7 +9,7 @@ { if(!validate(value)) { -@@ -1050,7 +1050,7 @@ +@@ -1108,7 +1108,7 @@ IcePy::EnumInfo::unmarshal(const Ice::InputStreamPtr& } void @@ -18,7 +18,7 @@ { if(!validate(value)) { -@@ -1305,7 +1311,7 @@ +@@ -1421,7 +1421,7 @@ IcePy::StructInfo::unmarshal(const Ice::InputStreamPtr } void @@ -27,7 +27,7 @@ { if(!validate(value)) { -@@ -1559,7 +1571,7 @@ +@@ -1689,7 +1689,7 @@ IcePy::SequenceInfo::unmarshal(const Ice::InputStreamP } void @@ -36,7 +36,7 @@ { if(!validate(value)) { -@@ -2397,7 +2409,7 @@ +@@ -2523,7 +2523,7 @@ IcePy::CustomInfo::unmarshal(const Ice::InputStreamPtr } void @@ -45,7 +45,7 @@ { if(!validate(value)) { -@@ -2597,7 +2615,7 @@ +@@ -2719,7 +2719,7 @@ IcePy::DictionaryInfo::unmarshaled(PyObject* val, PyOb } void @@ -54,7 +54,7 @@ { if(!validate(value)) { -@@ -2798,7 +2816,7 @@ +@@ -2911,7 +2911,7 @@ IcePy::ClassInfo::unmarshal(const Ice::InputStreamPtr& } void @@ -63,7 +63,7 @@ { if(!validate(value)) { -@@ -2863,7 +2881,7 @@ +@@ -2967,7 +2967,7 @@ IcePy::ClassInfo::destroy() } void @@ -72,7 +72,7 @@ { if(base) { -@@ -3011,7 +3035,7 @@ +@@ -3115,7 +3115,7 @@ IcePy::ProxyInfo::unmarshal(const Ice::InputStreamPtr& } void @@ -81,16 +81,16 @@ { if(!validate(value)) { -@@ -3463,7 +3487,7 @@ +@@ -3540,7 +3540,7 @@ IcePy::ExceptionInfo::unmarshal(const Ice::InputStream } void -IcePy::ExceptionInfo::print(PyObject* value, IceUtilInternal::Output& out) +IcePy::ExceptionInfo::print(PyObject* value, PrintHelper& out) { - if(!PyObject_IsInstance(value, pythonType.get())) + if(!PyObject_IsInstance(value, pythonType)) { -@@ -3481,7 +3505,7 @@ +@@ -3558,7 +3558,7 @@ IcePy::ExceptionInfo::print(PyObject* value, IceUtilIn } void @@ -99,7 +99,7 @@ { if(base) { -@@ -4209,7 +4233,7 @@ +@@ -4372,7 +4372,7 @@ IcePy_stringify(PyObject*, PyObject* args) assert(info); ostringstream ostr; @@ -108,7 +108,7 @@ PrintObjectHistory history; history.index = 0; info->print(value, out, &history); -@@ -4234,7 +4258,7 @@ +@@ -4397,7 +4397,7 @@ IcePy_stringifyException(PyObject*, PyObject* args) assert(info); ostringstream ostr; diff --git a/devel/ice/files/patch-python-modules-IcePy-Types.h b/devel/ice/files/patch-python-modules-IcePy-Types.h index ff270cc82c89..d81c45157a47 100644 --- a/devel/ice/files/patch-python-modules-IcePy-Types.h +++ b/devel/ice/files/patch-python-modules-IcePy-Types.h @@ -1,6 +1,6 @@ ---- python/modules/IcePy/Types.h.orig 2015-01-18 15:25:04.917707935 +0100 -+++ python/modules/IcePy/Types.h 2015-01-18 15:24:54.689631935 +0100 -@@ -69,6 +69,50 @@ +--- python/modules/IcePy/Types.h.orig 2019-08-12 19:54:18 UTC ++++ python/modules/IcePy/Types.h +@@ -71,6 +71,50 @@ struct PrintObjectHistory std::map<PyObject*, int> objects; }; @@ -51,7 +51,7 @@ // // The delayed nature of class unmarshaling in the Ice protocol requires us to // handle unmarshaling using a callback strategy. An instance of UnmarshalCallback -@@ -127,7 +171,7 @@ +@@ -129,7 +173,7 @@ class TypeInfo : public UnmarshalCallback (public) virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0) = 0; @@ -60,7 +60,7 @@ }; typedef IceUtil::Handle<TypeInfo> TypeInfoPtr; -@@ -164,7 +208,7 @@ +@@ -166,7 +210,7 @@ class PrimitiveInfo : public TypeInfo (public) virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); @@ -69,16 +69,16 @@ const Kind kind; }; -@@ -193,7 +237,7 @@ +@@ -195,7 +239,7 @@ class EnumInfo : public TypeInfo (public) virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); - virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + virtual void print(PyObject*, PrintHelper&, PrintObjectHistory*); - const std::string id; - const PyObjectHandle pythonType; -@@ -240,7 +284,7 @@ + virtual void destroy(); + +@@ -247,7 +291,7 @@ class StructInfo : public TypeInfo (public) virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); @@ -87,7 +87,7 @@ virtual void destroy(); -@@ -278,7 +322,7 @@ +@@ -288,7 +332,7 @@ class SequenceInfo : public TypeInfo (public) virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); @@ -96,16 +96,16 @@ virtual void destroy(); -@@ -338,7 +382,7 @@ +@@ -348,7 +392,7 @@ class CustomInfo : public TypeInfo (public) virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); - virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + virtual void print(PyObject*, PrintHelper&, PrintObjectHistory*); - virtual void destroy(); - -@@ -371,7 +415,7 @@ + const std::string id; + PyObject* pythonType; // Borrowed reference - the enclosing Python module owns the reference. +@@ -379,7 +423,7 @@ class DictionaryInfo : public TypeInfo (public) const Ice::StringSeq* = 0); virtual void unmarshaled(PyObject*, PyObject*, void*); @@ -114,7 +114,7 @@ virtual void destroy(); -@@ -420,11 +464,11 @@ +@@ -428,11 +472,11 @@ class ClassInfo : public TypeInfo (public) virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); @@ -128,16 +128,16 @@ const std::string id; const Ice::Int compactId; -@@ -462,7 +506,7 @@ +@@ -470,7 +514,7 @@ class ProxyInfo : public TypeInfo (public) virtual void unmarshal(const Ice::InputStreamPtr&, const UnmarshalCallbackPtr&, PyObject*, void*, bool, const Ice::StringSeq* = 0); - virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + virtual void print(PyObject*, PrintHelper&, PrintObjectHistory*); - virtual void destroy(); - -@@ -482,8 +526,8 @@ + const std::string id; + PyObject* pythonType; // Borrowed reference - the enclosing Python module owns the reference. +@@ -488,8 +532,8 @@ class ExceptionInfo : public IceUtil::Shared (public) void marshal(PyObject*, const Ice::OutputStreamPtr&, ObjectMap*); PyObject* unmarshal(const Ice::InputStreamPtr&); diff --git a/devel/ice/files/patch-python-python-Makefile b/devel/ice/files/patch-python-python-Makefile index 29f6b00bf05a..8672536246a0 100644 --- a/devel/ice/files/patch-python-python-Makefile +++ b/devel/ice/files/patch-python-python-Makefile @@ -1,6 +1,6 @@ ---- python/python/Makefile.orig 2010-07-11 13:05:38.000000000 +1000 -+++ python/python/Makefile 2012-09-11 00:09:09.000000000 +2000 -@@ -118,10 +118,11 @@ +--- python/python/Makefile.orig 2019-08-12 19:54:18 UTC ++++ python/python/Makefile +@@ -146,10 +146,11 @@ IceStorm_%_ice.py: $(slicedir)/IceStorm/%.ice $(SLICEP install:: $(ALL_SRCS) @echo "Installing generated code" @@ -13,4 +13,4 @@ + $(INSTALL_DATA) $$i/*.py* $(DESTDIR)$(install_pythondir)/$$i ; \ done - depend:: $(ICE_SLICE) $(GLACIER2_SLICE) $(ICEBOX_SLICE) $(ICEGRID_SLICE) $(ICEPATCH2_SLICE) $(ICESTORM_SLICE) + clean:: diff --git a/devel/ice/files/patch-python-test-Ice-info-AllTests.py b/devel/ice/files/patch-python-test-Ice-info-AllTests.py index aa2790226a53..3725f85020b5 100644 --- a/devel/ice/files/patch-python-test-Ice-info-AllTests.py +++ b/devel/ice/files/patch-python-test-Ice-info-AllTests.py @@ -1,5 +1,5 @@ ---- python/test/Ice/info/AllTests.py.orig 2015-06-27 10:55:33.131456669 +0000 -+++ python/test/Ice/info/AllTests.py 2015-06-27 10:52:58.191276825 +0000 +--- python/test/Ice/info/AllTests.py.orig 2019-08-12 19:54:18 UTC ++++ python/test/Ice/info/AllTests.py @@ -7,12 +7,31 @@ # # ********************************************************************** @@ -33,7 +33,7 @@ def allTests(communicator): sys.stdout.write("testing proxy endpoint information... ") sys.stdout.flush() -@@ -74,12 +93,12 @@ +@@ -74,12 +93,12 @@ def allTests(communicator): ipEndpoint = endpoints[0].getInfo() test(ipEndpoint.type() == Ice.TCPEndpointType or ipEndpoint.type() == 2 or ipEndpoint.type() == 4 or ipEndpoint.type() == 5) @@ -48,7 +48,7 @@ test(udpEndpoint.datagram()) test(udpEndpoint.port > 0) -@@ -115,7 +134,7 @@ +@@ -115,7 +134,7 @@ def allTests(communicator): ipinfo = base.ice_getConnection().getEndpoint().getInfo() test(ipinfo.port == 12010) test(not ipinfo.compress) @@ -57,7 +57,7 @@ ctx = testIntf.getEndpointInfoAsContext() test(ctx["host"] == ipinfo.host) -@@ -125,7 +144,7 @@ +@@ -125,7 +144,7 @@ def allTests(communicator): udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo() test(udp.port == 12010) @@ -66,7 +66,7 @@ print("ok") -@@ -140,8 +159,8 @@ +@@ -140,8 +159,8 @@ def allTests(communicator): test(len(info.adapterName) == 0) test(info.remotePort == 12010) if defaultHost == '127.0.0.1': diff --git a/devel/ice/files/patch-python-test-Ice-properties-run.py b/devel/ice/files/patch-python-test-Ice-properties-run.py index 0bce6ffe5340..69463719cb1c 100644 --- a/devel/ice/files/patch-python-test-Ice-properties-run.py +++ b/devel/ice/files/patch-python-test-Ice-properties-run.py @@ -1,6 +1,6 @@ ---- python/test/Ice/properties/run.py.orig 2015-12-27 02:42:11.742927971 +0100 -+++ python/test/Ice/properties/run.py 2015-12-27 03:06:41.640921970 +0100 -@@ -26,10 +26,10 @@ +--- python/test/Ice/properties/run.py.orig 2019-08-12 19:54:18 UTC ++++ python/test/Ice/properties/run.py +@@ -26,10 +26,10 @@ import TestUtil # 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-python-test-Ice-timeout-AllTests.py b/devel/ice/files/patch-python-test-Ice-timeout-AllTests.py new file mode 100644 index 000000000000..ed0d80f3089b --- /dev/null +++ b/devel/ice/files/patch-python-test-Ice-timeout-AllTests.py @@ -0,0 +1,14 @@ +--- python/test/Ice/timeout/AllTests.py.orig 2019-08-12 19:54:18 UTC ++++ python/test/Ice/timeout/AllTests.py +@@ -249,9 +249,9 @@ def allTests(communicator): + comm = Ice.initialize(initData) + connection = comm.stringToProxy(sref).ice_getConnection(); + timeout.holdAdapter(800); +- now = time.clock(); ++ now = time.perf_counter(); + comm.destroy(); +- test((time.clock() - now) < 0.7); ++ test((time.perf_counter() - now) < 0.7); + + print("ok") + diff --git a/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py b/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py index a25ba2280743..bf6cf07b8f9b 100644 --- a/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py +++ b/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py @@ -1,6 +1,6 @@ ---- python/test/Slice/unicodePaths/run.py.orig 2016-10-05 16:59:08.000000000 +0200 -+++ python/test/Slice/unicodePaths/run.py 2016-10-12 12:00:24.045889876 +0200 -@@ -26,7 +26,7 @@ +--- python/test/Slice/unicodePaths/run.py.orig 2019-08-12 19:54:18 UTC ++++ python/test/Slice/unicodePaths/run.py +@@ -26,7 +26,7 @@ def test(b): print("failed!") sys.exit(1) diff --git a/devel/ice/files/patch-scripts-Expect.py b/devel/ice/files/patch-scripts-Expect.py index 8072c6b69ce9..c77d90442231 100644 --- a/devel/ice/files/patch-scripts-Expect.py +++ b/devel/ice/files/patch-scripts-Expect.py @@ -1,6 +1,6 @@ ---- scripts.orig/Expect.py 2015-01-23 13:16:01.000000000 +0000 -+++ scripts/Expect.py 2015-01-23 13:21:06.526614131 +0000 -@@ -484,7 +484,7 @@ +--- scripts/Expect.py.orig 2019-08-12 19:54:18 UTC ++++ scripts/Expect.py +@@ -505,7 +505,7 @@ class Expect (object): global processes del processes[self.p.pid] self.p = None diff --git a/devel/ice/files/patch-scripts-IceGridAdmin.py b/devel/ice/files/patch-scripts-IceGridAdmin.py index c9ad90d37805..622be4f4992b 100644 --- a/devel/ice/files/patch-scripts-IceGridAdmin.py +++ b/devel/ice/files/patch-scripts-IceGridAdmin.py @@ -1,6 +1,6 @@ ---- scripts/IceGridAdmin.py.orig 2015-07-04 12:59:57.542262997 +0200 -+++ scripts/IceGridAdmin.py 2015-07-04 13:02:16.496576997 +0200 -@@ -222,11 +222,14 @@ +--- scripts/IceGridAdmin.py.orig 2019-08-12 19:54:18 UTC ++++ scripts/IceGridAdmin.py +@@ -222,11 +222,14 @@ def killNodeServers(): def iceGridTest(application, additionalOptions = "", applicationOptions = ""): testdir = os.getcwd() diff --git a/devel/ice/files/patch-scripts-TestUtil.py b/devel/ice/files/patch-scripts-TestUtil.py index f9fa9e29b201..fb46cbbbd74d 100644 --- a/devel/ice/files/patch-scripts-TestUtil.py +++ b/devel/ice/files/patch-scripts-TestUtil.py @@ -1,6 +1,6 @@ ---- scripts/TestUtil.py.orig 2016-10-05 16:59:08.000000000 +0200 -+++ scripts/TestUtil.py 2016-10-11 23:30:25.933993909 +0200 -@@ -145,6 +145,25 @@ +--- scripts/TestUtil.py.orig 2019-08-12 19:54:18 UTC ++++ scripts/TestUtil.py +@@ -145,6 +145,25 @@ def isSles(): def iceUseOpenSSL(): return any(sys.platform.startswith(p) for p in ["linux", "freebsd"]) @@ -26,7 +26,7 @@ def getCppCompiler(): compiler = "" if os.environ.get("CPP_COMPILER", "") != "": -@@ -340,7 +359,7 @@ +@@ -340,7 +359,7 @@ else: print("uname failed:\n" + p.stdout.read().strip()) sys.exit(1) line = p.stdout.readline().decode('UTF-8').strip() @@ -35,7 +35,7 @@ x64 = True elif line == "armv7l": armv7l = True -@@ -879,7 +898,7 @@ +@@ -879,7 +898,7 @@ def hashPasswords(filePath, entries): os.remove(filePath) passwords = open(filePath, "a") @@ -44,8 +44,8 @@ os.path.abspath(os.path.join(os.path.dirname(__file__), "icehashpassword.py"))) # -@@ -2013,7 +2032,7 @@ - addLdPath(getCppLibDir(lang), env) +@@ -2018,7 +2037,7 @@ def getTestEnv(lang, testdir): + addLdPath(getCppLibDir(lang), env) elif isAIX(): addLdPath(getCppLibDir(lang), env) - elif lang in ["python", "ruby", "php", "js", "objective-c"]: @@ -53,18 +53,18 @@ # C++ binaries use rpath $ORIGIN or similar to find the Ice libraries addLdPath(getCppLibDir(lang), env) -@@ -2366,6 +2385,14 @@ - print("%s*** test not supported under Yocto%s" % (prefix, suffix)) - continue +@@ -2369,6 +2388,14 @@ def runTests(start, expanded, num = 0, script = False) + if isYocto() and "noyocto" in config: + print("%s*** test not supported under Yocto%s" % (prefix, suffix)) ++ continue ++ + if isFreeBSD() and "nofreebsd" in config: + print("%s*** test not supported under FreeBSD%s" % (prefix, suffix)) + continue + + if isFreeBSDJail() and "nofreebsdjail" in config: + print("%s*** test not supported within a FreeBSD Jail%s" % (prefix, suffix)) -+ continue -+ - if not isWin32() and "win32only" in config: - print("%s*** test only supported under Win32%s" % (prefix, suffix)) continue + + if not isWin32() and "win32only" in config: diff --git a/devel/ice/pkg-plist b/devel/ice/pkg-plist index f884b519d83a..fb4247277853 100644 --- a/devel/ice/pkg-plist +++ b/devel/ice/pkg-plist @@ -241,49 +241,49 @@ include/Slice/PythonUtil.h include/Slice/RubyUtil.h include/Slice/Util.h lib/libFreeze.so -lib/libFreeze.so.3.6.4 +lib/libFreeze.so.3.6.5 lib/libFreeze.so.36 lib/libGlacier2.so -lib/libGlacier2.so.3.6.4 +lib/libGlacier2.so.3.6.5 lib/libGlacier2.so.36 lib/libGlacier2CryptPermissionsVerifier.so -lib/libGlacier2CryptPermissionsVerifier.so.3.6.4 +lib/libGlacier2CryptPermissionsVerifier.so.3.6.5 lib/libGlacier2CryptPermissionsVerifier.so.36 lib/libIce.so -lib/libIce.so.3.6.4 +lib/libIce.so.3.6.5 lib/libIce.so.36 lib/libIceBox.so -lib/libIceBox.so.3.6.4 +lib/libIceBox.so.3.6.5 lib/libIceBox.so.36 lib/libIceDiscovery.so -lib/libIceDiscovery.so.3.6.4 +lib/libIceDiscovery.so.3.6.5 lib/libIceDiscovery.so.36 lib/libIceGrid.so -lib/libIceGrid.so.3.6.4 +lib/libIceGrid.so.3.6.5 lib/libIceGrid.so.36 lib/libIceLocatorDiscovery.so -lib/libIceLocatorDiscovery.so.3.6.4 +lib/libIceLocatorDiscovery.so.3.6.5 lib/libIceLocatorDiscovery.so.36 lib/libIcePatch2.so -lib/libIcePatch2.so.3.6.4 +lib/libIcePatch2.so.3.6.5 lib/libIcePatch2.so.36 lib/libIceSSL.so -lib/libIceSSL.so.3.6.4 +lib/libIceSSL.so.3.6.5 lib/libIceSSL.so.36 lib/libIceStorm.so -lib/libIceStorm.so.3.6.4 +lib/libIceStorm.so.3.6.5 lib/libIceStorm.so.36 lib/libIceStormService.so -lib/libIceStormService.so.3.6.4 +lib/libIceStormService.so.3.6.5 lib/libIceStormService.so.36 lib/libIceUtil.so -lib/libIceUtil.so.3.6.4 +lib/libIceUtil.so.3.6.5 lib/libIceUtil.so.36 lib/libIceXML.so -lib/libIceXML.so.3.6.4 +lib/libIceXML.so.3.6.5 lib/libIceXML.so.36 lib/libSlice.so -lib/libSlice.so.3.6.4 +lib/libSlice.so.3.6.5 lib/libSlice.so.36 man/man1/dumpdb.1.gz man/man1/glacier2router.1.gz |