svn commit: r391942 - in head/devel: ice ice/files php5-ice py-ice
Michael Gmelin
grembo at FreeBSD.org
Mon Jul 13 19:48:41 UTC 2015
Author: grembo
Date: Mon Jul 13 19:48:31 2015
New Revision: 391942
URL: https://svnweb.freebsd.org/changeset/ports/391942
Log:
Update devel/ice, devel/py-ice and devel/php5-ice to 3.6.0
PR: 201143
Differential Revision: https://reviews.freebsd.org/D2930
Reviewed by: bapt
Approved by: bapt
Tested by: Roger Leigh <rleigh at codelibre.net>
Added:
head/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h (contents, props changed)
head/devel/ice/files/patch-cpp-include-IceUtil-Config.h (contents, props changed)
head/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h (contents, props changed)
head/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp (contents, props changed)
head/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp (contents, props changed)
head/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp (contents, props changed)
head/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceGrid-session-run.py (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp (contents, props changed)
head/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py (contents, props changed)
head/devel/ice/files/patch-cpp-test-Slice-headers-run.py (contents, props changed)
head/devel/ice/files/patch-python-Makefile (contents, props changed)
head/devel/ice/files/patch-python-config-Make.rules (contents, props changed)
head/devel/ice/files/patch-python-modules-IcePy-Types.cpp (contents, props changed)
head/devel/ice/files/patch-python-modules-IcePy-Types.h (contents, props changed)
head/devel/ice/files/patch-python-python-Makefile (contents, props changed)
head/devel/ice/files/patch-python-test-Ice-info-AllTests.py (contents, props changed)
head/devel/ice/files/patch-scripts-IceGridAdmin.py (contents, props changed)
head/devel/ice/files/patch-scripts-icehashpassword.py (contents, props changed)
Deleted:
head/devel/ice/files/patch-cpp-include-Ice-Basicstream.h
head/devel/ice/files/patch-cpp-include-Ice-IconvStringConverter.h
head/devel/ice/files/patch-cpp-src-Ice-.depend
head/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.cpp
head/devel/ice/files/patch-cpp-src-IceGrid-AdapterCache.h
head/devel/ice/files/patch-cpp-src-IceGrid-Database.cpp
head/devel/ice/files/patch-cpp-src-slice2cpp-Gen.cpp
head/devel/ice/files/patch-cpp-test-Glacier2-staticFiltering-run.py
head/devel/ice/files/patch-py-Makefile
head/devel/ice/files/patch-py-config-Make.rules
head/devel/ice/files/patch-py-modules-IcePy-Types.cpp
head/devel/ice/files/patch-py-modules-IcePy-Types.h
head/devel/ice/files/patch-py-python-Makefile
head/devel/ice/files/patch-py-test-Ice-info-AllTests.py
Modified:
head/devel/ice/Makefile
head/devel/ice/distinfo
head/devel/ice/files/Make.rules.FreeBSD
head/devel/ice/files/patch-config-Make.common.rules
head/devel/ice/files/patch-cpp-Makefile
head/devel/ice/files/patch-cpp-allTests.py
head/devel/ice/files/patch-cpp-config-Make.rules
head/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp
head/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
head/devel/ice/files/patch-php-config-Make.rules.php
head/devel/ice/files/patch-scripts-Expect.py
head/devel/ice/files/patch-scripts-TestUtil.py
head/devel/ice/pkg-plist
head/devel/php5-ice/Makefile
head/devel/php5-ice/pkg-plist
head/devel/py-ice/Makefile
head/devel/py-ice/pkg-plist
Modified: head/devel/ice/Makefile
==============================================================================
--- head/devel/ice/Makefile Mon Jul 13 19:47:17 2015 (r391941)
+++ head/devel/ice/Makefile Mon Jul 13 19:48:31 2015 (r391942)
@@ -2,10 +2,8 @@
# $FreeBSD$
PORTNAME= Ice
-PORTVERSION= 3.5.1
-PORTREVISION= 7
+PORTVERSION= 3.6.0
CATEGORIES= devel
-MASTER_SITES= http://download.zeroc.com/Ice/3.5/
MAINTAINER= freebsd at grem.de
COMMENT= Modern alternative to object middleware such as CORBA/COM/DCOM/COM+
@@ -24,10 +22,9 @@ LIB_DEPENDS+= libIce.so.${LIB_VRS}:${PO
PLIST_SUB+= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}"
.endif
-OPTIONS_DEFINE?= DEBUG DEMOS DOCS TESTS
-OPTIONS_DEFAULT?= DEMOS TESTS
+OPTIONS_DEFINE?= DEBUG TESTS
+OPTIONS_DEFAULT?= TESTS
TESTS_DESC?= Build and run tests (requires lang/python)
-DEMOS_DESC?= Build demos
.include <bsd.port.options.mk>
@@ -35,29 +32,30 @@ USES+= iconv gmake
.if ${PORT_OPTIONS:MTESTS} && ${SLAVE_PORT} == "no"
USES+= python:build
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}passlib>0:${PORTSDIR}/security/py-passlib
.endif
+WRKSRC= ${WRKDIR}/ice-${PORTVERSION}
+
USE_BDB= yes
WANT_BDB_VER= 5
INVALID_BDB_VER= 40 41 42 43 44 46 47 48 6
USE_LDCONFIG= yes
BUILD_WRKSRC?= ${WRKSRC}/cpp
INSTALL_WRKSRC?= ${WRKSRC}/cpp
+USE_GITHUB= yes
+GH_ACCOUNT= zeroc-ice
+GH_TAGNAME= v3.6.0
+
CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include
-.if ${PORT_OPTIONS:MDEBUG}
-CFLAGS+= -g
-.else
-CFLAGS+= -DNDEBUG
-.endif
-.if ${ARCH} == "ia64"
-BROKEN= does not compile on ia64
+.if !${PORT_OPTIONS:MDEBUG}
+CFLAGS+= -DNDEBUG
.endif
-.if ${ARCH} == "sparc64"
-BROKEN= fails to link
-.endif
+BROKEN_ia64= Does not compile on ${ARCH}
+BROKEN_sparc64= Does not compile on ${ARCH}
.if ((${ARCH} != i386) && (${ARCH} != powerpc))
MAKE_ENV+= LP64=yes
@@ -67,12 +65,8 @@ MAKE_ENV+= LP64=yes
MAKE_ENV+= NOTESTS=yes
.endif
-.if !${PORT_OPTIONS:MDEMOS}
-MAKE_ENV+= NODEMOS=yes
-.endif
-
-.if !${PORT_OPTIONS:MDOCS}
-MAKE_ENV+= NOICEDOCS=yes
+.if ${SLAVE_PORT} == "no"
+MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/cpp/lib:$$LD_LIBRARY_PATH
.endif
.include <bsd.port.pre.mk>
@@ -117,21 +111,26 @@ post-patch:
${WRKSRC}/cpp/config/Make.rules
@${REINPLACE_CMD} '/install_configdir/d' \
${WRKSRC}/cpp/config/Make.rules
- @${REINPLACE_CMD} 's|INSTALL_PROGRAM|INSTALL_DATA|g' \
- ${WRKSRC}/cpp/src/ca/Makefile
@${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}/py/config/Make.rules
+ 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
+.if empty(ICONV_LIB)
+ # native iconv detected
+ @${REINPLACE_CMD} \
+ -e 's|<iconv.h>|</usr/include/iconv.h>|g;' \
+ ${WRKSRC}/cpp/include/IceUtil/IconvStringConverter.h
+.endif
.if ${PORT_OPTIONS:MTESTS}
TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
@@ -141,4 +140,9 @@ check regression-test test: build
pre-install: regression-test
.endif
+.if ${SLAVE_PORT} == "no"
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.*
+.endif
+
.include <bsd.port.post.mk>
Modified: head/devel/ice/distinfo
==============================================================================
--- head/devel/ice/distinfo Mon Jul 13 19:47:17 2015 (r391941)
+++ head/devel/ice/distinfo Mon Jul 13 19:48:31 2015 (r391942)
@@ -1,2 +1,2 @@
-SHA256 (Ice-3.5.1.tar.gz) = 989e51194c6adadbd156da3288e37bad847b93b3b876502e83033b70493af392
-SIZE (Ice-3.5.1.tar.gz) = 4799296
+SHA256 (zeroc-ice-Ice-3.6.0-v3.6.0_GH0.tar.gz) = 77933580cdc7fade0ebfce517935819e9eef5fc6b9e3f4143b07404daf54e25e
+SIZE (zeroc-ice-Ice-3.6.0-v3.6.0_GH0.tar.gz) = 5300956
Modified: head/devel/ice/files/Make.rules.FreeBSD
==============================================================================
--- head/devel/ice/files/Make.rules.FreeBSD Mon Jul 13 19:47:17 2015 (r391941)
+++ head/devel/ice/files/Make.rules.FreeBSD Mon Jul 13 19:48:31 2015 (r391942)
@@ -3,12 +3,12 @@ mkshlib = $(CXX) -shared
BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib %%ICONV_LIB%%
LIBS = -lIce $(BASELIBS)
-ICEUTIL_OS_LIBS = -pthread
+CRYPT_OS_LIBS = -lcrypt
+ICEUTIL_OS_LIBS = -pthread -lcrypto
PLATFORM_HAS_READLINE := yes
-export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH)
-
+cpp11libdirsuffix =
lp64suffix =
create_runpath_symlink = no
prefix = %%PREFIX%%
Modified: head/devel/ice/files/patch-config-Make.common.rules
==============================================================================
--- head/devel/ice/files/patch-config-Make.common.rules Mon Jul 13 19:47:17 2015 (r391941)
+++ head/devel/ice/files/patch-config-Make.common.rules Mon Jul 13 19:48:31 2015 (r391942)
@@ -1,18 +1,40 @@
---- config.orig/Make.common.rules 2013-05-20 22:21:58.666286011 +0000
-+++ config/Make.common.rules 2013-05-20 22:20:50.897196090 +0000
-@@ -19,7 +19,7 @@
- SHORT_VERSION = 3.4
- SOVERSION = 34
+--- config/Make.common.rules.orig 2015-06-23 15:30:20.000000000 +0000
++++ config/Make.common.rules 2015-06-27 23:55:59.468049240 +0000
+@@ -19,7 +19,8 @@
+ SHORT_VERSION = 3.6
+ SOVERSION = 36
--INSTALL = cp -fp
-+INSTALL = %%INSTALL_PROGRAM%%
- INSTALL_PROGRAM = ${INSTALL}
- INSTALL_LIBRARY = ${INSTALL}
- INSTALL_DATA = ${INSTALL}
-@@ -386,11 +386,15 @@
- then \
- echo "Creating $(DESTDIR)$(install_slicedir)..." ; \
- $(call mkdir, $(DESTDIR)$(install_slicedir), -p) ; \
+-INSTALL = cp -fp
++override DESTDIR =
++INSTALL = %%INSTALL_PROGRAM%%
+ INSTALL_PROGRAM = ${INSTALL}
+ INSTALL_LIBRARY = ${INSTALL}
+ INSTALL_DATA = ${INSTALL}
+@@ -49,13 +50,13 @@
+ #
+ # 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
+
+ #
+ # A /usr style layout can be forced by setting USR_DIR_INSTALL=yes.
+@@ -461,20 +463,24 @@
+ then \
+ ln -s Ice-$(VERSION)/slice $(DESTDIR)/$(prefix)/share/slice ; \
+ fi ; \
+ fi
+
+ @if test -d $(DESTDIR)$(install_slicedir) ; \
@@ -26,20 +48,16 @@
- fi
+ fi
-@@ -410,12 +410,12 @@
- fi
-
-
-- @if test ! -f $(DESTDIR)$(prefix)/CHANGES$(TEXT_EXTENSION) ; \
-+ @if test ! -f $(DESTDIR)$(install_slicedir)/CHANGES$(TEXT_EXTENSION) ; \
+- @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)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \
-+ $(call installdata,$(top_srcdir)/../CHANGES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
+- $(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)$(prefix)/RELEASE_NOTES$(TEXT_EXTENSION) ; \
-+ @if test ! -f $(DESTDIR)$(install_slicedir)/RELEASE_NOTES$(TEXT_EXTENSION) ; \
+- @if test ! -f $(DESTDIR)$(install_docdir)/LICENSE$(TEXT_EXTENSION) ; \
++ @if test ! -f $(DESTDIR)$(install_slicedir)/LICENSE$(TEXT_EXTENSION) ; \
then \
-- $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(prefix)) ; \
-+ $(call installdata,$(top_srcdir)/../RELEASE_NOTES$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
+- $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \
++ $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \
fi
Modified: head/devel/ice/files/patch-cpp-Makefile
==============================================================================
--- head/devel/ice/files/patch-cpp-Makefile Mon Jul 13 19:47:17 2015 (r391941)
+++ head/devel/ice/files/patch-cpp-Makefile Mon Jul 13 19:48:31 2015 (r391942)
@@ -1,26 +1,13 @@
---- cpp.orig/Makefile 2013-03-11 15:19:46.000000000 +0000
-+++ cpp/Makefile 2013-05-19 22:06:57.713280491 +0000
-@@ -11,11 +11,22 @@
+--- 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 @@
- include $(top_srcdir)/config/Make.rules
+ SUBDIRS = config src include
--SUBDIRS = config src include test
-+SUBDIRS = config src include
-+
+-ifneq ($(MAKECMDGOALS),install)
+- SUBDIRS := $(SUBDIRS) test
+ifeq ($(NOTESTS),)
-+SUBDIRS := $(SUBDIRS) test
-+endif
-
- ifeq ($(shell uname | grep MINGW),)
-+ifeq ($(NODEMOS),)
- SUBDIRS := $(SUBDIRS) demo
++ SUBDIRS := $(SUBDIRS) test
endif
-+endif
-+
-+ifeq ($(NOICEDOCS),)
-+SUBDIRS := $(SUBDIRS) doc
-+endif
-+
-
- INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
+ INSTALL_SUBDIRS = $(install_bindir) $(install_libdir)$(cpp11libdirsuffix) $(install_includedir) \
Modified: head/devel/ice/files/patch-cpp-allTests.py
==============================================================================
--- head/devel/ice/files/patch-cpp-allTests.py Mon Jul 13 19:47:17 2015 (r391941)
+++ head/devel/ice/files/patch-cpp-allTests.py Mon Jul 13 19:48:31 2015 (r391942)
@@ -1,6 +1,6 @@
---- cpp.orig/allTests.py 2013-03-11 15:19:58.000000000 +0000
-+++ cpp/allTests.py 2013-05-19 22:25:00.000000000 +0000
-@@ -62,7 +63,7 @@
+--- 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 @@
("Ice/servantLocator", ["core"]),
("Ice/interceptor", ["core"]),
("Ice/stringConverter", ["core"]),
@@ -8,17 +8,22 @@
+ ("Ice/udp", ["core", "nofreebsdjail"]),
("Ice/defaultServant", ["core"]),
("Ice/defaultValue", ["core"]),
- ("Ice/invoke", ["core", "novc6"]),
-@@ -85,7 +85,7 @@
- ("IceStorm/federation2", ["service", "novc90", "nomingw"]),
- ("IceStorm/stress", ["service", "stress", "novc90", "noappverifier", "nomingw"]), # Too slow with appverifier.
- ("IceStorm/rep1", ["service", "novc90", "nomingw"]),
-- ("IceStorm/repgrid", ["service", "novc90", "nomingw"]),
-+ ("IceStorm/repgrid", ["service", "novc90", "nomingw", "nofreebsd"]),
- ("IceStorm/repstress", ["service", "noipv6", "stress", "novc90", "nomingw"]),
- ("FreezeScript/dbmap", ["once", "novc90", "nomingw"]),
- ("FreezeScript/evictor", ["once", "novc90", "nomingw"]),
-@@ -106,8 +107,8 @@
+ ("Ice/invoke", ["core"]),
+@@ -90,11 +90,11 @@
+ ("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 @@
#
if TestUtil.isWin32() or os.getuid() == 0:
tests += [
Modified: head/devel/ice/files/patch-cpp-config-Make.rules
==============================================================================
--- head/devel/ice/files/patch-cpp-config-Make.rules Mon Jul 13 19:47:17 2015 (r391941)
+++ head/devel/ice/files/patch-cpp-config-Make.rules Mon Jul 13 19:48:31 2015 (r391942)
@@ -1,13 +1,13 @@
---- cpp.orig/config/Make.rules Fri Mar 11 16:19:00 2013
-+++ cpp/config/Make.rules Fri May 19 22:00:09 2013
-@@ -233,7 +233,9 @@
- 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
+--- cpp/config/Make.rules.orig 2015-06-23 15:30:20.000000000 +0000
++++ cpp/config/Make.rules 2015-06-27 10:26:42.692387147 +0000
+@@ -240,7 +240,9 @@
+ 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
Added: head/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-include-Ice-FactoryTableInit.h Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +1,59 @@
+--- 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 @@
+
+ DefaultUserExceptionFactoryInit(const char* typeId) :
+ _typeId(typeId)
++#if defined(ICE_BROKEN_ATEXIT)
++ , _ftableInit(new IceInternal::FactoryTableInit)
++#endif
+ {
+ factoryTable->addExceptionFactory(_typeId, new DefaultUserExceptionFactory<E>(_typeId));
+ }
+@@ -55,10 +65,16 @@
+ ~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<class O>
+@@ -67,7 +83,10 @@
+ public:
+
+ DefaultObjectFactoryInit(const char* typeId) :
+- _typeId(typeId)
++ _typeId(typeId)
++#if defined(ICE_BROKEN_ATEXIT)
++ , _ftableInit(new IceInternal::FactoryTableInit)
++#endif
+ {
+ factoryTable->addObjectFactory(_typeId, new DefaultObjectFactory<O>(_typeId));
+ }
+@@ -75,11 +94,16 @@
+ ~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
+ };
+
+ }
Added: head/devel/ice/files/patch-cpp-include-IceUtil-Config.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-include-IceUtil-Config.h Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +1,19 @@
+--- cpp/include/IceUtil/Config.h.orig 2015-06-27 15:37:32.688102665 +0000
++++ cpp/include/IceUtil/Config.h 2015-06-27 15:37:34.926179135 +0000
+@@ -49,6 +49,16 @@
+ #endif
+
+ //
++// FreeBSD 10.0-RELEASE had a broken atexit handler
++// (affects the order of static destruction)
++#if defined(__FreeBSD__)
++#include <sys/param.h>
++# if __FreeBSD_version < 1000700
++# define ICE_BROKEN_ATEXIT = 1
++# endif
++#endif
++
++//
+ // Check for C++ 11 support
+ //
+ // For GCC, we recognize --std=c++0x only for GCC version 4.5 and greater,
Added: head/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-include-IceUtil-ScannerConfig.h Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +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
+@@ -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
+
Added: head/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +1,64 @@
+--- cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp.orig 2015-06-23 15:30:20.000000000 +0000
++++ cpp/src/Glacier2CryptPermissionsVerifier/CryptPermissionsVerifierI.cpp 2015-06-27 17:04:09.625743300 +0000
+@@ -17,6 +17,8 @@
+
+ #if defined(__GLIBC__)
+ # include <crypt.h>
++#elif defined(__FreeBSD__)
++# include <unistd.h>
+ #elif defined(__APPLE__)
+ # include <CoreFoundation/CoreFoundation.h>
+ # include <Security/Security.h>
+@@ -33,6 +35,28 @@
+ namespace
+ {
+
++#if defined(__FreeBSD__)
++IceUtil::Mutex* _staticMutex = 0;
++
++class Init
++{
++public:
++
++ Init()
++ {
++ _staticMutex = new IceUtil::Mutex;
++ }
++
++ ~Init()
++ {
++ delete _staticMutex;
++ _staticMutex = 0;
++ }
++};
++
++Init init;
++#endif
++
+ class CryptPermissionsVerifierI : public PermissionsVerifier
+ {
+ public:
+@@ -140,7 +164,7 @@
+ {
+ return false;
+ }
+-#if defined(__GLIBC__)
++#if defined(__GLIBC__) || defined(__FreeBSD__)
+ size_t i = p->second.rfind('$');
+ string salt;
+ if(i == string::npos)
+@@ -162,9 +186,14 @@
+ return false;
+ }
+ }
++# if defined(__GLIBC__)
+ struct crypt_data data;
+ data.initialized = 0;
+ return p->second == crypt_r(password.c_str(), salt.c_str(), &data);
++# else
++ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(_staticMutex);
++ return p->second == crypt(password.c_str(), salt.c_str());
++# endif
+ #elif defined(__APPLE__) || defined(_WIN32)
+ //
+ // Pbkdf2 string format:
Added: head/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +1,11 @@
+--- cpp/src/Ice/StreamSocket.cpp.orig 2015-07-03 16:22:19.091609986 +0200
++++ cpp/src/Ice/StreamSocket.cpp 2015-07-03 16:22:32.355937985 +0200
+@@ -32,7 +32,7 @@
+ #ifndef ICE_USE_IOCP
+ if(doConnect(_fd, _proxy ? _proxy->getAddress() : _addr, sourceAddr))
+ {
+- _state = StateConnected;
++ _state = _proxy ? StateProxyWrite : StateConnected;
+ }
+ #endif
+ _desc = fdToString(_fd, _proxy, _addr);
Added: head/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-src-IceGrid-PluginFacadeI.cpp Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +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 @@
+ 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;
Added: head/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-src-IceGrid-RegistryI.cpp Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +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 @@
+ using namespace Ice;
+ using namespace IceGrid;
+
++namespace IceGrid
++{
++
++ICE_GRID_API void setRegistryPluginFacade(const RegistryPluginFacadePtr&);
++
++}
++
+ namespace
+ {
+
+@@ -159,6 +166,7 @@
+
+ RegistryI::~RegistryI()
+ {
++ IceGrid::setRegistryPluginFacade(0);
+ }
+
+ bool
Modified: head/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp
==============================================================================
--- head/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp Mon Jul 13 19:47:17 2015 (r391941)
+++ head/devel/ice/files/patch-cpp-test-Ice-info-AllTests.cpp Mon Jul 13 19:48:31 2015 (r391942)
@@ -1,31 +1,20 @@
---- cpp.orig/test/Ice/info/AllTests.cpp 2011-06-15 21:43:59.000000000 +0200
-+++ cpp/test/Ice/info/AllTests.cpp 2012-03-04 20:14:53.000000000 +0100
-@@ -141,9 +141,11 @@
+--- 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 @@
test(info->adapterName.empty());
test(info->localPort > 0);
test(info->remotePort == 12010);
-- test(info->remoteAddress == defaultHost);
-- test(info->localAddress == defaultHost);
--
-+ if (!inFreeBSDJail())
-+ {
-+ test(info->remoteAddress == defaultHost);
-+ test(info->localAddress == defaultHost);
-+ }
- ostringstream os;
-
- Ice::Context ctx = testIntf->getConnectionInfoAsContext();
-@@ -163,8 +165,11 @@
+- 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 @@
test(info->adapterName.empty());
test(info->localPort > 0);
test(info->remotePort == 12010);
-- test(info->remoteAddress ==defaultHost);
-- test(info->localAddress == defaultHost);
-+ if (!inFreeBSDJail())
-+ {
-+ test(info->remoteAddress == defaultHost);
-+ test(info->localAddress == defaultHost);
-+ }
- }
- cout << "ok" << endl;
-
+- if(defaultHost == "127.0.0.1")
++ if(defaultHost == "127.0.0.1" && !inFreeBSDJail())
+ {
+ test(info->remoteAddress == defaultHost);
+ test(info->localAddress == defaultHost);
Modified: head/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
==============================================================================
--- head/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp Mon Jul 13 19:47:17 2015 (r391941)
+++ head/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp Mon Jul 13 19:48:31 2015 (r391942)
@@ -1,32 +1,50 @@
---- cpp.orig/test/Ice/metrics/AllTests.cpp 2013-03-11 15:19:47.000000000 +0000
-+++ cpp/test/Ice/metrics/AllTests.cpp 2013-05-20 02:11:00.939194168 +0000
-@@ -597,9 +597,12 @@
- 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", "");
-@@ -814,9 +817,12 @@
- 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);
+--- 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 @@
+ 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 @@
+ 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 @@
+ }
+ 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 @@
+ 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);
Added: head/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-test-IceGrid-admin-run.py Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +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 @@
+ 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();
+
Added: head/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +1,190 @@
+--- cpp/test/IceGrid/deployer/AllTests.cpp.orig 2015-07-04 13:12:57.306420997 +0200
++++ cpp/test/IceGrid/deployer/AllTests.cpp 2015-07-04 13:13:30.146599997 +0200
+@@ -126,21 +126,21 @@
+ //
+ // 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 @@
+ //
+ // 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 @@
+ //
+ // 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 @@
+ //
+ // 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 @@
+ 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 @@
+
+ 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 @@
+
+ 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]));
Added: head/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-test-IceGrid-deployer-Makefile Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +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 @@
+ $(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-*
Added: head/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-test-IceGrid-deployer-application.xml Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +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
+@@ -178,10 +178,10 @@
+ <object identity="${server}" type="::Test"/>
+ </adapter>
+
+- <log path="${test.dir}/log1.txt"/>
+- <log path="${test.dir}/log2.txt"/>
+- <log path="${test.dir}/log3.txt"/>
+- <log path="${test.dir}/log4.txt"/>
++ <log path="${test.dir}/db/log1.txt"/>
++ <log path="${test.dir}/db/log2.txt"/>
++ <log path="${test.dir}/db/log3.txt"/>
++ <log path="${test.dir}/db/log4.txt"/>
+ <env>MY_ENV_VARIABLE=12</env>
+ <env>MY_UNIX_COMPOSED_VARIABLE=BAR;$MY_FOO</env>
+ <env>MY_WINDOWS_COMPOSED_VARIABLE=BAR;%MY_FOO%</env>
Added: head/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-test-IceGrid-distribution-AllTests.cpp Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +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 @@
+ {
+ 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 @@
+ 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;
+
Added: head/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-test-IceGrid-distribution-application.xml Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +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
+@@ -1,7 +1,7 @@
+ <icegrid>
+
+ <application name="Test">
+- <variable name="icepatch.directory" value="${test.dir}/data/original"/>
++ <variable name="icepatch.directory" value="${test.dir}/db/data/original"/>
+
+ <server-template id="IcePatch2">
+
Added: head/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/ice/files/patch-cpp-test-IceGrid-distribution-run.py Mon Jul 13 19:48:31 2015 (r391942)
@@ -0,0 +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
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list