[omniORB/el5] initial import
by Haïkel
commit 4c9cb873ad9dc641806d8462c43adcbe6833576b
Author: Haïkel Guémar <hguemar(a)fedoraproject.org>
Date: Tue Jan 31 22:08:16 2012 +0100
initial import
.gitignore | 1 +
omniNames.service | 12 +
omniORB-4.1.6-fsf-address.patch | 6257 +++++++++++++++++++++++++++++++++++++++
omniORB-nameserver.init | 94 +
omniORB-nameserver.logrotate | 12 +
omniORB.cfg | 2 +
omniORB.spec | 265 ++
sources | 1 +
8 files changed, 6644 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..35134ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/omniORB-4.1.6.tar.bz2
diff --git a/omniNames.service b/omniNames.service
new file mode 100644
index 0000000..3fefca4
--- /dev/null
+++ b/omniNames.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=OmniORB Naming Service
+After=syslog.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/omniNames -start -always -logdir /var/log/omniORB/ -errlog /var/log/omniORB/error.log
+User=omniORB
+Group=OmniORB
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/omniORB-4.1.6-fsf-address.patch b/omniORB-4.1.6-fsf-address.patch
new file mode 100644
index 0000000..6eaaed1
--- /dev/null
+++ b/omniORB-4.1.6-fsf-address.patch
@@ -0,0 +1,6257 @@
+diff --git a/COPYING b/COPYING
+index ae3b531..e3f290f 100644
+--- a/COPYING
++++ b/COPYING
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+ Also add information on how to contact you by electronic and paper mail.
+diff --git a/COPYING.LIB b/COPYING.LIB
+index 223ede7..580e988 100644
+--- a/COPYING.LIB
++++ b/COPYING.LIB
+@@ -2,7 +2,7 @@
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Also add information on how to contact you by electronic and paper mail.
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index fd9d967..2ddf4ab 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -27,7 +27,7 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff --git a/bin/scripts/config.guess b/bin/scripts/config.guess
+index cd430f6..30971de 100755
+--- a/bin/scripts/config.guess
++++ b/bin/scripts/config.guess
+@@ -17,7 +17,7 @@ timestamp='2001-08-21'
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff --git a/bin/scripts/config.sub b/bin/scripts/config.sub
+index 12ebc78..550fe22 100755
+--- a/bin/scripts/config.sub
++++ b/bin/scripts/config.sub
+@@ -21,8 +21,8 @@ timestamp='2001-08-13'
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330,
+-# Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor,
++# Boston, MA 02110-1301, USA.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff --git a/idl/omniConnectionData.idl b/idl/omniConnectionData.idl
+index af8816b..7356a61 100644
+--- a/idl/omniConnectionData.idl
++++ b/idl/omniConnectionData.idl
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/idl/omniTypedefs.idl b/idl/omniTypedefs.idl
+index cd5ce9a..5de351f 100644
+--- a/idl/omniTypedefs.idl
++++ b/idl/omniTypedefs.idl
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/BiDirPolicy.h b/include/omniORB4/BiDirPolicy.h
+index 7e928f3..13789c1 100644
+--- a/include/omniORB4/BiDirPolicy.h
++++ b/include/omniORB4/BiDirPolicy.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA.h b/include/omniORB4/CORBA.h
+index 3ddb0ab..a1bbbb8 100644
+--- a/include/omniORB4/CORBA.h
++++ b/include/omniORB4/CORBA.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_AbstractBase.h b/include/omniORB4/CORBA_AbstractBase.h
+index 184f850..7b4b23b 100644
+--- a/include/omniORB4/CORBA_AbstractBase.h
++++ b/include/omniORB4/CORBA_AbstractBase.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Any.h b/include/omniORB4/CORBA_Any.h
+index 942aa36..46dad32 100644
+--- a/include/omniORB4/CORBA_Any.h
++++ b/include/omniORB4/CORBA_Any.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Any_vartypes.h b/include/omniORB4/CORBA_Any_vartypes.h
+index 3720281..6747bbf 100644
+--- a/include/omniORB4/CORBA_Any_vartypes.h
++++ b/include/omniORB4/CORBA_Any_vartypes.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_BOA.h b/include/omniORB4/CORBA_BOA.h
+index 9e13391..62e1214 100644
+--- a/include/omniORB4/CORBA_BOA.h
++++ b/include/omniORB4/CORBA_BOA.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Context.h b/include/omniORB4/CORBA_Context.h
+index 3361ebf..caf5a3f 100644
+--- a/include/omniORB4/CORBA_Context.h
++++ b/include/omniORB4/CORBA_Context.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Current.h b/include/omniORB4/CORBA_Current.h
+index 9158f0b..fe32ca3 100644
+--- a/include/omniORB4/CORBA_Current.h
++++ b/include/omniORB4/CORBA_Current.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_DomainManager.h b/include/omniORB4/CORBA_DomainManager.h
+index 00021f5..3b13bbc 100644
+--- a/include/omniORB4/CORBA_DomainManager.h
++++ b/include/omniORB4/CORBA_DomainManager.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Environment.h b/include/omniORB4/CORBA_Environment.h
+index 2659b9c..6c2a764 100644
+--- a/include/omniORB4/CORBA_Environment.h
++++ b/include/omniORB4/CORBA_Environment.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Exception.h b/include/omniORB4/CORBA_Exception.h
+index ed3d28c..a1c709a 100644
+--- a/include/omniORB4/CORBA_Exception.h
++++ b/include/omniORB4/CORBA_Exception.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_ExceptionList.h b/include/omniORB4/CORBA_ExceptionList.h
+index 1196ccd..bfc0567 100644
+--- a/include/omniORB4/CORBA_ExceptionList.h
++++ b/include/omniORB4/CORBA_ExceptionList.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Fixed.h b/include/omniORB4/CORBA_Fixed.h
+index 7a891ee..3a8f683 100644
+--- a/include/omniORB4/CORBA_Fixed.h
++++ b/include/omniORB4/CORBA_Fixed.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_LocalObject.h b/include/omniORB4/CORBA_LocalObject.h
+index a81982d..448f869 100644
+--- a/include/omniORB4/CORBA_LocalObject.h
++++ b/include/omniORB4/CORBA_LocalObject.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_LocalObject_vartypes.h b/include/omniORB4/CORBA_LocalObject_vartypes.h
+index 2e0786f..9b56378 100644
+--- a/include/omniORB4/CORBA_LocalObject_vartypes.h
++++ b/include/omniORB4/CORBA_LocalObject_vartypes.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ /*
+diff --git a/include/omniORB4/CORBA_NamedValue.h b/include/omniORB4/CORBA_NamedValue.h
+index 042b69d..ed91c2d 100644
+--- a/include/omniORB4/CORBA_NamedValue.h
++++ b/include/omniORB4/CORBA_NamedValue.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_ORB.h b/include/omniORB4/CORBA_ORB.h
+index b385983..a6ca56b 100644
+--- a/include/omniORB4/CORBA_ORB.h
++++ b/include/omniORB4/CORBA_ORB.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Object.h b/include/omniORB4/CORBA_Object.h
+index 04e4f40..ba7a4a3 100644
+--- a/include/omniORB4/CORBA_Object.h
++++ b/include/omniORB4/CORBA_Object.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Object_vartypes.h b/include/omniORB4/CORBA_Object_vartypes.h
+index 15b6d5e..8c69c24 100644
+--- a/include/omniORB4/CORBA_Object_vartypes.h
++++ b/include/omniORB4/CORBA_Object_vartypes.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Policy.h b/include/omniORB4/CORBA_Policy.h
+index 8d54fba..8987fc7 100644
+--- a/include/omniORB4/CORBA_Policy.h
++++ b/include/omniORB4/CORBA_Policy.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Principal.h b/include/omniORB4/CORBA_Principal.h
+index 1eaa49f..5eb7d4b 100644
+--- a/include/omniORB4/CORBA_Principal.h
++++ b/include/omniORB4/CORBA_Principal.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_Request.h b/include/omniORB4/CORBA_Request.h
+index d7453c2..7910392 100644
+--- a/include/omniORB4/CORBA_Request.h
++++ b/include/omniORB4/CORBA_Request.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_ServerRequest.h b/include/omniORB4/CORBA_ServerRequest.h
+index b7cf77e..de7b135 100644
+--- a/include/omniORB4/CORBA_ServerRequest.h
++++ b/include/omniORB4/CORBA_ServerRequest.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_String.h b/include/omniORB4/CORBA_String.h
+index bb287ae..55cea17 100644
+--- a/include/omniORB4/CORBA_String.h
++++ b/include/omniORB4/CORBA_String.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_TypeCode.h b/include/omniORB4/CORBA_TypeCode.h
+index e8f6abe..8deea58 100644
+--- a/include/omniORB4/CORBA_TypeCode.h
++++ b/include/omniORB4/CORBA_TypeCode.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_TypeCode_member.h b/include/omniORB4/CORBA_TypeCode_member.h
+index df55d66..c25c0a8 100644
+--- a/include/omniORB4/CORBA_TypeCode_member.h
++++ b/include/omniORB4/CORBA_TypeCode_member.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_UnknownUserException.h b/include/omniORB4/CORBA_UnknownUserException.h
+index 5724e58..4b068e6 100644
+--- a/include/omniORB4/CORBA_UnknownUserException.h
++++ b/include/omniORB4/CORBA_UnknownUserException.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_ValueBase.h b/include/omniORB4/CORBA_ValueBase.h
+index f0cf885..16bad34 100644
+--- a/include/omniORB4/CORBA_ValueBase.h
++++ b/include/omniORB4/CORBA_ValueBase.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_ValueBase_vartypes.h b/include/omniORB4/CORBA_ValueBase_vartypes.h
+index df04c57..d1337e2 100644
+--- a/include/omniORB4/CORBA_ValueBase_vartypes.h
++++ b/include/omniORB4/CORBA_ValueBase_vartypes.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_basetypes.h b/include/omniORB4/CORBA_basetypes.h
+index a8f9871..f75a8da 100644
+--- a/include/omniORB4/CORBA_basetypes.h
++++ b/include/omniORB4/CORBA_basetypes.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_primitive_types.h b/include/omniORB4/CORBA_primitive_types.h
+index b2a4513..c88ac6e 100644
+--- a/include/omniORB4/CORBA_primitive_types.h
++++ b/include/omniORB4/CORBA_primitive_types.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_static_fns.h b/include/omniORB4/CORBA_static_fns.h
+index cc822f2..eccf9f5 100644
+--- a/include/omniORB4/CORBA_static_fns.h
++++ b/include/omniORB4/CORBA_static_fns.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_sysdep.h b/include/omniORB4/CORBA_sysdep.h
+index 3ff1f22..10874d9 100644
+--- a/include/omniORB4/CORBA_sysdep.h
++++ b/include/omniORB4/CORBA_sysdep.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_sysdep_auto.h b/include/omniORB4/CORBA_sysdep_auto.h
+index 1b7d79b..5b2aa3b 100644
+--- a/include/omniORB4/CORBA_sysdep_auto.h
++++ b/include/omniORB4/CORBA_sysdep_auto.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_sysdep_trad.h b/include/omniORB4/CORBA_sysdep_trad.h
+index 9a30252..89ee75d 100644
+--- a/include/omniORB4/CORBA_sysdep_trad.h
++++ b/include/omniORB4/CORBA_sysdep_trad.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/CORBA_vartypes.h b/include/omniORB4/CORBA_vartypes.h
+index 32d2b42..6e7ecdf 100644
+--- a/include/omniORB4/CORBA_vartypes.h
++++ b/include/omniORB4/CORBA_vartypes.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/GIOP.h b/include/omniORB4/GIOP.h
+index 507f9ee..3d4ea32 100644
+--- a/include/omniORB4/GIOP.h
++++ b/include/omniORB4/GIOP.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/IIOP.h b/include/omniORB4/IIOP.h
+index 9c43065..91d108f 100644
+--- a/include/omniORB4/IIOP.h
++++ b/include/omniORB4/IIOP.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/IOP.h b/include/omniORB4/IOP.h
+index 5743254..22581f5 100644
+--- a/include/omniORB4/IOP.h
++++ b/include/omniORB4/IOP.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/IOP_C.h b/include/omniORB4/IOP_C.h
+index 528d40c..f88e1f5 100644
+--- a/include/omniORB4/IOP_C.h
++++ b/include/omniORB4/IOP_C.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/IOP_S.h b/include/omniORB4/IOP_S.h
+index fa3de20..7114448 100644
+--- a/include/omniORB4/IOP_S.h
++++ b/include/omniORB4/IOP_S.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/anyStream.h b/include/omniORB4/anyStream.h
+index b74fab6..1c3742d 100644
+--- a/include/omniORB4/anyStream.h
++++ b/include/omniORB4/anyStream.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/boa.h b/include/omniORB4/boa.h
+index 6be126b..af7defc 100644
+--- a/include/omniORB4/boa.h
++++ b/include/omniORB4/boa.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/callDescriptor.h b/include/omniORB4/callDescriptor.h
+index 4c51f9b..1d7abd9 100644
+--- a/include/omniORB4/callDescriptor.h
++++ b/include/omniORB4/callDescriptor.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/callHandle.h b/include/omniORB4/callHandle.h
+index 68f4fea..78d12e4 100644
+--- a/include/omniORB4/callHandle.h
++++ b/include/omniORB4/callHandle.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/cdrStream.h b/include/omniORB4/cdrStream.h
+index 34d76f8..bdbadfb 100644
+--- a/include/omniORB4/cdrStream.h
++++ b/include/omniORB4/cdrStream.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/codeSets.h b/include/omniORB4/codeSets.h
+index 3f42ad4..744bab6 100644
+--- a/include/omniORB4/codeSets.h
++++ b/include/omniORB4/codeSets.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/corba_operators.h b/include/omniORB4/corba_operators.h
+index b3e8054..fed153b 100644
+--- a/include/omniORB4/corba_operators.h
++++ b/include/omniORB4/corba_operators.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/dynAny.h b/include/omniORB4/dynAny.h
+index 340ebff..ebcc6fc 100644
+--- a/include/omniORB4/dynAny.h
++++ b/include/omniORB4/dynAny.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/finalCleanup.h b/include/omniORB4/finalCleanup.h
+index 83dc51f..05ee18c 100644
+--- a/include/omniORB4/finalCleanup.h
++++ b/include/omniORB4/finalCleanup.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/fixed.h b/include/omniORB4/fixed.h
+index 6e88ba4..1f52f7e 100644
+--- a/include/omniORB4/fixed.h
++++ b/include/omniORB4/fixed.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/giopEndpoint.h b/include/omniORB4/giopEndpoint.h
+index 9f05b39..4791882 100644
+--- a/include/omniORB4/giopEndpoint.h
++++ b/include/omniORB4/giopEndpoint.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/GIOP_C.h b/include/omniORB4/internal/GIOP_C.h
+index 9c54c30..b6945c1 100644
+--- a/include/omniORB4/internal/GIOP_C.h
++++ b/include/omniORB4/internal/GIOP_C.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/GIOP_S.h b/include/omniORB4/internal/GIOP_S.h
+index f845760..33d6812 100644
+--- a/include/omniORB4/internal/GIOP_S.h
++++ b/include/omniORB4/internal/GIOP_S.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/SocketCollection.h b/include/omniORB4/internal/SocketCollection.h
+index 7342c70..d67b857 100644
+--- a/include/omniORB4/internal/SocketCollection.h
++++ b/include/omniORB4/internal/SocketCollection.h
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/anonObject.h b/include/omniORB4/internal/anonObject.h
+index 4f792bc..004cfdf 100644
+--- a/include/omniORB4/internal/anonObject.h
++++ b/include/omniORB4/internal/anonObject.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/codeSetUtil.h b/include/omniORB4/internal/codeSetUtil.h
+index c38952d..ffefbe0 100644
+--- a/include/omniORB4/internal/codeSetUtil.h
++++ b/include/omniORB4/internal/codeSetUtil.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/context.h b/include/omniORB4/internal/context.h
+index a66ff95..24767c7 100644
+--- a/include/omniORB4/internal/context.h
++++ b/include/omniORB4/internal/context.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/corbaBoa.h b/include/omniORB4/internal/corbaBoa.h
+index 995ff76..a0cc745 100644
+--- a/include/omniORB4/internal/corbaBoa.h
++++ b/include/omniORB4/internal/corbaBoa.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/corbaOrb.h b/include/omniORB4/internal/corbaOrb.h
+index ebe17cf..ea833b0 100644
+--- a/include/omniORB4/internal/corbaOrb.h
++++ b/include/omniORB4/internal/corbaOrb.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/deferredRequest.h b/include/omniORB4/internal/deferredRequest.h
+index f282a54..3fc0e4c 100644
+--- a/include/omniORB4/internal/deferredRequest.h
++++ b/include/omniORB4/internal/deferredRequest.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/dynAnyImpl.h b/include/omniORB4/internal/dynAnyImpl.h
+index 20c6120..9daff58 100644
+--- a/include/omniORB4/internal/dynAnyImpl.h
++++ b/include/omniORB4/internal/dynAnyImpl.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/dynamicImplementation.h b/include/omniORB4/internal/dynamicImplementation.h
+index 4d8900a..ed30dd7 100644
+--- a/include/omniORB4/internal/dynamicImplementation.h
++++ b/include/omniORB4/internal/dynamicImplementation.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/dynamicLib.h b/include/omniORB4/internal/dynamicLib.h
+index cad0268..ae46bd2 100644
+--- a/include/omniORB4/internal/dynamicLib.h
++++ b/include/omniORB4/internal/dynamicLib.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/excepthandler.h b/include/omniORB4/internal/excepthandler.h
+index 353af98..afb6947 100644
+--- a/include/omniORB4/internal/excepthandler.h
++++ b/include/omniORB4/internal/excepthandler.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/exceptiondefs.h b/include/omniORB4/internal/exceptiondefs.h
+index b74d50f..c148035 100644
+--- a/include/omniORB4/internal/exceptiondefs.h
++++ b/include/omniORB4/internal/exceptiondefs.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopBiDir.h b/include/omniORB4/internal/giopBiDir.h
+index fb1bf3b..04e04b0 100644
+--- a/include/omniORB4/internal/giopBiDir.h
++++ b/include/omniORB4/internal/giopBiDir.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopMonitor.h b/include/omniORB4/internal/giopMonitor.h
+index f269b51..d973ee1 100644
+--- a/include/omniORB4/internal/giopMonitor.h
++++ b/include/omniORB4/internal/giopMonitor.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopRendezvouser.h b/include/omniORB4/internal/giopRendezvouser.h
+index 7ecaef8..baa8162 100644
+--- a/include/omniORB4/internal/giopRendezvouser.h
++++ b/include/omniORB4/internal/giopRendezvouser.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopRope.h b/include/omniORB4/internal/giopRope.h
+index 702e626..f4b0631 100644
+--- a/include/omniORB4/internal/giopRope.h
++++ b/include/omniORB4/internal/giopRope.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopServer.h b/include/omniORB4/internal/giopServer.h
+index 0769f95..b7612bd 100644
+--- a/include/omniORB4/internal/giopServer.h
++++ b/include/omniORB4/internal/giopServer.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopStrand.h b/include/omniORB4/internal/giopStrand.h
+index dd3bb5e..381e60c 100644
+--- a/include/omniORB4/internal/giopStrand.h
++++ b/include/omniORB4/internal/giopStrand.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopStrandFlags.h b/include/omniORB4/internal/giopStrandFlags.h
+index 9c05a47..4271c23 100644
+--- a/include/omniORB4/internal/giopStrandFlags.h
++++ b/include/omniORB4/internal/giopStrandFlags.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopStream.h b/include/omniORB4/internal/giopStream.h
+index 4c11074..3ec2ace 100644
+--- a/include/omniORB4/internal/giopStream.h
++++ b/include/omniORB4/internal/giopStream.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopStreamImpl.h b/include/omniORB4/internal/giopStreamImpl.h
+index 4c83de8..a3b22d0 100644
+--- a/include/omniORB4/internal/giopStreamImpl.h
++++ b/include/omniORB4/internal/giopStreamImpl.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/giopWorker.h b/include/omniORB4/internal/giopWorker.h
+index bf9b81e..8c69208 100644
+--- a/include/omniORB4/internal/giopWorker.h
++++ b/include/omniORB4/internal/giopWorker.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/inProcessIdentity.h b/include/omniORB4/internal/inProcessIdentity.h
+index e8f1d18..59762c2 100644
+--- a/include/omniORB4/internal/inProcessIdentity.h
++++ b/include/omniORB4/internal/inProcessIdentity.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/initRefs.h b/include/omniORB4/internal/initRefs.h
+index dc2df26..2554902 100644
+--- a/include/omniORB4/internal/initRefs.h
++++ b/include/omniORB4/internal/initRefs.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/initialiser.h b/include/omniORB4/internal/initialiser.h
+index b525d37..4c944d7 100644
+--- a/include/omniORB4/internal/initialiser.h
++++ b/include/omniORB4/internal/initialiser.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/interceptors.h b/include/omniORB4/internal/interceptors.h
+index a840630..7241ba1 100644
+--- a/include/omniORB4/internal/interceptors.h
++++ b/include/omniORB4/internal/interceptors.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/invoker.h b/include/omniORB4/internal/invoker.h
+index 1f2541b..a445d66 100644
+--- a/include/omniORB4/internal/invoker.h
++++ b/include/omniORB4/internal/invoker.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/libcWrapper.h b/include/omniORB4/internal/libcWrapper.h
+index 9d6bc59..67f8c26 100644
+--- a/include/omniORB4/internal/libcWrapper.h
++++ b/include/omniORB4/internal/libcWrapper.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/localIdentity.h b/include/omniORB4/internal/localIdentity.h
+index e813014..392462f 100644
+--- a/include/omniORB4/internal/localIdentity.h
++++ b/include/omniORB4/internal/localIdentity.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/objectAdapter.h b/include/omniORB4/internal/objectAdapter.h
+index d6ab76e..6412a4d 100644
+--- a/include/omniORB4/internal/objectAdapter.h
++++ b/include/omniORB4/internal/objectAdapter.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/objectStub.h b/include/omniORB4/internal/objectStub.h
+index 0453fab..8718f78 100644
+--- a/include/omniORB4/internal/objectStub.h
++++ b/include/omniORB4/internal/objectStub.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/objectTable.h b/include/omniORB4/internal/objectTable.h
+index 85aa1a3..ac3dbe2 100644
+--- a/include/omniORB4/internal/objectTable.h
++++ b/include/omniORB4/internal/objectTable.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/omniCurrent.h b/include/omniORB4/internal/omniCurrent.h
+index f40ba84..c6b2642 100644
+--- a/include/omniORB4/internal/omniCurrent.h
++++ b/include/omniORB4/internal/omniCurrent.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/omniIdentity.h b/include/omniORB4/internal/omniIdentity.h
+index ae0aaa8..c05d1cf 100644
+--- a/include/omniORB4/internal/omniIdentity.h
++++ b/include/omniORB4/internal/omniIdentity.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/orbOptions.h b/include/omniORB4/internal/orbOptions.h
+index 4254a8c..365b4c0 100644
+--- a/include/omniORB4/internal/orbOptions.h
++++ b/include/omniORB4/internal/orbOptions.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/orbParameters.h b/include/omniORB4/internal/orbParameters.h
+index 9da5df8..49a35fd 100644
+--- a/include/omniORB4/internal/orbParameters.h
++++ b/include/omniORB4/internal/orbParameters.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/poacurrentimpl.h b/include/omniORB4/internal/poacurrentimpl.h
+index d6790da..62c9350 100644
+--- a/include/omniORB4/internal/poacurrentimpl.h
++++ b/include/omniORB4/internal/poacurrentimpl.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/poaimpl.h b/include/omniORB4/internal/poaimpl.h
+index cb31d41..89ba7f9 100644
+--- a/include/omniORB4/internal/poaimpl.h
++++ b/include/omniORB4/internal/poaimpl.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/poamanager.h b/include/omniORB4/internal/poamanager.h
+index c55c5c8..defc0d2 100644
+--- a/include/omniORB4/internal/poamanager.h
++++ b/include/omniORB4/internal/poamanager.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/pseudo.h b/include/omniORB4/internal/pseudo.h
+index 17b4251..f56760b 100644
+--- a/include/omniORB4/internal/pseudo.h
++++ b/include/omniORB4/internal/pseudo.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/remoteIdentity.h b/include/omniORB4/internal/remoteIdentity.h
+index c0c3ba0..5353381 100644
+--- a/include/omniORB4/internal/remoteIdentity.h
++++ b/include/omniORB4/internal/remoteIdentity.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/request.h b/include/omniORB4/internal/request.h
+index 1120290..56e0562 100644
+--- a/include/omniORB4/internal/request.h
++++ b/include/omniORB4/internal/request.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/rmutex.h b/include/omniORB4/internal/rmutex.h
+index caa1e6a..2088a15 100644
+--- a/include/omniORB4/internal/rmutex.h
++++ b/include/omniORB4/internal/rmutex.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/shutdownIdentity.h b/include/omniORB4/internal/shutdownIdentity.h
+index d1a1e4c..4f06dca 100644
+--- a/include/omniORB4/internal/shutdownIdentity.h
++++ b/include/omniORB4/internal/shutdownIdentity.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/tcParser.h b/include/omniORB4/internal/tcParser.h
+index 10f76e2..f53f2d1 100644
+--- a/include/omniORB4/internal/tcParser.h
++++ b/include/omniORB4/internal/tcParser.h
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/transportRules.h b/include/omniORB4/internal/transportRules.h
+index 39c3ccb..48e4b90 100644
+--- a/include/omniORB4/internal/transportRules.h
++++ b/include/omniORB4/internal/transportRules.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/typecode.h b/include/omniORB4/internal/typecode.h
+index 703b516..1f912e3 100644
+--- a/include/omniORB4/internal/typecode.h
++++ b/include/omniORB4/internal/typecode.h
+@@ -22,8 +22,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/unknownValue.h b/include/omniORB4/internal/unknownValue.h
+index f8b24db..2de348e 100644
+--- a/include/omniORB4/internal/unknownValue.h
++++ b/include/omniORB4/internal/unknownValue.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/internal/valueTrackerImpl.h b/include/omniORB4/internal/valueTrackerImpl.h
+index 19e8cae..8549d7c 100644
+--- a/include/omniORB4/internal/valueTrackerImpl.h
++++ b/include/omniORB4/internal/valueTrackerImpl.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/linkHacks.h b/include/omniORB4/linkHacks.h
+index f38815b..c43f460 100644
+--- a/include/omniORB4/linkHacks.h
++++ b/include/omniORB4/linkHacks.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/minorCode.h b/include/omniORB4/minorCode.h
+index 46ffd2a..3c45d62 100644
+--- a/include/omniORB4/minorCode.h
++++ b/include/omniORB4/minorCode.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/objTracker.h b/include/omniORB4/objTracker.h
+index a90c6a3..510ac40 100644
+--- a/include/omniORB4/objTracker.h
++++ b/include/omniORB4/objTracker.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniAsyncInvoker.h b/include/omniORB4/omniAsyncInvoker.h
+index a1a1ff7..2e7c423 100644
+--- a/include/omniORB4/omniAsyncInvoker.h
++++ b/include/omniORB4/omniAsyncInvoker.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniConnectionMgmt.h b/include/omniORB4/omniConnectionMgmt.h
+index 6e3d214..85b9fd6 100644
+--- a/include/omniORB4/omniConnectionMgmt.h
++++ b/include/omniORB4/omniConnectionMgmt.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Proprietary omniORB connection management API
+diff --git a/include/omniORB4/omniIOR.h b/include/omniORB4/omniIOR.h
+index 8787353..80facfa 100644
+--- a/include/omniORB4/omniIOR.h
++++ b/include/omniORB4/omniIOR.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniInterceptors.h b/include/omniORB4/omniInterceptors.h
+index 5801daf..72894b3 100644
+--- a/include/omniORB4/omniInterceptors.h
++++ b/include/omniORB4/omniInterceptors.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniInternal.h b/include/omniORB4/omniInternal.h
+index dc81d6e..9095678 100644
+--- a/include/omniORB4/omniInternal.h
++++ b/include/omniORB4/omniInternal.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniORB.h b/include/omniORB4/omniORB.h
+index 45ea0ab..9a998ff 100644
+--- a/include/omniORB4/omniORB.h
++++ b/include/omniORB4/omniORB.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniORBcompat.h b/include/omniORB4/omniORBcompat.h
+index 2b382e2..aa6bdac 100644
+--- a/include/omniORB4/omniORBcompat.h
++++ b/include/omniORB4/omniORBcompat.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniObjKey.h b/include/omniORB4/omniObjKey.h
+index 78a524d..b257d40 100644
+--- a/include/omniORB4/omniObjKey.h
++++ b/include/omniORB4/omniObjKey.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniObjRef.h b/include/omniORB4/omniObjRef.h
+index bf77b5b..5116407 100644
+--- a/include/omniORB4/omniObjRef.h
++++ b/include/omniORB4/omniObjRef.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniPolicy.h b/include/omniORB4/omniPolicy.h
+index 682fca2..8477e93 100644
+--- a/include/omniORB4/omniPolicy.h
++++ b/include/omniORB4/omniPolicy.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniServant.h b/include/omniORB4/omniServant.h
+index 97c0708..c4d32da 100644
+--- a/include/omniORB4/omniServant.h
++++ b/include/omniORB4/omniServant.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniServer.h b/include/omniORB4/omniServer.h
+index 2b9da88..e88e9f7 100644
+--- a/include/omniORB4/omniServer.h
++++ b/include/omniORB4/omniServer.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniTransport.h b/include/omniORB4/omniTransport.h
+index 83bdec2..41327a8 100644
+--- a/include/omniORB4/omniTransport.h
++++ b/include/omniORB4/omniTransport.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniURI.h b/include/omniORB4/omniURI.h
+index 74ee558..af76db6 100644
+--- a/include/omniORB4/omniURI.h
++++ b/include/omniORB4/omniURI.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/omniutilities.h b/include/omniORB4/omniutilities.h
+index fde7045..f4adec4 100644
+--- a/include/omniORB4/omniutilities.h
++++ b/include/omniORB4/omniutilities.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/optionalFeatures.h b/include/omniORB4/optionalFeatures.h
+index a70e439..52623f4 100644
+--- a/include/omniORB4/optionalFeatures.h
++++ b/include/omniORB4/optionalFeatures.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/poa.h b/include/omniORB4/poa.h
+index f6c06f2..40656c2 100644
+--- a/include/omniORB4/poa.h
++++ b/include/omniORB4/poa.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/poa_defs.h b/include/omniORB4/poa_defs.h
+index 6c650e2..6f20e83 100644
+--- a/include/omniORB4/poa_defs.h
++++ b/include/omniORB4/poa_defs.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/poa_poa.h b/include/omniORB4/poa_poa.h
+index 12b37d1..2a1b2ae 100644
+--- a/include/omniORB4/poa_poa.h
++++ b/include/omniORB4/poa_poa.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/proxyFactory.h b/include/omniORB4/proxyFactory.h
+index ff6ad43..e04f200 100644
+--- a/include/omniORB4/proxyFactory.h
++++ b/include/omniORB4/proxyFactory.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/seqTemplatedecls.h b/include/omniORB4/seqTemplatedecls.h
+index 6d6556e..c6d731f 100644
+--- a/include/omniORB4/seqTemplatedecls.h
++++ b/include/omniORB4/seqTemplatedecls.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/seqTemplatedefns.h b/include/omniORB4/seqTemplatedefns.h
+index 747292b..e58c02f 100644
+--- a/include/omniORB4/seqTemplatedefns.h
++++ b/include/omniORB4/seqTemplatedefns.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/sslContext.h b/include/omniORB4/sslContext.h
+index 416cf52..d90dc3e 100644
+--- a/include/omniORB4/sslContext.h
++++ b/include/omniORB4/sslContext.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/streamOperators.h b/include/omniORB4/streamOperators.h
+index a551187..ac7161f 100644
+--- a/include/omniORB4/streamOperators.h
++++ b/include/omniORB4/streamOperators.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/stringtypes.h b/include/omniORB4/stringtypes.h
+index c5ba408..0e44376 100644
+--- a/include/omniORB4/stringtypes.h
++++ b/include/omniORB4/stringtypes.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/templatedecls.h b/include/omniORB4/templatedecls.h
+index 820c40e..ab6f76f 100644
+--- a/include/omniORB4/templatedecls.h
++++ b/include/omniORB4/templatedecls.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/templatedefns.h b/include/omniORB4/templatedefns.h
+index 1ae019a..a2a0e02 100644
+--- a/include/omniORB4/templatedefns.h
++++ b/include/omniORB4/templatedefns.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/tracedthread.h b/include/omniORB4/tracedthread.h
+index 09a170a..ce39ab8 100644
+--- a/include/omniORB4/tracedthread.h
++++ b/include/omniORB4/tracedthread.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/userexception.h b/include/omniORB4/userexception.h
+index 6d7a3fa..1a042ae 100644
+--- a/include/omniORB4/userexception.h
++++ b/include/omniORB4/userexception.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/valueFactoryManager.h b/include/omniORB4/valueFactoryManager.h
+index 0337e22..7c41bd7 100644
+--- a/include/omniORB4/valueFactoryManager.h
++++ b/include/omniORB4/valueFactoryManager.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/valueTemplatedecls.h b/include/omniORB4/valueTemplatedecls.h
+index f0dea1a..db70681 100644
+--- a/include/omniORB4/valueTemplatedecls.h
++++ b/include/omniORB4/valueTemplatedecls.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/valueTemplatedefns.h b/include/omniORB4/valueTemplatedefns.h
+index f06eb5f..b6f5d9e 100644
+--- a/include/omniORB4/valueTemplatedefns.h
++++ b/include/omniORB4/valueTemplatedefns.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/valueType.h b/include/omniORB4/valueType.h
+index 7d1dafb..259f915 100644
+--- a/include/omniORB4/valueType.h
++++ b/include/omniORB4/valueType.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniORB4/wstringtypes.h b/include/omniORB4/wstringtypes.h
+index 6acc485..5a798d2 100644
+--- a/include/omniORB4/wstringtypes.h
++++ b/include/omniORB4/wstringtypes.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/include/omniconfig.h b/include/omniconfig.h
+index 0deeb89..bff24cf 100644
+--- a/include/omniconfig.h
++++ b/include/omniconfig.h
+@@ -19,8 +19,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA
+ *
+ *
+ * Description:
+diff --git a/include/omniconfig.h.in b/include/omniconfig.h.in
+index 14f76a9..20402e6 100644
+--- a/include/omniconfig.h.in
++++ b/include/omniconfig.h.in
+@@ -19,8 +19,8 @@
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the Free
+- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- * 02111-1307, USA
++ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ * 02110-1301, USA
+ *
+ *
+ * Description:
+diff --git a/include/omnithread.h b/include/omnithread.h
+index 6767249..d62a2f3 100644
+--- a/include/omnithread.h
++++ b/include/omnithread.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff --git a/include/omnithread/mach.h b/include/omnithread/mach.h
+index 483f600..a8e5dd5 100644
+--- a/include/omnithread/mach.h
++++ b/include/omnithread/mach.h
+@@ -17,8 +17,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // OMNI thread implementation classes for posix threads
+diff --git a/include/omnithread/nt.h b/include/omnithread/nt.h
+index cd2519e..9b6660c 100644
+--- a/include/omnithread/nt.h
++++ b/include/omnithread/nt.h
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // OMNI thread implementation classes for NT threads.
+diff --git a/include/omnithread/posix.h b/include/omnithread/posix.h
+index c5fa4ac..4a4223f 100644
+--- a/include/omnithread/posix.h
++++ b/include/omnithread/posix.h
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // OMNI thread implementation classes for posix threads
+diff --git a/include/omnithread/pthread_nt.h b/include/omnithread/pthread_nt.h
+index cf3d879..0a95fc8 100644
+--- a/include/omnithread/pthread_nt.h
++++ b/include/omnithread/pthread_nt.h
+@@ -17,8 +17,8 @@
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+- 02111-1307, USA
++ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++ 02110-1301, USA
+
+ Posix Threads implementation for Windows NT, version 4.0
+ */
+diff --git a/include/omnithread/solaris.h b/include/omnithread/solaris.h
+index aaef036..e0f6f78 100644
+--- a/include/omnithread/solaris.h
++++ b/include/omnithread/solaris.h
+@@ -17,8 +17,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // OMNI thread implementation classes for solaris threads.
+ //
+diff --git a/src/appl/omniMapper/omniMapper.cc b/src/appl/omniMapper/omniMapper.cc
+index e35847d..22a78c6 100644
+--- a/src/appl/omniMapper/omniMapper.cc
++++ b/src/appl/omniMapper/omniMapper.cc
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+
+ // $Id: omniMapper.cc 5133 2005-01-06 23:11:24Z dgrisby $
+ // $Log$
+diff --git a/src/appl/omniNames/BindingIterator_i.h b/src/appl/omniNames/BindingIterator_i.h
+index 4ab27ac..173124f 100644
+--- a/src/appl/omniNames/BindingIterator_i.h
++++ b/src/appl/omniNames/BindingIterator_i.h
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/INSMapper.h b/src/appl/omniNames/INSMapper.h
+index 603fe89..544a748 100644
+--- a/src/appl/omniNames/INSMapper.h
++++ b/src/appl/omniNames/INSMapper.h
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/NamingContext_i.cc b/src/appl/omniNames/NamingContext_i.cc
+index c48163e..64a9175 100644
+--- a/src/appl/omniNames/NamingContext_i.cc
++++ b/src/appl/omniNames/NamingContext_i.cc
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/NamingContext_i.h b/src/appl/omniNames/NamingContext_i.h
+index 12c6d34..a60d1e4 100644
+--- a/src/appl/omniNames/NamingContext_i.h
++++ b/src/appl/omniNames/NamingContext_i.h
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/ObjectBinding.h b/src/appl/omniNames/ObjectBinding.h
+index 188623a..bb90e29 100644
+--- a/src/appl/omniNames/ObjectBinding.h
++++ b/src/appl/omniNames/ObjectBinding.h
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/ReadersWritersLock.h b/src/appl/omniNames/ReadersWritersLock.h
+index fa7314a..c079502 100644
+--- a/src/appl/omniNames/ReadersWritersLock.h
++++ b/src/appl/omniNames/ReadersWritersLock.h
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/log.cc b/src/appl/omniNames/log.cc
+index d3bc287..5a3544b 100644
+--- a/src/appl/omniNames/log.cc
++++ b/src/appl/omniNames/log.cc
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/log.h b/src/appl/omniNames/log.h
+index 7dec6ca..fb10484 100644
+--- a/src/appl/omniNames/log.h
++++ b/src/appl/omniNames/log.h
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/omniNames.cc b/src/appl/omniNames/omniNames.cc
+index a2facd5..1701536 100644
+--- a/src/appl/omniNames/omniNames.cc
++++ b/src/appl/omniNames/omniNames.cc
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/omniNames.h b/src/appl/omniNames/omniNames.h
+index e8b15e1..7a05ac3 100644
+--- a/src/appl/omniNames/omniNames.h
++++ b/src/appl/omniNames/omniNames.h
+@@ -19,7 +19,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/omniNames/omniNamesWin.cc b/src/appl/omniNames/omniNamesWin.cc
+index 6cd8ab7..ddd6765 100644
+--- a/src/appl/omniNames/omniNamesWin.cc
++++ b/src/appl/omniNames/omniNamesWin.cc
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/appl/utils/catior/catior.cc b/src/appl/utils/catior/catior.cc
+index 784b1a2..77d2945 100644
+--- a/src/appl/utils/catior/catior.cc
++++ b/src/appl/utils/catior/catior.cc
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+ //
+diff --git a/src/appl/utils/convertior/convertior.cc b/src/appl/utils/convertior/convertior.cc
+index bde9a69..4f336bf 100644
+--- a/src/appl/utils/convertior/convertior.cc
++++ b/src/appl/utils/convertior/convertior.cc
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+ //
+diff --git a/src/appl/utils/genior/genior.cc b/src/appl/utils/genior/genior.cc
+index 0627920..a219d9d 100644
+--- a/src/appl/utils/genior/genior.cc
++++ b/src/appl/utils/genior/genior.cc
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+ //
+diff --git a/src/appl/utils/nameclt/nameclt.cc b/src/appl/utils/nameclt/nameclt.cc
+index 3113480..d919f33 100644
+--- a/src/appl/utils/nameclt/nameclt.cc
++++ b/src/appl/utils/nameclt/nameclt.cc
+@@ -18,7 +18,7 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ // USA.
+ //
+
+diff --git a/src/lib/omniORB/codesets/cs-037.cc b/src/lib/omniORB/codesets/cs-037.cc
+index bcac381..776b546 100644
+--- a/src/lib/omniORB/codesets/cs-037.cc
++++ b/src/lib/omniORB/codesets/cs-037.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/codesets/cs-500.cc b/src/lib/omniORB/codesets/cs-500.cc
+index 727e0a2..3626fae 100644
+--- a/src/lib/omniORB/codesets/cs-500.cc
++++ b/src/lib/omniORB/codesets/cs-500.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/codesets/cs-EDF-4.cc b/src/lib/omniORB/codesets/cs-EDF-4.cc
+index a96dc9e..67871c3 100644
+--- a/src/lib/omniORB/codesets/cs-EDF-4.cc
++++ b/src/lib/omniORB/codesets/cs-EDF-4.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/codesets/cs-UCS-4.cc b/src/lib/omniORB/codesets/cs-UCS-4.cc
+index 6a98aa7..e35ccaa 100644
+--- a/src/lib/omniORB/codesets/cs-UCS-4.cc
++++ b/src/lib/omniORB/codesets/cs-UCS-4.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/codesets/omniCodeSets.cc b/src/lib/omniORB/codesets/omniCodeSets.cc
+index bae2960..d56e2e9 100644
+--- a/src/lib/omniORB/codesets/omniCodeSets.cc
++++ b/src/lib/omniORB/codesets/omniCodeSets.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/connections/dataStub.cc b/src/lib/omniORB/connections/dataStub.cc
+index a378e34..cc109c2 100644
+--- a/src/lib/omniORB/connections/dataStub.cc
++++ b/src/lib/omniORB/connections/dataStub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // omniidl generated stub file
+diff --git a/src/lib/omniORB/connections/omniConnectionMgmt.cc b/src/lib/omniORB/connections/omniConnectionMgmt.cc
+index cb70cd9..30e0f84 100644
+--- a/src/lib/omniORB/connections/omniConnectionMgmt.cc
++++ b/src/lib/omniORB/connections/omniConnectionMgmt.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Proprietary omniORB connection management API
+diff --git a/src/lib/omniORB/dynamic/Namingdynstub.cc b/src/lib/omniORB/dynamic/Namingdynstub.cc
+index 43ded94..028815c 100644
+--- a/src/lib/omniORB/dynamic/Namingdynstub.cc
++++ b/src/lib/omniORB/dynamic/Namingdynstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/abstractBase.cc b/src/lib/omniORB/dynamic/abstractBase.cc
+index 96ec451..85a9ee7 100644
+--- a/src/lib/omniORB/dynamic/abstractBase.cc
++++ b/src/lib/omniORB/dynamic/abstractBase.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/any.cc b/src/lib/omniORB/dynamic/any.cc
+index 3de09d7..bb1ceec 100644
+--- a/src/lib/omniORB/dynamic/any.cc
++++ b/src/lib/omniORB/dynamic/any.cc
+@@ -22,8 +22,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/anyStream.cc b/src/lib/omniORB/dynamic/anyStream.cc
+index 7321658..c655bf3 100644
+--- a/src/lib/omniORB/dynamic/anyStream.cc
++++ b/src/lib/omniORB/dynamic/anyStream.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/bootstrapdynstub.cc b/src/lib/omniORB/dynamic/bootstrapdynstub.cc
+index 97f85cc..58d5b80 100644
+--- a/src/lib/omniORB/dynamic/bootstrapdynstub.cc
++++ b/src/lib/omniORB/dynamic/bootstrapdynstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/boxes.cc b/src/lib/omniORB/dynamic/boxes.cc
+index 869f2db..87333c7 100644
+--- a/src/lib/omniORB/dynamic/boxes.cc
++++ b/src/lib/omniORB/dynamic/boxes.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #include <omniORB4/CORBA.h>
+diff --git a/src/lib/omniORB/dynamic/constants.cc b/src/lib/omniORB/dynamic/constants.cc
+index 39e99b4..ab744ae 100644
+--- a/src/lib/omniORB/dynamic/constants.cc
++++ b/src/lib/omniORB/dynamic/constants.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/context.cc b/src/lib/omniORB/dynamic/context.cc
+index f03fbff..6fb5dd0 100644
+--- a/src/lib/omniORB/dynamic/context.cc
++++ b/src/lib/omniORB/dynamic/context.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/contextList.cc b/src/lib/omniORB/dynamic/contextList.cc
+index f212bd9..b1ab5a4 100644
+--- a/src/lib/omniORB/dynamic/contextList.cc
++++ b/src/lib/omniORB/dynamic/contextList.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/corbaidldynstub.cc b/src/lib/omniORB/dynamic/corbaidldynstub.cc
+index 1a3e39d..0a57510 100644
+--- a/src/lib/omniORB/dynamic/corbaidldynstub.cc
++++ b/src/lib/omniORB/dynamic/corbaidldynstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/corbaidlstub.cc b/src/lib/omniORB/dynamic/corbaidlstub.cc
+index d4a5228..d7cc20e 100644
+--- a/src/lib/omniORB/dynamic/corbaidlstub.cc
++++ b/src/lib/omniORB/dynamic/corbaidlstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/deferredRequest.cc b/src/lib/omniORB/dynamic/deferredRequest.cc
+index 824a02b..cf72a8c 100644
+--- a/src/lib/omniORB/dynamic/deferredRequest.cc
++++ b/src/lib/omniORB/dynamic/deferredRequest.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/dynAny.cc b/src/lib/omniORB/dynamic/dynAny.cc
+index 868dc95..68b2192 100644
+--- a/src/lib/omniORB/dynamic/dynAny.cc
++++ b/src/lib/omniORB/dynamic/dynAny.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/dynAnyNil.cc b/src/lib/omniORB/dynamic/dynAnyNil.cc
+index b621853..e531c60 100644
+--- a/src/lib/omniORB/dynamic/dynAnyNil.cc
++++ b/src/lib/omniORB/dynamic/dynAnyNil.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/dynException.cc b/src/lib/omniORB/dynamic/dynException.cc
+index c9bf945..1e54af2 100644
+--- a/src/lib/omniORB/dynamic/dynException.cc
++++ b/src/lib/omniORB/dynamic/dynException.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/dynamicImplementation.cc b/src/lib/omniORB/dynamic/dynamicImplementation.cc
+index bbf9901..cb4dbe0 100644
+--- a/src/lib/omniORB/dynamic/dynamicImplementation.cc
++++ b/src/lib/omniORB/dynamic/dynamicImplementation.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/dynamicLib.cc b/src/lib/omniORB/dynamic/dynamicLib.cc
+index 7c8046b..7ff1aa6 100644
+--- a/src/lib/omniORB/dynamic/dynamicLib.cc
++++ b/src/lib/omniORB/dynamic/dynamicLib.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/environment.cc b/src/lib/omniORB/dynamic/environment.cc
+index 84145d5..53e6d59 100644
+--- a/src/lib/omniORB/dynamic/environment.cc
++++ b/src/lib/omniORB/dynamic/environment.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/exceptionList.cc b/src/lib/omniORB/dynamic/exceptionList.cc
+index c998b1b..70545dd 100644
+--- a/src/lib/omniORB/dynamic/exceptionList.cc
++++ b/src/lib/omniORB/dynamic/exceptionList.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/ir.cc b/src/lib/omniORB/dynamic/ir.cc
+index be845d6..1a29c6f 100644
+--- a/src/lib/omniORB/dynamic/ir.cc
++++ b/src/lib/omniORB/dynamic/ir.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/irdynstub.cc b/src/lib/omniORB/dynamic/irdynstub.cc
+index b8db0a5..b7d3105 100644
+--- a/src/lib/omniORB/dynamic/irdynstub.cc
++++ b/src/lib/omniORB/dynamic/irdynstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/irstub.cc b/src/lib/omniORB/dynamic/irstub.cc
+index e957fff..2894144 100644
+--- a/src/lib/omniORB/dynamic/irstub.cc
++++ b/src/lib/omniORB/dynamic/irstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/namedValue.cc b/src/lib/omniORB/dynamic/namedValue.cc
+index 49db3af..4b2f482 100644
+--- a/src/lib/omniORB/dynamic/namedValue.cc
++++ b/src/lib/omniORB/dynamic/namedValue.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/nvList.cc b/src/lib/omniORB/dynamic/nvList.cc
+index 0d5b176..0f1bbc7 100644
+--- a/src/lib/omniORB/dynamic/nvList.cc
++++ b/src/lib/omniORB/dynamic/nvList.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/omniTypedefs.cc b/src/lib/omniORB/dynamic/omniTypedefs.cc
+index 1bedf4d..2dd622b 100644
+--- a/src/lib/omniORB/dynamic/omniTypedefs.cc
++++ b/src/lib/omniORB/dynamic/omniTypedefs.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ #define USE_core_stub_in_nt_dll
+diff --git a/src/lib/omniORB/dynamic/orbMultiRequest.cc b/src/lib/omniORB/dynamic/orbMultiRequest.cc
+index fb63995..bd9986e 100644
+--- a/src/lib/omniORB/dynamic/orbMultiRequest.cc
++++ b/src/lib/omniORB/dynamic/orbMultiRequest.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/poastub.cc b/src/lib/omniORB/dynamic/poastub.cc
+index b4ced90..48ee7cc 100644
+--- a/src/lib/omniORB/dynamic/poastub.cc
++++ b/src/lib/omniORB/dynamic/poastub.cc
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ //
+diff --git a/src/lib/omniORB/dynamic/policy.cc b/src/lib/omniORB/dynamic/policy.cc
+index 0f7ae05..a1d2f06 100644
+--- a/src/lib/omniORB/dynamic/policy.cc
++++ b/src/lib/omniORB/dynamic/policy.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/pseudoBase.cc b/src/lib/omniORB/dynamic/pseudoBase.cc
+index edf9cb1..7934707 100644
+--- a/src/lib/omniORB/dynamic/pseudoBase.cc
++++ b/src/lib/omniORB/dynamic/pseudoBase.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/request.cc b/src/lib/omniORB/dynamic/request.cc
+index 839f41b..f34043b 100644
+--- a/src/lib/omniORB/dynamic/request.cc
++++ b/src/lib/omniORB/dynamic/request.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/serverRequest.cc b/src/lib/omniORB/dynamic/serverRequest.cc
+index 0a575a8..bcc1410 100644
+--- a/src/lib/omniORB/dynamic/serverRequest.cc
++++ b/src/lib/omniORB/dynamic/serverRequest.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/tcParser.cc b/src/lib/omniORB/dynamic/tcParser.cc
+index 0be03b7..9920a22 100644
+--- a/src/lib/omniORB/dynamic/tcParser.cc
++++ b/src/lib/omniORB/dynamic/tcParser.cc
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/typecode.cc b/src/lib/omniORB/dynamic/typecode.cc
+index b5ee74e..5d0ea46 100644
+--- a/src/lib/omniORB/dynamic/typecode.cc
++++ b/src/lib/omniORB/dynamic/typecode.cc
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/unknownUserExn.cc b/src/lib/omniORB/dynamic/unknownUserExn.cc
+index 5e45d6b..b2b5efd 100644
+--- a/src/lib/omniORB/dynamic/unknownUserExn.cc
++++ b/src/lib/omniORB/dynamic/unknownUserExn.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/unknownValue.cc b/src/lib/omniORB/dynamic/unknownValue.cc
+index 728d63b..950ccde 100644
+--- a/src/lib/omniORB/dynamic/unknownValue.cc
++++ b/src/lib/omniORB/dynamic/unknownValue.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/valueBase.cc b/src/lib/omniORB/dynamic/valueBase.cc
+index bffc6e6..2cf29f0 100644
+--- a/src/lib/omniORB/dynamic/valueBase.cc
++++ b/src/lib/omniORB/dynamic/valueBase.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/valueFactory.cc b/src/lib/omniORB/dynamic/valueFactory.cc
+index aba73a1..2860281 100644
+--- a/src/lib/omniORB/dynamic/valueFactory.cc
++++ b/src/lib/omniORB/dynamic/valueFactory.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/valueTracker.cc b/src/lib/omniORB/dynamic/valueTracker.cc
+index 86d5356..2492b00 100644
+--- a/src/lib/omniORB/dynamic/valueTracker.cc
++++ b/src/lib/omniORB/dynamic/valueTracker.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/dynamic/valueType.cc b/src/lib/omniORB/dynamic/valueType.cc
+index bab9d49..942d842 100644
+--- a/src/lib/omniORB/dynamic/valueType.cc
++++ b/src/lib/omniORB/dynamic/valueType.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/omniidl_be/cxx/__init__.py b/src/lib/omniORB/omniidl_be/cxx/__init__.py
+index b153b5e..b1a6b15 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/__init__.py
++++ b/src/lib/omniORB/omniidl_be/cxx/__init__.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/ast.py b/src/lib/omniORB/omniidl_be/cxx/ast.py
+index e1c8564..66585e4 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/ast.py
++++ b/src/lib/omniORB/omniidl_be/cxx/ast.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/call.py b/src/lib/omniORB/omniidl_be/cxx/call.py
+index 10fec73..374b14a 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/call.py
++++ b/src/lib/omniORB/omniidl_be/cxx/call.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce local callback functions
+diff --git a/src/lib/omniORB/omniidl_be/cxx/config.py b/src/lib/omniORB/omniidl_be/cxx/config.py
+index 7c72644..d4414ab 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/config.py
++++ b/src/lib/omniORB/omniidl_be/cxx/config.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/cxx.py b/src/lib/omniORB/omniidl_be/cxx/cxx.py
+index 0d92e68..17bae84 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/cxx.py
++++ b/src/lib/omniORB/omniidl_be/cxx/cxx.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/descriptor.py b/src/lib/omniORB/omniidl_be/cxx/descriptor.py
+index 581aef5..0f3a3b9 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/descriptor.py
++++ b/src/lib/omniORB/omniidl_be/cxx/descriptor.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce internal descriptors
+diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/__init__.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/__init__.py
+index 9d90d93..6c617b9 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/dynskel/__init__.py
++++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/__init__.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/main.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/main.py
+index f5442da..c9cea18 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/dynskel/main.py
++++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/main.py
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/tcstring.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/tcstring.py
+index 3bb0376..1383653 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/dynskel/tcstring.py
++++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/tcstring.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/template.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/template.py
+index 9672ade..bf60d64 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/dynskel/template.py
++++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/template.py
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py b/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py
+index fd98b2c..678f5c3 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py
++++ b/src/lib/omniORB/omniidl_be/cxx/dynskel/typecode.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/__init__.py b/src/lib/omniORB/omniidl_be/cxx/header/__init__.py
+index ce711dc..36ca8f7 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/__init__.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/__init__.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/defs.py b/src/lib/omniORB/omniidl_be/cxx/header/defs.py
+index 4dccc37..9db60ff 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/defs.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/defs.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/forward.py b/src/lib/omniORB/omniidl_be/cxx/header/forward.py
+index c2b041b..d0df5d4 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/forward.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/forward.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/marshal.py b/src/lib/omniORB/omniidl_be/cxx/header/marshal.py
+index 9847008..d6cacfa 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/marshal.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/marshal.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/obv.py b/src/lib/omniORB/omniidl_be/cxx/header/obv.py
+index 7690d77..45df72c 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/obv.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/obv.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/opers.py b/src/lib/omniORB/omniidl_be/cxx/header/opers.py
+index 0d4ec57..ca62413 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/opers.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/opers.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/poa.py b/src/lib/omniORB/omniidl_be/cxx/header/poa.py
+index 84b0d01..706251f 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/poa.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/poa.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/tcstring.py b/src/lib/omniORB/omniidl_be/cxx/header/tcstring.py
+index cec6fc8..1ecc0cc 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/tcstring.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/tcstring.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/template.py b/src/lib/omniORB/omniidl_be/cxx/header/template.py
+index fd8d5a4..a60b639 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/template.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/template.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/header/tie.py b/src/lib/omniORB/omniidl_be/cxx/header/tie.py
+index 95bc682..7111794 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/header/tie.py
++++ b/src/lib/omniORB/omniidl_be/cxx/header/tie.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/id.py b/src/lib/omniORB/omniidl_be/cxx/id.py
+index a2ee344..1d32735 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/id.py
++++ b/src/lib/omniORB/omniidl_be/cxx/id.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/iface.py b/src/lib/omniORB/omniidl_be/cxx/iface.py
+index 2053bf1..b43c6ca 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/iface.py
++++ b/src/lib/omniORB/omniidl_be/cxx/iface.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/impl/__init__.py b/src/lib/omniORB/omniidl_be/cxx/impl/__init__.py
+index 4a2a4ea..2dc6d5f 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/impl/__init__.py
++++ b/src/lib/omniORB/omniidl_be/cxx/impl/__init__.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/impl/main.py b/src/lib/omniORB/omniidl_be/cxx/impl/main.py
+index 5cb3f97..7c6de25 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/impl/main.py
++++ b/src/lib/omniORB/omniidl_be/cxx/impl/main.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/impl/template.py b/src/lib/omniORB/omniidl_be/cxx/impl/template.py
+index 3f0120d..ed1b7ae 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/impl/template.py
++++ b/src/lib/omniORB/omniidl_be/cxx/impl/template.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/mapping.py b/src/lib/omniORB/omniidl_be/cxx/mapping.py
+index 866a937..3683efa 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/mapping.py
++++ b/src/lib/omniORB/omniidl_be/cxx/mapping.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Abstract base class for C++ type mappings
+diff --git a/src/lib/omniORB/omniidl_be/cxx/output.py b/src/lib/omniORB/omniidl_be/cxx/output.py
+index 452538e..214cfd1 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/output.py
++++ b/src/lib/omniORB/omniidl_be/cxx/output.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/__init__.py b/src/lib/omniORB/omniidl_be/cxx/skel/__init__.py
+index af6f05c..49c1a92 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/skel/__init__.py
++++ b/src/lib/omniORB/omniidl_be/cxx/skel/__init__.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/main.py b/src/lib/omniORB/omniidl_be/cxx/skel/main.py
+index a75ccba..9adb18e 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/skel/main.py
++++ b/src/lib/omniORB/omniidl_be/cxx/skel/main.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/mangler.py b/src/lib/omniORB/omniidl_be/cxx/skel/mangler.py
+index 8ea9106..4fe4ba4 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/skel/mangler.py
++++ b/src/lib/omniORB/omniidl_be/cxx/skel/mangler.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Produce mangled names for types and operation signatures
+diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/poa.py b/src/lib/omniORB/omniidl_be/cxx/skel/poa.py
+index 8aeaaec..0f9ac25 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/skel/poa.py
++++ b/src/lib/omniORB/omniidl_be/cxx/skel/poa.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/skel/template.py b/src/lib/omniORB/omniidl_be/cxx/skel/template.py
+index e470cda..eed9283 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/skel/template.py
++++ b/src/lib/omniORB/omniidl_be/cxx/skel/template.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/skutil.py b/src/lib/omniORB/omniidl_be/cxx/skutil.py
+index ff7fd7a..89ac559 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/skutil.py
++++ b/src/lib/omniORB/omniidl_be/cxx/skutil.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/support.py b/src/lib/omniORB/omniidl_be/cxx/support.py
+index 9924260..69b0f82 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/support.py
++++ b/src/lib/omniORB/omniidl_be/cxx/support.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/tools/genIDL b/src/lib/omniORB/omniidl_be/cxx/tools/genIDL
+index 623425b..4853635 100755
+--- a/src/lib/omniORB/omniidl_be/cxx/tools/genIDL
++++ b/src/lib/omniORB/omniidl_be/cxx/tools/genIDL
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/tools/pretty b/src/lib/omniORB/omniidl_be/cxx/tools/pretty
+index 617c0f4..712a688 100755
+--- a/src/lib/omniORB/omniidl_be/cxx/tools/pretty
++++ b/src/lib/omniORB/omniidl_be/cxx/tools/pretty
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/types.py b/src/lib/omniORB/omniidl_be/cxx/types.py
+index 11901ac..d496f22 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/types.py
++++ b/src/lib/omniORB/omniidl_be/cxx/types.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/util.py b/src/lib/omniORB/omniidl_be/cxx/util.py
+index f251f41..5e43caa 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/util.py
++++ b/src/lib/omniORB/omniidl_be/cxx/util.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/lib/omniORB/omniidl_be/cxx/value.py b/src/lib/omniORB/omniidl_be/cxx/value.py
+index 18bc46a..31f87e0 100644
+--- a/src/lib/omniORB/omniidl_be/cxx/value.py
++++ b/src/lib/omniORB/omniidl_be/cxx/value.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ # Implementation of ValueType / ValueBox mapping
+diff --git a/src/lib/omniORB/orbcore/GIOP_C.cc b/src/lib/omniORB/orbcore/GIOP_C.cc
+index dac56aa..f892a0c 100644
+--- a/src/lib/omniORB/orbcore/GIOP_C.cc
++++ b/src/lib/omniORB/orbcore/GIOP_C.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/GIOP_S.cc b/src/lib/omniORB/orbcore/GIOP_S.cc
+index df0507f..c5d2f22 100644
+--- a/src/lib/omniORB/orbcore/GIOP_S.cc
++++ b/src/lib/omniORB/orbcore/GIOP_S.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/Namingstub.cc b/src/lib/omniORB/orbcore/Namingstub.cc
+index 496835b..102988b 100644
+--- a/src/lib/omniORB/orbcore/Namingstub.cc
++++ b/src/lib/omniORB/orbcore/Namingstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/SocketCollection.cc b/src/lib/omniORB/orbcore/SocketCollection.cc
+index 43665bc..9b8bf57 100644
+--- a/src/lib/omniORB/orbcore/SocketCollection.cc
++++ b/src/lib/omniORB/orbcore/SocketCollection.cc
+@@ -21,8 +21,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/anonObject.cc b/src/lib/omniORB/orbcore/anonObject.cc
+index f3a55df..0e3aff3 100644
+--- a/src/lib/omniORB/orbcore/anonObject.cc
++++ b/src/lib/omniORB/orbcore/anonObject.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/bootstrapstub.cc b/src/lib/omniORB/orbcore/bootstrapstub.cc
+index 69a42b9..828471c 100644
+--- a/src/lib/omniORB/orbcore/bootstrapstub.cc
++++ b/src/lib/omniORB/orbcore/bootstrapstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/callDescriptor.cc b/src/lib/omniORB/orbcore/callDescriptor.cc
+index 8eb9ebc..7590a37 100644
+--- a/src/lib/omniORB/orbcore/callDescriptor.cc
++++ b/src/lib/omniORB/orbcore/callDescriptor.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/callHandle.cc b/src/lib/omniORB/orbcore/callHandle.cc
+index 20e4622..ac8ba12 100644
+--- a/src/lib/omniORB/orbcore/callHandle.cc
++++ b/src/lib/omniORB/orbcore/callHandle.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/cdrMemoryStream.cc b/src/lib/omniORB/orbcore/cdrMemoryStream.cc
+index 4ff7ae8..f480489 100644
+--- a/src/lib/omniORB/orbcore/cdrMemoryStream.cc
++++ b/src/lib/omniORB/orbcore/cdrMemoryStream.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/cdrStream.cc b/src/lib/omniORB/orbcore/cdrStream.cc
+index 95abde1..08b8360 100644
+--- a/src/lib/omniORB/orbcore/cdrStream.cc
++++ b/src/lib/omniORB/orbcore/cdrStream.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/cdrStreamAdapter.cc b/src/lib/omniORB/orbcore/cdrStreamAdapter.cc
+index dc68fdf..380d4b9 100644
+--- a/src/lib/omniORB/orbcore/cdrStreamAdapter.cc
++++ b/src/lib/omniORB/orbcore/cdrStreamAdapter.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/cdrValueChunkStream.cc b/src/lib/omniORB/orbcore/cdrValueChunkStream.cc
+index 91c9b27..f9acaac 100644
+--- a/src/lib/omniORB/orbcore/cdrValueChunkStream.cc
++++ b/src/lib/omniORB/orbcore/cdrValueChunkStream.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/codeSets.cc b/src/lib/omniORB/orbcore/codeSets.cc
+index 7569613..9384ea5 100644
+--- a/src/lib/omniORB/orbcore/codeSets.cc
++++ b/src/lib/omniORB/orbcore/codeSets.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/constants.cc b/src/lib/omniORB/orbcore/constants.cc
+index 97375da..d8ce4cf 100644
+--- a/src/lib/omniORB/orbcore/constants.cc
++++ b/src/lib/omniORB/orbcore/constants.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/corbaBoa.cc b/src/lib/omniORB/orbcore/corbaBoa.cc
+index 37dfbc3..61a0bcb 100644
+--- a/src/lib/omniORB/orbcore/corbaBoa.cc
++++ b/src/lib/omniORB/orbcore/corbaBoa.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/corbaFixed.cc b/src/lib/omniORB/orbcore/corbaFixed.cc
+index eabf4f0..eada0e5 100644
+--- a/src/lib/omniORB/orbcore/corbaFixed.cc
++++ b/src/lib/omniORB/orbcore/corbaFixed.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/corbaObject.cc b/src/lib/omniORB/orbcore/corbaObject.cc
+index 4831ddf..69d03ac 100644
+--- a/src/lib/omniORB/orbcore/corbaObject.cc
++++ b/src/lib/omniORB/orbcore/corbaObject.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ // Description:
+ // Implementation of the CORBA::Object interface.
+diff --git a/src/lib/omniORB/orbcore/corbaOrb.cc b/src/lib/omniORB/orbcore/corbaOrb.cc
+index 5ed98e3..e9b2698 100644
+--- a/src/lib/omniORB/orbcore/corbaOrb.cc
++++ b/src/lib/omniORB/orbcore/corbaOrb.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/corbaString.cc b/src/lib/omniORB/orbcore/corbaString.cc
+index 0165e9e..ef15500 100644
+--- a/src/lib/omniORB/orbcore/corbaString.cc
++++ b/src/lib/omniORB/orbcore/corbaString.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/corbaWString.cc b/src/lib/omniORB/orbcore/corbaWString.cc
+index 020d194..5c5bde1 100644
+--- a/src/lib/omniORB/orbcore/corbaWString.cc
++++ b/src/lib/omniORB/orbcore/corbaWString.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/cs-16bit.cc b/src/lib/omniORB/orbcore/cs-16bit.cc
+index 553de02..3b78988 100644
+--- a/src/lib/omniORB/orbcore/cs-16bit.cc
++++ b/src/lib/omniORB/orbcore/cs-16bit.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/cs-8859-1.cc b/src/lib/omniORB/orbcore/cs-8859-1.cc
+index 116e571..9cf3ac0 100644
+--- a/src/lib/omniORB/orbcore/cs-8859-1.cc
++++ b/src/lib/omniORB/orbcore/cs-8859-1.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/cs-8bit.cc b/src/lib/omniORB/orbcore/cs-8bit.cc
+index add5cdb..3cd3315 100644
+--- a/src/lib/omniORB/orbcore/cs-8bit.cc
++++ b/src/lib/omniORB/orbcore/cs-8bit.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/cs-UTF-16.cc b/src/lib/omniORB/orbcore/cs-UTF-16.cc
+index ff5809d..fcd33d5 100644
+--- a/src/lib/omniORB/orbcore/cs-UTF-16.cc
++++ b/src/lib/omniORB/orbcore/cs-UTF-16.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/cs-UTF-8.cc b/src/lib/omniORB/orbcore/cs-UTF-8.cc
+index 10e9014..7969329 100644
+--- a/src/lib/omniORB/orbcore/cs-UTF-8.cc
++++ b/src/lib/omniORB/orbcore/cs-UTF-8.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/current.cc b/src/lib/omniORB/orbcore/current.cc
+index 0c946f0..bc11cd6 100644
+--- a/src/lib/omniORB/orbcore/current.cc
++++ b/src/lib/omniORB/orbcore/current.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/dynamicLib.cc b/src/lib/omniORB/orbcore/dynamicLib.cc
+index ca2ca96..71bb27b 100644
+--- a/src/lib/omniORB/orbcore/dynamicLib.cc
++++ b/src/lib/omniORB/orbcore/dynamicLib.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/exception.cc b/src/lib/omniORB/orbcore/exception.cc
+index 2a8e5d2..1109266 100644
+--- a/src/lib/omniORB/orbcore/exception.cc
++++ b/src/lib/omniORB/orbcore/exception.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/exceptn.cc b/src/lib/omniORB/orbcore/exceptn.cc
+index a5e52db..f4140f9 100644
+--- a/src/lib/omniORB/orbcore/exceptn.cc
++++ b/src/lib/omniORB/orbcore/exceptn.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopBiDir.cc b/src/lib/omniORB/orbcore/giopBiDir.cc
+index 2448d4e..afef704 100644
+--- a/src/lib/omniORB/orbcore/giopBiDir.cc
++++ b/src/lib/omniORB/orbcore/giopBiDir.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopEndpoint.cc b/src/lib/omniORB/orbcore/giopEndpoint.cc
+index e195ed7..bd1dad5 100644
+--- a/src/lib/omniORB/orbcore/giopEndpoint.cc
++++ b/src/lib/omniORB/orbcore/giopEndpoint.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopImpl10.cc b/src/lib/omniORB/orbcore/giopImpl10.cc
+index 9c112e5..2c0c8be 100644
+--- a/src/lib/omniORB/orbcore/giopImpl10.cc
++++ b/src/lib/omniORB/orbcore/giopImpl10.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopImpl11.cc b/src/lib/omniORB/orbcore/giopImpl11.cc
+index 556a5fe..83a1d57 100644
+--- a/src/lib/omniORB/orbcore/giopImpl11.cc
++++ b/src/lib/omniORB/orbcore/giopImpl11.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopImpl12.cc b/src/lib/omniORB/orbcore/giopImpl12.cc
+index 9ce0605..515a21e 100644
+--- a/src/lib/omniORB/orbcore/giopImpl12.cc
++++ b/src/lib/omniORB/orbcore/giopImpl12.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopMonitor.cc b/src/lib/omniORB/orbcore/giopMonitor.cc
+index 135c7b5..ca84e2a 100644
+--- a/src/lib/omniORB/orbcore/giopMonitor.cc
++++ b/src/lib/omniORB/orbcore/giopMonitor.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopRendezvouser.cc b/src/lib/omniORB/orbcore/giopRendezvouser.cc
+index a22c025..6d2fe89 100644
+--- a/src/lib/omniORB/orbcore/giopRendezvouser.cc
++++ b/src/lib/omniORB/orbcore/giopRendezvouser.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopRope.cc b/src/lib/omniORB/orbcore/giopRope.cc
+index c337e33..741d447 100644
+--- a/src/lib/omniORB/orbcore/giopRope.cc
++++ b/src/lib/omniORB/orbcore/giopRope.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopServer.cc b/src/lib/omniORB/orbcore/giopServer.cc
+index d6783a8..3293f0f 100644
+--- a/src/lib/omniORB/orbcore/giopServer.cc
++++ b/src/lib/omniORB/orbcore/giopServer.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopStrand.cc b/src/lib/omniORB/orbcore/giopStrand.cc
+index 24f052c..7f0c0e4 100644
+--- a/src/lib/omniORB/orbcore/giopStrand.cc
++++ b/src/lib/omniORB/orbcore/giopStrand.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopStream.cc b/src/lib/omniORB/orbcore/giopStream.cc
+index 2bc8f86..5e9233c 100644
+--- a/src/lib/omniORB/orbcore/giopStream.cc
++++ b/src/lib/omniORB/orbcore/giopStream.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopStreamImpl.cc b/src/lib/omniORB/orbcore/giopStreamImpl.cc
+index 1112b42..918d3d1 100644
+--- a/src/lib/omniORB/orbcore/giopStreamImpl.cc
++++ b/src/lib/omniORB/orbcore/giopStreamImpl.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/giopWorker.cc b/src/lib/omniORB/orbcore/giopWorker.cc
+index ae7e488..e862d0a 100644
+--- a/src/lib/omniORB/orbcore/giopWorker.cc
++++ b/src/lib/omniORB/orbcore/giopWorker.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/inProcessIdentity.cc b/src/lib/omniORB/orbcore/inProcessIdentity.cc
+index 6cfc61e..034a448 100644
+--- a/src/lib/omniORB/orbcore/inProcessIdentity.cc
++++ b/src/lib/omniORB/orbcore/inProcessIdentity.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/initRefs.cc b/src/lib/omniORB/orbcore/initRefs.cc
+index f6a9cb0..55f6c78 100644
+--- a/src/lib/omniORB/orbcore/initRefs.cc
++++ b/src/lib/omniORB/orbcore/initRefs.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/interceptors.cc b/src/lib/omniORB/orbcore/interceptors.cc
+index b28c4a0..3d2e8b4 100644
+--- a/src/lib/omniORB/orbcore/interceptors.cc
++++ b/src/lib/omniORB/orbcore/interceptors.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/invoker.cc b/src/lib/omniORB/orbcore/invoker.cc
+index f56cf50..9f069c2 100644
+--- a/src/lib/omniORB/orbcore/invoker.cc
++++ b/src/lib/omniORB/orbcore/invoker.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ior.cc b/src/lib/omniORB/orbcore/ior.cc
+index 9733ff9..4403e08 100644
+--- a/src/lib/omniORB/orbcore/ior.cc
++++ b/src/lib/omniORB/orbcore/ior.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/libcWrapper.cc b/src/lib/omniORB/orbcore/libcWrapper.cc
+index 55c6788..8bad7e9 100644
+--- a/src/lib/omniORB/orbcore/libcWrapper.cc
++++ b/src/lib/omniORB/orbcore/libcWrapper.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/localIdentity.cc b/src/lib/omniORB/orbcore/localIdentity.cc
+index c413cf7..d3e12f9 100644
+--- a/src/lib/omniORB/orbcore/localIdentity.cc
++++ b/src/lib/omniORB/orbcore/localIdentity.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/localObject.cc b/src/lib/omniORB/orbcore/localObject.cc
+index 04b1b22..b141b90 100644
+--- a/src/lib/omniORB/orbcore/localObject.cc
++++ b/src/lib/omniORB/orbcore/localObject.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/logIOstream.cc b/src/lib/omniORB/orbcore/logIOstream.cc
+index 812a12c..1f729df 100644
+--- a/src/lib/omniORB/orbcore/logIOstream.cc
++++ b/src/lib/omniORB/orbcore/logIOstream.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/minorCode.cc b/src/lib/omniORB/orbcore/minorCode.cc
+index 385e99d..36cd5c2 100644
+--- a/src/lib/omniORB/orbcore/minorCode.cc
++++ b/src/lib/omniORB/orbcore/minorCode.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/msvcdllstub.cc b/src/lib/omniORB/orbcore/msvcdllstub.cc
+index 7f07b2e..73ee804 100644
+--- a/src/lib/omniORB/orbcore/msvcdllstub.cc
++++ b/src/lib/omniORB/orbcore/msvcdllstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/objectAdapter.cc b/src/lib/omniORB/orbcore/objectAdapter.cc
+index ec21fe3..3eececb 100644
+--- a/src/lib/omniORB/orbcore/objectAdapter.cc
++++ b/src/lib/omniORB/orbcore/objectAdapter.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/objectStub.cc b/src/lib/omniORB/orbcore/objectStub.cc
+index 0e16d11..91c0bbe 100644
+--- a/src/lib/omniORB/orbcore/objectStub.cc
++++ b/src/lib/omniORB/orbcore/objectStub.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/omniIOR.cc b/src/lib/omniORB/orbcore/omniIOR.cc
+index f401e91..44a18b6 100644
+--- a/src/lib/omniORB/orbcore/omniIOR.cc
++++ b/src/lib/omniORB/orbcore/omniIOR.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/omniIdentity.cc b/src/lib/omniORB/orbcore/omniIdentity.cc
+index 15c5129..c26730f 100644
+--- a/src/lib/omniORB/orbcore/omniIdentity.cc
++++ b/src/lib/omniORB/orbcore/omniIdentity.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/omniInternal.cc b/src/lib/omniORB/orbcore/omniInternal.cc
+index 5a23515..834f4c3 100644
+--- a/src/lib/omniORB/orbcore/omniInternal.cc
++++ b/src/lib/omniORB/orbcore/omniInternal.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/omniORB.cc b/src/lib/omniORB/orbcore/omniORB.cc
+index 1afb6ac..009e778 100644
+--- a/src/lib/omniORB/orbcore/omniORB.cc
++++ b/src/lib/omniORB/orbcore/omniORB.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/omniObjRef.cc b/src/lib/omniORB/orbcore/omniObjRef.cc
+index 0197f98..725cbc6 100644
+--- a/src/lib/omniORB/orbcore/omniObjRef.cc
++++ b/src/lib/omniORB/orbcore/omniObjRef.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/omniPolicy.cc b/src/lib/omniORB/orbcore/omniPolicy.cc
+index 9a7e79e..27d2f11 100644
+--- a/src/lib/omniORB/orbcore/omniPolicy.cc
++++ b/src/lib/omniORB/orbcore/omniPolicy.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/omniServant.cc b/src/lib/omniORB/orbcore/omniServant.cc
+index 63e4287..1571f4c 100644
+--- a/src/lib/omniORB/orbcore/omniServant.cc
++++ b/src/lib/omniORB/orbcore/omniServant.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/omniTransport.cc b/src/lib/omniORB/orbcore/omniTransport.cc
+index 3f5d45d..d5f1c7b 100644
+--- a/src/lib/omniORB/orbcore/omniTransport.cc
++++ b/src/lib/omniORB/orbcore/omniTransport.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/orbOptions.cc b/src/lib/omniORB/orbcore/orbOptions.cc
+index 1b0a1cf..1ad2025 100644
+--- a/src/lib/omniORB/orbcore/orbOptions.cc
++++ b/src/lib/omniORB/orbcore/orbOptions.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/orbOptionsFile.cc b/src/lib/omniORB/orbcore/orbOptionsFile.cc
+index 7d83449..3da6f16 100644
+--- a/src/lib/omniORB/orbcore/orbOptionsFile.cc
++++ b/src/lib/omniORB/orbcore/orbOptionsFile.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/orbOptionsReg.cc b/src/lib/omniORB/orbcore/orbOptionsReg.cc
+index e26c0a5..6afd130 100644
+--- a/src/lib/omniORB/orbcore/orbOptionsReg.cc
++++ b/src/lib/omniORB/orbcore/orbOptionsReg.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/poa.cc b/src/lib/omniORB/orbcore/poa.cc
+index 71f4097..dc16927 100644
+--- a/src/lib/omniORB/orbcore/poa.cc
++++ b/src/lib/omniORB/orbcore/poa.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/poamanager.cc b/src/lib/omniORB/orbcore/poamanager.cc
+index f282a1f..8b1fe09 100644
+--- a/src/lib/omniORB/orbcore/poamanager.cc
++++ b/src/lib/omniORB/orbcore/poamanager.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/poastubs.cc b/src/lib/omniORB/orbcore/poastubs.cc
+index c1c52d5..c3e5710 100644
+--- a/src/lib/omniORB/orbcore/poastubs.cc
++++ b/src/lib/omniORB/orbcore/poastubs.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/policy.cc b/src/lib/omniORB/orbcore/policy.cc
+index 2988e81..fc6da06 100644
+--- a/src/lib/omniORB/orbcore/policy.cc
++++ b/src/lib/omniORB/orbcore/policy.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/portableserver.cc b/src/lib/omniORB/orbcore/portableserver.cc
+index c842422..d8d1bb2 100644
+--- a/src/lib/omniORB/orbcore/portableserver.cc
++++ b/src/lib/omniORB/orbcore/portableserver.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/proxyFactory.cc b/src/lib/omniORB/orbcore/proxyFactory.cc
+index 4dcb8a8..1ba4a89 100644
+--- a/src/lib/omniORB/orbcore/proxyFactory.cc
++++ b/src/lib/omniORB/orbcore/proxyFactory.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/remoteIdentity.cc b/src/lib/omniORB/orbcore/remoteIdentity.cc
+index 2e5ad90..192f2c0 100644
+--- a/src/lib/omniORB/orbcore/remoteIdentity.cc
++++ b/src/lib/omniORB/orbcore/remoteIdentity.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/rmutex.cc b/src/lib/omniORB/orbcore/rmutex.cc
+index 28921df..5de36a0 100644
+--- a/src/lib/omniORB/orbcore/rmutex.cc
++++ b/src/lib/omniORB/orbcore/rmutex.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/shutdownIdentity.cc b/src/lib/omniORB/orbcore/shutdownIdentity.cc
+index e2ad5ae..f343ddf 100644
+--- a/src/lib/omniORB/orbcore/shutdownIdentity.cc
++++ b/src/lib/omniORB/orbcore/shutdownIdentity.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc b/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc
+index 7f07b2e..73ee804 100644
+--- a/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc
++++ b/src/lib/omniORB/orbcore/ssl/msvcdllstub.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslActive.cc b/src/lib/omniORB/orbcore/ssl/sslActive.cc
+index cabd76b..2acf1b8 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslActive.cc
++++ b/src/lib/omniORB/orbcore/ssl/sslActive.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslAddress.cc b/src/lib/omniORB/orbcore/ssl/sslAddress.cc
+index 1b40f24..2dbac2e 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslAddress.cc
++++ b/src/lib/omniORB/orbcore/ssl/sslAddress.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslAddress.h b/src/lib/omniORB/orbcore/ssl/sslAddress.h
+index d068baf..4a36ee2 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslAddress.h
++++ b/src/lib/omniORB/orbcore/ssl/sslAddress.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslConnection.cc b/src/lib/omniORB/orbcore/ssl/sslConnection.cc
+index 5f32193..4aabdde 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslConnection.cc
++++ b/src/lib/omniORB/orbcore/ssl/sslConnection.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslConnection.h b/src/lib/omniORB/orbcore/ssl/sslConnection.h
+index 23405af..9afd244 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslConnection.h
++++ b/src/lib/omniORB/orbcore/ssl/sslConnection.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslContext.cc b/src/lib/omniORB/orbcore/ssl/sslContext.cc
+index 471bcc6..4a146a9 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslContext.cc
++++ b/src/lib/omniORB/orbcore/ssl/sslContext.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc b/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc
+index c048359..759eeb3 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc
++++ b/src/lib/omniORB/orbcore/ssl/sslEndpoint.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslEndpoint.h b/src/lib/omniORB/orbcore/ssl/sslEndpoint.h
+index db3c555..89b0422 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslEndpoint.h
++++ b/src/lib/omniORB/orbcore/ssl/sslEndpoint.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc b/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc
+index 0b07fdb..caa6162 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc
++++ b/src/lib/omniORB/orbcore/ssl/sslTransportImpl.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h b/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h
+index 431f1b1..a2c1773 100644
+--- a/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h
++++ b/src/lib/omniORB/orbcore/ssl/sslTransportImpl.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tcp/tcpActive.cc b/src/lib/omniORB/orbcore/tcp/tcpActive.cc
+index 9955914..abfcf6a 100644
+--- a/src/lib/omniORB/orbcore/tcp/tcpActive.cc
++++ b/src/lib/omniORB/orbcore/tcp/tcpActive.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tcp/tcpAddress.cc b/src/lib/omniORB/orbcore/tcp/tcpAddress.cc
+index ee577c7..ef66434 100644
+--- a/src/lib/omniORB/orbcore/tcp/tcpAddress.cc
++++ b/src/lib/omniORB/orbcore/tcp/tcpAddress.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tcp/tcpAddress.h b/src/lib/omniORB/orbcore/tcp/tcpAddress.h
+index 7095e84..c3bc2c3 100644
+--- a/src/lib/omniORB/orbcore/tcp/tcpAddress.h
++++ b/src/lib/omniORB/orbcore/tcp/tcpAddress.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tcp/tcpConnection.cc b/src/lib/omniORB/orbcore/tcp/tcpConnection.cc
+index bf17500..00ed12e 100644
+--- a/src/lib/omniORB/orbcore/tcp/tcpConnection.cc
++++ b/src/lib/omniORB/orbcore/tcp/tcpConnection.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tcp/tcpConnection.h b/src/lib/omniORB/orbcore/tcp/tcpConnection.h
+index dcfbf07..1eec1c1 100644
+--- a/src/lib/omniORB/orbcore/tcp/tcpConnection.h
++++ b/src/lib/omniORB/orbcore/tcp/tcpConnection.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc b/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc
+index e1700a6..0952286 100644
+--- a/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc
++++ b/src/lib/omniORB/orbcore/tcp/tcpEndpoint.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h b/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h
+index a27d80d..9d0ac79 100644
+--- a/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h
++++ b/src/lib/omniORB/orbcore/tcp/tcpEndpoint.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc b/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc
+index 94c4d57..b0965e8 100644
+--- a/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc
++++ b/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h b/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h
+index 9e15cb1..9523ea6 100644
+--- a/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h
++++ b/src/lib/omniORB/orbcore/tcp/tcpTransportImpl.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/tracedthread.cc b/src/lib/omniORB/orbcore/tracedthread.cc
+index 62027af..9cd4c51 100644
+--- a/src/lib/omniORB/orbcore/tracedthread.cc
++++ b/src/lib/omniORB/orbcore/tracedthread.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/transportRules.cc b/src/lib/omniORB/orbcore/transportRules.cc
+index f2a3b79..77eea2d 100644
+--- a/src/lib/omniORB/orbcore/transportRules.cc
++++ b/src/lib/omniORB/orbcore/transportRules.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/unix/unixActive.cc b/src/lib/omniORB/orbcore/unix/unixActive.cc
+index 08530f5..1b81dd7 100644
+--- a/src/lib/omniORB/orbcore/unix/unixActive.cc
++++ b/src/lib/omniORB/orbcore/unix/unixActive.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/unix/unixAddress.cc b/src/lib/omniORB/orbcore/unix/unixAddress.cc
+index bc2dc29..efc575a 100644
+--- a/src/lib/omniORB/orbcore/unix/unixAddress.cc
++++ b/src/lib/omniORB/orbcore/unix/unixAddress.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/unix/unixAddress.h b/src/lib/omniORB/orbcore/unix/unixAddress.h
+index 8075368..76ae1bf 100644
+--- a/src/lib/omniORB/orbcore/unix/unixAddress.h
++++ b/src/lib/omniORB/orbcore/unix/unixAddress.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/unix/unixConnection.cc b/src/lib/omniORB/orbcore/unix/unixConnection.cc
+index 92d21bf..1e688b7 100644
+--- a/src/lib/omniORB/orbcore/unix/unixConnection.cc
++++ b/src/lib/omniORB/orbcore/unix/unixConnection.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/unix/unixConnection.h b/src/lib/omniORB/orbcore/unix/unixConnection.h
+index 8a6ff68..ef965de 100644
+--- a/src/lib/omniORB/orbcore/unix/unixConnection.h
++++ b/src/lib/omniORB/orbcore/unix/unixConnection.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/unix/unixEndpoint.cc b/src/lib/omniORB/orbcore/unix/unixEndpoint.cc
+index a180269..6ae3894 100644
+--- a/src/lib/omniORB/orbcore/unix/unixEndpoint.cc
++++ b/src/lib/omniORB/orbcore/unix/unixEndpoint.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/unix/unixEndpoint.h b/src/lib/omniORB/orbcore/unix/unixEndpoint.h
+index 7fffc2d..ecd386d 100644
+--- a/src/lib/omniORB/orbcore/unix/unixEndpoint.h
++++ b/src/lib/omniORB/orbcore/unix/unixEndpoint.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc b/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc
+index 7f082bf..422529e 100644
+--- a/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc
++++ b/src/lib/omniORB/orbcore/unix/unixTransportImpl.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/unix/unixTransportImpl.h b/src/lib/omniORB/orbcore/unix/unixTransportImpl.h
+index 1bbaa74..d912f31 100644
+--- a/src/lib/omniORB/orbcore/unix/unixTransportImpl.h
++++ b/src/lib/omniORB/orbcore/unix/unixTransportImpl.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omniORB/orbcore/uri.cc b/src/lib/omniORB/orbcore/uri.cc
+index 38bc5d3..f68ccf3 100644
+--- a/src/lib/omniORB/orbcore/uri.cc
++++ b/src/lib/omniORB/orbcore/uri.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Description:
+diff --git a/src/lib/omnithread/mach.cc b/src/lib/omnithread/mach.cc
+index a288e3f..c078615 100644
+--- a/src/lib/omnithread/mach.cc
++++ b/src/lib/omnithread/mach.cc
+@@ -17,8 +17,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff --git a/src/lib/omnithread/nt.cc b/src/lib/omnithread/nt.cc
+index 2858496..1174343 100644
+--- a/src/lib/omnithread/nt.cc
++++ b/src/lib/omnithread/nt.cc
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff --git a/src/lib/omnithread/posix.cc b/src/lib/omnithread/posix.cc
+index 025d9f5..9f43086 100644
+--- a/src/lib/omnithread/posix.cc
++++ b/src/lib/omnithread/posix.cc
+@@ -18,8 +18,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ //
+diff --git a/src/lib/omnithread/solaris.cc b/src/lib/omnithread/solaris.cc
+index 9091326..ced87f4 100644
+--- a/src/lib/omnithread/solaris.cc
++++ b/src/lib/omnithread/solaris.cc
+@@ -17,8 +17,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // Implementation of OMNI thread abstraction for solaris threads.
+diff --git a/src/lib/omnithread/threaddata.cc b/src/lib/omnithread/threaddata.cc
+index 3d00771..f019e4e 100644
+--- a/src/lib/omnithread/threaddata.cc
++++ b/src/lib/omnithread/threaddata.cc
+@@ -17,8 +17,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+
+ // Implementation of per-thread data
+diff --git a/src/services/mklib/COS_sysdep.h b/src/services/mklib/COS_sysdep.h
+index 82f7272..e39f240 100644
+--- a/src/services/mklib/COS_sysdep.h
++++ b/src/services/mklib/COS_sysdep.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // This file is included by COS stub headers.
+diff --git a/src/services/mklib/mkBOAlib/COS_sysdep.h b/src/services/mklib/mkBOAlib/COS_sysdep.h
+index 45f09ca..f627dbe 100644
+--- a/src/services/mklib/mkBOAlib/COS_sysdep.h
++++ b/src/services/mklib/mkBOAlib/COS_sysdep.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU Library General Public
+ // License along with this library; if not, write to the Free
+-// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA
++// Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA
+ //
+ //
+ // This file is included by COS stub headers.
+diff --git a/src/tool/omniidl/COPYING b/src/tool/omniidl/COPYING
+index ae3b531..e3f290f 100644
+--- a/src/tool/omniidl/COPYING
++++ b/src/tool/omniidl/COPYING
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+@@ -305,7 +305,7 @@ the "copyright" line and a pointer to where the full notice is found.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
+ USA.
+
+ Also add information on how to contact you by electronic and paper mail.
+diff --git a/src/tool/omniidl/cxx/cccp/cccp.c b/src/tool/omniidl/cxx/cccp/cccp.c
+index 0198b1a..0f9484b 100644
+--- a/src/tool/omniidl/cxx/cccp/cccp.c
++++ b/src/tool/omniidl/cxx/cccp/cccp.c
+@@ -15,8 +15,8 @@ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+-Foundation, 59 Temple Place - Suite 330,
+-Boston, MA 02111-1307, USA.
++Foundation, 51 Franklin St, Fifth Floor,
++Boston, MA 02110-1301, USA.
+
+ In other words, you are welcome to use, share and improve this program.
+ You are forbidden to forbid anyone else to use, share and improve
+diff --git a/src/tool/omniidl/cxx/cccp/cexp.y b/src/tool/omniidl/cxx/cccp/cexp.y
+index 133539f..3ee3e72 100644
+--- a/src/tool/omniidl/cxx/cccp/cexp.y
++++ b/src/tool/omniidl/cxx/cccp/cexp.y
+@@ -13,8 +13,8 @@ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+-Foundation, 59 Temple Place - Suite 330,
+-Boston, MA 02111-1307, USA.
++Foundation, 51 Franklin St, Fifth Floor,
++Boston, MA 02110-1301, USA.
+
+ In other words, you are welcome to use, share and improve this program.
+ You are forbidden to forbid anyone else to use, share and improve
+diff --git a/src/tool/omniidl/cxx/cccp/pcp.h b/src/tool/omniidl/cxx/cccp/pcp.h
+index 280a65e..d79c31c 100644
+--- a/src/tool/omniidl/cxx/cccp/pcp.h
++++ b/src/tool/omniidl/cxx/cccp/pcp.h
+@@ -15,8 +15,8 @@ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNU CC; see the file COPYING. If not, write to
+-the Free Software Foundation, 59 Temple Place - Suite 330,
+-Boston, MA 02111-1307, USA. */
++the Free Software Foundation, 51 Franklin St, Fifth Floor,
++Boston, MA 02110-1301, USA. */
+
+
+
+diff --git a/src/tool/omniidl/cxx/idl.ll b/src/tool/omniidl/cxx/idl.ll
+index 5ed38ba..12a9ac5 100644
+--- a/src/tool/omniidl/cxx/idl.ll
++++ b/src/tool/omniidl/cxx/idl.ll
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idl.yy b/src/tool/omniidl/cxx/idl.yy
+index d1a5058..2358c40 100644
+--- a/src/tool/omniidl/cxx/idl.yy
++++ b/src/tool/omniidl/cxx/idl.yy
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlast.cc b/src/tool/omniidl/cxx/idlast.cc
+index f636927..83d0872 100644
+--- a/src/tool/omniidl/cxx/idlast.cc
++++ b/src/tool/omniidl/cxx/idlast.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlast.h b/src/tool/omniidl/cxx/idlast.h
+index 943579c..9b256c0 100644
+--- a/src/tool/omniidl/cxx/idlast.h
++++ b/src/tool/omniidl/cxx/idlast.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlc.cc b/src/tool/omniidl/cxx/idlc.cc
+index 09a58b7..a8c6064 100644
+--- a/src/tool/omniidl/cxx/idlc.cc
++++ b/src/tool/omniidl/cxx/idlc.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlconfig.cc b/src/tool/omniidl/cxx/idlconfig.cc
+index 2b8e884..c0e37a7 100644
+--- a/src/tool/omniidl/cxx/idlconfig.cc
++++ b/src/tool/omniidl/cxx/idlconfig.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlconfig.h b/src/tool/omniidl/cxx/idlconfig.h
+index 741ac56..2df9f4e 100644
+--- a/src/tool/omniidl/cxx/idlconfig.h
++++ b/src/tool/omniidl/cxx/idlconfig.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idldump.cc b/src/tool/omniidl/cxx/idldump.cc
+index 90c9a64..e6c1e9b 100644
+--- a/src/tool/omniidl/cxx/idldump.cc
++++ b/src/tool/omniidl/cxx/idldump.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idldump.h b/src/tool/omniidl/cxx/idldump.h
+index ce97c73..833ab13 100644
+--- a/src/tool/omniidl/cxx/idldump.h
++++ b/src/tool/omniidl/cxx/idldump.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlerr.cc b/src/tool/omniidl/cxx/idlerr.cc
+index 24de726..9922c24 100644
+--- a/src/tool/omniidl/cxx/idlerr.cc
++++ b/src/tool/omniidl/cxx/idlerr.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlerr.h b/src/tool/omniidl/cxx/idlerr.h
+index afaa250..89620d2 100644
+--- a/src/tool/omniidl/cxx/idlerr.h
++++ b/src/tool/omniidl/cxx/idlerr.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlexpr.cc b/src/tool/omniidl/cxx/idlexpr.cc
+index 3143f57..211d18f 100644
+--- a/src/tool/omniidl/cxx/idlexpr.cc
++++ b/src/tool/omniidl/cxx/idlexpr.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlexpr.h b/src/tool/omniidl/cxx/idlexpr.h
+index 49910aa..d000ab9 100644
+--- a/src/tool/omniidl/cxx/idlexpr.h
++++ b/src/tool/omniidl/cxx/idlexpr.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlfixed.cc b/src/tool/omniidl/cxx/idlfixed.cc
+index 8ecc1db..1318d4e 100644
+--- a/src/tool/omniidl/cxx/idlfixed.cc
++++ b/src/tool/omniidl/cxx/idlfixed.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlfixed.h b/src/tool/omniidl/cxx/idlfixed.h
+index 42a1dd0..c004005 100644
+--- a/src/tool/omniidl/cxx/idlfixed.h
++++ b/src/tool/omniidl/cxx/idlfixed.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlmath.h b/src/tool/omniidl/cxx/idlmath.h
+index 25230e4..00bec26 100644
+--- a/src/tool/omniidl/cxx/idlmath.h
++++ b/src/tool/omniidl/cxx/idlmath.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlpython.cc b/src/tool/omniidl/cxx/idlpython.cc
+index f823a5e..d898ae9 100644
+--- a/src/tool/omniidl/cxx/idlpython.cc
++++ b/src/tool/omniidl/cxx/idlpython.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlrepoId.cc b/src/tool/omniidl/cxx/idlrepoId.cc
+index 3b83a99..7119510 100644
+--- a/src/tool/omniidl/cxx/idlrepoId.cc
++++ b/src/tool/omniidl/cxx/idlrepoId.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlrepoId.h b/src/tool/omniidl/cxx/idlrepoId.h
+index 31b8c1f..65a9880 100644
+--- a/src/tool/omniidl/cxx/idlrepoId.h
++++ b/src/tool/omniidl/cxx/idlrepoId.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlscope.cc b/src/tool/omniidl/cxx/idlscope.cc
+index 0867da4..e8ece46 100644
+--- a/src/tool/omniidl/cxx/idlscope.cc
++++ b/src/tool/omniidl/cxx/idlscope.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlscope.h b/src/tool/omniidl/cxx/idlscope.h
+index 8806942..132fe4d 100644
+--- a/src/tool/omniidl/cxx/idlscope.h
++++ b/src/tool/omniidl/cxx/idlscope.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlsysdep.h b/src/tool/omniidl/cxx/idlsysdep.h
+index a18ed5e..0495352 100644
+--- a/src/tool/omniidl/cxx/idlsysdep.h
++++ b/src/tool/omniidl/cxx/idlsysdep.h
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idltype.cc b/src/tool/omniidl/cxx/idltype.cc
+index b952fae..dd80e05 100644
+--- a/src/tool/omniidl/cxx/idltype.cc
++++ b/src/tool/omniidl/cxx/idltype.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idltype.h b/src/tool/omniidl/cxx/idltype.h
+index 99e44bd..545688d 100644
+--- a/src/tool/omniidl/cxx/idltype.h
++++ b/src/tool/omniidl/cxx/idltype.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlutil.cc b/src/tool/omniidl/cxx/idlutil.cc
+index 7fa0cde..7066167 100644
+--- a/src/tool/omniidl/cxx/idlutil.cc
++++ b/src/tool/omniidl/cxx/idlutil.cc
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlutil.h b/src/tool/omniidl/cxx/idlutil.h
+index 771365b..fbda2b4 100644
+--- a/src/tool/omniidl/cxx/idlutil.h
++++ b/src/tool/omniidl/cxx/idlutil.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlvalidate.cc b/src/tool/omniidl/cxx/idlvalidate.cc
+index 817adef..baa2333 100644
+--- a/src/tool/omniidl/cxx/idlvalidate.cc
++++ b/src/tool/omniidl/cxx/idlvalidate.cc
+@@ -20,8 +20,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlvalidate.h b/src/tool/omniidl/cxx/idlvalidate.h
+index 7ecb56b..ed70b95 100644
+--- a/src/tool/omniidl/cxx/idlvalidate.h
++++ b/src/tool/omniidl/cxx/idlvalidate.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/idlvisitor.h b/src/tool/omniidl/cxx/idlvisitor.h
+index f478c6f..9e14013 100644
+--- a/src/tool/omniidl/cxx/idlvisitor.h
++++ b/src/tool/omniidl/cxx/idlvisitor.h
+@@ -19,8 +19,8 @@
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/lex.yy.cc b/src/tool/omniidl/cxx/lex.yy.cc
+index 3ef98b9..412bcac 100644
+--- a/src/tool/omniidl/cxx/lex.yy.cc
++++ b/src/tool/omniidl/cxx/lex.yy.cc
+@@ -837,8 +837,8 @@ char *yytext;
+ //
+ // You should have received a copy of the GNU General Public License
+ // along with this program; if not, write to the Free Software
+-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-// 02111-1307, USA.
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++// 02110-1301, USA.
+ //
+ // Description:
+ //
+diff --git a/src/tool/omniidl/cxx/y.tab.cc b/src/tool/omniidl/cxx/y.tab.cc
+index 9ed0088..cbb4899 100644
+--- a/src/tool/omniidl/cxx/y.tab.cc
++++ b/src/tool/omniidl/cxx/y.tab.cc
+@@ -991,8 +991,8 @@ static const short yycheck[] =
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+- Foundation, Inc., 59 Temple Place - Suite 330,
+- Boston, MA 02111-1307, USA. */
++ Foundation, Inc., 51 Franklin St, Fifth Floor,
++ Boston, MA 02110-1301, USA. */
+
+ /* As a special exception, when this file is copied by Bison into a
+ Bison output file, you may use that output file without restriction.
+diff --git a/src/tool/omniidl/python/omniidl/idlast.py b/src/tool/omniidl/python/omniidl/idlast.py
+index c03b61c..8083b41 100644
+--- a/src/tool/omniidl/python/omniidl/idlast.py
++++ b/src/tool/omniidl/python/omniidl/idlast.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/omniidl/idlstring.py b/src/tool/omniidl/python/omniidl/idlstring.py
+index 5e2c7f4..05158cd 100644
+--- a/src/tool/omniidl/python/omniidl/idlstring.py
++++ b/src/tool/omniidl/python/omniidl/idlstring.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/omniidl/idltype.py b/src/tool/omniidl/python/omniidl/idltype.py
+index 609ca66..a6c508f 100644
+--- a/src/tool/omniidl/python/omniidl/idltype.py
++++ b/src/tool/omniidl/python/omniidl/idltype.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/omniidl/idlutil.py b/src/tool/omniidl/python/omniidl/idlutil.py
+index 68ce897..37214f0 100644
+--- a/src/tool/omniidl/python/omniidl/idlutil.py
++++ b/src/tool/omniidl/python/omniidl/idlutil.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/omniidl/idlvisitor.py b/src/tool/omniidl/python/omniidl/idlvisitor.py
+index a86eda9..0b6566c 100644
+--- a/src/tool/omniidl/python/omniidl/idlvisitor.py
++++ b/src/tool/omniidl/python/omniidl/idlvisitor.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/omniidl/main.py b/src/tool/omniidl/python/omniidl/main.py
+index 73cf6b8..0c13331 100644
+--- a/src/tool/omniidl/python/omniidl/main.py
++++ b/src/tool/omniidl/python/omniidl/main.py
+@@ -21,8 +21,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/omniidl/output.py b/src/tool/omniidl/python/omniidl/output.py
+index 5c1700a..9344836 100644
+--- a/src/tool/omniidl/python/omniidl/output.py
++++ b/src/tool/omniidl/python/omniidl/output.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/omniidl_be/dump.py b/src/tool/omniidl/python/omniidl_be/dump.py
+index 251fc0f..9bb5f2b 100644
+--- a/src/tool/omniidl/python/omniidl_be/dump.py
++++ b/src/tool/omniidl/python/omniidl_be/dump.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/omniidl_be/example.py b/src/tool/omniidl/python/omniidl_be/example.py
+index 7a28d28..45ea2d7 100644
+--- a/src/tool/omniidl/python/omniidl_be/example.py
++++ b/src/tool/omniidl/python/omniidl_be/example.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/omniidl_be/interactive.py b/src/tool/omniidl/python/omniidl_be/interactive.py
+index b18d394..3a03a8d 100644
+--- a/src/tool/omniidl/python/omniidl_be/interactive.py
++++ b/src/tool/omniidl/python/omniidl_be/interactive.py
+@@ -19,8 +19,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/scripts/omniidl.in b/src/tool/omniidl/python/scripts/omniidl.in
+index d5ad0b9..a6162da 100644
+--- a/src/tool/omniidl/python/scripts/omniidl.in
++++ b/src/tool/omniidl/python/scripts/omniidl.in
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
+diff --git a/src/tool/omniidl/python/scripts/omniidlrun.py b/src/tool/omniidl/python/scripts/omniidlrun.py
+index 4b5d9f0..b1146b4 100644
+--- a/src/tool/omniidl/python/scripts/omniidlrun.py
++++ b/src/tool/omniidl/python/scripts/omniidlrun.py
+@@ -20,8 +20,8 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ #
+ # Description:
+ #
diff --git a/omniORB-nameserver.init b/omniORB-nameserver.init
new file mode 100755
index 0000000..a738969
--- /dev/null
+++ b/omniORB-nameserver.init
@@ -0,0 +1,94 @@
+#!/bin/sh
+#
+# omniNames init file for starting up the OMNI Naming service
+#
+# chkconfig: - 20 80
+# description: Starts and stops the OMNI Naming service
+#
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+exec="/usr/bin/omniNames"
+prog="omniNames"
+logdir="/var/log/omniORB/"
+logfile="/var/log/omniORB/error.log"
+options=" -start -always -logdir $logdir -errlog $logfile"
+
+#[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile="/var/lock/subsys/omniORB-nameserver"
+
+start() {
+ [ -x $exec ] || exit 5
+ echo -n $"Starting $prog: "
+ daemon --user omniORB "$exec $options 2>&1 &"
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && touch $lockfile
+ return $retval
+}
+
+stop() {
+ echo -n $"Stopping $prog: "
+ killproc $prog
+ retval=$?
+ echo
+ [ $retval -eq 0 ] && rm -f $lockfile
+ return $retval
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+force_reload() {
+ restart
+}
+
+rh_status() {
+ # run checks to determine if the service is running or use generic status
+ status $prog
+}
+
+rh_status_q() {
+ rh_status >/dev/null 2>&1
+}
+
+
+case "$1" in
+ start)
+ rh_status_q && exit 0
+ $1
+ ;;
+ stop)
+ rh_status_q || exit 0
+ $1
+ ;;
+ restart)
+ $1
+ ;;
+ reload)
+ rh_status_q || exit 7
+ $1
+ ;;
+ force-reload)
+ force_reload
+ ;;
+ status)
+ rh_status
+ ;;
+ condrestart|try-restart)
+ rh_status_q || exit 0
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+ exit 2
+esac
+exit $?
diff --git a/omniORB-nameserver.logrotate b/omniORB-nameserver.logrotate
new file mode 100644
index 0000000..c0a28cd
--- /dev/null
+++ b/omniORB-nameserver.logrotate
@@ -0,0 +1,12 @@
+/var/log/omniORB/*.log {
+ weekly
+ rotate 10
+ copytruncate
+ delaycompress
+ compress
+ notifempty
+ missingok
+ postrotate
+ /bin/kill -USR1 `cat /var/run/omniORB/omniORB.pid 2>/dev/null` 2> /dev/null|| true
+ endscript
+}
\ No newline at end of file
diff --git a/omniORB.cfg b/omniORB.cfg
new file mode 100644
index 0000000..a9d8e0c
--- /dev/null
+++ b/omniORB.cfg
@@ -0,0 +1,2 @@
+InitRef = NameService=corbaname::127.0.0.1:2809
+supportBootstrapAgent = 1
diff --git a/omniORB.spec b/omniORB.spec
new file mode 100644
index 0000000..9842298
--- /dev/null
+++ b/omniORB.spec
@@ -0,0 +1,265 @@
+# sitelib for noarch packages, sitearch for others (remove the unneeded one)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+
+%global nameserver omniNames
+
+%if 0%{?fedora} > 14 || 0%{?rhel} > 6
+%global with_systemd 1
+%endif
+
+Name: omniORB
+Version: 4.1.6
+Release: 1%{?dist}
+Summary: A robust high performance CORBA ORB for C++ and Python
+
+Group: System Environment/Libraries
+License: LGPLv2+
+URL: http://omniorb.sourceforge.net
+Source0: http://downloads.sourceforge.net/project/omniorb/%{name}/%{name}-%{versio...
+Source1: omniORB-nameserver.init
+Source2: omniORB-nameserver.logrotate
+Source3: omniORB.cfg
+Source4: omniNames.service
+# fix incorrect fsf address
+Patch0: %{name}-4.1.6-fsf-address.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: python-devel
+BuildRequires: openssl-devel
+%if 0%{?with_systemd}
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(pre): shadow-utils
+# This is for /sbin/service
+Requires(postun): initscripts
+%endif
+# needed for patch0
+BuildRequires: byacc
+
+# we don't want to provide private python extension libs
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_setup
+}
+
+%description
+omniORB is a robust high performance CORBA ORB for C++ and Python.
+omniORB is a certified CORBA 2.1 implementation and largely CORBA 2.6
+compliant.
+
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+License: LGPLv2+
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%package doc
+Summary: Documentation files for %{name}
+Group: Documentation
+Requires: %{name} = %{version}-%{release}
+
+%description doc
+The %{name}-doc package contains documentation files for
+developing and administrating applications that use %{name}.
+
+%package servers
+Summary: OmniORB naming service
+Group: System Environment/Daemons
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
+
+%description servers
+The %{name}-servers package contains omniNames naming server.
+
+%package utils
+Summary: Development files for %{name}
+Group: Development/Tools
+License: GPLv2+
+Requires: %{name} = %{version}-%{release}
+
+%description utils
+The %{name}-utils package contains supplementary command line tools for
+developing applications that use %{name}.
+
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+%configure --disable-static
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+# fix rpmlint warnings: unstripped-binary-or-object
+chmod 0755 %{buildroot}%{_libdir}/*.so.*
+chmod 0755 %{buildroot}%{python_sitearch}/_omniidlmodule.so.*
+# fix rpmlint errors: non-standard-dir-perm
+chmod 0755 %{buildroot}%{_includedir}/{omnithread,COS}
+chmod 0755 %{buildroot}%{_includedir}/omniORB4/{,internal}
+chmod 0755 %{buildroot}%{_datadir}/idl/%{name}/COS
+chmod 0755 %{buildroot}%{python_sitelib}/omniidl
+chmod 0755 %{buildroot}%{python_sitelib}/omniidl_be
+chmod 0755 %{buildroot}%{python_sitelib}/omniidl_be/cxx/{,skel,impl,dynskel,header}
+# fix rpmlint error: non-executable-script
+chmod +x %{buildroot}%{python_sitelib}/omniidl/main.py
+%if 0%{?with_systemd}
+# install systemd unit
+mkdir -p %{buildroot}/lib/systemd/system/
+install -m 0644 %{SOURCE4} %{buildroot}/lib/systemd/system/
+%else
+# install service init script
+mkdir -p %{buildroot}%{_initddir}
+install -m 0755 %{SOURCE1} %{buildroot}%{_initddir}/%{nameserver}
+mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/run/%{name}
+%endif
+# install server configuration stuff
+mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d/
+install -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{nameserver}
+mkdir -p %{buildroot}%{_sysconfdir}/
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}.cfg
+mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
+# install man pages
+pushd man
+mkdir -p %{buildroot}%{_mandir}/man1
+install -m 0644 man1/* %{buildroot}%{_mandir}/man1/
+mkdir -p %{buildroot}%{_mandir}/man8
+install -m 0644 man8/* %{buildroot}%{_mandir}/man8/
+popd
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%pre servers
+getent group %{name} >/dev/null || groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+useradd -r -g %{name} -d %{_sharedstatedir}/%{name} -s /sbin/nologin \
+-c "OmniNames Naming Service" %{name}
+exit 0
+
+%if 0%{?with_systemd}
+%post servers
+if [ $1 -eq 1 ]; then
+ # Package install, not upgrade
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+
+%preun servers
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl disable omniNames.service > /dev/null 2>&1 || :
+ /bin/systemctl stop omniNames.service > /dev/null 2>&1 || :
+fi
+
+%postun servers
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart omniNames.service >/dev/null 2>&1 || :
+fi
+%else
+%post servers
+/sbin/chkconfig --add %{nameserver}
+
+%preun servers
+if [ $1 = 0 ] ; then
+ /sbin/service stop >/dev/null 2>&1
+ /sbin/chkconfig --del %{nameserver}
+fi
+
+%postun servers
+if [ $1 -ge 1 ] ; then
+ /sbin/service %{nameserver} condrestart >/dev/null 2>&1 || :
+fi
+%endif
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.LIB README.FIRST.txt README.unix
+%{_libdir}/*.so.*
+
+%files servers
+%defattr(-,root,root,-)
+%if 0%{?fedora} < 15
+%{_initddir}/%{nameserver}
+%dir %attr(0755, %{name}, root) %{_sharedstatedir}/%{name}
+%dir %attr(0755, %{name}, root) %{_localstatedir}/run/%{name}
+%else
+/lib/systemd/system/omniNames.service
+%endif
+%config(noreplace) %{_sysconfdir}/%{name}.cfg
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{nameserver}
+%dir %attr(0755, %{name}, root) %{_localstatedir}/log/%{name}
+%{_bindir}/omniMapper
+%{_bindir}/%{nameserver}
+%{_mandir}/man8/*
+
+%files devel
+%defattr(-,root,root,-)
+%doc doc/
+%{_bindir}/omniidl
+%{_bindir}/omniidlrun.py
+%{_bindir}/omnicpp
+%{_bindir}/omkdepend
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+%{_datadir}/idl/%{name}/*
+# For noarch packages: sitelib
+%{python_sitelib}/*
+# For arch-specific packages: sitearch
+%{python_sitearch}/*
+%{_mandir}/man1/omniidl.1.gz
+%{_mandir}/man1/omnicpp.1.gz
+
+%files doc
+%defattr(-,root,root,-)
+%doc doc/
+
+%files utils
+%defattr(-,root,root,-)
+%doc COPYING
+%{_bindir}/catior
+%{_bindir}/convertior
+%{_bindir}/genior
+%{_bindir}/nameclt
+%{_mandir}/man1/catior.1.gz
+%{_mandir}/man1/convertior.1.gz
+%{_mandir}/man1/genior.1.gz
+%{_mandir}/man1/nameclt.1.gz
+
+
+%changelog
+* Wed Jul 13 2011 Haïkel Guémar <hguemar(a)fedoraproject.org> - 4.1.6-1
+- upstream 4.1.6
+- use systemd for fedora >= 15
+
+* Sun May 08 2011 Haïkel Guémar <hguemar(a)fedoraproject.org> - 4.1.5-2
+- spec cleanup
+
+* Sun Jan 09 2011 Haïkel Guémar <hguemar(a)fedoraproject.org> - 4.1.5-1
+- upstream 4.1.5
+
+* Wed Nov 24 2010 Haïkel Guémar <hguemar(a)fedoraproject.org> - 4.1.4-1
+- initial packaging
diff --git a/sources b/sources
index e69de29..53fe0d6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+44990f8139c349b53ab43110de6c629b omniORB-4.1.6.tar.bz2
11Â years
[perl-Panotools-Script] Remove ptograph since it dragged-in perl-GraphViz
by bpostle
commit cf35c7f077a613ba13990b6924a8aa9ce90a0d24
Author: Bruno Postle <bruno(a)postle.net>
Date: Tue Jan 31 22:53:54 2012 +0000
Remove ptograph since it dragged-in perl-GraphViz
perl-Panotools-Script.spec | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/perl-Panotools-Script.spec b/perl-Panotools-Script.spec
index 58f9f29..04805ab 100644
--- a/perl-Panotools-Script.spec
+++ b/perl-Panotools-Script.spec
@@ -1,6 +1,6 @@
Name: perl-Panotools-Script
Version: 0.26
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Library for manipulating Hugin .pto files
License: GPLv2+
Group: Development/Libraries
@@ -46,6 +46,10 @@ make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
+# added manually, remove unwanted graphviz dependency
+rm -f %{buildroot}/%{_bindir}/ptograph
+rm -f %{buildroot}/%{_datadir}/man/man1/ptograph.*
+
# added manually
desktop-file-install --vendor="" \
--dir=%{buildroot}/%{_datadir}/applications desktop/*.desktop
@@ -77,6 +81,9 @@ update-desktop-database &> /dev/null ||:
%{_mandir}/man1/*
%changelog
+* Tue Jan 31 2012 Bruno Postle - 0.26-4
+- rebuild without ptograph
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.26-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11Â years
[mod_auth_kerb/f16] Fix bad merge
by Rob Crittenden
commit 0d3f6f5637db844db794a657e8bcb11ee765217b
Author: Rob Crittenden <rcritten(a)redhat.com>
Date: Tue Jan 31 17:46:29 2012 -0500
Fix bad merge
mod_auth_kerb.spec | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/mod_auth_kerb.spec b/mod_auth_kerb.spec
index 86fcb8b..4c119b2 100644
--- a/mod_auth_kerb.spec
+++ b/mod_auth_kerb.spec
@@ -55,7 +55,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/modules/*.so
%changelog
-=======
* Tue Jan 31 2012 Rob Crittenden <rcritten(a)redhat.com> - 5.4-8
- Add support for Constrained Delegation/su42proxy (#767740)
11Â years
[mingw32-libglademm24] Rebuilt for libpng 1.5
by Kalev Lember
commit 1cf68643a102222e53af99ee451a44894fc6b5f7
Author: Kalev Lember <kalevlember(a)gmail.com>
Date: Wed Feb 1 00:41:15 2012 +0200
Rebuilt for libpng 1.5
- Spec cleanup
- Dropped .la files
mingw32-libglademm24.spec | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/mingw32-libglademm24.spec b/mingw32-libglademm24.spec
index 8735619..781560a 100644
--- a/mingw32-libglademm24.spec
+++ b/mingw32-libglademm24.spec
@@ -1,15 +1,12 @@
%global __strip %{_mingw32_strip}
%global __objdump %{_mingw32_objdump}
-%global _use_internal_dependency_generator 0
-%global __find_requires %{_mingw32_findrequires}
-%global __find_provides %{_mingw32_findprovides}
%define __debug_install_post %{_mingw32_debug_install_post}
%global name1 libglademm24
Name: mingw32-%{name1}
Version: 2.6.7
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: MinGW Windows C++ wrapper for libglade
@@ -17,11 +14,10 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://gtkmm.sourceforge.net/
Source0: http://ftp.gnome.org/pub/GNOME/sources/libglademm/2.6/libglademm-%{versio...
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: mingw32-filesystem >= 52
+BuildRequires: mingw32-filesystem >= 68
BuildRequires: mingw32-gcc
BuildRequires: mingw32-binutils
BuildRequires: mingw32-gcc-c++
@@ -36,7 +32,7 @@ interface for C++ programmers to create Gnome GUIs with GTK+'s
flexible object-oriented framework.
-%{_mingw32_debug_package}
+%{?_mingw32_debug_package}
%prep
@@ -49,28 +45,26 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm -rf ${RPM_BUILD_ROOT}%{_mingw32_docdir}/gnomemm-2.6/libglademm-2.4/*
rm -f ${RPM_BUILD_ROOT}%{_mingw32_datadir}/devhelp/books/libglademm-2.4/*
-
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -f ${RPM_BUILD_ROOT}%{_mingw32_libdir}/*.la
%files
-%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
%{_mingw32_bindir}/libglademm-2.4-1.dll
%{_mingw32_includedir}/libglademm-2.4
%{_mingw32_libdir}/libglademm-2.4.dll.a
-%{_mingw32_libdir}/libglademm-2.4.la
%{_mingw32_libdir}/libglademm-2.4
%{_mingw32_libdir}/pkgconfig/*.pc
%changelog
+* Wed Feb 01 2012 Kalev Lember <kalevlember(a)gmail.com> - 2.6.7-13
+- Rebuilt for libpng 1.5
+- Spec cleanup
+- Dropped .la files
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.6.7-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
11Â years
[mod_auth_kerb/f16] Add support for Constrained Delegation/S4U2Proxy (#767740)
by Rob Crittenden
commit 5cef1e4b0a85e52bcf0655772dba7b86e9643044
Author: Rob Crittenden <rcritten(a)redhat.com>
Date: Tue Jan 31 15:43:18 2012 -0500
Add support for Constrained Delegation/S4U2Proxy (#767740)
The S4U2Proxy patch includes locking code inspired by mod_rewrite
so the ASL license is being added.
LICENSE.ASL | 201 +++++++++++++
mod_auth_kerb-5.4-s4u2proxy.patch | 570 +++++++++++++++++++++++++++++++++++++
mod_auth_kerb.spec | 16 +-
3 files changed, 784 insertions(+), 3 deletions(-)
---
diff --git a/LICENSE.ASL b/LICENSE.ASL
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/LICENSE.ASL
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/mod_auth_kerb-5.4-s4u2proxy.patch b/mod_auth_kerb-5.4-s4u2proxy.patch
new file mode 100644
index 0000000..d1793c6
--- /dev/null
+++ b/mod_auth_kerb-5.4-s4u2proxy.patch
@@ -0,0 +1,570 @@
+diff -up --recursive mod_auth_kerb-5.4.orig/README mod_auth_kerb-5.4/README
+--- mod_auth_kerb-5.4.orig/README 2008-11-26 11:51:05.000000000 -0500
++++ mod_auth_kerb-5.4/README 2012-01-04 11:17:22.000000000 -0500
+@@ -122,4 +122,16 @@ KrbSaveCredentials, the tickets will be
+ credential cache that will be available for the request handler. The ticket
+ file will be removed after request is handled.
+
++Constrained Delegation
++----------------------
++S4U2Proxy, or constrained delegation, enables a service to use a client's
++ticket to itself to request another ticket for delegation. The KDC
++checks krbAllowedToDelegateTo to decide if it will issue a new ticket.
++If KrbConstrainedDelegation is enabled the server will use its own credentials
++to retrieve a delegated ticket for the user. For this to work the user must
++have a forwardable ticket (though the delegation flag need not be set).
++The server needs a valid credentials cache for this to work.
++
++The module itself will obtain and manage the necessary credentials.
++
+ $Id: README,v 1.12 2008/09/17 14:01:55 baalberith Exp $
+diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
+--- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c 2011-12-09 17:55:05.000000000 -0500
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c 2012-01-31 15:05:47.000000000 -0500
+@@ -42,6 +42,31 @@
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
++/*
++ * Locking mechanism inspired by mod_rewrite.
++ *
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements. See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
++/*
++ * S4U2Proxy code
++ *
++ * Copyright (C) 2012 Red Hat
++ */
++
+ #ident "$Id: mod_auth_kerb.c,v 1.150 2008/12/04 10:14:03 baalberith Exp $"
+
+ #include "config.h"
+@@ -49,6 +74,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <unixd.h>
+
+ #define MODAUTHKERB_VERSION "5.4"
+
+@@ -131,6 +157,12 @@ module AP_MODULE_DECLARE_DATA auth_kerb_
+ module auth_kerb_module;
+ #endif
+
++#ifdef STANDARD20_MODULE_STUFF
++/* s4u2proxy only supported in 2.0+ */
++static const char *lockname;
++static apr_global_mutex_t *s4u2proxy_lock = NULL;
++#endif
++
+ /***************************************************************************
+ Macros To Ease Compatibility
+ ***************************************************************************/
+@@ -165,6 +197,7 @@ typedef struct {
+ int krb_method_gssapi;
+ int krb_method_k5pass;
+ int krb5_do_auth_to_local;
++ int krb5_s4u2proxy;
+ #endif
+ #ifdef KRB4
+ char *krb_4_srvtab;
+@@ -185,6 +218,11 @@ set_kerb_auth_headers(request_rec *r, co
+
+ static const char*
+ krb5_save_realms(cmd_parms *cmd, void *sec, const char *arg);
++static const char *
++cmd_delegationlock(cmd_parms *cmd, void *dconf, const char *a1);
++
++static int
++obtain_server_credentials(request_rec *r, const char *service_name);
+
+ #ifdef STANDARD20_MODULE_STUFF
+ #define command(name, func, var, type, usage) \
+@@ -237,6 +275,12 @@ static const command_rec kerb_auth_cmds[
+
+ command("KrbLocalUserMapping", ap_set_flag_slot, krb5_do_auth_to_local,
+ FLAG, "Set to 'on' to have Kerberos do auth_to_local mapping of principal names to system user names."),
++
++ command("KrbConstrainedDelegation", ap_set_flag_slot, krb5_s4u2proxy,
++ FLAG, "Set to 'on' to have Kerberos use S4U2Proxy delegation."),
++
++ AP_INIT_TAKE1("KrbConstrainedDelegationLock", cmd_delegationlock, NULL,
++ RSRC_CONF, "the filename of a lockfile used for inter-process synchronization"),
+ #endif
+
+ #ifdef KRB4
+@@ -302,6 +346,7 @@ static void *kerb_dir_create_config(MK_P
+ #endif
+ #ifdef KRB5
+ ((kerb_auth_config *)rec)->krb5_do_auth_to_local = 0;
++ ((kerb_auth_config *)rec)->krb5_s4u2proxy = 0;
+ ((kerb_auth_config *)rec)->krb_method_k5pass = 1;
+ ((kerb_auth_config *)rec)->krb_method_gssapi = 1;
+ #endif
+@@ -319,6 +364,24 @@ krb5_save_realms(cmd_parms *cmd, void *v
+ return NULL;
+ }
+
++static const char *
++cmd_delegationlock(cmd_parms *cmd, void *dconf, const char *a1)
++{
++ const char *error;
++
++ if ((error = ap_check_cmd_context(cmd, GLOBAL_ONLY)) != NULL)
++ return error;
++
++ /* fixup the path, especially for s4u2proxylock_remove() */
++ lockname = ap_server_root_relative(cmd->pool, a1);
++
++ if (!lockname) {
++ return apr_pstrcat(cmd->pool, "Invalid KrbConstrainedDelegationLock path ", a1, NULL);
++ }
++
++ return NULL;
++}
++
+ static void
+ log_rerror(const char *file, int line, int level, int status,
+ const request_rec *r, const char *fmt, ...)
+@@ -1170,6 +1233,7 @@ get_gss_creds(request_rec *r,
+ gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
+ OM_uint32 major_status, minor_status, minor_status2;
+ gss_name_t server_name = GSS_C_NO_NAME;
++ gss_cred_usage_t usage = GSS_C_ACCEPT;
+ char buf[1024];
+ int have_server_princ;
+
+@@ -1212,10 +1276,13 @@ get_gss_creds(request_rec *r,
+
+ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Acquiring creds for %s",
+ token.value);
++ if (conf->krb5_s4u2proxy)
++ usage = GSS_C_BOTH;
++ obtain_server_credentials(r, conf->krb_service_name);
+ gss_release_buffer(&minor_status, &token);
+
+ major_status = gss_acquire_cred(&minor_status, server_name, GSS_C_INDEFINITE,
+- GSS_C_NO_OID_SET, GSS_C_ACCEPT,
++ GSS_C_NO_OID_SET, usage,
+ server_creds, NULL, NULL);
+ gss_release_name(&minor_status2, &server_name);
+ if (GSS_ERROR(major_status)) {
+@@ -1257,6 +1324,293 @@ cmp_gss_type(gss_buffer_t token, gss_OID
+ }
+ #endif
+
++/* Renew the ticket if it will expire in under a minute */
++#define RENEWAL_TIME 60
++
++/*
++ * Services4U2Proxy lets a server prinicipal request another service
++ * principal on behalf of a user. To do this the Apache service needs
++ * to have its own ccache. This will ensure that the ccache has a valid
++ * principal and will initialize or renew new credentials when needed.
++ */
++
++static int
++verify_server_credentials(request_rec *r,
++ krb5_context kcontext,
++ krb5_ccache ccache,
++ krb5_principal princ,
++ int *renew
++)
++{
++ krb5_creds match_cred;
++ krb5_creds creds;
++ char * princ_name = NULL;
++ char *tgs_princ_name = NULL;
++ krb5_timestamp now;
++ krb5_error_code kerr = 0;
++
++ *renew = 0;
++
++ memset (&match_cred, 0, sizeof(match_cred));
++ memset (&creds, 0, sizeof(creds));
++
++ if (NULL == ccache || NULL == princ) {
++ /* Nothing to verify */
++ *renew = 1;
++ goto cleanup;
++ }
++
++ if ((kerr = krb5_unparse_name(kcontext, princ, &princ_name))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not unparse principal %s (%d)",
++ error_message(kerr), kerr);
++ goto cleanup;
++ }
++
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Using principal %s for s4u2proxy", princ_name);
++
++ tgs_princ_name = apr_psprintf(r->pool, "%s/%.*s(a)%.*s", KRB5_TGS_NAME,
++ krb5_princ_realm(kcontext, princ)->length,
++ krb5_princ_realm(kcontext, princ)->data,
++ krb5_princ_realm(kcontext, princ)->length,
++ krb5_princ_realm(kcontext, princ)->data);
++
++ if ((kerr = krb5_parse_name(kcontext, tgs_princ_name, &match_cred.server)))
++ {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not parse principal %s: %s (%d)",
++ tgs_princ_name, error_message(kerr), kerr);
++ goto cleanup;
++ }
++
++ match_cred.client = princ;
++
++ if ((kerr = krb5_cc_retrieve_cred(kcontext, ccache, 0, &match_cred, &creds)))
++ {
++ krb5_unparse_name(kcontext, princ, &princ_name);
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Could not unparse principal %s: %s (%d)",
++ princ_name, error_message(kerr), kerr);
++ goto cleanup;
++ }
++
++ if ((kerr = krb5_timeofday(kcontext, &now))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not get current time: %d (%s)",
++ kerr, error_message(kerr));
++ goto cleanup;
++ }
++
++ if (now > (creds.times.endtime + RENEWAL_TIME)) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Credentials for %s have expired or will soon "
++ "expire - now %d endtime %d",
++ princ_name, now, creds.times.endtime);
++ *renew = 1;
++ } else {
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Credentials for %s will expire at "
++ "%d, it is now %d", princ_name, creds.times.endtime, now);
++ }
++
++cleanup:
++ /* Closing context, ccache, etc happens elsewhere */
++ if (match_cred.server) {
++ krb5_free_principal(kcontext, match_cred.server);
++ }
++ if (creds.client) {
++ krb5_free_cred_contents(kcontext, &creds);
++ }
++
++ return kerr;
++}
++
++static int
++obtain_server_credentials(request_rec *r,
++ const char *service_name)
++{
++ krb5_context kcontext = NULL;
++ krb5_keytab keytab = NULL;
++ krb5_ccache ccache = NULL;
++ char * princ_name = NULL;
++ char *tgs_princ_name = NULL;
++ krb5_error_code kerr = 0;
++ krb5_principal princ = NULL;
++ krb5_creds creds;
++ krb5_get_init_creds_opt gicopts;
++ int renew = 0;
++ apr_status_t rv = 0;
++
++ memset(&creds, 0, sizeof(creds));
++
++ if ((kerr = krb5_init_context(&kcontext))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Kerberos context initialization failed: %s (%d)", error_message(kerr), kerr);
++ goto done;
++ }
++
++ if ((kerr = krb5_cc_default(kcontext, &ccache))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not get default Kerberos ccache: %s (%d)",
++ error_message(kerr), kerr);
++ goto done;
++ }
++
++ if ((kerr = krb5_cc_get_principal(kcontext, ccache, &princ))) {
++ char * name = NULL;
++
++ if ((asprintf(&name, "%s:%s", krb5_cc_get_type(kcontext, ccache),
++ krb5_cc_get_name(kcontext, ccache))) == -1) {
++ kerr = KRB5_CC_NOMEM;
++ goto done;
++ }
++
++ if (KRB5_FCC_NOFILE == kerr) {
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Credentials cache %s not found, create one", name);
++ krb5_cc_close(kcontext, ccache);
++ ccache = NULL;
++ free(name);
++ } else {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failure to open credentials cache %s: %s (%d)",
++ name, error_message(kerr), kerr);
++ free(name);
++ goto done;
++ }
++ }
++
++ kerr = verify_server_credentials(r, kcontext, ccache, princ, &renew);
++
++ if (kerr || !renew) {
++ goto done;
++ }
++
++#ifdef STANDARD20_MODULE_STUFF
++ if (s4u2proxy_lock) {
++ rv = apr_global_mutex_lock(s4u2proxy_lock);
++ if (rv != APR_SUCCESS) {
++ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++ "apr_global_mutex_lock(s4u2proxy_lock) "
++ "failed");
++ }
++ }
++#endif
++
++ /* We have the lock, check again to be sure another process hasn't already
++ * renewed the ticket.
++ */
++ kerr = verify_server_credentials(r, kcontext, ccache, princ, &renew);
++ if (kerr || !renew) {
++ goto unlock;
++ }
++
++ if (NULL == princ) {
++ princ_name = apr_psprintf(r->pool, "%s/%s",
++ (service_name) ? service_name : SERVICE_NAME,
++ ap_get_server_name(r));
++
++ if ((kerr = krb5_parse_name(kcontext, princ_name, &princ))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not parse principal %s: %s (%d) ",
++ princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++ } else if (NULL == princ_name) {
++ if ((kerr = krb5_unparse_name(kcontext, princ, &princ_name))) {
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Could not unparse principal %s: %s (%d)",
++ princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++ }
++
++ if ((kerr = krb5_kt_default(kcontext, &keytab))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Unable to get default keytab: %s (%d)",
++ error_message(kerr), kerr);
++ goto unlock;
++ }
++
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Obtaining new credentials for %s", princ_name);
++ krb5_get_init_creds_opt_init(&gicopts);
++ krb5_get_init_creds_opt_set_forwardable(&gicopts, 1);
++
++ tgs_princ_name = apr_psprintf(r->pool, "%s/%.*s(a)%.*s", KRB5_TGS_NAME,
++ krb5_princ_realm(kcontext, princ)->length,
++ krb5_princ_realm(kcontext, princ)->data,
++ krb5_princ_realm(kcontext, princ)->length,
++ krb5_princ_realm(kcontext, princ)->data);
++
++ if ((kerr = krb5_get_init_creds_keytab(kcontext, &creds, princ, keytab,
++ 0, tgs_princ_name, &gicopts))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failed to obtain credentials for principal %s: "
++ "%s (%d)", princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++
++ krb5_kt_close(kcontext, keytab);
++ keytab = NULL;
++
++ if (NULL == ccache) {
++ if ((kerr = krb5_cc_default(kcontext, &ccache))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failed to open default ccache: %s (%d)",
++ error_message(kerr), kerr);
++ goto unlock;
++ }
++ }
++
++ if ((kerr = krb5_cc_initialize(kcontext, ccache, princ))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failed to initialize ccache for %s: %s (%d)",
++ princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++
++ if ((kerr = krb5_cc_store_cred(kcontext, ccache, &creds))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failed to store %s in ccache: %s (%d)",
++ princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++
++unlock:
++#ifdef STANDARD20_MODULE_STUFF
++ if (s4u2proxy_lock) {
++ apr_global_mutex_unlock(s4u2proxy_lock);
++ if (rv != APR_SUCCESS) {
++ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++ "apr_global_mutex_unlock(s4u2proxy_lock) "
++ "failed");
++ }
++ }
++#endif
++
++done:
++ if (0 == kerr)
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Done obtaining credentials for s4u2proxy");
++ else
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Failed to obtain credentials for s4u2proxy");
++
++ if (creds.client) {
++ krb5_free_cred_contents(kcontext, &creds);
++ }
++ if (ccache) {
++ krb5_cc_close(kcontext, ccache);
++ }
++ if (kcontext) {
++ krb5_free_context(kcontext);
++ }
++
++ return kerr;
++}
++
+ static int
+ authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
+ const char *auth_line, char **negotiate_ret_value)
+@@ -1697,10 +2051,60 @@ have_rcache_type(const char *type)
+ /***************************************************************************
+ Module Setup/Configuration
+ ***************************************************************************/
++#ifdef STANDARD20_MODULE_STUFF
++static apr_status_t
++s4u2proxylock_create(server_rec *s, apr_pool_t *p)
++{
++ apr_status_t rc;
++
++ /* only operate if a lockfile is used */
++ if (lockname == NULL || *(lockname) == '\0') {
++ return APR_SUCCESS;
++ }
++
++ /* create the lockfile */
++ rc = apr_global_mutex_create(&s4u2proxy_lock, lockname,
++ APR_LOCK_DEFAULT, p);
++ if (rc != APR_SUCCESS) {
++ ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s,
++ "Parent could not create lock file %s", lockname);
++ return rc;
++ }
++
++#ifdef AP_NEED_SET_MUTEX_PERMS
++ rc = unixd_set_global_mutex_perms(s4u2proxy_lock);
++ if (rc != APR_SUCCESS) {
++ ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s,
++ "mod_auth_kerb: Parent could not set permissions "
++ "on lock; check User and Group directives");
++ return rc;
++ }
++#endif
++
++ return APR_SUCCESS;
++}
++
++static apr_status_t
++s4u2proxylock_remove(void *unused)
++{
++ /* only operate if a lockfile is used */
++ if (lockname == NULL || *(lockname) == '\0') {
++ return APR_SUCCESS;
++ }
++
++ /* destroy the rewritelock */
++ apr_global_mutex_destroy(s4u2proxy_lock);
++ s4u2proxy_lock = NULL;
++ lockname = NULL;
++ return APR_SUCCESS;
++}
++#endif
++
+ #ifndef STANDARD20_MODULE_STUFF
+ static void
+ kerb_module_init(server_rec *dummy, pool *p)
+ {
++ apr_status_t status;
+ #ifndef HEIMDAL
+ /* Suppress the MIT replay cache. Requires MIT Kerberos 1.4.0 or later.
+ 1.3.x are covered by the hack overiding the replay calls */
+@@ -1741,6 +2145,7 @@ static int
+ kerb_init_handler(apr_pool_t *p, apr_pool_t *plog,
+ apr_pool_t *ptemp, server_rec *s)
+ {
++ apr_status_t rv;
+ ap_add_version_component(p, "mod_auth_kerb/" MODAUTHKERB_VERSION);
+ #ifndef HEIMDAL
+ /* Suppress the MIT replay cache. Requires MIT Kerberos 1.4.0 or later.
+@@ -1748,14 +2153,41 @@ kerb_init_handler(apr_pool_t *p, apr_poo
+ if (getenv("KRB5RCACHETYPE") == NULL && have_rcache_type("none"))
+ putenv(strdup("KRB5RCACHETYPE=none"));
+ #endif
++#ifdef STANDARD20_MODULE_STUFF
++ rv = s4u2proxylock_create(s, p);
++ if (rv != APR_SUCCESS) {
++ return HTTP_INTERNAL_SERVER_ERROR;
++ }
++
++ apr_pool_cleanup_register(p, (void *)s, s4u2proxylock_remove,
++ apr_pool_cleanup_null);
++#endif
+
+ return OK;
+ }
+
+ static void
++initialize_child(apr_pool_t *p, server_rec *s)
++{
++ apr_status_t rv = 0;
++
++#ifdef STANDARD20_MODULE_STUFF
++ if (lockname != NULL && *(lockname) != '\0') {
++ rv = apr_global_mutex_child_init(&s4u2proxy_lock, lockname, p);
++ if (rv != APR_SUCCESS) {
++ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
++ "mod_auth_kerb: could not init s4u2proxy_lock"
++ " in child");
++ }
++ }
++#endif
++}
++
++static void
+ kerb_register_hooks(apr_pool_t *p)
+ {
+ ap_hook_post_config(kerb_init_handler, NULL, NULL, APR_HOOK_MIDDLE);
++ ap_hook_child_init(initialize_child, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_check_user_id(kerb_authenticate_user, NULL, NULL, APR_HOOK_MIDDLE);
+ }
+
diff --git a/mod_auth_kerb.spec b/mod_auth_kerb.spec
index 20d879b..86fcb8b 100644
--- a/mod_auth_kerb.spec
+++ b/mod_auth_kerb.spec
@@ -2,14 +2,16 @@
Summary: Kerberos authentication module for HTTP
Name: mod_auth_kerb
Version: 5.4
-Release: 7%{?dist}
-License: BSD and MIT
+Release: 8%{?dist}
+License: BSD and MIT and ASL 2.0
Group: System Environment/Daemons
URL: http://modauthkerb.sourceforge.net/
Source0: http://downloads.sourceforge.net/modauthkerb/%{name}-%{version}.tar.gz
Source1: auth_kerb.conf
+Source2: LICENSE.ASL
Patch1: mod_auth_kerb-5.4-rcopshack.patch
Patch2: mod_auth_kerb-5.4-fixes.patch
+Patch3: mod_auth_kerb-5.4-s4u2proxy.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: httpd-devel, krb5-devel
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
@@ -24,6 +26,7 @@ authentication based on ticket exchanges.
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .rcopshack
%patch2 -p1 -b .fixes
+%patch3 -p1 -b .s4u2proxy
%build
%configure --without-krb4 --with-krb5=%{_prefix} \
@@ -39,16 +42,23 @@ install -m 755 src/.libs/mod_auth_kerb.so \
install -p -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/auth_kerb.conf
+# Copy the license files here so we can include them in %doc
+cp -p %{SOURCE2} .
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc README
+%doc README LICENSE.ASL
%config(noreplace) %{_sysconfdir}/httpd/conf.d/auth_kerb.conf
%{_libdir}/httpd/modules/*.so
%changelog
+=======
+* Tue Jan 31 2012 Rob Crittenden <rcritten(a)redhat.com> - 5.4-8
+- Add support for Constrained Delegation/su42proxy (#767740)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 5.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
11Â years
[mod_auth_kerb/f15] Add support for Constrained Delegation/S4U2Proxy (#767740)
by Rob Crittenden
commit bf0e5ca193ab37b21542a93baf24a3f0cdd2e355
Author: Rob Crittenden <rcritten(a)redhat.com>
Date: Tue Jan 31 15:43:18 2012 -0500
Add support for Constrained Delegation/S4U2Proxy (#767740)
The S4U2Proxy patch includes locking code inspired by mod_rewrite
so the ASL license is being added.
LICENSE.ASL | 201 +++++++++++++
mod_auth_kerb-5.4-s4u2proxy.patch | 570 +++++++++++++++++++++++++++++++++++++
mod_auth_kerb.spec | 15 +-
3 files changed, 783 insertions(+), 3 deletions(-)
---
diff --git a/LICENSE.ASL b/LICENSE.ASL
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/LICENSE.ASL
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/mod_auth_kerb-5.4-s4u2proxy.patch b/mod_auth_kerb-5.4-s4u2proxy.patch
new file mode 100644
index 0000000..d1793c6
--- /dev/null
+++ b/mod_auth_kerb-5.4-s4u2proxy.patch
@@ -0,0 +1,570 @@
+diff -up --recursive mod_auth_kerb-5.4.orig/README mod_auth_kerb-5.4/README
+--- mod_auth_kerb-5.4.orig/README 2008-11-26 11:51:05.000000000 -0500
++++ mod_auth_kerb-5.4/README 2012-01-04 11:17:22.000000000 -0500
+@@ -122,4 +122,16 @@ KrbSaveCredentials, the tickets will be
+ credential cache that will be available for the request handler. The ticket
+ file will be removed after request is handled.
+
++Constrained Delegation
++----------------------
++S4U2Proxy, or constrained delegation, enables a service to use a client's
++ticket to itself to request another ticket for delegation. The KDC
++checks krbAllowedToDelegateTo to decide if it will issue a new ticket.
++If KrbConstrainedDelegation is enabled the server will use its own credentials
++to retrieve a delegated ticket for the user. For this to work the user must
++have a forwardable ticket (though the delegation flag need not be set).
++The server needs a valid credentials cache for this to work.
++
++The module itself will obtain and manage the necessary credentials.
++
+ $Id: README,v 1.12 2008/09/17 14:01:55 baalberith Exp $
+diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
+--- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c 2011-12-09 17:55:05.000000000 -0500
++++ mod_auth_kerb-5.4/src/mod_auth_kerb.c 2012-01-31 15:05:47.000000000 -0500
+@@ -42,6 +42,31 @@
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
++/*
++ * Locking mechanism inspired by mod_rewrite.
++ *
++ * Licensed to the Apache Software Foundation (ASF) under one or more
++ * contributor license agreements. See the NOTICE file distributed with
++ * this work for additional information regarding copyright ownership.
++ * The ASF licenses this file to You under the Apache License, Version 2.0
++ * (the "License"); you may not use this file except in compliance with
++ * the License. You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
++/*
++ * S4U2Proxy code
++ *
++ * Copyright (C) 2012 Red Hat
++ */
++
+ #ident "$Id: mod_auth_kerb.c,v 1.150 2008/12/04 10:14:03 baalberith Exp $"
+
+ #include "config.h"
+@@ -49,6 +74,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <stdarg.h>
++#include <unixd.h>
+
+ #define MODAUTHKERB_VERSION "5.4"
+
+@@ -131,6 +157,12 @@ module AP_MODULE_DECLARE_DATA auth_kerb_
+ module auth_kerb_module;
+ #endif
+
++#ifdef STANDARD20_MODULE_STUFF
++/* s4u2proxy only supported in 2.0+ */
++static const char *lockname;
++static apr_global_mutex_t *s4u2proxy_lock = NULL;
++#endif
++
+ /***************************************************************************
+ Macros To Ease Compatibility
+ ***************************************************************************/
+@@ -165,6 +197,7 @@ typedef struct {
+ int krb_method_gssapi;
+ int krb_method_k5pass;
+ int krb5_do_auth_to_local;
++ int krb5_s4u2proxy;
+ #endif
+ #ifdef KRB4
+ char *krb_4_srvtab;
+@@ -185,6 +218,11 @@ set_kerb_auth_headers(request_rec *r, co
+
+ static const char*
+ krb5_save_realms(cmd_parms *cmd, void *sec, const char *arg);
++static const char *
++cmd_delegationlock(cmd_parms *cmd, void *dconf, const char *a1);
++
++static int
++obtain_server_credentials(request_rec *r, const char *service_name);
+
+ #ifdef STANDARD20_MODULE_STUFF
+ #define command(name, func, var, type, usage) \
+@@ -237,6 +275,12 @@ static const command_rec kerb_auth_cmds[
+
+ command("KrbLocalUserMapping", ap_set_flag_slot, krb5_do_auth_to_local,
+ FLAG, "Set to 'on' to have Kerberos do auth_to_local mapping of principal names to system user names."),
++
++ command("KrbConstrainedDelegation", ap_set_flag_slot, krb5_s4u2proxy,
++ FLAG, "Set to 'on' to have Kerberos use S4U2Proxy delegation."),
++
++ AP_INIT_TAKE1("KrbConstrainedDelegationLock", cmd_delegationlock, NULL,
++ RSRC_CONF, "the filename of a lockfile used for inter-process synchronization"),
+ #endif
+
+ #ifdef KRB4
+@@ -302,6 +346,7 @@ static void *kerb_dir_create_config(MK_P
+ #endif
+ #ifdef KRB5
+ ((kerb_auth_config *)rec)->krb5_do_auth_to_local = 0;
++ ((kerb_auth_config *)rec)->krb5_s4u2proxy = 0;
+ ((kerb_auth_config *)rec)->krb_method_k5pass = 1;
+ ((kerb_auth_config *)rec)->krb_method_gssapi = 1;
+ #endif
+@@ -319,6 +364,24 @@ krb5_save_realms(cmd_parms *cmd, void *v
+ return NULL;
+ }
+
++static const char *
++cmd_delegationlock(cmd_parms *cmd, void *dconf, const char *a1)
++{
++ const char *error;
++
++ if ((error = ap_check_cmd_context(cmd, GLOBAL_ONLY)) != NULL)
++ return error;
++
++ /* fixup the path, especially for s4u2proxylock_remove() */
++ lockname = ap_server_root_relative(cmd->pool, a1);
++
++ if (!lockname) {
++ return apr_pstrcat(cmd->pool, "Invalid KrbConstrainedDelegationLock path ", a1, NULL);
++ }
++
++ return NULL;
++}
++
+ static void
+ log_rerror(const char *file, int line, int level, int status,
+ const request_rec *r, const char *fmt, ...)
+@@ -1170,6 +1233,7 @@ get_gss_creds(request_rec *r,
+ gss_buffer_desc token = GSS_C_EMPTY_BUFFER;
+ OM_uint32 major_status, minor_status, minor_status2;
+ gss_name_t server_name = GSS_C_NO_NAME;
++ gss_cred_usage_t usage = GSS_C_ACCEPT;
+ char buf[1024];
+ int have_server_princ;
+
+@@ -1212,10 +1276,13 @@ get_gss_creds(request_rec *r,
+
+ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "Acquiring creds for %s",
+ token.value);
++ if (conf->krb5_s4u2proxy)
++ usage = GSS_C_BOTH;
++ obtain_server_credentials(r, conf->krb_service_name);
+ gss_release_buffer(&minor_status, &token);
+
+ major_status = gss_acquire_cred(&minor_status, server_name, GSS_C_INDEFINITE,
+- GSS_C_NO_OID_SET, GSS_C_ACCEPT,
++ GSS_C_NO_OID_SET, usage,
+ server_creds, NULL, NULL);
+ gss_release_name(&minor_status2, &server_name);
+ if (GSS_ERROR(major_status)) {
+@@ -1257,6 +1324,293 @@ cmp_gss_type(gss_buffer_t token, gss_OID
+ }
+ #endif
+
++/* Renew the ticket if it will expire in under a minute */
++#define RENEWAL_TIME 60
++
++/*
++ * Services4U2Proxy lets a server prinicipal request another service
++ * principal on behalf of a user. To do this the Apache service needs
++ * to have its own ccache. This will ensure that the ccache has a valid
++ * principal and will initialize or renew new credentials when needed.
++ */
++
++static int
++verify_server_credentials(request_rec *r,
++ krb5_context kcontext,
++ krb5_ccache ccache,
++ krb5_principal princ,
++ int *renew
++)
++{
++ krb5_creds match_cred;
++ krb5_creds creds;
++ char * princ_name = NULL;
++ char *tgs_princ_name = NULL;
++ krb5_timestamp now;
++ krb5_error_code kerr = 0;
++
++ *renew = 0;
++
++ memset (&match_cred, 0, sizeof(match_cred));
++ memset (&creds, 0, sizeof(creds));
++
++ if (NULL == ccache || NULL == princ) {
++ /* Nothing to verify */
++ *renew = 1;
++ goto cleanup;
++ }
++
++ if ((kerr = krb5_unparse_name(kcontext, princ, &princ_name))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not unparse principal %s (%d)",
++ error_message(kerr), kerr);
++ goto cleanup;
++ }
++
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Using principal %s for s4u2proxy", princ_name);
++
++ tgs_princ_name = apr_psprintf(r->pool, "%s/%.*s(a)%.*s", KRB5_TGS_NAME,
++ krb5_princ_realm(kcontext, princ)->length,
++ krb5_princ_realm(kcontext, princ)->data,
++ krb5_princ_realm(kcontext, princ)->length,
++ krb5_princ_realm(kcontext, princ)->data);
++
++ if ((kerr = krb5_parse_name(kcontext, tgs_princ_name, &match_cred.server)))
++ {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not parse principal %s: %s (%d)",
++ tgs_princ_name, error_message(kerr), kerr);
++ goto cleanup;
++ }
++
++ match_cred.client = princ;
++
++ if ((kerr = krb5_cc_retrieve_cred(kcontext, ccache, 0, &match_cred, &creds)))
++ {
++ krb5_unparse_name(kcontext, princ, &princ_name);
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Could not unparse principal %s: %s (%d)",
++ princ_name, error_message(kerr), kerr);
++ goto cleanup;
++ }
++
++ if ((kerr = krb5_timeofday(kcontext, &now))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not get current time: %d (%s)",
++ kerr, error_message(kerr));
++ goto cleanup;
++ }
++
++ if (now > (creds.times.endtime + RENEWAL_TIME)) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Credentials for %s have expired or will soon "
++ "expire - now %d endtime %d",
++ princ_name, now, creds.times.endtime);
++ *renew = 1;
++ } else {
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Credentials for %s will expire at "
++ "%d, it is now %d", princ_name, creds.times.endtime, now);
++ }
++
++cleanup:
++ /* Closing context, ccache, etc happens elsewhere */
++ if (match_cred.server) {
++ krb5_free_principal(kcontext, match_cred.server);
++ }
++ if (creds.client) {
++ krb5_free_cred_contents(kcontext, &creds);
++ }
++
++ return kerr;
++}
++
++static int
++obtain_server_credentials(request_rec *r,
++ const char *service_name)
++{
++ krb5_context kcontext = NULL;
++ krb5_keytab keytab = NULL;
++ krb5_ccache ccache = NULL;
++ char * princ_name = NULL;
++ char *tgs_princ_name = NULL;
++ krb5_error_code kerr = 0;
++ krb5_principal princ = NULL;
++ krb5_creds creds;
++ krb5_get_init_creds_opt gicopts;
++ int renew = 0;
++ apr_status_t rv = 0;
++
++ memset(&creds, 0, sizeof(creds));
++
++ if ((kerr = krb5_init_context(&kcontext))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Kerberos context initialization failed: %s (%d)", error_message(kerr), kerr);
++ goto done;
++ }
++
++ if ((kerr = krb5_cc_default(kcontext, &ccache))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not get default Kerberos ccache: %s (%d)",
++ error_message(kerr), kerr);
++ goto done;
++ }
++
++ if ((kerr = krb5_cc_get_principal(kcontext, ccache, &princ))) {
++ char * name = NULL;
++
++ if ((asprintf(&name, "%s:%s", krb5_cc_get_type(kcontext, ccache),
++ krb5_cc_get_name(kcontext, ccache))) == -1) {
++ kerr = KRB5_CC_NOMEM;
++ goto done;
++ }
++
++ if (KRB5_FCC_NOFILE == kerr) {
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Credentials cache %s not found, create one", name);
++ krb5_cc_close(kcontext, ccache);
++ ccache = NULL;
++ free(name);
++ } else {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failure to open credentials cache %s: %s (%d)",
++ name, error_message(kerr), kerr);
++ free(name);
++ goto done;
++ }
++ }
++
++ kerr = verify_server_credentials(r, kcontext, ccache, princ, &renew);
++
++ if (kerr || !renew) {
++ goto done;
++ }
++
++#ifdef STANDARD20_MODULE_STUFF
++ if (s4u2proxy_lock) {
++ rv = apr_global_mutex_lock(s4u2proxy_lock);
++ if (rv != APR_SUCCESS) {
++ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++ "apr_global_mutex_lock(s4u2proxy_lock) "
++ "failed");
++ }
++ }
++#endif
++
++ /* We have the lock, check again to be sure another process hasn't already
++ * renewed the ticket.
++ */
++ kerr = verify_server_credentials(r, kcontext, ccache, princ, &renew);
++ if (kerr || !renew) {
++ goto unlock;
++ }
++
++ if (NULL == princ) {
++ princ_name = apr_psprintf(r->pool, "%s/%s",
++ (service_name) ? service_name : SERVICE_NAME,
++ ap_get_server_name(r));
++
++ if ((kerr = krb5_parse_name(kcontext, princ_name, &princ))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Could not parse principal %s: %s (%d) ",
++ princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++ } else if (NULL == princ_name) {
++ if ((kerr = krb5_unparse_name(kcontext, princ, &princ_name))) {
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Could not unparse principal %s: %s (%d)",
++ princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++ }
++
++ if ((kerr = krb5_kt_default(kcontext, &keytab))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Unable to get default keytab: %s (%d)",
++ error_message(kerr), kerr);
++ goto unlock;
++ }
++
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Obtaining new credentials for %s", princ_name);
++ krb5_get_init_creds_opt_init(&gicopts);
++ krb5_get_init_creds_opt_set_forwardable(&gicopts, 1);
++
++ tgs_princ_name = apr_psprintf(r->pool, "%s/%.*s(a)%.*s", KRB5_TGS_NAME,
++ krb5_princ_realm(kcontext, princ)->length,
++ krb5_princ_realm(kcontext, princ)->data,
++ krb5_princ_realm(kcontext, princ)->length,
++ krb5_princ_realm(kcontext, princ)->data);
++
++ if ((kerr = krb5_get_init_creds_keytab(kcontext, &creds, princ, keytab,
++ 0, tgs_princ_name, &gicopts))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failed to obtain credentials for principal %s: "
++ "%s (%d)", princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++
++ krb5_kt_close(kcontext, keytab);
++ keytab = NULL;
++
++ if (NULL == ccache) {
++ if ((kerr = krb5_cc_default(kcontext, &ccache))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failed to open default ccache: %s (%d)",
++ error_message(kerr), kerr);
++ goto unlock;
++ }
++ }
++
++ if ((kerr = krb5_cc_initialize(kcontext, ccache, princ))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failed to initialize ccache for %s: %s (%d)",
++ princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++
++ if ((kerr = krb5_cc_store_cred(kcontext, ccache, &creds))) {
++ log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
++ "Failed to store %s in ccache: %s (%d)",
++ princ_name, error_message(kerr), kerr);
++ goto unlock;
++ }
++
++unlock:
++#ifdef STANDARD20_MODULE_STUFF
++ if (s4u2proxy_lock) {
++ apr_global_mutex_unlock(s4u2proxy_lock);
++ if (rv != APR_SUCCESS) {
++ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r,
++ "apr_global_mutex_unlock(s4u2proxy_lock) "
++ "failed");
++ }
++ }
++#endif
++
++done:
++ if (0 == kerr)
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Done obtaining credentials for s4u2proxy");
++ else
++ log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
++ "Failed to obtain credentials for s4u2proxy");
++
++ if (creds.client) {
++ krb5_free_cred_contents(kcontext, &creds);
++ }
++ if (ccache) {
++ krb5_cc_close(kcontext, ccache);
++ }
++ if (kcontext) {
++ krb5_free_context(kcontext);
++ }
++
++ return kerr;
++}
++
+ static int
+ authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
+ const char *auth_line, char **negotiate_ret_value)
+@@ -1697,10 +2051,60 @@ have_rcache_type(const char *type)
+ /***************************************************************************
+ Module Setup/Configuration
+ ***************************************************************************/
++#ifdef STANDARD20_MODULE_STUFF
++static apr_status_t
++s4u2proxylock_create(server_rec *s, apr_pool_t *p)
++{
++ apr_status_t rc;
++
++ /* only operate if a lockfile is used */
++ if (lockname == NULL || *(lockname) == '\0') {
++ return APR_SUCCESS;
++ }
++
++ /* create the lockfile */
++ rc = apr_global_mutex_create(&s4u2proxy_lock, lockname,
++ APR_LOCK_DEFAULT, p);
++ if (rc != APR_SUCCESS) {
++ ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s,
++ "Parent could not create lock file %s", lockname);
++ return rc;
++ }
++
++#ifdef AP_NEED_SET_MUTEX_PERMS
++ rc = unixd_set_global_mutex_perms(s4u2proxy_lock);
++ if (rc != APR_SUCCESS) {
++ ap_log_error(APLOG_MARK, APLOG_CRIT, rc, s,
++ "mod_auth_kerb: Parent could not set permissions "
++ "on lock; check User and Group directives");
++ return rc;
++ }
++#endif
++
++ return APR_SUCCESS;
++}
++
++static apr_status_t
++s4u2proxylock_remove(void *unused)
++{
++ /* only operate if a lockfile is used */
++ if (lockname == NULL || *(lockname) == '\0') {
++ return APR_SUCCESS;
++ }
++
++ /* destroy the rewritelock */
++ apr_global_mutex_destroy(s4u2proxy_lock);
++ s4u2proxy_lock = NULL;
++ lockname = NULL;
++ return APR_SUCCESS;
++}
++#endif
++
+ #ifndef STANDARD20_MODULE_STUFF
+ static void
+ kerb_module_init(server_rec *dummy, pool *p)
+ {
++ apr_status_t status;
+ #ifndef HEIMDAL
+ /* Suppress the MIT replay cache. Requires MIT Kerberos 1.4.0 or later.
+ 1.3.x are covered by the hack overiding the replay calls */
+@@ -1741,6 +2145,7 @@ static int
+ kerb_init_handler(apr_pool_t *p, apr_pool_t *plog,
+ apr_pool_t *ptemp, server_rec *s)
+ {
++ apr_status_t rv;
+ ap_add_version_component(p, "mod_auth_kerb/" MODAUTHKERB_VERSION);
+ #ifndef HEIMDAL
+ /* Suppress the MIT replay cache. Requires MIT Kerberos 1.4.0 or later.
+@@ -1748,14 +2153,41 @@ kerb_init_handler(apr_pool_t *p, apr_poo
+ if (getenv("KRB5RCACHETYPE") == NULL && have_rcache_type("none"))
+ putenv(strdup("KRB5RCACHETYPE=none"));
+ #endif
++#ifdef STANDARD20_MODULE_STUFF
++ rv = s4u2proxylock_create(s, p);
++ if (rv != APR_SUCCESS) {
++ return HTTP_INTERNAL_SERVER_ERROR;
++ }
++
++ apr_pool_cleanup_register(p, (void *)s, s4u2proxylock_remove,
++ apr_pool_cleanup_null);
++#endif
+
+ return OK;
+ }
+
+ static void
++initialize_child(apr_pool_t *p, server_rec *s)
++{
++ apr_status_t rv = 0;
++
++#ifdef STANDARD20_MODULE_STUFF
++ if (lockname != NULL && *(lockname) != '\0') {
++ rv = apr_global_mutex_child_init(&s4u2proxy_lock, lockname, p);
++ if (rv != APR_SUCCESS) {
++ ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
++ "mod_auth_kerb: could not init s4u2proxy_lock"
++ " in child");
++ }
++ }
++#endif
++}
++
++static void
+ kerb_register_hooks(apr_pool_t *p)
+ {
+ ap_hook_post_config(kerb_init_handler, NULL, NULL, APR_HOOK_MIDDLE);
++ ap_hook_child_init(initialize_child, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_check_user_id(kerb_authenticate_user, NULL, NULL, APR_HOOK_MIDDLE);
+ }
+
diff --git a/mod_auth_kerb.spec b/mod_auth_kerb.spec
index 20d879b..4c119b2 100644
--- a/mod_auth_kerb.spec
+++ b/mod_auth_kerb.spec
@@ -2,14 +2,16 @@
Summary: Kerberos authentication module for HTTP
Name: mod_auth_kerb
Version: 5.4
-Release: 7%{?dist}
-License: BSD and MIT
+Release: 8%{?dist}
+License: BSD and MIT and ASL 2.0
Group: System Environment/Daemons
URL: http://modauthkerb.sourceforge.net/
Source0: http://downloads.sourceforge.net/modauthkerb/%{name}-%{version}.tar.gz
Source1: auth_kerb.conf
+Source2: LICENSE.ASL
Patch1: mod_auth_kerb-5.4-rcopshack.patch
Patch2: mod_auth_kerb-5.4-fixes.patch
+Patch3: mod_auth_kerb-5.4-s4u2proxy.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: httpd-devel, krb5-devel
Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo missing)
@@ -24,6 +26,7 @@ authentication based on ticket exchanges.
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .rcopshack
%patch2 -p1 -b .fixes
+%patch3 -p1 -b .s4u2proxy
%build
%configure --without-krb4 --with-krb5=%{_prefix} \
@@ -39,16 +42,22 @@ install -m 755 src/.libs/mod_auth_kerb.so \
install -p -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/auth_kerb.conf
+# Copy the license files here so we can include them in %doc
+cp -p %{SOURCE2} .
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc README
+%doc README LICENSE.ASL
%config(noreplace) %{_sysconfdir}/httpd/conf.d/auth_kerb.conf
%{_libdir}/httpd/modules/*.so
%changelog
+* Tue Jan 31 2012 Rob Crittenden <rcritten(a)redhat.com> - 5.4-8
+- Add support for Constrained Delegation/su42proxy (#767740)
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 5.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
11Â years
[pssh] 2.3
by terjeros
commit d6c4d65196c52239adc158ff5dca5e9109b6ae2c
Author: Terje R�sten <terje.rosten(a)ntnu.no>
Date: Tue Jan 31 23:32:19 2012 +0100
2.3
.gitignore | 1 +
pssh.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ccf7fb1..dd8daae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ pssh-2.1.1.tar.gz
/pssh-2.2.tar.gz
/pssh-2.2.1.tar.gz
/pssh-2.2.2.tar.gz
+/pssh-2.3.tar.gz
diff --git a/pssh.spec b/pssh.spec
index 3d15bfc..528282c 100644
--- a/pssh.spec
+++ b/pssh.spec
@@ -3,8 +3,8 @@
Summary: Parallel SSH tools
Name: pssh
-Version: 2.2.2
-Release: 3%{?dist}
+Version: 2.3
+Release: 1%{?dist}
License: BSD
Url: http://code.google.com/p/parallel-ssh/
Group: Applications/Productivity
@@ -58,6 +58,9 @@ Parallell version includes:
%{python_sitelib}/%{name}lib
%changelog
+* Tue Jan 31 2012 Terje Rosten <terje.rosten(a)ntnu.no> - 2.3-1
+- 2.3
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
@@ -72,7 +75,7 @@ Parallell version includes:
* Sat Jan 22 2011 Terje Rosten <terje.rosten(a)ntnu.no> - 2.2-1
- 2.2
-
+
* Wed Jul 21 2010 David Malcolm <dmalcolm(a)redhat.com> - 2.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
diff --git a/sources b/sources
index aca60ea..b1324a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-865305ae39647884bc54a42e9f9554bb pssh-2.2.2.tar.gz
+dbdbfda5681b82d4c64abdb3668e88bc pssh-2.3.tar.gz
11Â years