Update devel/ice, devel/py-ice and devel/php5-ice to 3.6.0

PR:		201143
Differential Revision:	https://reviews.freebsd.org/D2930
Reviewed by:	bapt
Approved by:	bapt
Tested by:	Roger Leigh <rleigh@codelibre.net>

1 files changed, 50 insertions, 32 deletions

diff --git a/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp b/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
index 7da26e749dfb..5a81f47eb21c 100644
--- a/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
+++ b/devel/ice/files/patch-cpp-test-Ice-metrics-AllTests.cpp
@@ -1,32 +1,50 @@
---- cpp.orig/test/Ice/metrics/AllTests.cpp	2013-03-11 15:19:47.000000000 +0000
-+++ cpp/test/Ice/metrics/AllTests.cpp	2013-05-20 02:11:00.939194168 +0000
-@@ -597,9 +597,12 @@
-     testAttribute(clientMetrics, clientProps, update, "Connection", "incoming", "false");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "adapterName", "");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "connectionId", "Con1");
--    testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
-+    if (!inFreeBSDJail())
-+    {
-+      testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
-+      testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
-+    }
-     //testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", "");
--    testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "remotePort", "12010");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "");
-     testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "");
-@@ -814,9 +817,12 @@
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "incoming", "true", op);
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "adapterName", "TestAdapter", op);
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "connectionId", "", op);
--    testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
-+    if (!inFreeBSDJail())
-+    {
-+      testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
-+      testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
-+    }
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "localPort", "12010", op);
--    testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
-     //testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", "12010", op);
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastHost", "", op);
-     testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastPort", "", op);
+--- cpp/test/Ice/metrics/AllTests.cpp.orig	2015-06-23 15:30:20.000000000 +0000
++++ cpp/test/Ice/metrics/AllTests.cpp	2015-06-27 19:16:18.877197646 +0000
+@@ -639,9 +639,12 @@
+         testAttribute(clientMetrics, clientProps, update, "Connection", "incoming", "false");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "adapterName", "");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "connectionId", "Con1");
+-        testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
++        if (!inFreeBSDJail())
++        {
++            testAttribute(clientMetrics, clientProps, update, "Connection", "localHost", "127.0.0.1");
++            testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
++        }
+         //testAttribute(clientMetrics, clientProps, update, "Connection", "localPort", "");
+-        testAttribute(clientMetrics, clientProps, update, "Connection", "remoteHost", "127.0.0.1");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "remotePort", "12010");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "mcastHost", "");
+         testAttribute(clientMetrics, clientProps, update, "Connection", "mcastPort", "");
+@@ -726,7 +729,7 @@
+         bool dnsException = false;
+         try
+         {
+-            communicator->stringToProxy("test:tcp -t 500 -p 12010 -h unknownfoo.zeroc.com")->ice_ping();
++            communicator->stringToProxy("test:tcp -t 500 -p 12010 -h unknownhost9999.example.org")->ice_ping();
+             test(false);
+         }
+         catch(const Ice::DNSException&)
+@@ -739,7 +742,7 @@
+         }
+         test(clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"].size() == 2);
+         m1 = clientMetrics->getMetricsView("View", timestamp)["EndpointLookup"][1];
+-        test(m1->id == "tcp -h unknownfoo.zeroc.com -p 12010 -t 500" && m1->total == 2 &&
++        test(m1->id == "tcp -h unknownhost9999.example.org -p 12010 -t 500" && m1->total == 2 &&
+              (!dnsException || m1->failures == 2));
+         if(dnsException)
+         {
+@@ -871,9 +874,12 @@
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "incoming", "true", op);
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "adapterName", "TestAdapter", op);
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "connectionId", "", op);
+-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
++        if (!inFreeBSDJail())
++        {
++            testAttribute(serverMetrics, serverProps, update, "Dispatch", "localHost", "127.0.0.1", op);
++            testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
++        }
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "localPort", "12010", op);
+-        testAttribute(serverMetrics, serverProps, update, "Dispatch", "remoteHost", "127.0.0.1", op);
+         //testAttribute(serverMetrics, serverProps, update, "Dispatch", "remotePort", "12010", op);
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastHost", "", op);
+         testAttribute(serverMetrics, serverProps, update, "Dispatch", "mcastPort", "", op);