From owner-svn-ports-all@freebsd.org Mon Jan 22 23:05:53 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7CF16EB5E84; Mon, 22 Jan 2018 23:05:53 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 57D1F73836; Mon, 22 Jan 2018 23:05:53 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98E4420B0E; Mon, 22 Jan 2018 23:05:52 +0000 (UTC) (envelope-from grembo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0MN5qiV097111; Mon, 22 Jan 2018 23:05:52 GMT (envelope-from grembo@FreeBSD.org) Received: (from grembo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0MN5paY097103; Mon, 22 Jan 2018 23:05:51 GMT (envelope-from grembo@FreeBSD.org) Message-Id: <201801222305.w0MN5paY097103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grembo set sender to grembo@FreeBSD.org using -f From: Michael Gmelin Date: Mon, 22 Jan 2018 23:05:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459707 - in head/devel/ice: . files X-SVN-Group: ports-head X-SVN-Commit-Author: grembo X-SVN-Commit-Paths: in head/devel/ice: . files X-SVN-Commit-Revision: 459707 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2018 23:05:53 -0000 Author: grembo Date: Mon Jan 22 23:05:51 2018 New Revision: 459707 URL: https://svnweb.freebsd.org/changeset/ports/459707 Log: Update devel/ice, devel/py-ice, devel/php5-ice to version 3.6.4 PR: 222291 Submitted by: Andreas Sommer Deleted: head/devel/ice/files/patch-cpp-src-IceGrid-ServerI.cpp head/devel/ice/files/patch-cpp-src-IceSSL-OpenSSLEngine.cpp head/devel/ice/files/patch-cpp-src-IceSSL-Util.cpp head/devel/ice/files/patch-cpp-src-IceUtil-Cond.cpp head/devel/ice/files/patch-python-modules-IcePy-Operation.cpp Modified: head/devel/ice/Makefile head/devel/ice/distinfo head/devel/ice/files/Make.rules.FreeBSD head/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp head/devel/ice/files/patch-php-config-Make.rules.php head/devel/ice/files/patch-scripts-TestUtil.py head/devel/ice/pkg-plist Modified: head/devel/ice/Makefile ============================================================================== --- head/devel/ice/Makefile Mon Jan 22 22:59:31 2018 (r459706) +++ head/devel/ice/Makefile Mon Jan 22 23:05:51 2018 (r459707) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Ice -PORTVERSION= 3.6.3 -PORTREVISION= 3 +PORTVERSION= 3.6.4 DISTVERSIONPREFIX= v CATEGORIES= devel Modified: head/devel/ice/distinfo ============================================================================== --- head/devel/ice/distinfo Mon Jan 22 22:59:31 2018 (r459706) +++ head/devel/ice/distinfo Mon Jan 22 23:05:51 2018 (r459707) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483464992 -SHA256 (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc -SIZE (zeroc-ice-ice-v3.6.3_GH0.tar.gz) = 5512741 +TIMESTAMP = 1505206779 +SHA256 (zeroc-ice-ice-v3.6.4_GH0.tar.gz) = 4f5cc5e09586eab7de7745bbdc5fbf383c59f8fdc561264d4010bba19afdde2a +SIZE (zeroc-ice-ice-v3.6.4_GH0.tar.gz) = 5523841 Modified: head/devel/ice/files/Make.rules.FreeBSD ============================================================================== --- head/devel/ice/files/Make.rules.FreeBSD Mon Jan 22 22:59:31 2018 (r459706) +++ head/devel/ice/files/Make.rules.FreeBSD Mon Jan 22 23:05:51 2018 (r459707) @@ -1,4 +1,6 @@ mkshlib = $(CXX) -shared $(LDFLAGS) -o $(1) -Wl,-h,$(2) $(3) $(4) +mkplugin = $(CXX) -shared $(LDFLAGS) -o $(1) $(3) $(4) + BASELIBS = -lIceUtil -pthread -L$(LOCALBASE)/lib %%ICONV_LIB%% LIBS = -lIce $(BASELIBS) Modified: head/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp ============================================================================== --- head/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp Mon Jan 22 22:59:31 2018 (r459706) +++ head/devel/ice/files/patch-cpp-test-IceSSL-configuration-AllTests.cpp Mon Jan 22 23:05:51 2018 (r459707) @@ -9,6 +9,15 @@ const string anonCiphers = "ADH:@SECLEVEL=0"; # else const string anonCiphers = "ADH"; +@@ -2048,7 +2048,7 @@ + // + // No DSA support in Secure Transport / AIX 7.1 / SChannel + // +-#if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL) ++#if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL) && !defined(LIBRESSL_VERSION_NUMBER) + { + // + // DSA PEM keys are not supported with SChannel. Since Windows 10 @@ -3215,9 +3215,7 @@ #endif } Modified: head/devel/ice/files/patch-php-config-Make.rules.php ============================================================================== --- head/devel/ice/files/patch-php-config-Make.rules.php Mon Jan 22 22:59:31 2018 (r459706) +++ head/devel/ice/files/patch-php-config-Make.rules.php Mon Jan 22 23:05:51 2018 (r459707) @@ -1,22 +1,22 @@ ---- 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 @@ +--- php/config/Make.rules.php.orig 2017-09-13 13:20:00.000000000 +0200 ++++ php/config/Make.rules.php 2017-09-13 13:20:00.000000000 +0200 +@@ -81,13 +81,8 @@ ifeq ($(findstring /php/test/,$(abspath $(MAKEFILE_LIST))),) + $(error $(PHP_CONFIG) not found review your PHP installation and ensure $(PHP_CONFIG) is in your PATH) + endif - 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_CONFIG) --extension-dir) +- endif ++ install_phpdir = $(prefix)/share/pear ++ install_libdir = $(prefix)/lib/php/$(PHP_EXT_DIR) + endif --ifndef usr_dir_install -- install_phpdir = $(prefix)/php -- install_libdir = $(prefix)/php --else -- install_phpdir = $(prefix)/share/php -- install_libdir = $(shell $(PHP_CONFIG) --extension-dir) --endif -+install_phpdir = $(prefix)/share/pear -+install_libdir = $(prefix)/lib/php/$(PHP_EXT_DIR) - ifdef ice_src_dist - RPATH_DIR = $(LOADER_PATH)/../../cpp/$(libsubdir) -@@ -172,7 +167,8 @@ +@@ -145,7 +140,8 @@ else endif ifeq ($(installphplib),) Modified: head/devel/ice/files/patch-scripts-TestUtil.py ============================================================================== --- head/devel/ice/files/patch-scripts-TestUtil.py Mon Jan 22 22:59:31 2018 (r459706) +++ head/devel/ice/files/patch-scripts-TestUtil.py Mon Jan 22 23:05:51 2018 (r459707) @@ -35,6 +35,15 @@ x64 = True elif line == "armv7l": armv7l = True +@@ -879,7 +898,7 @@ + os.remove(filePath) + passwords = open(filePath, "a") + +- command = '"%s" "%s"' % (sys.executable, ++ command = '"%s" "%s" 2>/dev/null' % (sys.executable, + os.path.abspath(os.path.join(os.path.dirname(__file__), "icehashpassword.py"))) + + # @@ -2013,7 +2032,7 @@ addLdPath(getCppLibDir(lang), env) elif isAIX(): Modified: head/devel/ice/pkg-plist ============================================================================== --- head/devel/ice/pkg-plist Mon Jan 22 22:59:31 2018 (r459706) +++ head/devel/ice/pkg-plist Mon Jan 22 23:05:51 2018 (r459707) @@ -241,49 +241,49 @@ include/Slice/PythonUtil.h include/Slice/RubyUtil.h include/Slice/Util.h lib/libFreeze.so -lib/libFreeze.so.3.6.3 +lib/libFreeze.so.3.6.4 lib/libFreeze.so.36 lib/libGlacier2.so -lib/libGlacier2.so.3.6.3 +lib/libGlacier2.so.3.6.4 lib/libGlacier2.so.36 lib/libGlacier2CryptPermissionsVerifier.so -lib/libGlacier2CryptPermissionsVerifier.so.3.6.3 +lib/libGlacier2CryptPermissionsVerifier.so.3.6.4 lib/libGlacier2CryptPermissionsVerifier.so.36 lib/libIce.so -lib/libIce.so.3.6.3 +lib/libIce.so.3.6.4 lib/libIce.so.36 lib/libIceBox.so -lib/libIceBox.so.3.6.3 +lib/libIceBox.so.3.6.4 lib/libIceBox.so.36 lib/libIceDiscovery.so -lib/libIceDiscovery.so.3.6.3 +lib/libIceDiscovery.so.3.6.4 lib/libIceDiscovery.so.36 lib/libIceGrid.so -lib/libIceGrid.so.3.6.3 +lib/libIceGrid.so.3.6.4 lib/libIceGrid.so.36 lib/libIceLocatorDiscovery.so -lib/libIceLocatorDiscovery.so.3.6.3 +lib/libIceLocatorDiscovery.so.3.6.4 lib/libIceLocatorDiscovery.so.36 lib/libIcePatch2.so -lib/libIcePatch2.so.3.6.3 +lib/libIcePatch2.so.3.6.4 lib/libIcePatch2.so.36 lib/libIceSSL.so -lib/libIceSSL.so.3.6.3 +lib/libIceSSL.so.3.6.4 lib/libIceSSL.so.36 lib/libIceStorm.so -lib/libIceStorm.so.3.6.3 +lib/libIceStorm.so.3.6.4 lib/libIceStorm.so.36 lib/libIceStormService.so -lib/libIceStormService.so.3.6.3 +lib/libIceStormService.so.3.6.4 lib/libIceStormService.so.36 lib/libIceUtil.so -lib/libIceUtil.so.3.6.3 +lib/libIceUtil.so.3.6.4 lib/libIceUtil.so.36 lib/libIceXML.so -lib/libIceXML.so.3.6.3 +lib/libIceXML.so.3.6.4 lib/libIceXML.so.36 lib/libSlice.so -lib/libSlice.so.3.6.3 +lib/libSlice.so.3.6.4 lib/libSlice.so.36 man/man1/dumpdb.1.gz man/man1/glacier2router.1.gz