aboutsummaryrefslogtreecommitdiff
path: root/devel/ice
diff options
context:
space:
mode:
authorMichael Gmelin <grembo@FreeBSD.org>2016-10-12 17:23:57 +0000
committerMichael Gmelin <grembo@FreeBSD.org>2016-10-12 17:23:57 +0000
commitca88d4185442d186287d9694a0b5c4c8ae793b47 (patch)
treea868f7556ba059bce352402316515733238a5f3e /devel/ice
parenta5f588697cd7f3d5049fdd4141ebe0665c9c25fe (diff)
downloadports-ca88d4185442d186287d9694a0b5c4c8ae793b47.tar.gz
ports-ca88d4185442d186287d9694a0b5c4c8ae793b47.zip
Update ice ports to 3.6.3
A few critical patches got merged upstream, a few new were required to maintain LibreSSL support and fix other new issues. Note that slice2py moved from devel/py-ice to devel/ice. Approved by: mentors (implicit)
Notes
Notes: svn path=/head/; revision=423875
Diffstat (limited to 'devel/ice')
-rw-r--r--devel/ice/Makefile3
-rw-r--r--devel/ice/distinfo5
-rw-r--r--devel/ice/files/patch-config-Make.common.rules33
-rw-r--r--devel/ice/files/patch-cpp-config-Make.rules9
-rw-r--r--devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h15
-rw-r--r--devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp69
-rw-r--r--devel/ice/files/patch-cpp-src-Ice-Network.cpp15
-rw-r--r--devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp11
-rw-r--r--devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp27
-rw-r--r--devel/ice/files/patch-cpp-src-IceSSL-Makefile4
-rw-r--r--devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp78
-rw-r--r--devel/ice/files/patch-cpp-src-IceSSL-Util.cpp29
-rw-r--r--devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp11
-rw-r--r--devel/ice/files/patch-cpp-test-Ice-objects-Makefile11
-rw-r--r--devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp14
-rw-r--r--devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp57
-rw-r--r--devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp26
-rw-r--r--devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py9
-rw-r--r--devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py11
-rw-r--r--devel/ice/files/patch-php-config-Make.rules.php2
-rw-r--r--devel/ice/files/patch-python-test-Slice-unicodePaths-run.py11
-rw-r--r--devel/ice/files/patch-scripts-TestUtil.py24
-rw-r--r--devel/ice/files/patch-scripts-icehashpassword.py11
-rw-r--r--devel/ice/pkg-plist32
24 files changed, 217 insertions, 300 deletions
diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index ddddf774ee0e..12217be90a5a 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Ice
-PORTVERSION= 3.6.2
-PORTREVISION= 1
+PORTVERSION= 3.6.3
DISTVERSIONPREFIX= v
CATEGORIES= devel
diff --git a/devel/ice/distinfo b/devel/ice/distinfo
index 09bf187cf4d6..535eb1621adb 100644
--- a/devel/ice/distinfo
+++ b/devel/ice/distinfo
@@ -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
diff --git a/devel/ice/files/patch-config-Make.common.rules b/devel/ice/files/patch-config-Make.common.rules
index e2ea0e9aa60f..f96952a70867 100644
--- a/devel/ice/files/patch-config-Make.common.rules
+++ b/devel/ice/files/patch-config-Make.common.rules
@@ -1,5 +1,5 @@
---- 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
@@ -10,7 +10,7 @@
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.
#
@@ -31,33 +31,20 @@
#
# 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
diff --git a/devel/ice/files/patch-cpp-config-Make.rules b/devel/ice/files/patch-cpp-config-Make.rules
index c1c762935266..ad17eeb8a61c 100644
--- a/devel/ice/files/patch-cpp-config-Make.rules
+++ b/devel/ice/files/patch-cpp-config-Make.rules
@@ -26,12 +26,3 @@
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) $<
diff --git a/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h b/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h
deleted file mode 100644
index ba55870f7a0b..000000000000
--- a/devel/ice/files/patch-cpp-include-IceUtil-IconvStringConverter.h
+++ /dev/null
@@ -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 <IceUtil/UndefSysMacros.h>
-
- #include <algorithm>
- #include <iconv.h>
- #include <langinfo.h>
- #include <string.h> // 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
- //
diff --git a/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp b/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
index c9b023c3d26a..68883e884abe 100644
--- a/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
+++ b/devel/ice/files/patch-cpp-src-Glacier2CryptPermissionsVerifier-CryptPermissionsVerifierI.cpp
@@ -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 <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;
+--- 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<IceUtil::Mutex> lock(_staticMutex);
+ # else
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> 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:
diff --git a/devel/ice/files/patch-cpp-src-Ice-Network.cpp b/devel/ice/files/patch-cpp-src-Ice-Network.cpp
deleted file mode 100644
index 63d7833b2a76..000000000000
--- a/devel/ice/files/patch-cpp-src-Ice-Network.cpp
+++ /dev/null
@@ -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();
diff --git a/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp b/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp
deleted file mode 100644
index e8507767608a..000000000000
--- a/devel/ice/files/patch-cpp-src-Ice-StreamSocket.cpp
+++ /dev/null
@@ -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);
diff --git a/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp b/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp
deleted file mode 100644
index 39d41e788afe..000000000000
--- a/devel/ice/files/patch-cpp-src-IceGrid-Parser.cpp
+++ /dev/null
@@ -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);
diff --git a/devel/ice/files/patch-cpp-src-IceSSL-Makefile b/devel/ice/files/patch-cpp-src-IceSSL-Makefile
index a43a202ba7be..30968acf84e3 100644
--- a/devel/ice/files/patch-cpp-src-IceSSL-Makefile
+++ b/devel/ice/files/patch-cpp-src-IceSSL-Makefile
@@ -4,8 +4,8 @@
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)
diff --git a/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp b/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp
index a239d042f9e3..82af12b7bd8a 100644
--- a/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp
+++ b/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp
@@ -1,6 +1,51 @@
---- 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())
{
@@ -10,3 +55,30 @@
{
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<SSL_METHOD*>(TLS_method());
+ #else
+ //
diff --git a/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp b/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp
new file mode 100644
index 000000000000..0a772332d0a0
--- /dev/null
+++ b/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp
@@ -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)
diff --git a/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp b/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp
new file mode 100644
index 000000000000..33b46439eb5e
--- /dev/null
+++ b/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp
@@ -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)
+ {
diff --git a/devel/ice/files/patch-cpp-test-Ice-objects-Makefile b/devel/ice/files/patch-cpp-test-Ice-objects-Makefile
index de44a26171c3..9c6290068e67 100644
--- a/devel/ice/files/patch-cpp-test-Ice-objects-Makefile
+++ b/devel/ice/files/patch-cpp-test-Ice-objects-Makefile
@@ -1,17 +1,14 @@
---- 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)
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
index f30051f81dbc..a42d617e4145 100644
--- a/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
@@ -1,5 +1,5 @@
---- 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.
@@ -48,7 +48,7 @@
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);
@@ -64,7 +64,7 @@
@@ -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());
@@ -84,7 +84,7 @@
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);
@@ -131,7 +131,7 @@
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);
@@ -182,7 +182,7 @@
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]));
diff --git a/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp
deleted file mode 100644
index 4c4219787f29..000000000000
--- a/devel/ice/files/patch-cpp-test-IceGrid-simple-AllTests.cpp
+++ /dev/null
@@ -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();
diff --git a/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp b/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
index 316888270243..8c6178639dd4 100644
--- a/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp
@@ -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)
- {
diff --git a/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py b/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py
index af0c8928de73..2a766f33aba5 100644
--- a/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py
+++ b/devel/ice/files/patch-cpp-test-IceSSL-configuration-run.py
@@ -9,15 +9,6 @@
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"]:
diff --git a/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py b/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py
new file mode 100644
index 000000000000..7c90ab73a7e5
--- /dev/null
+++ b/devel/ice/files/patch-cpp-test-Slice-unicodePaths-run.py
@@ -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")
diff --git a/devel/ice/files/patch-php-config-Make.rules.php b/devel/ice/files/patch-php-config-Make.rules.php
index 0b8bff3f7e39..076ca9c421f0 100644
--- a/devel/ice/files/patch-php-config-Make.rules.php
+++ b/devel/ice/files/patch-php-config-Make.rules.php
@@ -9,7 +9,7 @@
- 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)
diff --git a/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py b/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py
new file mode 100644
index 000000000000..a25ba2280743
--- /dev/null
+++ b/devel/ice/files/patch-python-test-Slice-unicodePaths-run.py
@@ -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")
diff --git a/devel/ice/files/patch-scripts-TestUtil.py b/devel/ice/files/patch-scripts-TestUtil.py
index e014e83c7af5..c2c83ba3424e 100644
--- a/devel/ice/files/patch-scripts-TestUtil.py
+++ b/devel/ice/files/patch-scripts-TestUtil.py
@@ -1,8 +1,8 @@
---- 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")
@@ -26,7 +26,7 @@
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()
@@ -35,17 +35,17 @@
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:
diff --git a/devel/ice/files/patch-scripts-icehashpassword.py b/devel/ice/files/patch-scripts-icehashpassword.py
deleted file mode 100644
index 512390e90b81..000000000000
--- a/devel/ice/files/patch-scripts-icehashpassword.py
+++ /dev/null
@@ -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")
diff --git a/devel/ice/pkg-plist b/devel/ice/pkg-plist
index 2200f390aa70..12156e7d115d 100644
--- a/devel/ice/pkg-plist
+++ b/devel/ice/pkg-plist
@@ -20,6 +20,7 @@ bin/slice2html
bin/slice2java
bin/slice2js
bin/slice2php
+bin/slice2py
bin/transformdb
include/Freeze/BackgroundSaveEvictor.h
include/Freeze/Catalog.h
@@ -240,49 +241,49 @@ 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
@@ -306,6 +307,7 @@ 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