Index: head/devel/ice/Makefile =================================================================== --- head/devel/ice/Makefile (revision 423874) +++ head/devel/ice/Makefile (revision 423875) @@ -1,133 +1,132 @@ # Created by: Stefan Ehmann # $FreeBSD$ PORTNAME= Ice -PORTVERSION= 3.6.2 -PORTREVISION= 1 +PORTVERSION= 3.6.3 DISTVERSIONPREFIX= v CATEGORIES= devel MAINTAINER= freebsd@grem.de COMMENT= Modern alternative to object middleware such as CORBA/COM/DCOM/COM+ LICENSE= GPLv2 SLAVE_PORT?= no .if ${SLAVE_PORT} == "no" LIB_DEPENDS= libexpat.so:textproc/expat2 \ libmcpp.so:devel/mcpp USES+= 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 .endif WRKSRC= ${WRKDIR}/ice-${PORTVERSION} USES+= bdb:5 INVALID_BDB_VER= 48 6 USE_LDCONFIG= yes BUILD_WRKSRC?= ${WRKSRC}/cpp INSTALL_WRKSRC?= ${WRKSRC}/cpp USE_GITHUB= yes GH_ACCOUNT= zeroc-ice CFLAGS+= -ftemplate-depth-128 -fPIC -DPIC -Wall -D_REENTRANT -I${LOCALBASE}/include .if !${PORT_OPTIONS:MDEBUG} CFLAGS+= -DNDEBUG .endif BROKEN_ia64= Does not compile on ${ARCH} BROKEN_sparc64= Does not compile on ${ARCH} .if ((${ARCH} != i386) && (${ARCH} != powerpc)) 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: @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py .if ${SLAVE_PORT} == "no" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* .endif .include Index: head/devel/ice/distinfo =================================================================== --- head/devel/ice/distinfo (revision 423874) +++ head/devel/ice/distinfo (revision 423875) @@ -1,2 +1,3 @@ -SHA256 (zeroc-ice-Ice-v3.6.2_GH0.tar.gz) = 5e9305a5eb6081c8f128d63a5546158594e9f115174fc91208f645dbe2fc02fe -SIZE (zeroc-ice-Ice-v3.6.2_GH0.tar.gz) = 5393239 +TIMESTAMP = 1476218141 +SHA256 (zeroc-ice-Ice-v3.6.3_GH0.tar.gz) = 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc +SIZE (zeroc-ice-Ice-v3.6.3_GH0.tar.gz) = 5512741 Index: head/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp =================================================================== --- head/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp (revision 423874) +++ head/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- 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); Property changes on: head/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ice/files/patch-scripts-icehashpassword.py =================================================================== --- head/devel/ice/files/patch-scripts-icehashpassword.py (revision 423874) +++ head/devel/ice/files/patch-scripts-icehashpassword.py (nonexistent) @@ -1,11 +0,0 @@ ---- scripts/icehashpassword.py.orig 2015-06-23 15:30:20.000000000 +0000 -+++ scripts/icehashpassword.py 2015-06-27 17:12:00.818709719 +0000 -@@ -11,7 +11,7 @@ - import sys, getopt, passlib.hash, getpass - - usePBKDF2 = sys.platform == "win32" or sys.platform == "darwin" --useCryptExt = sys.platform.startswith("linux") -+useCryptExt = sys.platform.startswith("linux") or sys.platform.startswith("freebsd") - - if not usePBKDF2 and not useCryptExt: - print("platform not supported") Property changes on: head/devel/ice/files/patch-scripts-icehashpassword.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h =================================================================== --- head/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h (revision 423874) +++ head/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h (nonexistent) @@ -1,15 +0,0 @@ ---- cpp/include/IceUtil/IconvStringConverter.h.orig 2013-10-04 15:48:14 UTC -+++ cpp/include/IceUtil/IconvStringConverter.h -@@ -14,11 +14,11 @@ - #include - - #include - #include - #include - #include // For strerror - --#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__) -+#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) - // - // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962 - // Property changes on: head/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp =================================================================== --- head/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp (revision 423874) +++ head/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp (nonexistent) @@ -1,27 +0,0 @@ ---- cpp/src/IceGrid/Parser.cpp.orig 2016-05-16 22:49:28.132976967 +0200 -+++ cpp/src/IceGrid/Parser.cpp 2016-05-16 23:15:17.589867966 +0200 -@@ -1912,10 +1912,24 @@ - return; - } - -+ - Ice::ObjectPrx admin = _admin->getServerAdmin(server); - Ice::PropertiesAdminPrx propAdmin = - Ice::PropertiesAdminPrx::uncheckedCast(admin, "IceBox.Service." + service + ".Properties"); - -+ try -+ { -+ propAdmin->ice_ping(); -+ } -+ catch(const Ice::ObjectNotExistException&) -+ { -+ Ice::PropertiesAdminPrx serverPropAdmin = Ice::PropertiesAdminPrx::uncheckedCast(admin, "Properties"); -+ if (atoi(serverPropAdmin->getProperty("IceBox.UseSharedCommunicator." + service).c_str())) -+ { -+ propAdmin = Ice::PropertiesAdminPrx::uncheckedCast(admin, "IceBox.SharedCommunicator.Properties"); -+ } -+ } -+ - if(single) - { - string val = propAdmin->getProperty(property); Property changes on: head/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp =================================================================== --- head/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp (revision 423874) +++ head/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp (nonexistent) @@ -1,57 +0,0 @@ ---- cpp/test/IceGrid/simple/AllTests.cpp.orig 2015-06-23 15:30:20.000000000 +0000 -+++ cpp/test/IceGrid/simple/AllTests.cpp 2015-06-27 16:05:16.492987125 +0000 -@@ -49,6 +49,7 @@ - cout << "ok" << endl; - - cout << "testing discovery... " << flush; -+ bool discoveryOk = true; - { - // Add test well-known object - IceGrid::RegistryPrx registry = IceGrid::RegistryPrx::checkedCast( -@@ -77,15 +78,22 @@ - initData.properties->setProperty("AdapterForDiscoveryTest.Endpoints", "default"); - - Ice::CommunicatorPtr com = Ice::initialize(initData); -- test(com->getDefaultLocator()); -- com->stringToProxy("test @ TestAdapter")->ice_ping(); -- com->stringToProxy("test")->ice_ping(); - -- test(com->getDefaultLocator()->getRegistry()); -- test(IceGrid::LocatorPrx::checkedCast(com->getDefaultLocator())); -- test(IceGrid::LocatorPrx::uncheckedCast(com->getDefaultLocator())->getLocalRegistry()); -- test(IceGrid::LocatorPrx::uncheckedCast(com->getDefaultLocator())->getLocalQuery()); -+ try -+ { -+ test(com->getDefaultLocator()); -+ com->stringToProxy("test @ TestAdapter")->ice_ping(); -+ com->stringToProxy("test")->ice_ping(); - -+ test(com->getDefaultLocator()->getRegistry()); -+ test(IceGrid::LocatorPrx::checkedCast(com->getDefaultLocator())); -+ test(IceGrid::LocatorPrx::uncheckedCast(com->getDefaultLocator())->getLocalRegistry()); -+ test(IceGrid::LocatorPrx::uncheckedCast(com->getDefaultLocator())->getLocalQuery()); -+ } -+ catch(const Ice::NoEndpointException&) -+ { -+ discoveryOk = false; -+ } - Ice::ObjectAdapterPtr adapter = com->createObjectAdapter("AdapterForDiscoveryTest"); - adapter->activate(); - adapter->deactivate(); -@@ -131,7 +139,15 @@ - - com->destroy(); - } -- cout << "ok" << endl; -+ -+ if (discoveryOk) -+ { -+ cout << "ok" << endl; -+ } -+ else -+ { -+ cout << "failed (is a firewall enabled?)" << endl; -+ } - - cout << "shutting down server... " << flush; - obj->shutdown(); Property changes on: head/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ice/files/patch-cpp-src-Ice-Network.cpp =================================================================== --- head/devel/ice/files/patch-cpp-src-Ice-Network.cpp (revision 423874) +++ head/devel/ice/files/patch-cpp-src-Ice-Network.cpp (nonexistent) @@ -1,15 +0,0 @@ ---- cpp.orig/src/Ice/Network.cpp 2013-03-11 15:19:46.000000000 +0000 -+++ cpp/src/Ice/Network.cpp 2013-05-19 22:55:40.257195813 +0000 -@@ -936,7 +936,11 @@ - WSASetLastError(error); - #else - int error = errno; -- if(close(fd) == SOCKET_ERROR) -+ if(close(fd) == SOCKET_ERROR -+# if defined(__FreeBSD__) -+ && getSocketErrno() != ECONNRESET -+# endif -+ ) - { - SocketException ex(__FILE__, __LINE__); - ex.error = getSocketErrno(); Property changes on: head/devel/ice/files/patch-cpp-src-Ice-Network.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/ice/files/patch-config-Make.common.rules =================================================================== --- head/devel/ice/files/patch-config-Make.common.rules (revision 423874) +++ head/devel/ice/files/patch-config-Make.common.rules (revision 423875) @@ -1,63 +1,50 @@ ---- 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 +--- 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 @@ SHORT_VERSION = 3.6 SOVERSION = 36 -INSTALL = cp -fp +override DESTDIR = +INSTALL = %%INSTALL_PROGRAM%% INSTALL_PROGRAM = ${INSTALL} INSTALL_LIBRARY = ${INSTALL} INSTALL_DATA = ${INSTALL} -@@ -49,13 +50,13 @@ +@@ -53,13 +54,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) ; \ -+ then \ - cd $(top_srcdir)/../slice ; \ - for subdir in * ; \ - do \ - echo "Copying slice/$$subdir to $(DESTDIR)$(install_slicedir)..." ; \ - cp -fpr $$subdir $(DESTDIR)$(install_slicedir) ; \ - done ; \ -- fi -+ fi +@@ -507,12 +508,12 @@ + 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)) ; \ +- $(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)) ; \ +- $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_docdir)) ; \ ++ $(call installdata,$(top_srcdir)/../LICENSE$(TEXT_EXTENSION),$(DESTDIR)$(install_slicedir)) ; \ fi Index: head/devel/ice/files/patch-cpp-config-Make.rules =================================================================== --- head/devel/ice/files/patch-cpp-config-Make.rules (revision 423874) +++ head/devel/ice/files/patch-cpp-config-Make.rules (revision 423875) @@ -1,37 +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 @@ 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 @@ 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 -@@ -381,7 +381,7 @@ - .cpp.o: - $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< - @mkdir -p .depend -- @$(CXX) -DMAKEDEPEND -MM $(CPPFLAGS) $< > .depend/$(*F).d -+ @$(CXX) -DMAKEDEPEND -MM $(CPPFLAGS) $(CXXFLAGS) $< > .depend/$(*F).d - - .c.o: - $(CC) -c $(CPPFLAGS) $(CFLAGS) $< Index: head/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp =================================================================== --- head/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp (revision 423874) +++ head/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp (revision 423875) @@ -1,64 +1,11 @@ ---- 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 -+#elif defined(__FreeBSD__) -+# include - #elif defined(__APPLE__) - # include - # include -@@ -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; +--- 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 @@ return p->second == crypt_r(password.c_str(), salt.c_str(), &data); -+# else -+ IceUtilInternal::MutexPtrLock lock(_staticMutex); + # 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) + # endif + #elif defined(__APPLE__) || defined(_WIN32) // - // Pbkdf2 string format: Index: head/devel/ice/files/patch-cpp-src-IceSSL-Makefile =================================================================== --- head/devel/ice/files/patch-cpp-src-IceSSL-Makefile (revision 423874) +++ head/devel/ice/files/patch-cpp-src-IceSSL-Makefile (revision 423875) @@ -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) 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) +-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) Index: head/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp =================================================================== --- head/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp (revision 423874) +++ head/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp (revision 423875) @@ -1,12 +1,84 @@ ---- cpp/src/IceSSL/OpenSSLEngine.cpp.orig 2015-09-14 23:12:17.842563990 +0000 -+++ cpp/src/IceSSL/OpenSSLEngine.cpp 2015-09-14 23:13:21.929560990 +0000 -@@ -267,7 +267,9 @@ +--- cpp/src/IceSSL/OpenSSLEngine.cpp.orig 2016-10-05 16:59:08.000000000 +0200 ++++ cpp/src/IceSSL/OpenSSLEngine.cpp 2016-10-12 01:59:40.150375902 +0200 +@@ -43,7 +43,7 @@ + int instanceCount = 0; + bool initOpenSSL = false; + +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + IceUtil::Mutex* locks = 0; + #endif + +@@ -62,7 +62,7 @@ + // OpenSSL 1.1.0 introduces a new thread API and removes + // the need to use a custom thread callback. + // +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_set_locking_callback(0); + CRYPTO_set_id_callback(0); + +@@ -87,7 +87,7 @@ + // OpenSSL 1.1.0 introduces a new thread API and removes + // the need to use a custom thread callback. + // +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + // + // OpenSSL mutex callback. + // +@@ -158,7 +158,7 @@ + DH* + IceSSL_opensslDHCallback(SSL* ssl, int /*isExport*/, int keyLength) + { +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_CTX* ctx = SSL_get_SSL_CTX(ssl); + # else + SSL_CTX* ctx = ssl->ctx; +@@ -219,7 +219,7 @@ + // + // OpenSSL 1.1.0 remove the need for library initialization and cleanup. + // +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + // + // Create the mutexes and set the callbacks. + // +@@ -292,7 +292,9 @@ string entropyDaemon = properties->getProperty("IceSSL.EntropyDaemon"); if(!entropyDaemon.empty()) { +# ifndef OPENSSL_NO_EGD if(RAND_egd(entropyDaemon.c_str()) <= 0) +# endif { throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: EGD failure using file " + entropyDaemon); +@@ -326,7 +328,7 @@ + // + // OpenSSL 1.1.0 remove the need for library initialization and cleanup. + // +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + // + // Clean up OpenSSL resources. + // +@@ -399,7 +401,7 @@ + "IceSSL: unable to create SSL context:\n" + sslErrors()); + } + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + int securityLevel = properties->getPropertyAsIntWithDefault(propPrefix + "SecurityLevel", -1); + if(securityLevel != -1) + { +@@ -954,7 +956,7 @@ + SSL_METHOD* + OpenSSLEngine::getMethod(int /*protocols*/) + { +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + SSL_METHOD* meth = const_cast(TLS_method()); + #else + // Index: head/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp =================================================================== --- head/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp (nonexistent) +++ head/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp (revision 423875) @@ -0,0 +1,29 @@ +--- cpp/src/IceSSL/Util.cpp~ 2016-10-05 16:59:08.000000000 +0200 ++++ cpp/src/IceSSL/Util.cpp 2016-10-12 01:55:08.517427902 +0200 +@@ -110,7 +110,7 @@ + { + + # ifndef OPENSSL_NO_DH +-# if OPENSSL_VERSION_NUMBER < 0x10100000L ++# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + + // The following arrays are predefined Diffie Hellman group parameters. + // These are known strong primes, distributed with the OpenSSL library +@@ -338,7 +338,7 @@ + // + // Convert a predefined parameter set into a DH value. + // +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + static DH* + convertDH(const unsigned char* buf, int len) + { +@@ -428,7 +428,7 @@ + // No match found. Use one of the predefined parameter sets instead. + // + IceUtil::Mutex::Lock sync(*this); +-# if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) + if(keyLength >= 4096) + { + if(!_dh4096) Property changes on: head/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp =================================================================== --- head/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp (nonexistent) +++ head/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp (revision 423875) @@ -0,0 +1,11 @@ +--- cpp/src/IceUtil/Cond.cpp.orig 2016-10-12 00:34:17.622732906 +0200 ++++ cpp/src/IceUtil/Cond.cpp 2016-10-12 00:34:40.133725906 +0200 +@@ -332,7 +332,7 @@ + throw ThreadSyscallException(__FILE__, __LINE__, rc); + } + +-#if !defined(__hppa) && !defined(__APPLE__) && !defined(__FreeBSD__) ++#if !defined(__hppa) && !defined(__APPLE__) + rc = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); + if(rc != 0) + { Property changes on: head/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/ice/files/patch-cpp-test-Ice-objects-Makefile =================================================================== --- head/devel/ice/files/patch-cpp-test-Ice-objects-Makefile (revision 423874) +++ head/devel/ice/files/patch-cpp-test-Ice-objects-Makefile (revision 423875) @@ -1,28 +1,25 @@ ---- cpp.orig/test/Ice/objects/Makefile.orig 2016-04-05 23:00:02.156584966 +0200 -+++ cpp/test/Ice/objects/Makefile 2016-04-05 23:44:31.611624964 +0200 -@@ -12,9 +12,9 @@ +--- 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 @@ CLIENT = $(call mktestname,client) SERVER = $(call mktestname,server) COLLOCATED = $(call mktestname,collocated) -TESTLIBNAME = libTestDerived.a +TESTLIBNAME = libTestDerived.so --TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) -+TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) $(TESTLIBNAME) + TARGETS = $(CLIENT) $(SERVER) $(COLLOCATED) $(TESTLIBNAME) - SLICE_OBJS = Test.o \ - Derived.o \ @@ -47,11 +47,11 @@ $(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 $@ Index: head/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp =================================================================== --- head/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp (revision 423874) +++ head/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp (revision 423875) @@ -1,190 +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 +--- 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 @@ // // 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])); Index: head/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp =================================================================== --- head/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp (revision 423874) +++ head/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp (revision 423875) @@ -1,18 +1,22 @@ ---- cpp/test/IceSSL/configuration/AllTests.cpp.orig 2015-06-23 15:30:20.000000000 +0000 -+++ cpp/test/IceSSL/configuration/AllTests.cpp 2015-09-15 00:15:34.865304987 +0000 -@@ -3164,6 +3184,7 @@ +--- 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 @@ + // + // 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"; +@@ -3215,9 +3215,7 @@ #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; -@@ -3208,6 +3229,7 @@ - comm->destroy(); - } - cout << "ok" << endl; -+#endif - - if(shutdown) - { Index: head/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py =================================================================== --- head/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py (revision 423874) +++ head/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py (revision 423875) @@ -1,28 +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 @@ 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) -@@ -43,7 +43,7 @@ - os.system("security create-keychain -p password %s" % keychainPath) - for cert in ["s_rsa_ca1.p12", "c_rsa_ca1.p12"]: - os.system("security import %s -f pkcs12 -A -P password -k %s" % (os.path.join(certsPath, cert), keychainPath)) --elif TestUtil.isLinux(): -+elif TestUtil.isLinux() or TestUtil.isFreeBSD(): - # - # Create copies of the CA certificates named after the subject - # hash. This is used by the tests to find the CA certificates in @@ -51,6 +51,6 @@ # 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()) Index: head/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py =================================================================== --- head/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py (nonexistent) +++ head/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py (revision 423875) @@ -0,0 +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 @@ + 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") Property changes on: head/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/ice/files/patch-php-config-Make.rules.php =================================================================== --- head/devel/ice/files/patch-php-config-Make.rules.php (revision 423874) +++ head/devel/ice/files/patch-php-config-Make.rules.php (revision 423875) @@ -1,28 +1,28 @@ --- php/config/Make.rules.php.orig 2015-06-23 15:30:20.000000000 +0000 +++ php/config/Make.rules.php 2015-06-27 19:48:31.900063596 +0000 @@ -108,13 +108,8 @@ libdir = $(top_srcdir)/lib -ifndef usr_dir_install - install_phpdir = $(prefix)/php - install_libdir = $(prefix)/php -else - install_phpdir = $(prefix)/share/php -- install_libdir = $(shell php -r "echo(ini_get('extension_dir'));") +- install_libdir = $(shell $(PHP_CONFIG) --extension-dir) -endif +install_phpdir = $(prefix)/share/pear +install_libdir = $(prefix)/lib/php/$(PHP_EXT_DIR) ifdef ice_src_dist RPATH_DIR = $(LOADER_PATH)/../../cpp/$(libsubdir) @@ -172,7 +167,8 @@ endif ifeq ($(installphplib),) - installphplib = $(INSTALL) $(1) $(2); \ + installphplib = mkdir -p $(2) ; \ + $(INSTALL) $(1) $(2); \ chmod a+rx $(2)/$(notdir $(1)) endif Index: head/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py =================================================================== --- head/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py (nonexistent) +++ head/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py (revision 423875) @@ -0,0 +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 @@ + 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") Property changes on: head/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/ice/files/patch-scripts-TestUtil.py =================================================================== --- head/devel/ice/files/patch-scripts-TestUtil.py (revision 423874) +++ head/devel/ice/files/patch-scripts-TestUtil.py (revision 423875) @@ -1,61 +1,61 @@ ---- scripts/TestUtil.py.orig 2015-06-23 15:30:20.000000000 +0000 -+++ scripts/TestUtil.py 2015-06-27 10:59:56.354249500 +0000 -@@ -120,6 +120,25 @@ - def isSles(): - return isLinux() and linuxDistribution and linuxDistribution == "SUSE LINUX" +--- 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 @@ + 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", "") != "": -@@ -324,7 +324,7 @@ +@@ -340,7 +359,7 @@ 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 -@@ -1887,7 +1906,7 @@ - if lang == "java": - addLdPath(os.path.join(getIceDir("cpp"), "bin", "x64" if x64 else ""), env) # Add bin for db53_vc100.dll +@@ -2013,7 +2032,7 @@ 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) - if lang == "java": -@@ -2233,6 +2252,14 @@ - print("%s*** test not supported under Darwin%s" % (prefix, suffix)) +@@ -2366,6 +2385,14 @@ + 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 Index: head/devel/ice/pkg-plist =================================================================== --- head/devel/ice/pkg-plist (revision 423874) +++ head/devel/ice/pkg-plist (revision 423875) @@ -1,392 +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.2 +lib/libFreeze.so.3.6.3 lib/libFreeze.so.36 lib/libGlacier2.so -lib/libGlacier2.so.3.6.2 +lib/libGlacier2.so.3.6.3 lib/libGlacier2.so.36 lib/libGlacier2CryptPermissionsVerifier.so -lib/libGlacier2CryptPermissionsVerifier.so.3.6.2 +lib/libGlacier2CryptPermissionsVerifier.so.3.6.3 lib/libGlacier2CryptPermissionsVerifier.so.36 lib/libIce.so -lib/libIce.so.3.6.2 +lib/libIce.so.3.6.3 lib/libIce.so.36 lib/libIceBox.so -lib/libIceBox.so.3.6.2 +lib/libIceBox.so.3.6.3 lib/libIceBox.so.36 lib/libIceDiscovery.so -lib/libIceDiscovery.so.3.6.2 +lib/libIceDiscovery.so.3.6.3 lib/libIceDiscovery.so.36 lib/libIceGrid.so -lib/libIceGrid.so.3.6.2 +lib/libIceGrid.so.3.6.3 lib/libIceGrid.so.36 lib/libIceLocatorDiscovery.so -lib/libIceLocatorDiscovery.so.3.6.2 +lib/libIceLocatorDiscovery.so.3.6.3 lib/libIceLocatorDiscovery.so.36 lib/libIcePatch2.so -lib/libIcePatch2.so.3.6.2 +lib/libIcePatch2.so.3.6.3 lib/libIcePatch2.so.36 lib/libIceSSL.so -lib/libIceSSL.so.3.6.2 +lib/libIceSSL.so.3.6.3 lib/libIceSSL.so.36 lib/libIceStorm.so -lib/libIceStorm.so.3.6.2 +lib/libIceStorm.so.3.6.3 lib/libIceStorm.so.36 lib/libIceStormService.so -lib/libIceStormService.so.3.6.2 +lib/libIceStormService.so.3.6.3 lib/libIceStormService.so.36 lib/libIceUtil.so -lib/libIceUtil.so.3.6.2 +lib/libIceUtil.so.3.6.3 lib/libIceUtil.so.36 lib/libIceXML.so -lib/libIceXML.so.3.6.2 +lib/libIceXML.so.3.6.3 lib/libIceXML.so.36 lib/libSlice.so -lib/libSlice.so.3.6.2 +lib/libSlice.so.3.6.3 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 Index: head/devel/py-ice/Makefile =================================================================== --- head/devel/py-ice/Makefile (revision 423874) +++ head/devel/py-ice/Makefile (revision 423875) @@ -1,44 +1,41 @@ # Created by: Boris B. Samorodov # $FreeBSD$ CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= freebsd@grem.de COMMENT= Ice (Internet Communications Engine) language mapping for Python LICENSE= GPLv2 BUILD_DEPENDS= mcpp:devel/mcpp LIB_DEPENDS= libIce.so.${LIB_VRS}:devel/ice USES= python shebangfix USE_PYTHON= py3kplist SLAVE_PORT= yes MASTERDIR= ${.CURDIR}/../ice PLIST= ${.CURDIR}/pkg-plist BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${WRKSRC}/python SHEBANG_FILES= ${BUILD_WRKSRC}/config/s2py.py MAKE_ENV+= PYTHON_VERSION=${PYTHON_VERSION} LIB_VRS= ${PORTVERSION:S|.||g:C|[0-9]$||} PLIST_SUB= LIB_VERSION="${PORTVERSION}" LIB_VRS="${LIB_VRS}" OPTIONS_DEFINE= DEBUG TEST post-install: ${STRIP_CMD} ${STAGEDIR}${PYSITEDIR}/Ice/*.so.* ${ECHO} "Ice" > ${STAGEDIR}${PYSITEDIR}/Ice.pth @${FIND} ${STAGEDIR}${PYSITEDIR}/Ice \( -name "*.pyc" -or -name "*.pyo" \) \ -exec ${CHMOD} u+w {} \; @${PYTHON_CMD} -m compileall -d ${PYSITEDIR}/Ice ${STAGEDIR}${PYSITEDIR}/Ice @${PYTHON_CMD} -O -m compileall -d ${PYSITEDIR}/Ice ${STAGEDIR}${PYSITEDIR}/Ice - ${INSTALL_MAN} ${WRKSRC}/man/man1/slice2py.1 ${STAGEDIR}${PREFIX}/man/man1 - ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/config/s2py.py \ - ${STAGEDIR}${PREFIX}/bin/slice2py .include "${MASTERDIR}/Makefile" Index: head/devel/py-ice/pkg-plist =================================================================== --- head/devel/py-ice/pkg-plist (revision 423874) +++ head/devel/py-ice/pkg-plist (revision 423875) @@ -1,210 +1,208 @@ %%PYTHON_SITELIBDIR%%/Ice.pth %%PYTHON_SITELIBDIR%%/Ice/Glacier2.pyc %%PYTHON_SITELIBDIR%%/Ice/Glacier2.pyo %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Metrics_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Metrics_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifierF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifierF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.pyc %%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.pyo %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceMX/__init__.pyc %%PYTHON_SITELIBDIR%%/Ice/IceMX/__init__.pyo %%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.pyc %%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.pyo %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.pyc %%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.pyo %%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/IceStorm_Metrics_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/IceStorm_Metrics_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_BuiltinSequences_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_BuiltinSequences_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_CommunicatorF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_CommunicatorF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Communicator_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Communicator_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ConnectionF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ConnectionF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointTypes_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointTypes_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_InstrumentationF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_InstrumentationF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Instrumentation_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Instrumentation_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Locator_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Locator_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_LoggerF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_LoggerF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Logger_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Logger_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Metrics_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Metrics_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapterF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapterF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapter_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapter_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactoryF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactoryF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactory_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactory_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_PluginF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_PluginF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesAdmin_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesAdmin_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_RemoteLogger_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_RemoteLogger_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Ice_Version_ice.pyc %%PYTHON_SITELIBDIR%%/Ice/Ice_Version_ice.pyo %%PYTHON_SITELIBDIR%%/Ice/Glacier2.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Metrics_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifierF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_PermissionsVerifier_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_RouterF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Router_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_SSLInfo_ice.py %%PYTHON_SITELIBDIR%%/Ice/Glacier2_Session_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice.py %%PYTHON_SITELIBDIR%%/Ice/IceBox/__init__.py %%PYTHON_SITELIBDIR%%/Ice/IceBox_IceBox_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid/__init__.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Admin_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Descriptor_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Exception_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_FileParser_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Locator_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Observer_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Query_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Registry_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_Session_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceGrid_UserAccountMapper_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceMX/__init__.py %%PYTHON_SITELIBDIR%%/Ice/IcePatch2/__init__.py %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileInfo_ice.py %%PYTHON_SITELIBDIR%%/Ice/IcePatch2_FileServer_ice.py %%PYTHON_SITELIBDIR%%/Ice/IcePy.so %%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VERSION%% %%PYTHON_SITELIBDIR%%/Ice/IcePy.so.%%LIB_VRS%% %%PYTHON_SITELIBDIR%%/Ice/IceStorm/__init__.py %%PYTHON_SITELIBDIR%%/Ice/IceStorm_IceStorm_ice.py %%PYTHON_SITELIBDIR%%/Ice/IceStorm_Metrics_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_BuiltinSequences_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_CommunicatorF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Communicator_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ConnectionF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Connection_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Current_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_EndpointTypes_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Endpoint_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_FacetMap_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Identity_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContextF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ImplicitContext_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_InstrumentationF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Instrumentation_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_LocalException_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_LocatorF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Locator_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_LoggerF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Logger_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Metrics_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapterF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectAdapter_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactoryF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ObjectFactory_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_PluginF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Plugin_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ProcessF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Process_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesAdmin_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_PropertiesF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Properties_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_RemoteLogger_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_RouterF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Router_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocatorF_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_ServantLocator_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_SliceChecksumDict_ice.py %%PYTHON_SITELIBDIR%%/Ice/Ice_Version_ice.py -bin/slice2py -man/man1/slice2py.1.gz