Date: Tue, 12 Feb 2019 11:19:54 +0000 (UTC) From: Michael Gmelin <grembo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r492774 - in head/devel/ice37: . files Message-ID: <201902121119.x1CBJsnH063654@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: grembo Date: Tue Feb 12 11:19:54 2019 New Revision: 492774 URL: https://svnweb.freebsd.org/changeset/ports/492774 Log: Update devel/{ice37|php-ice37|py-ice37} to v3.7.2 Added: head/devel/ice37/files/patch-cpp-test-include-TestHelper.h (contents, props changed) Deleted: head/devel/ice37/files/patch-cpp-test-include-TestCommon.h Modified: head/devel/ice37/Makefile head/devel/ice37/distinfo head/devel/ice37/files/patch-cpp-test-Glacier2-ssl-Server.cpp head/devel/ice37/files/patch-python-test-Ice-info-AllTests.py head/devel/ice37/files/patch-scripts-Util.py head/devel/ice37/pkg-plist Modified: head/devel/ice37/Makefile ============================================================================== --- head/devel/ice37/Makefile Tue Feb 12 10:46:47 2019 (r492773) +++ head/devel/ice37/Makefile Tue Feb 12 11:19:54 2019 (r492774) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= Ice -PORTVERSION= 3.7.1 -PORTREVISION= 1 +PORTVERSION= 3.7.2 DISTVERSIONPREFIX= v CATEGORIES= devel PKGNAMESUFFIX?= 37 Modified: head/devel/ice37/distinfo ============================================================================== --- head/devel/ice37/distinfo Tue Feb 12 10:46:47 2019 (r492773) +++ head/devel/ice37/distinfo Tue Feb 12 11:19:54 2019 (r492774) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534213743 -SHA256 (zeroc-ice-ice-v3.7.1_GH0.tar.gz) = b1526ab9ba80a3d5f314dacf22674dff005efb9866774903d0efca5a0fab326d -SIZE (zeroc-ice-ice-v3.7.1_GH0.tar.gz) = 8765196 +TIMESTAMP = 1549889745 +SHA256 (zeroc-ice-ice-v3.7.2_GH0.tar.gz) = e329a24abf94a4772a58a0fe61af4e707743a272c854552eef3d7833099f40f9 +SIZE (zeroc-ice-ice-v3.7.2_GH0.tar.gz) = 9427121 Modified: head/devel/ice37/files/patch-cpp-test-Glacier2-ssl-Server.cpp ============================================================================== --- head/devel/ice37/files/patch-cpp-test-Glacier2-ssl-Server.cpp Tue Feb 12 10:46:47 2019 (r492773) +++ head/devel/ice37/files/patch-cpp-test-Glacier2-ssl-Server.cpp Tue Feb 12 11:19:54 2019 (r492774) @@ -20,6 +20,6 @@ - test(info.localHost == "127.0.0.1"); + test(info.remoteHost == "127.0.0.1" || inFreeBSDJail()); + test(info.localHost == "127.0.0.1" || inFreeBSDJail()); - test(info.localPort == getTestPort(current.adapter->getCommunicator()->getProperties(), 1)); + test(info.localPort == TestHelper::getTestPort(current.adapter->getCommunicator()->getProperties(), 1)); try Added: head/devel/ice37/files/patch-cpp-test-include-TestHelper.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ice37/files/patch-cpp-test-include-TestHelper.h Tue Feb 12 11:19:54 2019 (r492774) @@ -0,0 +1,23 @@ +--- cpp/test/include/TestHelper.h.orig 2019-02-11 14:02:41.681160000 +0100 ++++ cpp/test/include/TestHelper.h 2019-02-11 16:04:38.557681000 +0100 +@@ -199,4 +199,20 @@ + + #define test(ex) ((ex) ? ((void)0) : ::Test::testFailed(#ex, __FILE__, __LINE__)) + ++#if defined(__FreeBSD__) ++extern "C" { int sysctlbyname(const char *name, void *oldp, size_t *oldlenp, ++ const void *newp, size_t newlen); } ++inline bool inFreeBSDJail() ++{ ++ int jailed; ++ size_t size = sizeof(jailed); ++ return (sysctlbyname("security.jail.jailed", &jailed, &size, NULL, 0) != -1 || jailed); ++} ++#else ++inline bool inFreeBSDJail() ++{ ++ return false; ++} ++#endif ++ + #endif Modified: head/devel/ice37/files/patch-python-test-Ice-info-AllTests.py ============================================================================== --- head/devel/ice37/files/patch-python-test-Ice-info-AllTests.py Tue Feb 12 10:46:47 2019 (r492773) +++ head/devel/ice37/files/patch-python-test-Ice-info-AllTests.py Tue Feb 12 11:19:54 2019 (r492774) @@ -34,12 +34,12 @@ while(info): if isinstance(info, Ice.TCPEndpointInfo): @@ -119,7 +138,7 @@ def allTests(communicator): - test(tcpEndpoint.port == 12020) + test(tcpEndpoint.port == 15000) tcpEndpoint = getTCPEndpointInfo(publishedEndpoints[0].getInfo()) - test(tcpEndpoint.host == "127.0.0.1") + test(tcpEndpoint.host == "127.0.0.1" or isFreeBSDJail()) - test(tcpEndpoint.port == 12020) + test(tcpEndpoint.port == 15000) adapter.destroy() @@ -137,7 +156,7 @@ def allTests(communicator): @@ -54,7 +54,7 @@ @@ -147,7 +166,7 @@ def allTests(communicator): udp = base.ice_datagram().ice_getConnection().getEndpoint().getInfo() - test(udp.port == 12010) + test(udp.port == port) - test(udp.host == defaultHost) + test(udp.host == defaultHost or isFreeBSDJail()) Modified: head/devel/ice37/files/patch-scripts-Util.py ============================================================================== --- head/devel/ice37/files/patch-scripts-Util.py Tue Feb 12 10:46:47 2019 (r492773) +++ head/devel/ice37/files/patch-scripts-Util.py Tue Feb 12 11:19:54 2019 (r492774) @@ -1,48 +1,29 @@ ---- scripts/Util.py.orig 2018-08-27 01:10:47 UTC -+++ scripts/Util.py -@@ -82,7 +82,7 @@ class Platform: +--- scripts/Util.py.orig 2019-02-11 16:48:19.076747000 +0100 ++++ scripts/Util.py 2019-02-11 19:16:32.768690000 +0100 +@@ -232,7 +232,7 @@ + elif Mapping.getByName("cpp"): + cwd = Mapping.getByName("cpp").getPath() - def parseBuildVariables(self, variables): - # Run make to get the values of the given variables -- output = run('make print V="{0}"'.format(" ".join(variables.keys())), cwd = toplevel) -+ output = run('gmake print V="{0}"'.format(" ".join(variables.keys())), cwd = toplevel) +- output = run('make print V="{0}"'.format(" ".join(variables.keys())), cwd=cwd) ++ output = run('gmake print V="{0}"'.format(" ".join(variables.keys())), cwd=cwd) for l in output.split("\n"): match = re.match(r'^.*:.*: (.*) = (.*)', l) if match and match.group(1): -@@ -199,6 +199,46 @@ class AIX(Platform): +@@ -304,6 +304,27 @@ def hasOpenSSL(self): return True +class FreeBSD(Platform): + + def __init__(self): -+ Platform.__init__(self) ++ self.nugetPackageCache = None + -+ def getFilters(self, config): -+ filters = Platform.getFilters(self, config) -+ #filters = (filters[0], filters[1] + ["Slice/*"]) -+ return filters -+ + def hasOpenSSL(self): + return True + -+ def getBinSubDir(self, mapping, process, current): -+ buildPlatform = current.driver.configs[mapping].buildPlatform -+ return "bin" -+ -+ def getLibSubDir(self, mapping, process, current): -+ buildPlatform = current.driver.configs[mapping].buildPlatform -+ -+ # PHP module is always installed in the lib directory for the default build platform -+ if isinstance(mapping, PhpMapping) and buildPlatform == self.getDefaultBuildPlatform(): -+ return "lib" -+ return "lib" -+ -+ def getBuildSubDir(self, name, current): -+ return os.path.join("build", current.config.buildPlatform, current.config.buildConfig) -+ + def getSliceDir(self, iceDir): -+ return os.path.join(iceDir, "slice") ++ installDir = self.getInstallDir(mapping, current) ++ return os.path.join(installDir, "slice") + + def getDefaultExe(self, name, config): + if name == "icebox": @@ -56,7 +37,24 @@ class Linux(Platform): def __init__(self): -@@ -434,6 +474,8 @@ if sys.platform == "darwin": +@@ -1374,13 +1402,13 @@ + if os.path.exists(translator): + return translator + " " + args if args else translator + elif isinstance(platform, Windows): +- return os.path.join(os.path.dirname(sys.executable), "Scripts", "slice2py.exe") ++ return os.path.join(os.path.dirname(sys.executable), "Scripts", "slice2py.exe") + " " + args if args else translator + elif os.path.exists("/usr/local/bin/slice2py"): +- return "/usr/local/bin/slice2py" ++ return "/usr/local/bin/slice2py" + " " + args if args else translator + else: + import slice2py + return sys.executable + " " + os.path.normpath( +- os.path.join(slice2py.__file__, "..", "..", "..", "..", "bin", "slice2py")) ++ os.path.join(slice2py.__file__, "..", "..", "..", "..", "bin", "slice2py")) + " " + args if args else translator + else: + return Process.getCommandLine(self, current, args) + +@@ -3786,6 +3807,8 @@ platform = Darwin() elif sys.platform.startswith("aix"): platform = AIX() @@ -65,14 +63,3 @@ elif sys.platform.startswith("linux") or sys.platform.startswith("gnukfreebsd"): platform = Linux() elif sys.platform == "win32" or sys.platform[:6] == "cygwin": -@@ -1333,8 +1375,8 @@ class SliceTranslator(ProcessFromBinDir, - return translator + " " + args if args else translator - elif isinstance(platform, Windows): - return os.path.join(os.path.dirname(sys.executable), "Scripts", "slice2py.exe") -- elif os.path.exists("/usr/local/bin/slice2py"): -- return "/usr/local/bin/slice2py" -+ elif os.path.exists("%%LOCALBASE%%/bin/slice2py"): -+ return "%%LOCALBASE%%/bin/slice2py " + args if args else "%%LOCALBASE%%/bin/slice2py " - else: - import slice2py - return sys.executable + " " + os.path.normpath( Modified: head/devel/ice37/pkg-plist ============================================================================== --- head/devel/ice37/pkg-plist Tue Feb 12 10:46:47 2019 (r492773) +++ head/devel/ice37/pkg-plist Tue Feb 12 11:19:54 2019 (r492774) @@ -219,79 +219,79 @@ include/IceUtil/UUID.h include/IceUtil/UndefSysMacros.h %%STATIC%%lib/libGlacier2++11.a lib/libGlacier2++11.so -lib/libGlacier2++11.so.3.7.1 +lib/libGlacier2++11.so.3.7.2 lib/libGlacier2++11.so.37 %%STATIC%%lib/libGlacier2.a lib/libGlacier2.so -lib/libGlacier2.so.3.7.1 +lib/libGlacier2.so.3.7.2 lib/libGlacier2.so.37 -lib/libGlacier2CryptPermissionsVerifier.so.3.7.1 +lib/libGlacier2CryptPermissionsVerifier.so.3.7.2 lib/libGlacier2CryptPermissionsVerifier.so.37 %%STATIC%%lib/libIce++11.a lib/libIce++11.so -lib/libIce++11.so.3.7.1 +lib/libIce++11.so.3.7.2 lib/libIce++11.so.37 %%STATIC%%lib/libIce.a lib/libIce.so -lib/libIce.so.3.7.1 +lib/libIce.so.3.7.2 lib/libIce.so.37 %%STATIC%%lib/libIceBox++11.a lib/libIceBox++11.so -lib/libIceBox++11.so.3.7.1 +lib/libIceBox++11.so.3.7.2 lib/libIceBox++11.so.37 %%STATIC%%lib/libIceBox.a lib/libIceBox.so -lib/libIceBox.so.3.7.1 +lib/libIceBox.so.3.7.2 lib/libIceBox.so.37 -lib/libIceDB.so.3.7.1 +lib/libIceDB.so.3.7.2 lib/libIceDB.so.37 %%STATIC%%lib/libIceDiscovery++11.a lib/libIceDiscovery++11.so -lib/libIceDiscovery++11.so.3.7.1 +lib/libIceDiscovery++11.so.3.7.2 lib/libIceDiscovery++11.so.37 %%STATIC%%lib/libIceDiscovery.a lib/libIceDiscovery.so -lib/libIceDiscovery.so.3.7.1 +lib/libIceDiscovery.so.3.7.2 lib/libIceDiscovery.so.37 %%STATIC%%lib/libIceGrid++11.a lib/libIceGrid++11.so -lib/libIceGrid++11.so.3.7.1 +lib/libIceGrid++11.so.3.7.2 lib/libIceGrid++11.so.37 %%STATIC%%lib/libIceGrid.a lib/libIceGrid.so -lib/libIceGrid.so.3.7.1 +lib/libIceGrid.so.3.7.2 lib/libIceGrid.so.37 %%STATIC%%lib/libIceLocatorDiscovery++11.a lib/libIceLocatorDiscovery++11.so -lib/libIceLocatorDiscovery++11.so.3.7.1 +lib/libIceLocatorDiscovery++11.so.3.7.2 lib/libIceLocatorDiscovery++11.so.37 %%STATIC%%lib/libIceLocatorDiscovery.a lib/libIceLocatorDiscovery.so -lib/libIceLocatorDiscovery.so.3.7.1 +lib/libIceLocatorDiscovery.so.3.7.2 lib/libIceLocatorDiscovery.so.37 %%STATIC%%lib/libIcePatch2.a lib/libIcePatch2.so -lib/libIcePatch2.so.3.7.1 +lib/libIcePatch2.so.3.7.2 lib/libIcePatch2.so.37 %%STATIC%%lib/libIceSSL++11.a lib/libIceSSL++11.so -lib/libIceSSL++11.so.3.7.1 +lib/libIceSSL++11.so.3.7.2 lib/libIceSSL++11.so.37 %%STATIC%%lib/libIceSSL.a lib/libIceSSL.so -lib/libIceSSL.so.3.7.1 +lib/libIceSSL.so.3.7.2 lib/libIceSSL.so.37 %%STATIC%%lib/libIceStorm++11.a lib/libIceStorm++11.so -lib/libIceStorm++11.so.3.7.1 +lib/libIceStorm++11.so.3.7.2 lib/libIceStorm++11.so.37 %%STATIC%%lib/libIceStorm.a lib/libIceStorm.so -lib/libIceStorm.so.3.7.1 +lib/libIceStorm.so.3.7.2 lib/libIceStorm.so.37 -lib/libIceStormService.so.3.7.1 +lib/libIceStormService.so.3.7.2 lib/libIceStormService.so.37 -lib/libIceXML.so.3.7.1 +lib/libIceXML.so.3.7.2 lib/libIceXML.so.37 man/man1/glacier2router.1.gz man/man1/icebox.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902121119.x1CBJsnH063654>