diff --git a/devel/ice/Makefile b/devel/ice/Makefile index 3923208b815f..567c23f2eb9c 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -1,131 +1,122 @@ # Created by: Stefan Ehmann PORTNAME= Ice -PORTVERSION= 3.6.4 +PORTVERSION= 3.6.5 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= grembo@FreeBSD.org COMMENT= Modern alternative to object middleware such as CORBA/COM/DCOM/COM+ LICENSE= GPLv2 SLAVE_PORT?= no CONFLICTS= Ice37 py*-Ice37 php*-Ice37 MAKE_JOBS_UNSAFE= yes .if ${SLAVE_PORT} == "no" LIB_DEPENDS= libexpat.so:textproc/expat2 \ libmcpp.so:devel/mcpp USES+= compiler:c++11-lang ssl .else LIB_VRS= ${PORTVERSION:R:S|.||g} LIB_DEPENDS+= libIce.so.${LIB_VRS}:devel/ice PLIST_SUB+= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}" .endif OPTIONS_DEFINE?= DEBUG TEST -.include - -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 + +.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 .if !${PORT_OPTIONS:MDEBUG} CFLAGS+= -DNDEBUG .endif # determine if we are on a 64-bit arch .if ${ARCH:M*64*} MAKE_ENV+= LP64=yes .endif .if !${PORT_OPTIONS:MTEST} MAKE_ENV+= NOTESTS=yes .endif .if ${SLAVE_PORT} == "no" MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/cpp/lib:$$LD_LIBRARY_PATH .endif .include .if ${PREFIX} != ${LOCALBASE} PYSITEDIR= ${PREFIX}${PYTHON_SITELIBDIR:S|^${LOCALBASE}||} .else 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; \ s|%%DOCSDIR%%|${STAGEDIR}${DOCSDIR}|g; \ s|%%ICONV_LIB%%|${ICONV_LIB}|g; \ s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \ s|%%OPENSSLLIB%%|${OPENSSLLIB}|g; \ s|%%OPENSSLINC%%|${OPENSSLINC}|g; \ s|%%OPENSSLRPATH%%|${OPENSSLRPATH}|g;' \ ${FILESDIR}/Make.rules.FreeBSD > ${WRKSRC}/cpp/config/Make.rules.FreeBSD @${REINPLACE_CMD} 's|%%BDB_LIB_CXX_NAME%%|${BDB_LIB_CXX_NAME}|g; \ s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g; \ s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g; \ s|%%OPENSSLLIB%%|${OPENSSLLIB}|g; \ s|%%OPENSSLINC%%|${OPENSSLINC}|g; \ s|%%OPENSSLRPATH%%|${OPENSSLRPATH}|g; \ /install_docdir/d' \ ${WRKSRC}/cpp/config/Make.rules @${REINPLACE_CMD} 's|%%OPENSSLBASE%%|${OPENSSLBASE}|g;' \ ${WRKSRC}/cpp/test/IceSSL/configuration/run.py @${REINPLACE_CMD} '/install_configdir/d' \ ${WRKSRC}/cpp/config/Make.rules @${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/; \ s|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g;' \ ${WRKSRC}/config/Make.common.rules @${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \ s|%%ICONV_LIB%%|${ICONV_LIB}|g; \ s|%%PYTHON_CMD%%|${PYTHON_CMD}|g; \ s|%%PYTHON_SITELIBDIR%%|${STAGEDIR}${PYSITEDIR}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/python/config/Make.rules @${REINPLACE_CMD} 's|%%INSTALL_PROGRAM%%|${INSTALL_PROGRAM}|g; \ s|%%INSTALL_DATA%%|${INSTALL_DATA}|g; \ s|%%PREFIX%%|${PREFIX}|g; \ 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" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* .endif .include 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,50 +1,51 @@ ---- 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 -INSTALL = cp -fp +override DESTDIR = +INSTALL = %%INSTALL_PROGRAM%% 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 +# +#ifeq ($(prefix), /usr/local) +# 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 - @if test ! -f $(DESTDIR)$(install_docdir)/ICE_LICENSE$(TEXT_EXTENSION) ; \ + @if test ! -f $(DESTDIR)$(install_slicedir)/ICE_LICENSE$(TEXT_EXTENSION) ; \ then \ - $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ + $(call installdata,$(top_srcdir)/../ICE_LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ fi - @if test ! -f $(DESTDIR)$(install_docdir)/LICENSE$(TEXT_EXTENSION) ; \ + @if test ! -f $(DESTDIR)$(install_slicedir)/LICENSE$(TEXT_EXTENSION) ; \ then \ - $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ + $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ 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,13 +1,13 @@ ---- 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 -ifneq ($(MAKECMDGOALS),install) - SUBDIRS := $(SUBDIRS) test +ifeq ($(NOTESTS),) + 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,36 +1,36 @@ ---- 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"]), - ("Ice/udp", ["core"]), + ("Ice/udp", ["core", "nofreebsdjail"]), ("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"]), - ("IceStorm/repgrid", ["service", "novc100", "nomingw"]), + ("IceStorm/repgrid", ["service", "novc100", "nomingw", "nofreebsd"]), ("IceStorm/repstress", ["service", "noipv6", "stress", "novc100", "nomingw"]), ("FreezeScript/dbmap", ["once", "novc100", "nomingw"]), ("FreezeScript/evictor", ["once", "novc100", "nomingw"]), - ("IceDiscovery/simple", ["service"]), + ("IceDiscovery/simple", ["service", "nofreebsdjail"]), ("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 += [ - ("IceUtil/priority", ["core", "nodarwin"]), - ("Ice/threadPoolPriority", ["core", "nodarwin", "nomx"]) + ("IceUtil/priority", ["core", "nodarwin", "nofreebsd"]), + ("Ice/threadPoolPriority", ["core", "nodarwin", "nofreebsd", "nomx"]) ] if __name__ == "__main__": 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,28 +1,28 @@ ---- 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 -OPENSSL_FLAGS += $(if $(OPENSSL_HOME),-I$(OPENSSL_HOME)/include) +OPENSSL_FLAGS += -I%%OPENSSLINC%% ifeq ($(OPENSSL_LIBS),) - OPENSSL_LIBS = $(if $(OPENSSL_HOME),-L$(OPENSSL_HOME)/$(libsubdir)) -lssl -lcrypto + OPENSSL_LIBS = -L%%OPENSSLLIB%% -lssl -lcrypto endif -OPENSSL_RPATH_LINK = $(if $(OPENSSL_HOME),$(call rpathlink,$(OPENSSL_HOME)/$(libsubdir))) +OPENSSL_RPATH_LINK = $(if %%OPENSSLRPATH%%,$(call rpathlink,%%OPENSSLRPATH%%)) 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 - DB_LIBS = -ldb_cxx + DB_FLAGS = -I%%BDB_INCLUDE_DIR%% + DB_LIBS = -L%%BDB_LIB_DIR%% -l%%BDB_LIB_CXX_NAME%% + DB_RPATH_LINK = $(call rpathlink,%%BDB_LIB_DIR%%) endif endif endif 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,59 +1,57 @@ ---- 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) +#if defined(ICE_BROKEN_ATEXIT) + , _ftableInit(new IceInternal::FactoryTableInit) +#endif { factoryTable->addExceptionFactory(_typeId, new DefaultUserExceptionFactory(_typeId)); } -@@ -55,10 +65,16 @@ +@@ -55,10 +58,16 @@ class DefaultUserExceptionFactoryInit (public) ~DefaultUserExceptionFactoryInit() { factoryTable->removeExceptionFactory(_typeId); +#if defined(ICE_BROKEN_ATEXIT) + delete _ftableInit; +#endif } private: const ::std::string _typeId; +#if defined(ICE_BROKEN_ATEXIT) + IceInternal::FactoryTableInit* _ftableInit; +#endif }; template -@@ -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(_typeId)); } -@@ -75,11 +94,16 @@ +@@ -75,11 +87,16 @@ class DefaultObjectFactoryInit (public) ~DefaultObjectFactoryInit() { factoryTable->removeObjectFactory(_typeId); +#if defined(ICE_BROKEN_ATEXIT) + delete _ftableInit; +#endif } private: const ::std::string _typeId; - +#if defined(ICE_BROKEN_ATEXIT) + IceInternal::FactoryTableInit* _ftableInit; +#endif }; } 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,37 +1,37 @@ ---- 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 -# if defined(__WORDSIZE) && (__WORDSIZE == 64) +# if (__cplusplus >= 201103L) && defined(__WORDSIZE) && (__WORDSIZE == 64) # define ICE_64 -# elif defined(__WORDSIZE) && (__WORDSIZE == 32) +# 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 +# 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,11 +1,11 @@ ---- 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. // -#if defined(__clang__) +#if defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 4 # pragma clang diagnostic ignored "-Wdeprecated-register" #endif 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,11 +1,11 @@ ---- 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 lock(_staticMutex); - return p->second == crypt(password.c_str(), salt.c_str()) + return p->second == crypt(password.c_str(), salt.c_str()); # endif #elif defined(__APPLE__) || defined(_WIN32) // 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,10 +1,10 @@ ---- 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(_retryIntervals.size())) { + interval = 0; // apeace compiler if(traceLevels->retry >= 1) { Trace out(logger, traceLevels->retryCat); 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,23 +1,23 @@ ---- 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); } - ~Init() - { - IceGrid::setRegistryPluginFacade(0); - } +/* This is a bad idea, see + * https://isocpp.org/wiki/faq/ctors#construct-on-first-use-v2 + * That's why we disabled it and make sure the registrypluginfacace + * is reset somwhere else. Construction is still here, so that + * registry plugins work as expected. + * ~Init() + * { + * IceGrid::setRegistryPluginFacade(0); + * } + */ }; Init init; 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,24 +1,24 @@ ---- 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; +namespace IceGrid +{ + +ICE_GRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&); + +} + namespace { -@@ -159,6 +166,7 @@ +@@ -157,6 +164,7 @@ RegistryI::RegistryI(const CommunicatorPtr& communicat RegistryI::~RegistryI() { + IceGrid::setRegistryPluginFacade(0); } bool 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,11 +1,11 @@ ---- 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) +LINKWITH := $(BZIP2_RPATH_LINK) -lIce -lIceUtil $(OPENSSL_RPATH_LINK) $(SSL_OS_LIBS) $(CXXLIBS) ifeq ($(STATICLIBS),yes) $(libdir)/$(LIBNAME): $(OBJS) 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,34 +1,34 @@ ---- 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"); } - test(ctx["_con.localAddress"] == "127.0.0.1"); + if (!inFreeBSDJail()) + { + test(ctx["_con.localAddress"] == "127.0.0.1"); + } test(ctx["_con.remotePort"] != ""); - test(ctx["_con.remoteAddress"] == "127.0.0.1"); + if (!inFreeBSDJail()) + { + test(ctx["_con.remoteAddress"] == "127.0.0.1"); + } } } -@@ -133,8 +139,11 @@ +@@ -125,8 +131,11 @@ class SSLSessionManagerI : public Glacier2::SSLSession { testContext(true, current.ctx); - test(info.remoteHost == "127.0.0.1"); - test(info.localHost == "127.0.0.1"); + if (!inFreeBSDJail()) + { + test(info.remoteHost == "127.0.0.1"); + test(info.localHost == "127.0.0.1"); + } test(info.localPort == 12348); try 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,38 +1,37 @@ ---- 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 @@ # # ********************************************************************** -import os, sys, time, socket +import os, sys, time, socket, subprocess path = [ ".", "..", "../..", "../../..", "../../../.." ] head = os.path.dirname(sys.argv[0]) -@@ -99,12 +99,26 @@ +@@ -99,11 +99,25 @@ try: hostname = "127.0.0.1" fqdn = "" domainname = "" + + # Check if IP addresses are configured on a local interface + if TestUtil.isFreeBSD(): + p = subprocess.Popen("ifconfig", shell=1, stdout=subprocess.PIPE) + r = p.communicate()[0] + if r.find("inet " + testaddr1) == -1 or r.find("inet " + testaddr2) == 1: + print("Warning: Not all host IP addresses are available") + limitedTests = True + hostname = "127.0.0.1" + fqdn = "" + domainname = "" except: limitedTests = True 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,20 +1,20 @@ ---- 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); - if(defaultHost == "127.0.0.1") + if(defaultHost == "127.0.0.1" && !inFreeBSDJail()) { 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); - if(defaultHost == "127.0.0.1") + if(defaultHost == "127.0.0.1" && !inFreeBSDJail()) { test(info->remoteAddress == defaultHost); test(info->localAddress == defaultHost); 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,50 +1,50 @@ ---- 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"); - testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1"); + if (!inFreeBSDJail()) + { + testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1"); + testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1"); + } //testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", ""); - testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1"); 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 { - communicator->stringToProxy("test:tcp -t 500 -p 12010 -h unknownfoo.zeroc.com")->ice_ping(); + communicator->stringToProxy("test:tcp -t 500 -p 12010 -h unknownhost9999.example.org")->ice_ping(); 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]; - test(m1->id == "tcp -h unknownfoo.zeroc.com -p 12010 -t 500" && m1->total == 2 && + test(m1->id == "tcp -h unknownhost9999.example.org -p 12010 -t 500" && m1->total == 2 && (!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); - testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op); + if (!inFreeBSDJail()) + { + testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op); + testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op); + } testAttribute(serverMetrics, serverProps, update, "Dispatch", "localPort", "12010", op); - testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op); //testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", "12010", op); testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastHost", "", op); testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastPort", "", 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,25 +1,25 @@ ---- 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) -TESTLIBNAME = libTestDerived.a +TESTLIBNAME = libTestDerived.so TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) $(TESTLIBNAME) -@@ -47,11 +47,11 @@ +@@ -47,11 +47,11 @@ LDFLAGS := -L. $(LDFLAGS) $(TESTLIBNAME): $(SLICE_OBJS) rm -f $@ - $(call mklib,$@,$(SLICE_OBJS)) + $(call mkshlib,$@,$(TESTLIBNAME),$(SLICE_OBJS),$(LIBS)) $(CLIENT): $(COBJS) $(TESTLIBNAME) rm -f $@ - $(call mktest,$@,$(COBJS) -lTestDerived $(LIBS)) + $(call mktest,$@,-lTestDerived $(COBJS) $(LIBS)) $(SERVER): $(SOBJS) 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,15 +1,15 @@ ---- 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" - decodedPath = configPath.decode("utf-8") + decodedPath = configPath else: configPath = "./config/\u4e2d\u56fd_client.config" - 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,21 +1,21 @@ ---- 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 +dbdir = os.path.join(os.getcwd(), "db") + if not TestUtil.isWin32() and os.getuid() == 0: - sys.stdout.write("\n") - sys.stdout.write("*** can't run test as root ***\n") - sys.stdout.write("\n") - sys.exit(0) + for root, dirs, files in os.walk(dbdir): + os.chown(os.path.join(dbdir, root), 65534, 65534) + for f in files: + os.chown(os.path.join(dbdir, root, f), 65534, 65534) + os.setuid(65534) testdir = os.getcwd(); 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,190 +1,190 @@ ---- 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. // - string path = testDir + "/log1.txt"; + string path = testDir + "/db/log1.txt"; ofstream os(path.c_str()); os.close(); - it = session->openServerLog("LogServer", testDir + "/log1.txt", -1); + it = session->openServerLog("LogServer", testDir + "/db/log1.txt", -1); test(it->read(1024, lines) && lines.empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log1.txt", 0); + it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 0); test(it->read(1024, lines) && lines.empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log1.txt", 100); + it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 100); 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. // - string path = testDir + "/log2.txt"; + string path = testDir + "/db/log2.txt"; ofstream os(path.c_str()); os << "one line file with no EOL on last line"; os.close(); - it = session->openServerLog("LogServer", testDir + "/log2.txt", -1); + it = session->openServerLog("LogServer", testDir + "/db/log2.txt", -1); 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()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log2.txt", 0); + it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 0); test(it->read(1024, lines) && lines.empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log2.txt", 1); + it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 1); 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()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log2.txt", 100); + it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 100); 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. // - string path = testDir + "/log3.txt"; + string path = testDir + "/db/log3.txt"; ofstream os(path.c_str()); os << "one line file with EOL on last line" << endl; os.close(); - it = session->openServerLog("LogServer", testDir + "/log3.txt", -1); + it = session->openServerLog("LogServer", testDir + "/db/log3.txt", -1); test(it->read(1024, lines) && lines.size() == 2); test(lines[0] == "one line file with EOL on last line"); test(lines[1].empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log3.txt", 0); + it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 0); test(it->read(1024, lines) && lines.empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log3.txt", 1); + it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 1); test(it->read(1024, lines) && lines.size() == 2); test(lines[0] == "one line file with EOL on last line"); test(lines[1].empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log3.txt", 100); + it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 100); test(it->read(1024, lines) && lines.size() == 2); test(lines[0] == "one line file with EOL on last line"); test(lines[1].empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log3.txt", 2); + it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 2); 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 // - string path = testDir + "/log4.txt"; + string path = testDir + "/db/log4.txt"; ofstream os(path.c_str()); os << "line 1" << endl; os << "line 2" << endl; os << "line 3" << endl; os.close(); - it = session->openServerLog("LogServer", testDir + "/log4.txt", -1); + it = session->openServerLog("LogServer", testDir + "/db/log4.txt", -1); 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(); - it = session->openServerLog("LogServer", testDir + "/log4.txt", 0); + it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 0); test(it->read(1024, lines) && lines.empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log4.txt", 1); + it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 1); test(it->read(1024, lines) && lines.size() == 2); test(lines[0] == "line 3"); test(lines[1].empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log4.txt", 2); + it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 2); test(it->read(1024, lines) && lines.size() == 3); test(lines[0] == "line 2"); test(lines[1] == "line 3"); test(lines[2].empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log4.txt", 100); + it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 100); 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 { - string path = testDir + "/log1.txt"; + string path = testDir + "/db/log1.txt"; ofstream os(path.c_str(), ios_base::out | ios_base::trunc); os << flush; - it = session->openServerLog("LogServer", testDir + "/log1.txt", -1); + it = session->openServerLog("LogServer", testDir + "/db/log1.txt", -1); 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(); - it = session->openServerLog("LogServer", testDir + "/log1.txt", 0); + it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 0); test(it->read(1024, lines) && lines.empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log1.txt", 1); + it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 1); test(!it->read(1024, lines) && lines.size() == 1 && isLongLineStart(lines[0])); test(!it->read(1024, lines) && lines.size() == 1 && isLongLineContent(lines[0])); test(it->read(1024, lines) && lines.size() == 2 && isLongLineEnd(lines[0]) && lines[1].empty()); test(it->read(1024, lines) && lines.empty()); it->destroy(); - it = session->openServerLog("LogServer", testDir + "/log1.txt", 2); + it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 2); test(!it->read(1024, lines) && lines.size() == 1 && isLongLineStart(lines[0])); test(!it->read(1024, lines) && lines.size() == 1 && isLongLineContent(lines[0])); test(!it->read(1024, lines) && lines.size() == 2 && isLongLineEnd(lines[0]) && isLongLineStart(lines[1])); 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,9 +1,9 @@ ---- 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:: - -rm -f build.txt log1.txt log2.txt log3.txt log4.txt + -rm -f build.txt db/log1.txt db/log2.txt db/log3.txt db/log4.txt -rm -rf db/node db/registry db/replica-* 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,17 +1,17 @@ ---- 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 @@ - + - - - - + + + + MY_ENV_VARIABLE=12 MY_UNIX_COMPOSED_VARIABLE=BAR;$MY_FOO MY_WINDOWS_COMPOSED_VARIABLE=BAR;%MY_FOO% 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,20 +1,20 @@ ---- 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"; - update.variables["icepatch.directory"] = "${test.dir}/data/updated"; + update.variables["icepatch.directory"] = "${test.dir}/db/data/updated"; 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"); - app.variables["icepatch.directory"] = "${test.dir}/data/original"; + app.variables["icepatch.directory"] = "${test.dir}/db/data/original"; test(app.nodes["localnode"].servers[2]->id == "server-dir1"); app.nodes["localnode"].servers[2]->applicationDistrib = false; 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,11 +1,11 @@ ---- 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 @@ - + 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,11 +1,11 @@ ---- 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() -datadir = os.path.join(os.getcwd(), "data") +datadir = os.path.join(os.getcwd(), "db/data") files = [ [ "original/rootfile", "rootfile" ], 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,21 +1,21 @@ ---- 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 +dbdir = os.path.join(os.getcwd(), "db") + if not TestUtil.isWin32() and os.getuid() == 0: - sys.stdout.write("\n") - sys.stdout.write("*** can't run test as root ***\n") - sys.stdout.write("\n") - sys.exit(0) + for root, dirs, files in os.walk(dbdir): + os.chown(os.path.join(dbdir, root), 65534, 65534) + for f in files: + os.chown(os.path.join(dbdir, root, f), 65534, 65534) + os.setuid(65534) name = os.path.join("IceGrid", "session") 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,31 +1,31 @@ ---- 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 // -# if OPENSSL_VERSION_NUMBER >= 0x10100000L +# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) const string anonCiphers = "ADH:@SECLEVEL=0"; # else const string anonCiphers = "ADH"; -@@ -2048,7 +2048,7 @@ +@@ -2060,7 +2060,7 @@ allTests(const CommunicatorPtr& communicator, const st // // No DSA support in Secure Transport / AIX 7.1 / SChannel // -#if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL) +#if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL) && !defined(LIBRESSL_VERSION_NUMBER) { // // DSA PEM keys are not supported with SChannel. Since Windows 10 -@@ -3215,9 +3215,7 @@ +@@ -3231,9 +3231,7 @@ allTests(const CommunicatorPtr& communicator, const st #endif } -#ifndef _AIX - // On AIX 6.1, the default root certificates don't validate demo.zeroc.com - +#if 0 // we don't want to talk to zeroc while building cout << "testing system CAs... " << flush; { InitializationData initData; 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,19 +1,19 @@ ---- 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) - os.system("rm -f {dir}/`openssl x509 -subject_hash -noout -in {pem}`.0".format(pem=pem, dir=certsPath)) + os.system("rm -f {dir}/`%%OPENSSLBASE%%/bin/openssl x509 -subject_hash -noout -in {pem}`.0".format(pem=pem, dir=certsPath)) 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) - os.system("cp {pem} {dir}/`openssl x509 -subject_hash -noout -in {pem}`.0".format(pem=pem, dir=certsPath)) + os.system("cp {pem} {dir}/`%%OPENSSLBASE%%/bin/openssl x509 -subject_hash -noout -in {pem}`.0".format(pem=pem, dir=certsPath)) TestUtil.clientServerTest(additionalClientOptions = '"%s"' % os.getcwd()) 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,95 +1,95 @@ ---- 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 +def execute(cmd): + return TestUtil.runCommand(cmd).wait() + 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) - os.system("rm -rf project1 tmp") + execute("rm -rf project1 tmp") clean() os.symlink("slices", "linktoslices") -@@ -43,7 +46,7 @@ +@@ -44,7 +47,7 @@ slicedir = TestUtil.getSliceDir() os.symlink(slicedir, "iceslices") def runTest(cmd): - os.system(cmd) + execute(cmd) f = open("b.h") if not re.search('#include \n' '#include \n' -@@ -71,9 +74,9 @@ +@@ -72,9 +75,9 @@ if os.path.exists("SLICES"): # # Slice files are symlinks, include dir is a regular directory # -os.system("mkdir -p project1/git/services.settings.slices") -os.system("mkdir -p project1/src/services/settings") -os.system("cd project1/src/services/settings && ln -s ../../../git/services.settings.slices slices") +execute("mkdir -p project1/git/services.settings.slices") +execute("mkdir -p project1/src/services/settings") +execute("cd project1/src/services/settings && ln -s ../../../git/services.settings.slices slices") 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 ") f.close() -os.system("cd project1 && %s -Isrc src/services/settings/slices/B.ice" % slice2cpp) +execute("cd project1 && %s -Isrc src/services/settings/slices/B.ice" % slice2cpp) f = open("project1/B.h") if not re.search(re.escape('#include '), 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 # -os.system("mkdir -p tmp/Ice-x.y.z/share") -os.system("cd tmp/Ice-x.y.z/share && ln -s %s" % slicedir) +execute("mkdir -p tmp/Ice-x.y.z/share") +execute("cd tmp/Ice-x.y.z/share && ln -s %s" % slicedir) -os.system("mkdir -p project1/share") -os.system("cd project1/share && ln -s %s/tmp/Ice-x.y.z/share/slice" % basedir) +execute("mkdir -p project1/share") +execute("cd project1/share && ln -s %s/tmp/Ice-x.y.z/share/slice" % basedir) f = open("project1/A.ice", "w") f.write("#include ") f.close() -os.system("cd project1 && %s -Ishare/slice A.ice" % slice2cpp) +execute("cd project1 && %s -Ishare/slice A.ice" % slice2cpp) f = open("project1/A.h") if not re.search(re.escape('#include '), 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 # -os.system("mkdir -p tmp/Ice-x.y.z/slice/Ice") -os.system("cd tmp && ln -s Ice-x.y.z Ice-x.y") +execute("mkdir -p tmp/Ice-x.y.z/slice/Ice") +execute("cd tmp && ln -s Ice-x.y.z Ice-x.y") f = open("tmp/Ice-x.y.z/slice/Ice/Identity.ice", "w") f.write("// dumy file") -os.system("mkdir -p project1") +execute("mkdir -p project1") f = open("project1/A.ice", "w") f.write("#include ") f.close() -os.system("cd project1 && %s -I%s/tmp/Ice-x.y/slice A.ice" % (slice2cpp, basedir)) +execute("cd project1 && %s -I%s/tmp/Ice-x.y/slice A.ice" % (slice2cpp, basedir)) f = open("project1/A.h") if not re.search(re.escape('#include '), f.read()): print("failed!") 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,11 +1,11 @@ ---- 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) -if TestUtil.isAIX() or TestUtil.isLinux(): +if TestUtil.isAIX() or TestUtil.isLinux() or TestUtil.isFreeBSD(): encoding = locale.getdefaultlocale()[1] if encoding != "UTF-8": print("Please set LC_ALL to xx_xx.UTF-8, for example FR_FR.UTF-8") 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,25 +1,25 @@ ---- 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 +--- cpp/test/include/TestCommon.h.orig 2019-08-12 19:54:18 UTC ++++ cpp/test/include/TestCommon.h +@@ -18,6 +18,22 @@ + # include #endif +#if defined(__FreeBSD__) +# include +# include +inline bool inFreeBSDJail() +{ + int jailed; + size_t size = sizeof(jailed); + return (sysctlbyname("security.jail.jailed", &jailed, &size, NULL, 0) != -1 || jailed); +} +#else +inline bool inFreeBSDJail() +{ + return false; +} +#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,11 +1,11 @@ ---- 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 +install:: @for subdir in $(INSTALL_SUBDIRS); \ do \ if test ! -d $(DESTDIR)$$subdir ; \ 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,28 +1,28 @@ ---- 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 - ifndef usr_dir_install - install_phpdir = $(prefix)/php - install_libdir = $(prefix)/php - else - install_phpdir = $(prefix)/share/php - install_libdir = $(shell $(PHP_CONFIG) --extension-dir) - endif + install_phpdir = $(prefix)/share/pear + install_libdir = $(prefix)/lib/php/$(PHP_EXT_DIR) endif ifdef ice_src_dist @@ -145,7 +140,8 @@ else endif ifeq ($(installphplib),) - installphplib = $(INSTALL) $(1) $(2); \ + installphplib = mkdir -p $(2) ; \ + $(INSTALL) $(1) $(2); \ chmod a+rx $(2)/$(notdir $(1)) 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,12 +1,12 @@ ---- 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 \ - $(INSTALL_DATA) -r $$i $(DESTDIR)$(install_phpdir) ; \ + mkdir -p $(DESTDIR)$(install_phpdir)/$$i ; \ + $(INSTALL_DATA) $$i/*.php $(DESTDIR)$(install_phpdir)/$$i ; \ done @for i in $(MODULE_SRCS) ; \ 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,11 +1,11 @@ ---- 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) -install:: install-common +install:: @for subdir in $(INSTALL_SUBDIRS); \ do \ if test ! -d $(DESTDIR)$$subdir ; \ 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,85 +1,86 @@ ---- 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. # -prefix ?= /opt/Ice-$(VERSION) +ICE_HOME = %%LOCALBASE%% +prefix ?= %%PREFIX%% # # 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. # -PYTHON ?= python +PYTHON ?= %%PYTHON_CMD%% 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 -ifndef usr_dir_install - install_pythondir = $(prefix)/python - install_libdir = $(prefix)/python -else +#ifndef usr_dir_install +# install_pythondir = $(prefix)/python +# install_libdir = $(prefix)/python +#else # # The install_dir script says where python wants site-packages installed. # - install_pythondir = $(shell $(PYTHON) $(top_srcdir)/config/install_dir) - install_libdir = $(install_pythondir) -endif + install_pythondir = %%PYTHON_SITELIBDIR%%/Ice + install_libdir = %%PYTHON_SITELIBDIR%%/Ice +#endif ifeq ($(UNAME),SunOS) ifeq ($(LP64),yes) -@@ -123,14 +124,10 @@ +@@ -123,15 +124,11 @@ ifeq ($(UNAME),SunOS) endif endif -ifdef ice_src_dist - ICE_LIB_DIR = -L$(ice_cpp_dir)/$(libsubdir) - ICE_FLAGS = -I$(ice_cpp_dir)/include -else - 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 - SLICEPARSERLIB = $(ice_cpp_dir)/$(libsubdir)/$(call mklibfilename,Slice,$(VERSION)) - ifeq ($(wildcard $(SLICEPARSERLIB)),) - SLICEPARSERLIB = $(ice_cpp_dir)/$(lib64subdir)/$(call mklibfilename,Slice,$(VERSION)) - endif + SLICEPARSERLIB = /usr/local/lib/$(call mklibfilename,Slice,$(VERSION)) else ifeq ($(UNAME),Darwin) SLICE2PY = /usr/local/bin/slice2py -@@ -167,7 +161,7 @@ +@@ -177,7 +171,7 @@ EVERYTHING = all depend clean install all:: $(SRCS) -%_ice.py: $(slicedir)/%.ice +%_ice.py: $(ICE_HOME)/%.ice rm -f $(*F).py $(SLICE2PY) $(SLICE2PYFLAGS) $< @mkdir -p .depend 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,119 +1,119 @@ ---- 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 -IcePy::PrimitiveInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory*) +IcePy::PrimitiveInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory*) { if(!validate(value)) { -@@ -1050,7 +1050,7 @@ +@@ -1108,7 +1108,7 @@ IcePy::EnumInfo::unmarshal(const Ice::InputStreamPtr& } void -IcePy::EnumInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory*) +IcePy::EnumInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory*) { if(!validate(value)) { -@@ -1305,7 +1311,7 @@ +@@ -1421,7 +1421,7 @@ IcePy::StructInfo::unmarshal(const Ice::InputStreamPtr } void -IcePy::StructInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history) +IcePy::StructInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history) { if(!validate(value)) { -@@ -1559,7 +1571,7 @@ +@@ -1689,7 +1689,7 @@ IcePy::SequenceInfo::unmarshal(const Ice::InputStreamP } void -IcePy::SequenceInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history) +IcePy::SequenceInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history) { if(!validate(value)) { -@@ -2397,7 +2409,7 @@ +@@ -2523,7 +2523,7 @@ IcePy::CustomInfo::unmarshal(const Ice::InputStreamPtr } void -IcePy::CustomInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history) +IcePy::CustomInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history) { if(!validate(value)) { -@@ -2597,7 +2615,7 @@ +@@ -2719,7 +2719,7 @@ IcePy::DictionaryInfo::unmarshaled(PyObject* val, PyOb } void -IcePy::DictionaryInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history) +IcePy::DictionaryInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history) { if(!validate(value)) { -@@ -2798,7 +2816,7 @@ +@@ -2911,7 +2911,7 @@ IcePy::ClassInfo::unmarshal(const Ice::InputStreamPtr& } void -IcePy::ClassInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history) +IcePy::ClassInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory* history) { if(!validate(value)) { -@@ -2863,7 +2881,7 @@ +@@ -2967,7 +2967,7 @@ IcePy::ClassInfo::destroy() } void -IcePy::ClassInfo::printMembers(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history) +IcePy::ClassInfo::printMembers(PyObject* value, PrintHelper& out, PrintObjectHistory* history) { if(base) { -@@ -3011,7 +3035,7 @@ +@@ -3115,7 +3115,7 @@ IcePy::ProxyInfo::unmarshal(const Ice::InputStreamPtr& } void -IcePy::ProxyInfo::print(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory*) +IcePy::ProxyInfo::print(PyObject* value, PrintHelper& out, PrintObjectHistory*) { 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 -IcePy::ExceptionInfo::printMembers(PyObject* value, IceUtilInternal::Output& out, PrintObjectHistory* history) +IcePy::ExceptionInfo::printMembers(PyObject* value, PrintHelper& out, PrintObjectHistory* history) { if(base) { -@@ -4209,7 +4233,7 @@ +@@ -4372,7 +4372,7 @@ IcePy_stringify(PyObject*, PyObject* args) assert(info); ostringstream ostr; - IceUtilInternal::Output out(ostr); + PrintHelper out(ostr); 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; - IceUtilInternal::Output out(ostr); + PrintHelper out(ostr); info->print(value, out); string str = ostr.str(); 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,150 +1,150 @@ ---- 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 objects; }; +struct PrintHelper +{ + std::ostream& os; + Ice::Long indent; + + PrintHelper(std::ostream& o): os(o), indent(0) {} + void newline() + { + os << "\n" << std::string(indent * 4, ' '); + os.flush(); + } + + void sb() + { + newline(); + os << "{"; + ++indent; + } + + void eb() + { + --indent; + newline(); + os << "}"; + } +}; + +template +inline PrintHelper& +operator<<(PrintHelper& ph, const T& val) +{ + ph.os << val; + return ph; +} + +template<> +inline PrintHelper& +operator<<(PrintHelper& ph, const IceUtilInternal::NextLine&) +{ + ph.newline(); + return ph; +} + + // // 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; - virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*) = 0; + virtual void print(PyObject*, PrintHelper&, PrintObjectHistory*) = 0; }; typedef IceUtil::Handle 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); - virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + virtual void print(PyObject*, PrintHelper&, PrintObjectHistory*); 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); - virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + virtual void print(PyObject*, PrintHelper&, PrintObjectHistory*); 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); - virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + virtual void print(PyObject*, PrintHelper&, PrintObjectHistory*); 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*); - virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + virtual void print(PyObject*, PrintHelper&, PrintObjectHistory*); 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); - virtual void print(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + virtual void print(PyObject*, PrintHelper&, PrintObjectHistory*); virtual void destroy(); - void printMembers(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + void printMembers(PyObject*, PrintHelper&, PrintObjectHistory*); 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&); - void print(PyObject*, IceUtilInternal::Output&); - void printMembers(PyObject*, IceUtilInternal::Output&, PrintObjectHistory*); + void print(PyObject*, PrintHelper&); + void printMembers(PyObject*, PrintHelper&, PrintObjectHistory*); std::string id; bool preserve; 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,16 +1,16 @@ ---- 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" - $(INSTALL_DATA) *.py $(DESTDIR)$(install_pythondir) + $(INSTALL_DATA) *.py* $(DESTDIR)$(install_pythondir) @for i in $(PACKAGES) ; \ do \ - $(INSTALL_DATA) -r $$i $(DESTDIR)$(install_pythondir) ; \ + mkdir -p $(DESTDIR)$(install_pythondir)/$$i ; \ + $(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,79 +1,79 @@ ---- 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 @@ # # ********************************************************************** -import Ice, Test, sys, threading +import Ice, Test, sys, threading, subprocess def test(b): if not b: raise RuntimeError('test assertion failed') +def isFreeBSD(): + return sys.platform.startswith("freebsd") + +def sysctl(key): + p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE) + try: + result = p.communicate()[0].strip().split()[1] + except IndexError: + return 0 + if sys.version_info >= (3,): + result = str(result, sys.stdout.encoding) + try: + return int(result) + except ValueError: + return result + +def isFreeBSDJail(): + return isFreeBSD() and sysctl("security.jail.jailed") + 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) - test(ipEndpoint.host == defaultHost) + test(ipEndpoint.host == defaultHost or isFreeBSDJail()) test(ipEndpoint.port > 0) test(ipEndpoint.timeout == 15000) udpEndpoint = endpoints[1].getInfo() - test(udpEndpoint.host == defaultHost) + test(udpEndpoint.host == defaultHost or isFreeBSDJail()) 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) - test(ipinfo.host == defaultHost) + test(ipinfo.host == defaultHost or isFreeBSDJail()) 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) - test(udp.host == defaultHost) + test(udp.host == defaultHost or isFreeBSDJail()) 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': - test(info.remoteAddress == defaultHost) - test(info.localAddress == defaultHost) + test(info.remoteAddress == defaultHost or isFreeBSDJail()) + test(info.localAddress == defaultHost or isFreeBSDJail()) test(info.rcvSize >= 1024) test(info.sndSize >= 2048) 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,15 +1,15 @@ ---- 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" - decodedPath = configPath.decode("utf-8") + decodedPath = configPath else: configPath = "./config/\u4e2d\u56fd_client.config" - 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,11 +1,11 @@ ---- 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) -if TestUtil.isAIX() or TestUtil.isLinux(): +if TestUtil.isAIX() or TestUtil.isLinux() or TestUtil.isFreeBSD(): encoding = locale.getdefaultlocale()[1] if encoding != "UTF-8": print("Please set LC_ALL to xx_xx.UTF-8, for example FR_FR.UTF-8") 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,11 +1,11 @@ ---- 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 - self.r.join() + self.r.join(timeout) # Simulate a match on EOF self.buf = self.r.getbuf() self.before = self.buf 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,21 +1,21 @@ ---- 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() + dbdir = os.path.join(os.getcwd(), "db") + if not TestUtil.isWin32() and os.getuid() == 0: - print - print("*** can't run test as root ***") - print - return + for root, dirs, files in os.walk(dbdir): + os.chown(os.path.join(dbdir, root), 65534, 65534) + for f in files: + os.chown(os.path.join(dbdir, root, f), 65534, 65534) + os.setuid(65534) client = TestUtil.getDefaultClientFile() if TestUtil.getDefaultMapping() != "java": 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,70 +1,70 @@ ---- 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"]) +def isFreeBSD(): + return sys.platform.startswith("freebsd") + +def sysctl(key): + p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE) + try: + result = p.communicate()[0].strip().split()[1] + except IndexError: + return 0 + if sys.version_info >= (3,): + result = str(result, sys.stdout.encoding) + try: + return int(result) + except ValueError: + return result + +def isFreeBSDJail(): + return isFreeBSD() and sysctl("security.jail.jailed") + 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() - if line == "x86_64" and os.environ.get("LP64", "") != "no": + if line in ["x86_64", "amd64"] and os.environ.get("LP64", "") != "no": 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") - command = '"%s" "%s"' % (sys.executable, + command = '"%s" "%s" 2>/dev/null' % (sys.executable, os.path.abspath(os.path.join(os.path.dirname(__file__), "icehashpassword.py"))) # -@@ -2013,7 +2032,7 @@ - addLdPath(getCppLibDir(lang), env) +@@ -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"]: + elif lang in ["cpp", "python", "ruby", "php", "js", "objective-c"]: # 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 @@ -1,394 +1,394 @@ bin/dumpdb bin/glacier2router bin/icebox bin/iceboxadmin bin/icegridadmin bin/icegriddb bin/icegridnode bin/icegridregistry bin/icepatch2calc bin/icepatch2client bin/icepatch2server bin/icestormadmin bin/icestormdb bin/icestormmigrate bin/slice2cpp bin/slice2cs bin/slice2freeze bin/slice2freezej bin/slice2html bin/slice2java bin/slice2js bin/slice2php bin/slice2py bin/transformdb include/Freeze/BackgroundSaveEvictor.h include/Freeze/Catalog.h include/Freeze/CatalogData.h include/Freeze/CatalogIndexList.h include/Freeze/Connection.h include/Freeze/ConnectionF.h include/Freeze/DB.h include/Freeze/Evictor.h include/Freeze/EvictorF.h include/Freeze/EvictorStorage.h include/Freeze/Exception.h include/Freeze/Freeze.h include/Freeze/Index.h include/Freeze/Initialize.h include/Freeze/Map.h include/Freeze/Transaction.h include/Freeze/TransactionHolder.h include/Freeze/TransactionalEvictor.h include/Glacier2/Application.h include/Glacier2/Config.h include/Glacier2/Glacier2.h include/Glacier2/Metrics.h include/Glacier2/NullPermissionsVerifier.h include/Glacier2/PermissionsVerifier.h include/Glacier2/PermissionsVerifierF.h include/Glacier2/Router.h include/Glacier2/RouterF.h include/Glacier2/SSLInfo.h include/Glacier2/Session.h include/Glacier2/SessionHelper.h include/Ice/ACMF.h include/Ice/Application.h include/Ice/AsyncResult.h include/Ice/AsyncResultF.h include/Ice/BasicStream.h include/Ice/BatchRequestInterceptor.h include/Ice/BatchRequestQueueF.h include/Ice/Buffer.h include/Ice/BuiltinSequences.h include/Ice/Communicator.h include/Ice/CommunicatorAsync.h include/Ice/CommunicatorF.h include/Ice/Config.h include/Ice/Connection.h include/Ice/ConnectionAsync.h include/Ice/ConnectionF.h include/Ice/ConnectionFactoryF.h include/Ice/ConnectionIF.h include/Ice/Current.h include/Ice/DefaultObjectFactory.h include/Ice/DeprecatedStringConverter.h include/Ice/DispatchInterceptor.h include/Ice/Dispatcher.h include/Ice/DynamicLibrary.h include/Ice/DynamicLibraryF.h include/Ice/Endpoint.h include/Ice/EndpointF.h include/Ice/EndpointTypes.h include/Ice/Exception.h include/Ice/FacetMap.h include/Ice/FactoryTable.h include/Ice/FactoryTableInit.h include/Ice/Format.h include/Ice/Functional.h include/Ice/GCObject.h include/Ice/Handle.h include/Ice/Ice.h include/Ice/Identity.h include/Ice/ImplicitContext.h include/Ice/ImplicitContextF.h include/Ice/Incoming.h include/Ice/IncomingAsync.h include/Ice/IncomingAsyncF.h include/Ice/Initialize.h include/Ice/InstanceF.h include/Ice/Instrumentation.h include/Ice/InstrumentationF.h include/Ice/LocalException.h include/Ice/LocalObject.h include/Ice/LocalObjectF.h include/Ice/Locator.h include/Ice/LocatorF.h include/Ice/Logger.h include/Ice/LoggerF.h include/Ice/LoggerUtil.h include/Ice/Metrics.h include/Ice/MetricsAdminI.h include/Ice/MetricsFunctional.h include/Ice/MetricsObserverI.h include/Ice/NativePropertiesAdmin.h include/Ice/Object.h include/Ice/ObjectAdapter.h include/Ice/ObjectAdapterF.h include/Ice/ObjectAdapterFactoryF.h include/Ice/ObjectF.h include/Ice/ObjectFactory.h include/Ice/ObjectFactoryF.h include/Ice/ObjectFactoryManagerF.h include/Ice/ObserverHelper.h include/Ice/Outgoing.h include/Ice/OutgoingAsync.h include/Ice/OutgoingAsyncF.h include/Ice/Plugin.h include/Ice/PluginF.h include/Ice/Process.h include/Ice/ProcessF.h include/Ice/Properties.h include/Ice/PropertiesAdmin.h include/Ice/PropertiesF.h include/Ice/Protocol.h include/Ice/Proxy.h include/Ice/ProxyF.h include/Ice/ProxyFactoryF.h include/Ice/ProxyHandle.h include/Ice/ReferenceF.h include/Ice/RegisterPlugins.h include/Ice/RemoteLogger.h include/Ice/RequestHandlerF.h include/Ice/ResponseHandlerF.h include/Ice/Router.h include/Ice/RouterF.h include/Ice/ServantLocator.h include/Ice/ServantLocatorF.h include/Ice/ServantManagerF.h include/Ice/Service.h include/Ice/SliceChecksumDict.h include/Ice/SliceChecksums.h include/Ice/SlicedData.h include/Ice/SlicedDataF.h include/Ice/Stream.h include/Ice/StreamF.h include/Ice/StreamHelpers.h include/Ice/ThreadPoolF.h include/Ice/UserExceptionFactory.h include/Ice/Version.h include/IceBox/Config.h include/IceBox/IceBox.h include/IceGrid/Admin.h include/IceGrid/Config.h include/IceGrid/Descriptor.h include/IceGrid/Exception.h include/IceGrid/FileParser.h include/IceGrid/IceGrid.h include/IceGrid/Locator.h include/IceGrid/Observer.h include/IceGrid/PluginFacade.h include/IceGrid/Query.h include/IceGrid/Registry.h include/IceGrid/ReplicaGroupFilter.h include/IceGrid/Session.h include/IceGrid/UserAccountMapper.h include/IcePatch2/ClientUtil.h include/IcePatch2/Config.h include/IcePatch2/FileInfo.h include/IcePatch2/FileServer.h include/IcePatch2/IcePatch2.h include/IceSSL/Config.h include/IceSSL/ConnectionInfo.h include/IceSSL/EndpointInfo.h include/IceSSL/IceSSL.h include/IceSSL/Plugin.h include/IceStorm/Config.h include/IceStorm/IceStorm.h include/IceStorm/Metrics.h include/IceUtil/AbstractMutex.h include/IceUtil/Atomic.h include/IceUtil/Cache.h include/IceUtil/Cond.h include/IceUtil/Config.h include/IceUtil/CountDownLatch.h include/IceUtil/CtrlCHandler.h include/IceUtil/DisableWarnings.h include/IceUtil/Exception.h include/IceUtil/Functional.h include/IceUtil/Handle.h include/IceUtil/IceUtil.h include/IceUtil/IconvStringConverter.h include/IceUtil/InputUtil.h include/IceUtil/Iterator.h include/IceUtil/Lock.h include/IceUtil/Monitor.h include/IceUtil/Mutex.h include/IceUtil/MutexProtocol.h include/IceUtil/MutexPtrLock.h include/IceUtil/MutexPtrTryLock.h include/IceUtil/Optional.h include/IceUtil/Options.h include/IceUtil/OutputUtil.h include/IceUtil/PopDisableWarnings.h include/IceUtil/PushDisableWarnings.h include/IceUtil/Random.h include/IceUtil/RecMutex.h include/IceUtil/SHA1.h include/IceUtil/ScannerConfig.h include/IceUtil/ScopedArray.h include/IceUtil/Shared.h include/IceUtil/StringConverter.h include/IceUtil/StringUtil.h include/IceUtil/Thread.h include/IceUtil/ThreadException.h include/IceUtil/Time.h include/IceUtil/Timer.h include/IceUtil/UUID.h include/IceUtil/UndefSysMacros.h include/IceUtil/UniquePtr.h include/Slice/CPlusPlusUtil.h include/Slice/Checksum.h include/Slice/CsUtil.h include/Slice/DotNetNames.h include/Slice/FileTracker.h include/Slice/JavaUtil.h include/Slice/ObjCUtil.h include/Slice/PHPUtil.h include/Slice/Parser.h include/Slice/Preprocessor.h 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 man/man1/icebox.1.gz man/man1/iceboxadmin.1.gz man/man1/icegridadmin.1.gz man/man1/icegriddb.1.gz man/man1/icegridnode.1.gz man/man1/icegridregistry.1.gz man/man1/icepatch2calc.1.gz man/man1/icepatch2client.1.gz man/man1/icepatch2server.1.gz man/man1/icestormadmin.1.gz man/man1/icestormdb.1.gz man/man1/icestormmigrate.1.gz man/man1/slice2cpp.1.gz man/man1/slice2cs.1.gz man/man1/slice2freeze.1.gz man/man1/slice2freezej.1.gz man/man1/slice2html.1.gz man/man1/slice2java.1.gz man/man1/slice2js.1.gz man/man1/slice2php.1.gz man/man1/slice2py.1.gz man/man1/transformdb.1.gz %%DATADIR%%/Freeze/BackgroundSaveEvictor.ice %%DATADIR%%/Freeze/CatalogData.ice %%DATADIR%%/Freeze/Connection.ice %%DATADIR%%/Freeze/ConnectionF.ice %%DATADIR%%/Freeze/DB.ice %%DATADIR%%/Freeze/Evictor.ice %%DATADIR%%/Freeze/EvictorF.ice %%DATADIR%%/Freeze/EvictorStorage.ice %%DATADIR%%/Freeze/Exception.ice %%DATADIR%%/Freeze/Transaction.ice %%DATADIR%%/Freeze/TransactionalEvictor.ice %%DATADIR%%/Glacier2/Metrics.ice %%DATADIR%%/Glacier2/PermissionsVerifier.ice %%DATADIR%%/Glacier2/PermissionsVerifierF.ice %%DATADIR%%/Glacier2/Router.ice %%DATADIR%%/Glacier2/RouterF.ice %%DATADIR%%/Glacier2/SSLInfo.ice %%DATADIR%%/Glacier2/Session.ice %%DATADIR%%/ICE_LICENSE %%DATADIR%%/Ice/BuiltinSequences.ice %%DATADIR%%/Ice/Communicator.ice %%DATADIR%%/Ice/CommunicatorF.ice %%DATADIR%%/Ice/Connection.ice %%DATADIR%%/Ice/ConnectionF.ice %%DATADIR%%/Ice/Current.ice %%DATADIR%%/Ice/Endpoint.ice %%DATADIR%%/Ice/EndpointF.ice %%DATADIR%%/Ice/EndpointTypes.ice %%DATADIR%%/Ice/FacetMap.ice %%DATADIR%%/Ice/Identity.ice %%DATADIR%%/Ice/ImplicitContext.ice %%DATADIR%%/Ice/ImplicitContextF.ice %%DATADIR%%/Ice/Instrumentation.ice %%DATADIR%%/Ice/InstrumentationF.ice %%DATADIR%%/Ice/LocalException.ice %%DATADIR%%/Ice/Locator.ice %%DATADIR%%/Ice/LocatorF.ice %%DATADIR%%/Ice/Logger.ice %%DATADIR%%/Ice/LoggerF.ice %%DATADIR%%/Ice/Metrics.ice %%DATADIR%%/Ice/ObjectAdapter.ice %%DATADIR%%/Ice/ObjectAdapterF.ice %%DATADIR%%/Ice/ObjectFactory.ice %%DATADIR%%/Ice/ObjectFactoryF.ice %%DATADIR%%/Ice/Plugin.ice %%DATADIR%%/Ice/PluginF.ice %%DATADIR%%/Ice/Process.ice %%DATADIR%%/Ice/ProcessF.ice %%DATADIR%%/Ice/Properties.ice %%DATADIR%%/Ice/PropertiesAdmin.ice %%DATADIR%%/Ice/PropertiesF.ice %%DATADIR%%/Ice/RemoteLogger.ice %%DATADIR%%/Ice/Router.ice %%DATADIR%%/Ice/RouterF.ice %%DATADIR%%/Ice/ServantLocator.ice %%DATADIR%%/Ice/ServantLocatorF.ice %%DATADIR%%/Ice/SliceChecksumDict.ice %%DATADIR%%/Ice/Version.ice %%DATADIR%%/IceBox/IceBox.ice %%DATADIR%%/IceDiscovery/IceDiscovery.ice %%DATADIR%%/IceGrid/Admin.ice %%DATADIR%%/IceGrid/Descriptor.ice %%DATADIR%%/IceGrid/Exception.ice %%DATADIR%%/IceGrid/FileParser.ice %%DATADIR%%/IceGrid/Locator.ice %%DATADIR%%/IceGrid/Observer.ice %%DATADIR%%/IceGrid/PluginFacade.ice %%DATADIR%%/IceGrid/Query.ice %%DATADIR%%/IceGrid/Registry.ice %%DATADIR%%/IceGrid/Session.ice %%DATADIR%%/IceGrid/UserAccountMapper.ice %%DATADIR%%/IceLocatorDiscovery/IceLocatorDiscovery.ice %%DATADIR%%/IcePatch2/FileInfo.ice %%DATADIR%%/IcePatch2/FileServer.ice %%DATADIR%%/IceSSL/ConnectionInfo.ice %%DATADIR%%/IceSSL/EndpointInfo.ice %%DATADIR%%/IceStorm/IceStorm.ice %%DATADIR%%/IceStorm/Metrics.ice %%DATADIR%%/LICENSE %%DATADIR%%/config/icegrid-slice.3.5.ice.gz %%DATADIR%%/config/icegrid-slice.3.6.ice.gz %%DATADIR%%/config/templates.xml %%DATADIR%%/config/upgradeicegrid36.py