<pre style='margin:0'>
Kurt Hindenburg (kurthindenburg) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/052eba29780a09c609a655dcfa2102e9424da0c2">https://github.com/macports/macports-ports/commit/052eba29780a09c609a655dcfa2102e9424da0c2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 052eba29780a09c609a655dcfa2102e9424da0c2
</span>Author: Kurt Hindenburg <khindenburg@macports.org>
AuthorDate: Fri Mar 10 08:09:03 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> ice-cpp: remove obsolete replaced_by port
</span>---
devel/ice-cpp/Portfile | 39 ------
devel/ice-cpp/files/patch-ice.cpp.allTests.py.diff | 30 -----
.../patch-ice.cpp.config.Make.rules.Darwin.diff | 18 ---
.../files/patch-ice.cpp.config.Make.rules.diff | 16 ---
.../patch-ice.cpp.demo.IceGrid.secure.README.diff | 15 ---
...ce.cpp.demo.IceGrid.secure.application.xml.diff | 13 --
...h-ice.cpp.demo.IceGrid.secure.config.admin.diff | 11 --
...-ice.cpp.demo.IceGrid.secure.config.client.diff | 11 --
...-ice.cpp.demo.IceGrid.secure.config.master.diff | 64 ----------
...ch-ice.cpp.demo.IceGrid.secure.config.node.diff | 19 ---
...ce.cpp.demo.IceGrid.secure.config.registry.diff | 57 ---------
...h-ice.cpp.demo.IceGrid.secure.config.slave.diff | 69 -----------
...h-ice.cpp.demo.IceGrid.secure.makecerts.py.diff | 14 ---
.../files/patch-ice.cpp.include.Freeze.Map.h.diff | 11 --
.../files/patch-ice.cpp.include.Ice.Buffer.h.diff | 10 --
.../patch-ice.cpp.include.Ice.ConnectionIF.h.diff | 17 ---
...ice.cpp.include.Ice.IconvStringConverter.h.diff | 21 ----
...patch-ice.cpp.include.Ice.IncomingAsyncF.h.diff | 15 ---
.../patch-ice.cpp.include.Ice.LocalObjectF.h.diff | 15 ---
.../files/patch-ice.cpp.include.Ice.ObjectF.h.diff | 22 ----
...patch-ice.cpp.include.Ice.OutgoingAsyncF.h.diff | 17 ---
.../files/patch-ice.cpp.include.Ice.Proxy.h.diff | 56 ---------
.../files/patch-ice.cpp.include.Ice.ProxyF.h.diff | 76 ------------
.../files/patch-ice.cpp.include.Ice.Stream.h.diff | 79 ------------
.../files/patch-ice.cpp.include.Ice.StreamF.h.diff | 15 ---
.../patch-ice.cpp.include.IceUtil.Mutex.h.diff | 15 ---
.../files/patch-ice.cpp.src.Freeze.MapDb.cpp.diff | 15 ---
.../files/patch-ice.cpp.src.Freeze.MapI.cpp.diff | 41 -------
.../patch-ice.cpp.src.Freeze.SharedDbEnv.cpp.diff | 15 ---
.../patch-ice.cpp.src.Glacier2.Blobject.cpp.diff | 18 ---
.../patch-ice.cpp.src.Glacier2.Blobject.h.diff | 11 --
...atch-ice.cpp.src.Glacier2.RequestQueue.cpp.diff | 74 -----------
.../patch-ice.cpp.src.Glacier2.RequestQueue.h.diff | 23 ----
.../patch-ice.cpp.src.Glacier2.RouterI.cpp.diff | 15 ---
.../patch-ice.cpp.src.Ice.ConnectionI.cpp.diff | 27 ----
.../patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff | 11 --
.../patch-ice.cpp.src.Ice.LocalObject.cpp.diff | 11 --
.../files/patch-ice.cpp.src.Ice.Network.cpp.diff | 15 ---
.../files/patch-ice.cpp.src.Ice.Object.cpp.diff | 11 --
.../patch-ice.cpp.src.Ice.OutgoingAsync.cpp.diff | 11 --
.../patch-ice.cpp.src.Ice.PropertyNames.cpp.diff | 20 ---
.../patch-ice.cpp.src.Ice.PropertyNames.h.diff | 11 --
.../patch-ice.cpp.src.Ice.ProxyFactory.cpp.diff | 10 --
.../files/patch-ice.cpp.src.Ice.Service.cpp.diff | 32 -----
.../files/patch-ice.cpp.src.Ice.Stream.cpp.diff | 24 ----
...ce.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff | 16 ---
...h-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff | 35 ------
.../patch-ice.cpp.src.IceGrid.Internal.ice.diff | 20 ---
...-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff | 136 ---------------------
...ch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff | 11 --
...ice.cpp.src.IceGrid.NodeSessionManager.cpp.diff | 17 ---
...patch-ice.cpp.src.IceGrid.ReplicaCache.cpp.diff | 11 --
....cpp.src.IceGrid.ReplicaSessionManager.cpp.diff | 17 ---
.../patch-ice.cpp.src.IceGrid.SessionI.h.diff | 11 --
.../patch-ice.cpp.src.IceSSL.Instance.cpp.diff | 11 --
.../patch-ice.cpp.src.IceSSL.InstanceF.h.diff | 17 ---
.../patch-ice.cpp.src.IceSSL.TrustManager.cpp.diff | 11 --
.../patch-ice.cpp.src.IceSSL.TrustManagerF.h.diff | 17 ---
.../files/patch-ice.cpp.src.IceSSL.Util.cpp.diff | 11 --
.../files/patch-ice.cpp.src.IceSSL.UtilF.h.diff | 17 ---
.../patch-ice.cpp.src.IceStorm.NodeI.cpp.diff | 14 ---
.../files/patch-ice.cpp.src.IceUtil.Cond.cpp.diff | 15 ---
...tch-ice.cpp.src.IceUtil.CountDownLatch.cpp.diff | 21 ----
...patch-ice.cpp.src.IceUtil.CtrlCHandler.cpp.diff | 49 --------
.../patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff | 13 --
.../patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff | 28 -----
.../patch-ice.cpp.src.Slice.CPlusPlusUtil.cpp.diff | 20 ---
.../patch-ice.cpp.src.Slice.FileTracker.cpp.diff | 13 --
.../files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff | 111 -----------------
.../files/patch-ice.cpp.src.slice2cs.Gen.cpp.diff | 28 -----
.../patch-ice.cpp.src.slice2java.Gen.cpp.diff | 20 ---
...patch-ice.cpp.test.Glacier2.ssl.Server.cpp.diff | 43 -------
...ch-ice.cpp.test.Ice.background.EndpointI.h.diff | 11 --
...patch-ice.cpp.test.Ice.custom.AllTests.cpp.diff | 32 -----
.../patch-ice.cpp.test.Ice.info.AllTests.cpp.diff | 31 -----
.../patch-ice.cpp.test.Ice.properties.run.py.diff | 18 ---
...ch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff | 13 --
...atch-ice.cpp.test.Slice.keyword.Client.cpp.diff | 20 ---
.../patch-ice.cpp.test.include.TestCommon.h.diff | 25 ----
.../files/patch-ice.scripts.TestUtil.py.diff | 44 -------
80 files changed, 2067 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/Portfile b/devel/ice-cpp/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 01df31a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,39 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name ice-cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-replaced_by zeroc-ice34
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers blair
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description Fast, object-oriented RPC for C++, Java, Python, Ruby, PHP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- The Internet Communications Engine (Ice) is a modern alternative to \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- object middleware such as CORBA or COM/DCOM/COM+, with support for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C++, C#, Java, PHP, Python, Ruby and Visual Basic. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ice consists of the following packages. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Slice: The Specification Language for Ice. Slice establishes a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contract between clients and servers, and is also used to describe \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- persistent data. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Slice Compilers: Slice specifications are compiled into various \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- programming languages. Ice supports C++, Java, C#, Visual Basic, PHP, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Python and Ruby. Ice clients and servers work together, regardless \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- of the programming language. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ice: The Ice core library manages all the communication tasks using a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- highly efficient protocol (including protocol compression and support \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for both TCP and UDP), provides a flexible thread pool for \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- multi-threaded servers. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- This Port provides the C++ runtime libraries, the core Slice files \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- and slice2cpp. It also includes the slice compilers for all the \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- other languages: slice2cs, slice2java, slice2py, slice2rb and slice2vb.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.zeroc.com/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "Please install zeroc-ice34 instead."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "obsolete port"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.allTests.py.diff b/devel/ice-cpp/files/patch-ice.cpp.allTests.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e86e754..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.allTests.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/allTests.py 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/allTests.py 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # List of all basic tests.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("IceUtil/condvar", ["once", "win32only"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("IceUtil/thread", ["once"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("IceUtil/unicode", ["once"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,7 +63,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("Ice/servantLocator", ["core"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("Ice/interceptor", ["core"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("Ice/stringConverter", ["core"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ("Ice/udp", ["core"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ("Ice/udp", ["core", "nofreebsdjail"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("Ice/defaultServant", ["core"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("Ice/defaultValue", ["core"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ("Ice/invoke", ["core", "novc6"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,8 +107,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if TestUtil.isWin32() or os.getuid() == 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tests += [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ("IceUtil/priority", ["core", "nodarwin"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ("Ice/threadPoolPriority", ["core", "nodarwin"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ("IceUtil/priority", ["core", "nodarwin", "nofreebsd"]),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ("Ice/threadPoolPriority", ["core", "nodarwin", "nofreebsd"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if __name__ == "__main__":
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff b/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 45433ee..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.Darwin.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru Ice-3.4.0.orig/cpp/config/Make.rules.Darwin Ice-3.4.0/cpp/config/Make.rules.Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.0.orig/cpp/config/Make.rules.Darwin 2010-02-25 07:55:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.0/cpp/config/Make.rules.Darwin 2010-05-18 10:43:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This file is included by Make.rules when uname is Darwin.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXX = c++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXX ?= c++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS = -Wall -D_REENTRANT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -88,4 +88,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICEUTIL_OS_LIBS = -lpthread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICE_OS_LIBS = -ldl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PLATFORM_HAS_READLINE := no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLATFORM_HAS_READLINE := yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.diff b/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7f1cfad..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.config.Make.rules.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru Ice-3.4.0.orig/cpp/config/Make.rules Ice-3.4.0/cpp/config/Make.rules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.0.orig/cpp/config/Make.rules 2010-02-25 07:55:46.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.0/cpp/config/Make.rules 2010-05-18 10:43:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,9 +188,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICONV_LIBS = $(if $(ICONV_HOME),-L$(ICONV_HOME)/$(libsubdir)) $(ICONV_LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(DB_HOME),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DB_FLAGS = -I$(DB_HOME)/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DB_FLAGS = -I$(DB_HOME)/include/db46
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DB_LIBS = -L$(DB_HOME)/$(libsubdir)/db46 -ldb_cxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)/db46)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(shell if [ -d /usr/include/db48 -a -d /usr/$(libsubdir)/db48 ] ; then echo yes; fi), yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DB_FLAGS = -I/usr/include/db48
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.README.diff b/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.README.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 89d0027..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.README.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/README 2011-06-15 21:44:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/README 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,9 +31,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the filesystem permissions to restrict access to the certificate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Once the certificates are generated, you can start the IceGrid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--registry, node, and Glacier2 router:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+registries, node, and Glacier2 router:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$ icegridregistry --Ice.Config=config.registry
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$ icegridregistry --Ice.Config=config.master
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$ icegridregistry --Ice.Config=config.slave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ icegridnode --Ice.Config=config.node
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $ glacier2router --Ice.Config=config.glacier2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.application.xml.diff b/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.application.xml.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 84e9a7b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.application.xml.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/application.xml 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/application.xml 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,8 +20,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <property name="IceSSL.DefaultDir" value="certs"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <property name="Ice.Admin.Endpoints" value="ssl -h 127.0.0.1"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <property name="IceSSL.TrustOnly.Client" value="CN=IceGrid Registry"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=IceGrid Node"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <property name="IceSSL.TrustOnly.Client" value="CN=Master;CN=Slave"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=Node"/>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </properties>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <node name="Node">
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.admin.diff b/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.admin.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 64beb69..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.admin.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.admin 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.admin 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # SSL Configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceSSL.DefaultDir=certs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="Glacier2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Glacier2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # C++ configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ice.Plugin.IceSSL.cpp=IceSSL:createIceSSL
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.client.diff b/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.client.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 63dec1f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.client.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.client 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.client 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The IceGrid locator proxy.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Ice.Default.Locator=DemoIceGrid/Locator:tcp -p 4061
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Ice.Default.Locator=DemoIceGrid/Locator:tcp -p 4061:tcp -p 14061
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Trace properties.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.master.diff b/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.master.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 96e651d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.master.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,64 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.master 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.master 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,61 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# The IceGrid instance name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.InstanceName=DemoIceGrid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IceGrid registry configuration.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Server.Endpoints=ssl -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Data=db/master
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Ensure that nodes and slaves connecting to this registry have a name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# matching the certificate CN.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.RequireNodeCertCN=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.RequireReplicaCertCN=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IceGrid admin clients must use a secure connection to connect to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# registry or use Glacier2.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IceGrid SQL configuration if using SQL database.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#IceGrid.SQL.DatabaseType=QSQLITE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#IceGrid.SQL.DatabaseName=db/master/Registry.db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Trace properties.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Ice.ProgramName=Master
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Trace.Node=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Trace.Replica=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# SSL Configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Ice.Plugin.IceSSL=IceSSL:createIceSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.DefaultDir=certs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.CertAuthFile=ca_cert.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.CertFile=master_cert.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.KeyFile=master_key.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Don't require certificates. This is useful for admin clients that don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# use certificate but still need to establish a secure connection for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# username/password authentication
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.VerifyPeer=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.node.diff b/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.node.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9f87703..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.node.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.node 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.node 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The IceGrid locator proxy.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000:ssl -p 14062 -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # IceGrid node configuration.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,5 +26,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceSSL.CertFile=node_cert.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceSSL.KeyFile=node_key.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.TrustOnly.Client=CN="Server";CN="IceGrid Registry"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.TrustOnly.Server=CN="IceGrid Registry"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Client=CN="Server";CN="Master";CN="Slave"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Server=CN="Master";CN="Slave"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.registry.diff b/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.registry.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f778412..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.registry.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,57 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.registry 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.registry 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,54 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# The IceGrid instance name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceGrid.InstanceName=DemoIceGrid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# IceGrid registry configuration.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceGrid.Registry.Server.Endpoints=ssl -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceGrid.Registry.Internal.Endpoints=ssl -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceGrid.Registry.Data=db/registry
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# IceGrid admin clients must use a secure connection to connect to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# registry or use Glacier2.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# IceGrid SQL configuration if using SQL database.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#IceGrid.SQL.DatabaseType=QSQLITE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#IceGrid.SQL.DatabaseName=db/registry/Registry.db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Trace properties.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Ice.ProgramName=Registry
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceGrid.Registry.Trace.Node=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceGrid.Registry.Trace.Replica=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# SSL Configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Ice.Plugin.IceSSL=IceSSL:createIceSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.DefaultDir=certs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.CertAuthFile=ca_cert.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.CertFile=registry_cert.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.KeyFile=registry_key.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# Don't require certificates. This is useful for admin clients that don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# use certificate but still need to establish a secure connection for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# username/password authentication
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.VerifyPeer=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="IceGrid Node";CN="Glacier2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="IceGrid Node";CN="IceGrid Registry"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.slave.diff b/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.slave.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d5815b5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.config.slave.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,69 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/config.slave 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/config.slave 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,66 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# The IceGrid locator proxy.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# The IceGrid instance name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.InstanceName=DemoIceGrid
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IceGrid registry configuration.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Client.Endpoints=tcp -p 14061 -t 10000:ssl -p 14062 -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Server.Endpoints=ssl -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Data=db/slave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.ReplicaName=Slave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Ensure that nodes connecting to this registry have a name matching
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# the certificate CN.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.RequireNodeCertCN=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IceGrid admin clients must use a secure connection to connect to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# registry or use Glacier2.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IceGrid SQL configuration if using SQL database.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#IceGrid.SQL.DatabaseType=QSQLITE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#IceGrid.SQL.DatabaseName=db/slave/Registry.db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Trace properties.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Ice.ProgramName=Slave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Trace.Node=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceGrid.Registry.Trace.Replica=2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# SSL Configuration
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Ice.Plugin.IceSSL=IceSSL:createIceSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.DefaultDir=certs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.CertAuthFile=ca_cert.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.CertFile=slave_cert.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.KeyFile=slave_key.pem
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Don't require certificates. This is useful for admin clients that don't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# use certificate but still need to establish a secure connection for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# username/password authentication
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.VerifyPeer=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.makecerts.py.diff b/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.makecerts.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 19dfae5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.demo.IceGrid.secure.makecerts.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/demo/IceGrid/secure/makecerts.py 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/demo/IceGrid/secure/makecerts.py 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,8 +44,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--createCertificate("registry", "IceGrid Registry")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--createCertificate("node", "IceGrid Node")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+createCertificate("master", "Master")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+createCertificate("slave", "Slave")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+createCertificate("node", "Node")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- createCertificate("glacier2", "Glacier2")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- createCertificate("server", "Server")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Freeze.Map.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Freeze.Map.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fc5c4c2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Freeze.Map.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Freeze/Map.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Freeze/Map.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -426,7 +426,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ConstIterator(MapHelper& mapHelper, const Ice::CommunicatorPtr& communicator) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _helper(IteratorHelper::create(mapHelper, true)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _communicator(_communicator),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _communicator(communicator),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _refValid(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.Buffer.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.Buffer.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cf80b56..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.Buffer.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/Buffer.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/Buffer.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,6 +10,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef ICEE_BUFFER_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ICEE_BUFFER_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <cstddef>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Ice/Config.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace IceInternal
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.ConnectionIF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.ConnectionIF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b7df586..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.ConnectionIF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/ConnectionIF.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/ConnectionIF.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,13 +17,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class ConnectionI;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum AsyncStatus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.IconvStringConverter.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.IconvStringConverter.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 58c89d1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.IconvStringConverter.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/IconvStringConverter.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/IconvStringConverter.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -225,10 +225,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template<typename charT> /*static*/ void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IconvStringConverter<charT>::close(std::pair<iconv_t, iconv_t> cdp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int rs = iconv_close(cdp.first);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int rs =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ iconv_close(cdp.first);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rs == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rs = iconv_close(cdp.second);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rs =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ iconv_close(cdp.second);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rs == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.IncomingAsyncF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.IncomingAsyncF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 409e824..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.IncomingAsyncF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/IncomingAsyncF.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/IncomingAsyncF.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,12 +28,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class AMD_Object_ice_invoke;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class AMD_Array_Object_ice_invoke;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICE_API IceUtil::Shared* upCast(::Ice::AMD_Array_Object_ice_invoke*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.LocalObjectF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.LocalObjectF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ef96136..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.LocalObjectF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/LocalObjectF.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/LocalObjectF.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,12 +18,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class LocalObject;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICE_API IceUtil::Shared* upCast(::Ice::LocalObject*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.ObjectF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.ObjectF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c15e02e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.ObjectF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/ObjectF.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/ObjectF.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,19 +17,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Object;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICE_API IceUtil::Shared* upCast(::Ice::Object*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace Ice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef IceInternal::Handle< Object > ObjectPtr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void ICE_API __patch__ObjectPtr(void*, ObjectPtr&);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.OutgoingAsyncF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.OutgoingAsyncF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e900f17..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.OutgoingAsyncF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/OutgoingAsyncF.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/OutgoingAsyncF.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,13 +19,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class AsyncResult;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef IceInternal::Handle<AsyncResult> AsyncResultPtr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class OutgoingAsync;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICE_API IceUtil::Shared* upCast(OutgoingAsync*);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.Proxy.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.Proxy.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 972300e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.Proxy.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/Proxy.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/Proxy.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +38,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Locator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Router;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,8 +48,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class LocalExceptionWrapper;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1172,7 +1172,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TwowayCallbackNC(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : CallbackNC<T>(instance, excb, sentcb)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- checkCallback(instance, cb || excb != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this->checkCallback(instance, cb || excb != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1188,7 +1188,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TwowayCallback(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : Callback<T, CT>(instance, excb, sentcb)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- checkCallback(instance, cb || excb != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this->checkCallback(instance, cb || excb != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1209,7 +1209,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OnewayCallbackNC(const TPtr& instance, Response cb, Exception excb, Sent sentcb) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CallbackNC<T>(instance, excb, sentcb), response(cb)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- checkCallback(instance, cb != 0 || excb != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this->checkCallback(instance, cb != 0 || excb != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void __completed(const ::Ice::AsyncResultPtr& result) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1254,7 +1254,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OnewayCallback(const TPtr& instance, Response cb, Exception excb, Sent sentcb) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Callback<T, CT>(instance, excb, sentcb), response(cb)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- checkCallback(instance, cb != 0 || excb != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this->checkCallback(instance, cb != 0 || excb != 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void __completed(const ::Ice::AsyncResultPtr& result) const
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.ProxyF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.ProxyF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7806c55..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.ProxyF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/ProxyF.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/ProxyF.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Object;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline ::IceProxy::Ice::Object*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+upCast(::IceProxy::Ice::Object* o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return o;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +39,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Object;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline ::IceDelegate::Ice::Object*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+upCast(::IceDelegate::Ice::Object* o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return o;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,6 +57,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Object;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline ::IceDelegateM::Ice::Object*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+upCast(::IceDelegateM::Ice::Object* o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return o;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,36 +74,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Object;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--inline ::IceProxy::Ice::Object*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--upCast(::IceProxy::Ice::Object* o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return o;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--inline ::IceDelegate::Ice::Object*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--upCast(::IceDelegate::Ice::Object* o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return o;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline ::IceDelegateD::Ice::Object*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- upCast(::IceDelegateD::Ice::Object* o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return o;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--inline ::IceDelegateM::Ice::Object*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--upCast(::IceDelegateM::Ice::Object* o)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return o;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.Stream.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.Stream.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5c0af0a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.Stream.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,79 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/Stream.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/Stream.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Ice/Proxy.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IceUtil/Shared.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Forward declaration required for writer specializations.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void delegateThrowMarshalException(const char*, int, const ::std::string&);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace Ice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -45,9 +51,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- StreamTraitTypeUnknown
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// Forward declaration required for writer specializations.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--class MarshalException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Base trait template. This doesn't actually do anything -- we just
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // use it as a template that we can specialize.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -542,7 +545,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- outS->write(static_cast<Byte>(v));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -558,7 +561,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inS->read(val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(val > StreamTrait<T>::enumLimit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v = static_cast<T>(val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -573,7 +576,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- outS->write(static_cast<Short>(v));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -589,7 +592,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inS->read(val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(val < 0 || val > StreamTrait<T>::enumLimit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v = static_cast<T>(val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -603,7 +606,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- outS->write(static_cast<Int>(v));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -619,7 +622,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inS->read(val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(val < 0 || val > StreamTrait<T>::enumLimit)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v = static_cast<T>(val);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.StreamF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.Ice.StreamF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ea7d98f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.Ice.StreamF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/Ice/StreamF.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/Ice/StreamF.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,12 +19,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class InputStream;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class OutputStream;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICE_API IceUtil::Shared* upCast(::Ice::InputStream*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.include.IceUtil.Mutex.h.diff b/devel/ice-cpp/files/patch-ice.cpp.include.IceUtil.Mutex.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0f94c7f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.include.IceUtil.Mutex.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/include/IceUtil/Mutex.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/include/IceUtil/Mutex.h 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -251,8 +251,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Mutex::~Mutex()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = pthread_mutex_destroy(&_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_mutex_destroy(&_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Freeze.MapDb.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Freeze.MapDb.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1cd6337..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Freeze.MapDb.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Freeze/MapDb.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Freeze/MapDb.cpp 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -229,7 +229,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool inserted =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get())).second;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .second
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(inserted);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- indexBase->_impl = indexI.release();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Freeze.MapI.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Freeze.MapI.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 98b3b84..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Freeze.MapI.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,41 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Freeze/MapI.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Freeze/MapI.cpp 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -749,8 +749,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err = _dbc->put(&dbKey, &dbValue, DB_CURRENT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _dbc->put(&dbKey, &dbValue, DB_CURRENT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(err == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch(const ::DbDeadlockException& dx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1023,7 +1026,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool inserted =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)).second;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _indices.insert(IndexMap::value_type(indexBase->name(), indexBase))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .second
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(inserted);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- indexBase->_map = this;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1360,8 +1367,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- u_int32_t count;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err = _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(err == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Freeze.SharedDbEnv.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Freeze.SharedDbEnv.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0fc6ef4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Freeze.SharedDbEnv.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Freeze/SharedDbEnv.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Freeze/SharedDbEnv.cpp 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,8 +336,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Remove from map
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size_t one;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- one = sharedDbEnvMap->erase(key);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ one =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sharedDbEnvMap->erase(key);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(one == 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(sharedDbEnvMap->size() == 0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.Blobject.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.Blobject.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 20e7e8b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.Blobject.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Glacier2/Blobject.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Glacier2/Blobject.cpp 2012-03-04 19:39:27.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -171,6 +171,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Glacier2::Blobject::destroy()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(_requestQueue)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _requestQueue->destroy();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amdCB,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const std::pair<const Ice::Byte*, const Ice::Byte*>& inParams, const Current& current)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.Blobject.h.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.Blobject.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 04c83bb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.Blobject.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Glacier2/Blobject.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Glacier2/Blobject.h 2012-03-04 19:39:27.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Blobject(const InstancePtr&, const Ice::ConnectionPtr&, const Ice::Context&);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual ~Blobject();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void destroy();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protected:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void invoke(Ice::ObjectPrx&, const Ice::AMD_Object_ice_invokePtr&,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.RequestQueue.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.RequestQueue.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9a7bec1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.RequestQueue.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,74 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Glacier2/RequestQueue.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Glacier2/RequestQueue.cpp 2012-03-04 19:39:27.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -185,7 +185,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _callback(newCallback_Object_ice_invoke(this, &RequestQueue::response, &RequestQueue::exception,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &RequestQueue::sent)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _flushCallback(newCallback_Connection_flushBatchRequests(this, &RequestQueue::exception, &RequestQueue::sent)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _pendingSend(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _pendingSend(false),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _destroyed(false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,6 +242,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Glacier2::RequestQueue::destroy()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceUtil::Mutex::Lock lock(*this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _destroyed = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Although the session has been destroyed, we cannot destroy this queue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // until all requests have completed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(_requests.empty())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ destroyInternal();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Glacier2::RequestQueue::destroyInternal()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Must be called with the mutex locked.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Remove cyclic references.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const_cast<Ice::Callback_Object_ice_invokePtr&>(_callback) = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const_cast<Ice::Callback_Connection_flushBatchRequestsPtr&>(_flushCallback) = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Glacier2::RequestQueue::flush()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(_connection);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -289,6 +321,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _pendingSendRequest = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(_destroyed && _requests.empty())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ destroyInternal();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -312,6 +349,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _requests.clear();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(_destroyed)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ destroyInternal();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.RequestQueue.h.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.RequestQueue.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dda26f6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.RequestQueue.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Glacier2/RequestQueue.h 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Glacier2/RequestQueue.h 2012-03-04 19:39:27.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,8 +65,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool addRequest(const RequestPtr&);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void flushRequests(std::set<Ice::ObjectPrx>&);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void destroy();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void destroyInternal();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void flush();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void flush(std::set<Ice::ObjectPrx>&);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,6 +87,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::deque<RequestPtr> _requests;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool _pendingSend;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RequestPtr _pendingSendRequest;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool _destroyed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef IceUtil::Handle<RequestQueue> RequestQueuePtr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.RouterI.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.RouterI.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 79c2251..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Glacier2.RouterI.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Glacier2/RouterI.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Glacier2/RouterI.cpp 2012-03-04 19:39:27.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -98,6 +98,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _session->destroy_async(amiCB);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _clientBlobject->destroy();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(_serverBlobject)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _serverBlobject->destroy();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ObjectPrx
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectionI.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectionI.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0101fe3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ConnectionI.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,27 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/ConnectionI.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/ConnectionI.cpp 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace Ice;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceInternal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Ice::LocalObject* IceInternal::upCast(ConnectionI* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Ice::LocalObject* Ice::upCast(ConnectionI* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -600,6 +600,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch(const LocalException& ex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setState(StateClosed, ex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(_exception.get());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _exception->ice_throw();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -971,6 +972,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch(const Ice::LocalException& ex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setState(StateClosed, ex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(_exception.get());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _exception->ice_throw();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index cf080b6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.IncomingAsync.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/IncomingAsync.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/IncomingAsync.cpp 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceInternal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* IceInternal::upCast(AMD_Object_ice_invoke* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.LocalObject.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.LocalObject.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b19c8d5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.LocalObject.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/LocalObject.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/LocalObject.cpp 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,7 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace Ice;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceInternal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* IceInternal::upCast(LocalObject* obj) { return obj; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* Ice::upCast(LocalObject* obj) { return obj; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ice::LocalObject::operator==(const LocalObject& r) const
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Network.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Network.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 38bd2c7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Network.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/Network.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/Network.cpp 2011-07-15 23:40:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -715,7 +715,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WSASetLastError(error);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int error = errno;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(close(fd) == SOCKET_ERROR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(close(fd) == SOCKET_ERROR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# if defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && getSocketErrno() != ECONNRESET
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SocketException ex(__FILE__, __LINE__);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ex.error = getSocketErrno();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Object.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Object.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e5f96e4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Object.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/Object.cpp 2011-06-15 21:43:58.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/Object.cpp 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,7 +19,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace Ice;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceInternal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* IceInternal::upCast(Object* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* Ice::upCast(Object* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ice::Object::operator==(const Object& r) const
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.OutgoingAsync.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.OutgoingAsync.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 83b93fe..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.OutgoingAsync.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/OutgoingAsync.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/OutgoingAsync.cpp 2012-03-04 20:14:52.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace Ice;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceInternal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* IceInternal::upCast(AsyncResult* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* Ice::upCast(AsyncResult* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceUtil::Shared* IceInternal::upCast(OutgoingAsyncMessageCallback* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.PropertyNames.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.PropertyNames.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f5e7fa2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.PropertyNames.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/PropertyNames.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/PropertyNames.cpp 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // **********************************************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon May 09 07:39:43 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 12 07:22:34 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // IMPORTANT: Do not edit this file -- any edits made here will be lost!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -335,6 +335,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceInternal::Property("IceGrid.Registry.ReplicaSessionTimeout", false, 0),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceInternal::Property("IceGrid.Registry.RequireNodeCertCN", false, 0),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceInternal::Property("IceGrid.Registry.RequireReplicaCertCN", false, 0),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceInternal::Property("IceGrid.Registry.Server.ACM", false, 0),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceInternal::Property("IceGrid.Registry.Server.AdapterId", false, 0),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceInternal::Property("IceGrid.Registry.Server.Endpoints", false, 0),
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.PropertyNames.h.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.PropertyNames.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 77ab4a3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.PropertyNames.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/PropertyNames.h 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/PropertyNames.h 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // **********************************************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon May 09 07:39:43 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 12 07:22:34 2011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // IMPORTANT: Do not edit this file -- any edits made here will be lost!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ProxyFactory.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ProxyFactory.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 899371b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.ProxyFactory.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/ProxyFactory.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/ProxyFactory.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -229,6 +229,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if(cnt > static_cast<int>(_retryIntervals.size()))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ interval = 0; // apeace compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(traceLevels->retry >= 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Trace out(logger, traceLevels->retryCat);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Service.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Service.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2d2fe97..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Service.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/Service.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/Service.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2136,17 +2136,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Associate stdin, stdout and stderr with /dev/null.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int fd;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd = open("/dev/null", O_RDWR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ open("/dev/null", O_RDWR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(fd == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(stdOut.empty())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd = dup2(0, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dup2(0, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(fd == 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(stdErr.empty())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fd = dup2(1, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fd =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dup2(1, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(fd == 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Stream.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Stream.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3936095..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Ice.Stream.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Ice/Stream.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Ice/Stream.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,10 +8,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // **********************************************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Ice/Stream.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Ice/LocalException.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace std;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace Ice;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceInternal;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* IceInternal::upCast(InputStream* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* IceInternal::upCast(OutputStream* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* Ice::upCast(InputStream* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void delegateThrowMarshalException(const char* file, int line , const ::std::string& message)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw Ice::MarshalException(file, line, message);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8bd9e4f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.AdminCallbackRouter.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceGrid/AdminCallbackRouter.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceGrid/AdminCallbackRouter.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,7 +49,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool inserted =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con)).second;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ .second
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(inserted == true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37ca75a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.DescriptorHelper.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,35 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceGrid/DescriptorHelper.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceGrid/DescriptorHelper.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -198,15 +198,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--template<typename Dict> Dict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--getDictUpdatedElts(const Dict& ldict, const Dict& rdict)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(_MSC_VER) && (_MSC_VER < 1300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template<typename EqFunc, typename Dict> Dict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -223,6 +214,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template<typename Dict> Dict
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+getDictUpdatedElts(const Dict& ldict, const Dict& rdict)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_MSC_VER) && (_MSC_VER < 1300)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <typename Dict> Ice::StringSeq
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- getDictRemovedElts(const Dict& ldict, const Dict& rdict)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.Internal.ice.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.Internal.ice.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6dddcf7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.Internal.ice.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceGrid/Internal.ice 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceGrid/Internal.ice 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -702,7 +702,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NodeSession* registerNode(InternalNodeInfo info, Node* prx, LoadInfo loadInf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throws NodeActiveException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throws NodeActiveException, PermissionDeniedException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -721,7 +721,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ReplicaSession* registerReplica(InternalReplicaInfo info, InternalRegistry* prx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- throws ReplicaActiveException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throws ReplicaActiveException, PermissionDeniedException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dda62ae..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,136 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceGrid/InternalRegistryI.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceGrid/InternalRegistryI.cpp 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IceGrid/ReplicaSessionI.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IceGrid/ReplicaSessionManager.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <IceGrid/FileCache.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <IceSSL/IceSSL.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <IceSSL/RFC2253.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace std;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceGrid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,6 +40,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ice::PropertiesPtr properties = database->getCommunicator()->getProperties();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _nodeSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.NodeSessionTimeout", 30);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _replicaSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.ReplicaSessionTimeout", 30);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _requireNodeCertCN = properties->getPropertyAsIntWithDefault("IceGrid.Registry.RequireNodeCertCN", 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _requireReplicaCertCN = properties->getPropertyAsIntWithDefault("IceGrid.Registry.RequireReplicaCertCN", 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- InternalRegistryI::~InternalRegistryI()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +54,56 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const LoadInfo& load,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const Ice::Current& current)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const Ice::LoggerPtr logger = _database->getTraceLevels()->logger;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const TraceLevelsPtr traceLevels = _database->getTraceLevels();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const Ice::LoggerPtr logger = traceLevels->logger;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!info || !node)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(_requireNodeCertCN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceSSL::ConnectionInfoPtr sslConnInfo = IceSSL::ConnectionInfoPtr::dynamicCast(current.con->getInfo());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(sslConnInfo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sslConnInfo->certs.empty() ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ !IceSSL::Certificate::decode(sslConnInfo->certs[0])->getSubjectDN().match("CN=" + info->name))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(traceLevels->node > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Ice::Trace out(logger, traceLevels->nodeCat);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out << "certificate CN doesn't match node name `" << info->name << "'";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw PermissionDeniedException("certificate CN doesn't match node name `" + info->name + "'");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(traceLevels->node > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Ice::Trace out(logger, traceLevels->nodeCat);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out << "node certificate for `" << info->name << "' is required to connect to this registry";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw PermissionDeniedException("node certificate is required to connect to this registry");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch(const PermissionDeniedException& ex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw ex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch(const IceUtil::Exception&)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(traceLevels->node > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Ice::Trace out(logger, traceLevels->nodeCat);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out << "unexpected exception while verifying certificate for node `" << info->name << "'";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw PermissionDeniedException("unable to verify certificate for node `" + info->name + "'");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NodeSessionIPtr session = new NodeSessionI(_database, node, info, _nodeSessionTimeout, load);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +121,56 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const InternalRegistryPrx& prx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const Ice::Current& current)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- const Ice::LoggerPtr logger = _database->getTraceLevels()->logger;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const TraceLevelsPtr traceLevels = _database->getTraceLevels();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ const Ice::LoggerPtr logger = traceLevels->logger;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!info || !prx)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(_requireReplicaCertCN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IceSSL::ConnectionInfoPtr sslConnInfo = IceSSL::ConnectionInfoPtr::dynamicCast(current.con->getInfo());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(sslConnInfo)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (sslConnInfo->certs.empty() ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ !IceSSL::Certificate::decode(sslConnInfo->certs[0])->getSubjectDN().match("CN=" + info->name))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(traceLevels->replica > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Ice::Trace out(logger, traceLevels->replicaCat);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out << "certificate CN doesn't match replica name `" << info->name << "'";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw PermissionDeniedException("certificate CN doesn't match replica name `" + info->name + "'");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(traceLevels->replica > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Ice::Trace out(logger, traceLevels->replicaCat);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out << "replica certificate for `" << info->name << "' is required to connect to this registry";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw PermissionDeniedException("replica certificate is required to connect to this registry");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch(const PermissionDeniedException& ex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw ex;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch(const IceUtil::Exception&)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(traceLevels->replica > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Ice::Trace out(logger, traceLevels->replicaCat);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out << "unexpected exception while verifying certificate for replica `" << info->name << "'";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw PermissionDeniedException("unable to verify certificate for replica `" + info->name + "'");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ReplicaSessionIPtr s = new ReplicaSessionI(_database, _wellKnownObjects, info, prx, _replicaSessionTimeout);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 59d819a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.InternalRegistryI.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceGrid/InternalRegistryI.h 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceGrid/InternalRegistryI.h 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +68,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ReplicaSessionManager& _session;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int _nodeSessionTimeout;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int _replicaSessionTimeout;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool _requireNodeCertCN;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool _requireReplicaCertCN;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.NodeSessionManager.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.NodeSessionManager.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bf1087f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.NodeSessionManager.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceGrid/NodeSessionManager.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceGrid/NodeSessionManager.cpp 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,6 +110,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exception.reset(ex.ice_clone());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch(const PermissionDeniedException& ex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(traceLevels)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ traceLevels->logger->error("connection to the the registry `" + _name + "' was denied:\n" + ex.reason);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exception.reset(ex.ice_clone());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch(const Ice::Exception& ex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exception.reset(ex.ice_clone());
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.ReplicaCache.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.ReplicaCache.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c03dfaf..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.ReplicaCache.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceGrid/ReplicaCache.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceGrid/ReplicaCache.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Lock sync(*this);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ReplicaEntryPtr entry;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- while(entry = getImpl(name))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while((entry = getImpl(name)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ReplicaSessionIPtr session = entry->getSession();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(session->isDestroyed())
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.ReplicaSessionManager.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.ReplicaSessionManager.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5ff0307..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.ReplicaSessionManager.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceGrid/ReplicaSessionManager.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceGrid/ReplicaSessionManager.cpp 2012-03-04 19:55:44.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -500,6 +500,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exception.reset(ex.ice_clone());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch(const PermissionDeniedException& ex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(_traceLevels)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _traceLevels->logger->error("connection to the the registry `" + _name + "' was denied:\n" + ex.reason);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exception.reset(ex.ice_clone());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- catch(const Ice::Exception& ex)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exception.reset(ex.ice_clone());
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.SessionI.h.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.SessionI.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2b4aba8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceGrid.SessionI.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceGrid/SessionI.h 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceGrid/SessionI.h 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class SessionI;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef IceUtil::Handle<SessionI> SessionIPtr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--class BaseSessionI : virtual Ice::Object, public IceUtil::Mutex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class BaseSessionI : virtual public Ice::Object, public IceUtil::Mutex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 18c7da2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.Instance.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceSSL/Instance.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceSSL/Instance.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace Ice;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceSSL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* IceInternal::upCast(IceSSL::Instance* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* IceSSL::upCast(IceSSL::Instance* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.InstanceF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.InstanceF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 54c1614..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.InstanceF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceSSL/InstanceF.h 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceSSL/InstanceF.h 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,13 +18,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class Instance;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* upCast(IceSSL::Instance*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* upCast(IceSSL::Instance*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.TrustManager.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.TrustManager.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5e6aa0e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.TrustManager.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceSSL/TrustManager.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceSSL/TrustManager.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace std;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceSSL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* IceInternal::upCast(IceSSL::TrustManager* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* IceSSL::upCast(IceSSL::TrustManager* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TrustManager::TrustManager(const Ice::CommunicatorPtr& communicator) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _communicator(communicator)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.TrustManagerF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.TrustManagerF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7c3fefe..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.TrustManagerF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceSSL/TrustManagerF.h 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceSSL/TrustManagerF.h 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,13 +18,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class TrustManager;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* upCast(IceSSL::TrustManager*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* upCast(IceSSL::TrustManager*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.Util.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.Util.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 92dc0e2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.Util.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceSSL/Util.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceSSL/Util.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,7 +175,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return dh;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* IceInternal::upCast(IceSSL::DHParams* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* IceSSL::upCast(IceSSL::DHParams* p) { return p; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceSSL::DHParams::DHParams() :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _dh512(0), _dh1024(0), _dh2048(0), _dh4096(0)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.UtilF.h.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.UtilF.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ec21874..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceSSL.UtilF.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,17 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceSSL/UtilF.h 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceSSL/UtilF.h 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,13 +21,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class DHParams;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IceUtil::Shared* upCast(IceSSL::DHParams*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace IceInternal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IceUtil::Shared* upCast(IceSSL::DHParams*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceStorm.NodeI.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceStorm.NodeI.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 748f758..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceStorm.NodeI.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceStorm/NodeI.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceStorm/NodeI.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,11 +18,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--bool operator==(const GroupNodeInfo& info, int id)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return info.id == id;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class CheckTask : public IceUtil::TimerTask
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const NodeIPtr _node;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.Cond.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.Cond.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bedcda1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.Cond.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceUtil/Cond.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceUtil/Cond.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -330,8 +330,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceUtil::Cond::~Cond()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = pthread_cond_destroy(&_cond);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_cond_destroy(&_cond);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.CountDownLatch.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.CountDownLatch.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c9f197b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.CountDownLatch.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceUtil/CountDownLatch.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceUtil/CountDownLatch.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -44,10 +44,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CloseHandle(_event);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = pthread_mutex_destroy(&_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_mutex_destroy(&_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = pthread_cond_destroy(&_cond);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_cond_destroy(&_cond);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.CtrlCHandler.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.CtrlCHandler.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a14802d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.CtrlCHandler.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceUtil/CtrlCHandler.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceUtil/CtrlCHandler.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -219,29 +219,41 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigaddset(&ctrlCLikeSignals, SIGHUP);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigaddset(&ctrlCLikeSignals, SIGINT);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sigaddset(&ctrlCLikeSignals, SIGTERM);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int rc = pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Joinable thread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = pthread_create(&_tid, 0, sigwaitThread, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_create(&_tid, 0, sigwaitThread, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CtrlCHandler::~CtrlCHandler()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int rc = pthread_cancel(_tid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_cancel(_tid);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // WORKAROUND: sigwait isn't a cancellation point on MacOS X, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // comment in sigwaitThread
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = pthread_kill(_tid, SIGTERM);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_kill(_tid, SIGTERM);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //assert(rc == 0); For some reaosns, this assert is sometime triggered
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void* status = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = pthread_join(_tid, &status);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_join(_tid, &status);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(status == PTHREAD_CANCELED);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 756244e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.FileUtil.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceUtil/FileUtil.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceUtil/FileUtil.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <dir.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __FreeBSD__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace std;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c898293..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.IceUtil.RecMutex.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/IceUtil/RecMutex.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/IceUtil/RecMutex.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,8 +148,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IceUtil::RecMutex::~RecMutex()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(_count == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = pthread_mutex_destroy(&_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_mutex_destroy(&_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -196,8 +199,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(--_count == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NDEBUG
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int rc = 0; // Prevent warnings when NDEBUG is defined.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rc = pthread_mutex_unlock(&_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rc =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pthread_mutex_unlock(&_mutex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assert(rc == 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Slice.CPlusPlusUtil.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Slice.CPlusPlusUtil.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3427498..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Slice.CPlusPlusUtil.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Slice/CPlusPlusUtil.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Slice/CPlusPlusUtil.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -631,7 +631,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string scope = fixKwd(cl->scope());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(marshal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- out << nl << stream << deref << "write(::Ice::ObjectPtr(::IceInternal::upCast(" << fixedParam
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out << nl << stream << deref << "write(::Ice::ObjectPtr(" << scope << "upCast(" << fixedParam
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << ".get())));";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -649,7 +649,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string scope = fixKwd(px->_class()->scope());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(marshal)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceInternal::upCast(" << fixedParam
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceProxy" << scope << "upCast(" << fixedParam
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << ".get())));";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.Slice.FileTracker.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.Slice.FileTracker.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7fc92e6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.Slice.FileTracker.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/Slice/FileTracker.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/Slice/FileTracker.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <direct.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __FreeBSD__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace std;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Slice::FileException::FileException(const char* file, int line, const string& r) :
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 498eaa9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.slice2cpp.Gen.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,111 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/slice2cpp/Gen.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/slice2cpp/Gen.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1944,8 +1944,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string name = fixKwd(p->name());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string scoped = fixKwd(p->scoped());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- H << sp << nl << "class " << name << ';';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Slice::Gen::ProxyVisitor::ProxyVisitor(Output& h, Output& c, const string& dllExport) :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3691,10 +3693,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Slice::Gen::ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string name = fixKwd(p->name());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string scoped = fixKwd(p->scoped());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- H << sp << nl << "class " << name << ';';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- H << nl << "bool operator==(const " << name << "&, const " << name << "&);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- H << nl << "bool operator<(const " << name << "&, const " << name << "&);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ H << sp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(!p->isLocal())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ H << nl << _dllExport << "::Ice::LocalObject* upCast(" << scoped << "*);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4922,13 +4936,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if((BuiltinPtr::dynamicCast(p) && BuiltinPtr::dynamicCast(p)->kind() == Builtin::KindObject)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- || ClassDeclPtr::dynamicCast(p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- C << nl << "if(" << prefix << name << ')';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { C << nl << "if(" << prefix << name << ')';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C << sb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ClassDeclPtr decl = ClassDeclPtr::dynamicCast(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(decl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- C << nl << "::IceInternal::upCast(" << prefix << name << ".get())->__addObject(_c);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string scope = fixKwd(decl->scope());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ C << nl << scope << "upCast(" << prefix << name << ".get())->__addObject(_c);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4991,9 +5005,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ClassDeclPtr decl = ClassDeclPtr::dynamicCast(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(decl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- C << nl << "if(" << "::IceInternal::upCast(" << prefix << name << ".get())->__usesClasses())";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string scope = fixKwd(decl->scope());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ C << nl << "if(" << scope << "upCast(" << prefix << name << ".get())->__usesClasses())";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C << sb;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- C << nl << "::IceInternal::upCast(" << prefix << name << ".get())->__decRefUnsafe();";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ C << nl << scope << "upCast(" << prefix << name << ".get())->__decRefUnsafe();";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C << nl << prefix << name << ".__clearHandleUnsafe();";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5629,40 +5644,30 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string scoped = fixKwd(p->scoped());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- H << sp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(!p->isLocal())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- H << nl << _dllExport << "::Ice::LocalObject* upCast(" << scoped << "*);";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Slice::Gen::IceInternalVisitor::visitClassDefStart(const ClassDefPtr& p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string scoped = fixKwd(p->scoped());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ string scope = fixKwd(p->scope());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C << sp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(!p->isLocal())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C << nl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << "::Ice::Object* IceInternal::upCast(" << scoped << "* p) { return p; }";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "::Ice::Object* " << scope << "upCast(" << scoped << "* p) { return p; }";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C << nl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << "::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy" << scoped
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "::IceProxy::Ice::Object* IceProxy" << scope << "upCast(::IceProxy" << scoped
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << "* p) { return p; }";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C << nl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- << "::Ice::LocalObject* IceInternal::upCast(" << scoped << "* p) { return p; }";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << "::Ice::LocalObject* " << scope << "upCast(" << scoped << "* p) { return p; }";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return true;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.slice2cs.Gen.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.slice2cs.Gen.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dc0a26c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.slice2cs.Gen.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/slice2cs/Gen.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/slice2cs/Gen.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1281,7 +1281,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _out << value << "F";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if(ep = EnumPtr::dynamicCast(type))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if((ep = EnumPtr::dynamicCast(type)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string enumName = fixId(ep->scoped());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string::size_type colon = value.rfind(':');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3914,16 +3914,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string name = fixId(p->name(), DotNet::ICloneable, true);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vector<string> params = getParams(p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- bool hasOutParams = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ParamDeclList paramList = p->parameters();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if((*pli)->isOutParam())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hasOutParams = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _out << sp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.src.slice2java.Gen.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.src.slice2java.Gen.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37f70a8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.src.slice2java.Gen.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/src/slice2java/Gen.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/src/slice2java/Gen.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1246,7 +1246,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BuiltinPtr bp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EnumPtr ep;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(bp = BuiltinPtr::dynamicCast(type))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if((bp = BuiltinPtr::dynamicCast(type)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch(bp->kind())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1349,7 +1349,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if(ep = EnumPtr::dynamicCast(type))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if((ep = EnumPtr::dynamicCast(type)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string val = value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- string::size_type pos = val.rfind(':');
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.test.Glacier2.ssl.Server.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.test.Glacier2.ssl.Server.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 275c114..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.test.Glacier2.ssl.Server.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/test/Glacier2/ssl/Server.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/test/Glacier2/ssl/Server.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,9 +31,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(ctx["_con.type"] == "ssl");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(ctx["_con.localPort"] == "12348");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test(ctx["_con.localAddress"] == "127.0.0.1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!inFreeBSDJail())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test(ctx["_con.localAddress"] == "127.0.0.1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(ctx["_con.remotePort"] != "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test(ctx["_con.remoteAddress"] == "127.0.0.1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!inFreeBSDJail())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test(ctx["_con.remoteAddress"] == "127.0.0.1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -99,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ice_ping(const Ice::Current& current)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ice_ping(const Ice::Current& current) const
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testContext(_ssl, current.ctx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,8 +139,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testContext(true, current.ctx);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test(info.remoteHost == "127.0.0.1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test(info.localHost == "127.0.0.1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!inFreeBSDJail())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test(info.remoteHost == "127.0.0.1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test(info.localHost == "127.0.0.1");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(info.localPort == 12348);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.test.Ice.background.EndpointI.h.diff b/devel/ice-cpp/files/patch-ice.cpp.test.Ice.background.EndpointI.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6b41c26..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.test.Ice.background.EndpointI.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/test/Ice/background/EndpointI.h 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/test/Ice/background/EndpointI.h 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual Ice::Int hashInit() const;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if !defined(_MSC_VER) || _MSC_VER > 1300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- using IceInternal::EndpointI::connectors;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ using ::IceInternal::EndpointI::connectors;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.test.Ice.custom.AllTests.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.test.Ice.custom.AllTests.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a78893b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.test.Ice.custom.AllTests.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/test/Ice/custom/AllTests.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/test/Ice/custom/AllTests.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1384,7 +1384,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const ::Test::ClassStructSeq& seq,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const InParamPtr& cookie)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pair< ::Test::ClassStructPtr, ::Test::ClassStructSeq> in = getIn(in, cookie);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pair< ::Test::ClassStructPtr, ::Test::ClassStructSeq> in;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ in = getIn(in, cookie);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(ret == in.first);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(cs1 == in.first);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(seq == in.second);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1432,7 +1433,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void throwExcept1(const Ice::AsyncResultPtr& result)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wstring in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wstring in;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Test1::WstringClassPrx t = Test1::WstringClassPrx::uncheckedCast(result->getProxy());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1451,7 +1453,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void throwExcept2(const Ice::AsyncResultPtr& result)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wstring in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wstring in;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Test2::WstringClassPrx t = Test2::WstringClassPrx::uncheckedCast(result->getProxy());
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.test.Ice.info.AllTests.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.test.Ice.info.AllTests.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 572ac92..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.test.Ice.info.AllTests.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/test/Ice/info/AllTests.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/test/Ice/info/AllTests.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,9 +141,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(info->adapterName.empty());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(info->localPort > 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(info->remotePort == 12010);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test(info->remoteAddress == defaultHost);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test(info->localAddress == defaultHost);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!inFreeBSDJail())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test(info->remoteAddress == defaultHost);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test(info->localAddress == defaultHost);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ostringstream os;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Ice::Context ctx = testIntf->getConnectionInfoAsContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,8 +165,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(info->adapterName.empty());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(info->localPort > 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test(info->remotePort == 12010);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test(info->remoteAddress ==defaultHost);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- test(info->localAddress == defaultHost);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!inFreeBSDJail())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test(info->remoteAddress == defaultHost);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test(info->localAddress == defaultHost);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cout << "ok" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.test.Ice.properties.run.py.diff b/devel/ice-cpp/files/patch-ice.cpp.test.Ice.properties.run.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb78bd3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.test.Ice.properties.run.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/test/Ice/properties/run.py 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/test/Ice/properties/run.py 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Write config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--configPath = u"./config/中国_client.config"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+configPath = u"./config/中国_client.config".encode("utf-8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TestUtil.createConfig(configPath,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ["# Automatically generated by Ice test driver.",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,4 +38,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TestUtil.simpleTest(client)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.path.exists(configPath):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.remove(configPath)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.remove(configPath)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index be5daa7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.test.IceUtil.unicode.Client.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/test/IceUtil/unicode/Client.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/test/IceUtil/unicode/Client.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,6 +15,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <io.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __FreeBSD__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <unistd.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace IceUtil;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using namespace std;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.test.Slice.keyword.Client.cpp.diff b/devel/ice-cpp/files/patch-ice.cpp.test.Slice.keyword.Client.cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c83d9a9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.test.Slice.keyword.Client.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/test/Slice/keyword/Client.cpp 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/test/Slice/keyword/Client.cpp 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,6 +73,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void ice_response(Ice::Int) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- virtual void ice_exception(const ::Ice::Exception&) {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template<typename T>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+void unused(T const &) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This section of the test is present to ensure that the C++ types
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -86,6 +89,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _cpp_and::_cpp_auto b;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- b._cpp_default = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ unused(b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _cpp_and::deletePtr c = new _cpp_and::_cpp_delete();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- c->_cpp_else = "";
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.cpp.test.include.TestCommon.h.diff b/devel/ice-cpp/files/patch-ice.cpp.test.include.TestCommon.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6bc389..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.cpp.test.include.TestCommon.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/cpp/test/include/TestCommon.h 2011-06-15 21:43:59.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/cpp/test/include/TestCommon.h 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,6 +17,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <sys/sysctl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline bool inFreeBSDJail()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int jailed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ size_t size = sizeof(jailed);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (sysctlbyname("security.jail.jailed", &jailed, &size, NULL, 0) != -1 || jailed);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline bool inFreeBSDJail()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline testFailed(const char* expr, const char* file, unsigned int line)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/ice-cpp/files/patch-ice.scripts.TestUtil.py.diff b/devel/ice-cpp/files/patch-ice.scripts.TestUtil.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d2e9575..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/ice-cpp/files/patch-ice.scripts.TestUtil.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,44 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Ice-3.4.2.orig/scripts/TestUtil.py 2011-06-15 21:44:00.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Ice-3.4.2/scripts/TestUtil.py 2012-03-04 20:14:53.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,6 +74,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def isLinux():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return sys.platform.startswith("linux")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def isFreeBSD():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return sys.platform.startswith("freebsd")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def sysctl(key):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ result = p.communicate()[0].strip().split()[1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except IndexError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if sys.version_info >= (3,):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ result = str(result, sys.stdout.encoding)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return int(result)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except ValueError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return result
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def isFreeBSDJail():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return isFreeBSD() and sysctl("security.jail.jailed")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def getCppCompiler():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler = ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.environ.get("CPP_COMPILER", "") != "":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1590,7 +1609,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if isDarwin() and "nodarwin" in config:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print "%s*** test not supported under Darwin%s" % (prefix, suffix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if isFreeBSD() and "nofreebsd" in config:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print "%s*** test not supported under FreeBSD%s" % (prefix, suffix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if isFreeBSDJail() and "nofreebsdjail" in config:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print "%s*** test not supported within a FreeBSD Jail%s" % (prefix, suffix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not isWin32() and "win32only" in config:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print "%s*** test only supported under Win32%s" % (prefix, suffix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span></pre><pre style='margin:0'>
</pre>