r4395 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2010-08-31 21:34:40 +0000 (Tue, 31 Aug 2010)
New Revision: 4395
Added:
glibc-package/trunk/debian/patches/any/cvs-sunrpc-license.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/copyright
glibc-package/trunk/debian/patches/series
Log:
* Add any/cvs-sunrpc-license.diff from upstream to fix the license of
Sun RPC: contrary to what Simon Phipps announced on his blog, and
according to the lawyers, the copy in glibc wasn't contained in the
agreement from February, 2009. In August, 2010, Oracle confirmed that
the code has been relicensed under BSD. Update debian/copyright
accordingly.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-08-31 21:29:20 UTC (rev 4394)
+++ glibc-package/trunk/debian/changelog 2010-08-31 21:34:40 UTC (rev 4395)
@@ -35,8 +35,14 @@
patches/any/cvs-etc-resolv.conf.diff.
* Add mips/cvs-non-pic-n32-64-syscall.diff from upstream to fix non-PIC
syscall on MIPS n32 and 64 ABI.
+ * Add any/cvs-sunrpc-license.diff from upstream to fix the license of
+ Sun RPC: contrary to what Simon Phipps announced on his blog, and
+ according to the lawyers, the copy in glibc wasn't contained in the
+ agreement from February, 2009. In August, 2010, Oracle confirmed that
+ the code has been relicensed under BSD. Update debian/copyright
+ accordingly.
- -- Aurelien Jarno <aurel32@debian.org> Fri, 30 Jul 2010 22:18:39 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 31 Aug 2010 23:28:57 +0200
eglibc (2.11.2-2) unstable; urgency=medium
Modified: glibc-package/trunk/debian/copyright
===================================================================
--- glibc-package/trunk/debian/copyright 2010-08-31 21:29:20 UTC (rev 4394)
+++ glibc-package/trunk/debian/copyright 2010-08-31 21:34:40 UTC (rev 4395)
@@ -107,7 +107,7 @@
* The Sun RPC support (from rpcsrc-4.0) is covered by the following
license:
- Copyright (C) 1984, Sun Microsystems, Inc.
+ Copyright (c) 2010, Oracle America, Inc.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -119,7 +119,7 @@
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials
provided with the distribution.
- * Neither the name of Sun Microsystems, Inc. nor the names of its
+ * Neither the name of the "Oracle America, Inc." nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.
Added: glibc-package/trunk/debian/patches/any/cvs-sunrpc-license.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/cvs-sunrpc-license.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/cvs-sunrpc-license.diff 2010-08-31 21:34:40 UTC (rev 4395)
@@ -0,0 +1,2174 @@
+2010-08-20 Petr Baudis <pasky@suse.cz>
+
+ * LICENSES: Sync the sunrpc license.
+
+2010-08-19 Ulrich Drepper <drepper@redhat.com>
+
+ * sunrpc/auth_des.c: Update copyright notice once again.
+ * sunrpc/auth_none.c: Likewise.
+ * sunrpc/auth_unix.c: Likewise.
+ * sunrpc/authdes_prot.c: Likewise.
+ * sunrpc/authuxprot.c: Likewise.
+ * sunrpc/bindrsvprt.c: Likewise.
+ * sunrpc/clnt_gen.c: Likewise.
+ * sunrpc/clnt_perr.c: Likewise.
+ * sunrpc/clnt_raw.c: Likewise.
+ * sunrpc/clnt_simp.c: Likewise.
+ * sunrpc/clnt_tcp.c: Likewise.
+ * sunrpc/clnt_udp.c: Likewise.
+ * sunrpc/clnt_unix.c: Likewise.
+ * sunrpc/des_crypt.c: Likewise.
+ * sunrpc/des_soft.c: Likewise.
+ * sunrpc/get_myaddr.c: Likewise.
+ * sunrpc/getrpcport.c: Likewise.
+ * sunrpc/key_call.c: Likewise.
+ * sunrpc/key_prot.c: Likewise.
+ * sunrpc/openchild.c: Likewise.
+ * sunrpc/pm_getmaps.c: Likewise.
+ * sunrpc/pm_getport.c: Likewise.
+ * sunrpc/pmap_clnt.c: Likewise.
+ * sunrpc/pmap_prot.c: Likewise.
+ * sunrpc/pmap_prot2.c: Likewise.
+ * sunrpc/pmap_rmt.c: Likewise.
+ * sunrpc/rpc/auth.h: Likewise.
+ * sunrpc/rpc/auth_unix.h: Likewise.
+ * sunrpc/rpc/clnt.h: Likewise.
+ * sunrpc/rpc/des_crypt.h: Likewise.
+ * sunrpc/rpc/key_prot.h: Likewise.
+ * sunrpc/rpc/netdb.h: Likewise.
+ * sunrpc/rpc/pmap_clnt.h: Likewise.
+ * sunrpc/rpc/pmap_prot.h: Likewise.
+ * sunrpc/rpc/pmap_rmt.h: Likewise.
+ * sunrpc/rpc/rpc.h: Likewise.
+ * sunrpc/rpc/rpc_des.h: Likewise.
+ * sunrpc/rpc/rpc_msg.h: Likewise.
+ * sunrpc/rpc/svc.h: Likewise.
+ * sunrpc/rpc/svc_auth.h: Likewise.
+ * sunrpc/rpc/types.h: Likewise.
+ * sunrpc/rpc/xdr.h: Likewise.
+ * sunrpc/rpc_clntout.c: Likewise.
+ * sunrpc/rpc_cmsg.c: Likewise.
+ * sunrpc/rpc_common.c: Likewise.
+ * sunrpc/rpc_cout.c: Likewise.
+ * sunrpc/rpc_dtable.c: Likewise.
+ * sunrpc/rpc_hout.c: Likewise.
+ * sunrpc/rpc_main.c: Likewise.
+ * sunrpc/rpc_parse.c: Likewise.
+ * sunrpc/rpc_parse.h: Likewise.
+ * sunrpc/rpc_prot.c: Likewise.
+ * sunrpc/rpc_sample.c: Likewise.
+ * sunrpc/rpc_scan.c: Likewise.
+ * sunrpc/rpc_scan.h: Likewise.
+ * sunrpc/rpc_svcout.c: Likewise.
+ * sunrpc/rpc_tblout.c: Likewise.
+ * sunrpc/rpc_util.c: Likewise.
+ * sunrpc/rpc_util.h: Likewise.
+ * sunrpc/rpcinfo.c: Likewise.
+ * sunrpc/rpcsvc/bootparam_prot.x: Likewise.
+ * sunrpc/rpcsvc/key_prot.x: Likewise.
+ * sunrpc/rpcsvc/klm_prot.x: Likewise.
+ * sunrpc/rpcsvc/mount.x: Likewise.
+ * sunrpc/rpcsvc/nfs_prot.x: Likewise.
+ * sunrpc/rpcsvc/nlm_prot.x: Likewise.
+ * sunrpc/rpcsvc/rex.x: Likewise.
+ * sunrpc/rpcsvc/rstat.x: Likewise.
+ * sunrpc/rpcsvc/rusers.x: Likewise.
+ * sunrpc/rpcsvc/sm_inter.x: Likewise.
+ * sunrpc/rpcsvc/spray.x: Likewise.
+ * sunrpc/rpcsvc/yppasswd.x: Likewise.
+ * sunrpc/rtime.c: Likewise.
+ * sunrpc/svc.c: Likewise.
+ * sunrpc/svc_auth.c: Likewise.
+ * sunrpc/svc_authux.c: Likewise.
+ * sunrpc/svc_raw.c: Likewise.
+ * sunrpc/svc_run.c: Likewise.
+ * sunrpc/svc_simple.c: Likewise.
+ * sunrpc/svc_tcp.c: Likewise.
+ * sunrpc/svc_udp.c: Likewise.
+ * sunrpc/svc_unix.c: Likewise.
+ * sunrpc/svcauth_des.c: Likewise.
+ * sunrpc/xcrypt.c: Likewise.
+ * sunrpc/xdr.c: Likewise.
+ * sunrpc/xdr_array.c: Likewise.
+ * sunrpc/xdr_float.c: Likewise.
+ * sunrpc/xdr_mem.c: Likewise.
+ * sunrpc/xdr_rec.c: Likewise.
+ * sunrpc/xdr_ref.c: Likewise.
+ * sunrpc/xdr_sizeof.c: Likewise.
+ * sunrpc/xdr_stdio.c: Likewise.
+
+diff --git a/LICENSES b/LICENSES
+index b3b8899..1c99d2c 100644
+--- a/LICENSES
++++ b/LICENSES
+@@ -63,30 +63,34 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ The Sun RPC support (from rpcsrc-4.0) is covered by the following
+ license:
+
+-Copyright (C) 1984, Sun Microsystems, Inc.
+-
+-Sun RPC is a product of Sun Microsystems, Inc. and is provided for
+-unrestricted use provided that this legend is included on all tape media
+-and as a part of the software program in whole or part. Users may copy
+-or modify Sun RPC without charge, but are not authorized to license or
+-distribute it to anyone else except as part of a product or program
+-developed by the user.
+-
+-SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
+-WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
+-PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+-
+-Sun RPC is provided with no support and without any obligation on the
+-part of Sun Microsystems, Inc. to assist in its use, correction,
+-modification or enhancement.
+-
+-SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
+-INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
+-OR ANY PART THEREOF.
+-
+-In no event will Sun Microsystems, Inc. be liable for any lost revenue
+-or profits or other special, indirect and consequential damages, even if
+-Sun has been advised of the possibility of such damages.
++Copyright (c) 2010, Oracle America, Inc.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions are
++met:
++
++ * Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++ * Redistributions in binary form must reproduce the above
++ copyright notice, this list of conditions and the following
++ disclaimer in the documentation and/or other materials
++ provided with the distribution.
++ * Neither the name of the "Oracle America, Inc." nor the names of its
++ contributors may be used to endorse or promote products derived
++ from this software without specific prior written permission.
++
++ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
++ FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
++ COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
++ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
++ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+ The following CMU license covers some of the support code for Mach,
+
+diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c
+index acd8eb4..0228562 100644
+--- a/sunrpc/auth_des.c
++++ b/sunrpc/auth_des.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1988 by Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c
+index b78f1e1..57b3418 100644
+--- a/sunrpc/auth_none.c
++++ b/sunrpc/auth_none.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
+index 3a371c7..301055b 100644
+--- a/sunrpc/auth_unix.c
++++ b/sunrpc/auth_unix.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/authdes_prot.c b/sunrpc/authdes_prot.c
+index 392e0ff..0d1b535 100644
+--- a/sunrpc/authdes_prot.c
++++ b/sunrpc/authdes_prot.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1988 by Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/authuxprot.c b/sunrpc/authuxprot.c
+index 979cd68..74db8a2 100644
+--- a/sunrpc/authuxprot.c
++++ b/sunrpc/authuxprot.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/bindrsvprt.c b/sunrpc/bindrsvprt.c
+index 22aaecd..d493c9f 100644
+--- a/sunrpc/bindrsvprt.c
++++ b/sunrpc/bindrsvprt.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1987 by Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c
+index cbb4dd7..a562f41 100644
+--- a/sunrpc/clnt_gen.c
++++ b/sunrpc/clnt_gen.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 1987, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c
+index 7c860a3..f48c53a 100644
+--- a/sunrpc/clnt_perr.c
++++ b/sunrpc/clnt_perr.c
+@@ -1,7 +1,7 @@
+ /*
+ * clnt_perror.c
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c
+index d94032d..7a8030e 100644
+--- a/sunrpc/clnt_raw.c
++++ b/sunrpc/clnt_raw.c
+@@ -1,7 +1,7 @@
+ /*
+ * clnt_raw.c
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/clnt_simp.c b/sunrpc/clnt_simp.c
+index 11cdf8d..b7a64e6 100644
+--- a/sunrpc/clnt_simp.c
++++ b/sunrpc/clnt_simp.c
+@@ -2,7 +2,7 @@
+ * clnt_simple.c
+ * Simplified front end to rpc.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
+index d26a126..8527868 100644
+--- a/sunrpc/clnt_tcp.c
++++ b/sunrpc/clnt_tcp.c
+@@ -1,7 +1,7 @@
+ /*
+ * clnt_tcp.c, Implements a TCP/IP based, client side RPC.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
+index 360e26a..6bb1ca3 100644
+--- a/sunrpc/clnt_udp.c
++++ b/sunrpc/clnt_udp.c
+@@ -1,7 +1,7 @@
+ /*
+ * clnt_udp.c, Implements a UDP/IP based, client side RPC.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
+index bca1273..02b1489 100644
+--- a/sunrpc/clnt_unix.c
++++ b/sunrpc/clnt_unix.c
+@@ -1,7 +1,7 @@
+ /*
+ * clnt_unix.c, Implements a TCP/IP based, client side RPC.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/des_crypt.c b/sunrpc/des_crypt.c
+index b66589b..57dce6a 100644
+--- a/sunrpc/des_crypt.c
++++ b/sunrpc/des_crypt.c
+@@ -1,6 +1,6 @@
+ /*
+ * des_crypt.c, DES encryption library routines
+- * Copyright (C) 1986, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/des_soft.c b/sunrpc/des_soft.c
+index 4573d9d..20a3214 100644
+--- a/sunrpc/des_soft.c
++++ b/sunrpc/des_soft.c
+@@ -2,6 +2,7 @@
+ static char sccsid[] = "@(#)des_soft.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/08 SMI";
+ #endif
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -12,7 +13,7 @@ static char sccsid[] = "@(#)des_soft.c 2.2 88/08/10 4.0 RPCSRC; from 1.13 88/02/
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/get_myaddr.c b/sunrpc/get_myaddr.c
+index 7f20005..1906cfa 100644
+--- a/sunrpc/get_myaddr.c
++++ b/sunrpc/get_myaddr.c
+@@ -2,7 +2,7 @@
+ * get_myaddress.c
+ *
+ * Get client's IP address via ioctl. This avoids using the yellowpages.
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/getrpcport.c b/sunrpc/getrpcport.c
+index 7786701..07ee8c0 100644
+--- a/sunrpc/getrpcport.c
++++ b/sunrpc/getrpcport.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1985 by Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
+index 3ad066a..4ab6b97 100644
+--- a/sunrpc/key_call.c
++++ b/sunrpc/key_call.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1988 by Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/key_prot.c b/sunrpc/key_prot.c
+index b2eb233..8592bee 100644
+--- a/sunrpc/key_prot.c
++++ b/sunrpc/key_prot.c
+@@ -1,4 +1,4 @@
+-/* Copyright (c) 1990, 1991 Sun Microsystems, Inc.
++/* Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -10,7 +10,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/openchild.c b/sunrpc/openchild.c
+index defd93a..18c7d10 100644
+--- a/sunrpc/openchild.c
++++ b/sunrpc/openchild.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1988 by Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/pm_getmaps.c b/sunrpc/pm_getmaps.c
+index 983b2ba..a62b3c7 100644
+--- a/sunrpc/pm_getmaps.c
++++ b/sunrpc/pm_getmaps.c
+@@ -3,7 +3,7 @@
+ * Client interface to pmap rpc service.
+ * contains pmap_getmaps, which is only tcp service involved
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -15,7 +15,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
+index e37f6e7..66340c0 100644
+--- a/sunrpc/pm_getport.c
++++ b/sunrpc/pm_getport.c
+@@ -2,7 +2,7 @@
+ * pmap_getport.c
+ * Client interface to pmap rpc service.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/pmap_clnt.c b/sunrpc/pmap_clnt.c
+index 64a53b6..965469f 100644
+--- a/sunrpc/pmap_clnt.c
++++ b/sunrpc/pmap_clnt.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/pmap_prot.c b/sunrpc/pmap_prot.c
+index cc57456..8362e12 100644
+--- a/sunrpc/pmap_prot.c
++++ b/sunrpc/pmap_prot.c
+@@ -2,7 +2,7 @@
+ * pmap_prot.c
+ * Protocol for the local binder service, or pmap.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/pmap_prot2.c b/sunrpc/pmap_prot2.c
+index 43e62e3..bd180bc 100644
+--- a/sunrpc/pmap_prot2.c
++++ b/sunrpc/pmap_prot2.c
+@@ -2,7 +2,7 @@
+ * pmap_prot2.c
+ * Protocol for the local binder service, or pmap.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
+index 15a9591..c07b4b1 100644
+--- a/sunrpc/pmap_rmt.c
++++ b/sunrpc/pmap_rmt.c
+@@ -3,7 +3,7 @@
+ * Client interface to pmap rpc service.
+ * remote call and broadcast service
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -15,7 +15,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/auth.h b/sunrpc/rpc/auth.h
+index 0c26639..d0bee51 100644
+--- a/sunrpc/rpc/auth.h
++++ b/sunrpc/rpc/auth.h
+@@ -1,7 +1,7 @@
+ /*
+ * auth.h, Authentication interface.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/auth_unix.h b/sunrpc/rpc/auth_unix.h
+index 268c2b5..2f4ee1d 100644
+--- a/sunrpc/rpc/auth_unix.h
++++ b/sunrpc/rpc/auth_unix.h
+@@ -1,7 +1,7 @@
+ /*
+ * auth_unix.h, Protocol for UNIX style authentication parameters for RPC
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/clnt.h b/sunrpc/rpc/clnt.h
+index 5b03b86..7e4228c 100644
+--- a/sunrpc/rpc/clnt.h
++++ b/sunrpc/rpc/clnt.h
+@@ -1,7 +1,7 @@
+ /*
+ * clnt.h - Client side remote procedure call interface.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/des_crypt.h b/sunrpc/rpc/des_crypt.h
+index 6e84398..77cca3c 100644
+--- a/sunrpc/rpc/des_crypt.h
++++ b/sunrpc/rpc/des_crypt.h
+@@ -1,8 +1,8 @@
+ /*
+- * @(#)des_crypt.h 2.1 88/08/11 4.0 RPCSRC; from 1.4 88/02/08 (C) 1986 SMI
++ * @(#)des_crypt.h 2.1 88/08/11 4.0 RPCSRC
+ *
+ * des_crypt.h, des library routine interface
+- * Copyright (C) 1986, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/key_prot.h b/sunrpc/rpc/key_prot.h
+index 16f03ff..74627e6 100644
+--- a/sunrpc/rpc/key_prot.h
++++ b/sunrpc/rpc/key_prot.h
+@@ -8,7 +8,7 @@
+
+ #include <rpc/rpc.h>
+
+-/* Copyright (c) 1990, 1991 Sun Microsystems, Inc.
++/* Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -20,7 +20,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/netdb.h b/sunrpc/rpc/netdb.h
+index bcb0de2..0c03496 100644
+--- a/sunrpc/rpc/netdb.h
++++ b/sunrpc/rpc/netdb.h
+@@ -1,5 +1,6 @@
+ /* @(#)netdb.h 2.1 88/07/29 3.9 RPCSRC */
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -10,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+@@ -27,7 +28,6 @@
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+-/* @(#)rpc.h 1.8 87/07/24 SMI */
+
+ /* Cleaned up for GNU C library roland@gnu.ai.mit.edu:
+ added multiple inclusion protection and use of <sys/cdefs.h>.
+diff --git a/sunrpc/rpc/pmap_clnt.h b/sunrpc/rpc/pmap_clnt.h
+index 7564f99..f8587c6 100644
+--- a/sunrpc/rpc/pmap_clnt.h
++++ b/sunrpc/rpc/pmap_clnt.h
+@@ -2,7 +2,7 @@
+ * pmap_clnt.h
+ * Supplies C routines to get to portmap services.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/pmap_prot.h b/sunrpc/rpc/pmap_prot.h
+index 39d6176..e5fd7cb 100644
+--- a/sunrpc/rpc/pmap_prot.h
++++ b/sunrpc/rpc/pmap_prot.h
+@@ -2,7 +2,7 @@
+ * pmap_prot.h
+ * Protocol for the local binder service, or pmap.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/pmap_rmt.h b/sunrpc/rpc/pmap_rmt.h
+index 4ecb206..f868014 100644
+--- a/sunrpc/rpc/pmap_rmt.h
++++ b/sunrpc/rpc/pmap_rmt.h
+@@ -2,7 +2,7 @@
+ * Structures and XDR routines for parameters to and replies from
+ * the portmapper remote-call-service.
+ *
+- * Copyright (C) 1986, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/rpc.h b/sunrpc/rpc/rpc.h
+index 4c16c39..173a4e3 100644
+--- a/sunrpc/rpc/rpc.h
++++ b/sunrpc/rpc/rpc.h
+@@ -2,7 +2,7 @@
+ * rpc.h, Just includes the billions of rpc header files necessary to
+ * do remote procedure calling.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/rpc_des.h b/sunrpc/rpc/rpc_des.h
+index f70db03..4b3c426 100644
+--- a/sunrpc/rpc/rpc_des.h
++++ b/sunrpc/rpc/rpc_des.h
+@@ -1,7 +1,7 @@
+ /*
+ * Generic DES driver interface
+ * Keep this file hardware independent!
+- * Copyright (c) 1986 by Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/rpc_msg.h b/sunrpc/rpc/rpc_msg.h
+index 292cf90..273b187 100644
+--- a/sunrpc/rpc/rpc_msg.h
++++ b/sunrpc/rpc/rpc_msg.h
+@@ -2,7 +2,7 @@
+ * rpc_msg.h
+ * rpc message definition
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/svc.h b/sunrpc/rpc/svc.h
+index e7b126c..54d1ac1 100644
+--- a/sunrpc/rpc/svc.h
++++ b/sunrpc/rpc/svc.h
+@@ -1,7 +1,7 @@
+ /*
+ * svc.h, Server-side remote procedure call interface.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/svc_auth.h b/sunrpc/rpc/svc_auth.h
+index f72f4f1..4ba2741 100644
+--- a/sunrpc/rpc/svc_auth.h
++++ b/sunrpc/rpc/svc_auth.h
+@@ -1,7 +1,7 @@
+ /*
+ * svc_auth.h, Service side of rpc authentication.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
+index 5744e5a..3dca5c4 100644
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -1,4 +1,5 @@
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -9,7 +10,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc/xdr.h b/sunrpc/rpc/xdr.h
+index f5ba7b3..70f033a 100644
+--- a/sunrpc/rpc/xdr.h
++++ b/sunrpc/rpc/xdr.h
+@@ -1,7 +1,7 @@
+ /*
+ * xdr.h, External Data Representation Serialization Routines.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_clntout.c b/sunrpc/rpc_clntout.c
+index 8c0f9cc..ec040c7 100644
+--- a/sunrpc/rpc_clntout.c
++++ b/sunrpc/rpc_clntout.c
+@@ -1,6 +1,6 @@
+ /*
+ * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
+- * Copyright (C) 1987, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_cmsg.c b/sunrpc/rpc_cmsg.c
+index 0974903..2fe401c 100644
+--- a/sunrpc/rpc_cmsg.c
++++ b/sunrpc/rpc_cmsg.c
+@@ -1,7 +1,7 @@
+ /*
+ * rpc_callmsg.c
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
+index ba89953..9090402 100644
+--- a/sunrpc/rpc_common.c
++++ b/sunrpc/rpc_common.c
+@@ -1,4 +1,5 @@
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -9,7 +10,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_cout.c b/sunrpc/rpc_cout.c
+index e0e6535..d003ad7 100644
+--- a/sunrpc/rpc_cout.c
++++ b/sunrpc/rpc_cout.c
+@@ -1,6 +1,7 @@
+ /*
+- * From: @(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI
++ * From: @(#)rpc_cout.c 1.13 89/02/22
+ *
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_dtable.c b/sunrpc/rpc_dtable.c
+index 9aff675..44faa9f 100644
+--- a/sunrpc/rpc_dtable.c
++++ b/sunrpc/rpc_dtable.c
+@@ -1,5 +1,6 @@
+ /* @(#)rpc_dtablesize.c 2.1 88/07/29 4.0 RPCSRC */
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -10,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_hout.c b/sunrpc/rpc_hout.c
+index 346e154..31b6d3a 100644
+--- a/sunrpc/rpc_hout.c
++++ b/sunrpc/rpc_hout.c
+@@ -1,6 +1,7 @@
+ /*
+- * From: @(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI
++ * From: @(#)rpc_hout.c 1.12 89/02/22
+ *
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
+index fcb094d..ad1b400 100644
+--- a/sunrpc/rpc_main.c
++++ b/sunrpc/rpc_main.c
+@@ -1,6 +1,7 @@
+ /*
+- * From @(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI;
++ * From @(#)rpc_main.c 1.30 89/03/30
+ *
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
+index 56ec1a4..1a1df6d 100644
+--- a/sunrpc/rpc_parse.c
++++ b/sunrpc/rpc_parse.c
+@@ -1,6 +1,7 @@
+ /*
+- * From: @(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI
++ * From: @(#)rpc_parse.c 1.8 89/02/22
+ *
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_parse.h b/sunrpc/rpc_parse.h
+index 815c780..55a999d 100644
+--- a/sunrpc/rpc_parse.h
++++ b/sunrpc/rpc_parse.h
+@@ -1,6 +1,7 @@
+-/* @(#)rpc_parse.h 1.3 90/08/29 (C) 1987 SMI */
++/* @(#)rpc_parse.h 1.3 90/08/29
+
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c
+index d926083..efbb353 100644
+--- a/sunrpc/rpc_prot.c
++++ b/sunrpc/rpc_prot.c
+@@ -1,7 +1,7 @@
+ /*
+ * rpc_prot.c
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_sample.c b/sunrpc/rpc_sample.c
+index 1f3bfd0..e90b58c 100644
+--- a/sunrpc/rpc_sample.c
++++ b/sunrpc/rpc_sample.c
+@@ -1,6 +1,7 @@
+ /*
+- * From: @(#)rpc_sample.c 1.1 90/08/30 (C) 1987 SMI
++ * From: @(#)rpc_sample.c 1.1 90/08/30
+ *
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_scan.c b/sunrpc/rpc_scan.c
+index d4f518f..0a88baf 100644
+--- a/sunrpc/rpc_scan.c
++++ b/sunrpc/rpc_scan.c
+@@ -1,6 +1,7 @@
+ /*
+- * From: @(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI
++ * From: @(#)rpc_scan.c 1.11 89/02/22
+ *
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_scan.h b/sunrpc/rpc_scan.h
+index 384f807..9786a51 100644
+--- a/sunrpc/rpc_scan.h
++++ b/sunrpc/rpc_scan.h
+@@ -1,6 +1,7 @@
+-/* @(#)rpc_scan.h 1.3 90/08/29 (C) 1987 SMI */
++/* @(#)rpc_scan.h 1.3 90/08/29 */
+
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_svcout.c b/sunrpc/rpc_svcout.c
+index 1887b75..71d9abd 100644
+--- a/sunrpc/rpc_svcout.c
++++ b/sunrpc/rpc_svcout.c
+@@ -1,6 +1,7 @@
+ /*
+- * From: @(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI
++ * From: @(#)rpc_svcout.c 1.29 89/03/30
+ *
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_tblout.c b/sunrpc/rpc_tblout.c
+index 2d77c60..a7d2f43 100644
+--- a/sunrpc/rpc_tblout.c
++++ b/sunrpc/rpc_tblout.c
+@@ -1,6 +1,7 @@
+ /*
+- * From: @(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI
++ * From: @(#)rpc_tblout.c 1.4 89/02/22
+ *
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_util.c b/sunrpc/rpc_util.c
+index 6a6c0e4..52aa697 100644
+--- a/sunrpc/rpc_util.c
++++ b/sunrpc/rpc_util.c
+@@ -1,6 +1,7 @@
+ /*
+- * From: @(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI
++ * From: @(#)rpc_util.c 1.11 89/02/22
+ *
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpc_util.h b/sunrpc/rpc_util.h
+index 72f08eb..53316d9 100644
+--- a/sunrpc/rpc_util.h
++++ b/sunrpc/rpc_util.h
+@@ -1,6 +1,7 @@
+-/* @(#)rpc_util.h 1.5 90/08/29 (C) 1987 SMI */
++/* @(#)rpc_util.h 1.5 90/08/29 */
+
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -11,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcinfo.c b/sunrpc/rpcinfo.c
+index 6020cd5..16c0354 100644
+--- a/sunrpc/rpcinfo.c
++++ b/sunrpc/rpcinfo.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (C) 1986, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/bootparam_prot.x b/sunrpc/rpcsvc/bootparam_prot.x
+index f272d52..117e428 100644
+--- a/sunrpc/rpcsvc/bootparam_prot.x
++++ b/sunrpc/rpcsvc/bootparam_prot.x
+@@ -1,7 +1,7 @@
+ /* @(#)bootparam_prot.x 2.1 88/08/01 4.0 RPCSRC */
+-/* @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro */
+
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/key_prot.x b/sunrpc/rpcsvc/key_prot.x
+index 0350250..9baf943 100644
+--- a/sunrpc/rpcsvc/key_prot.x
++++ b/sunrpc/rpcsvc/key_prot.x
+@@ -1,6 +1,6 @@
+ /*
+ * Key server protocol definition
+- * Copyright (C) 1990, 1991 Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/klm_prot.x b/sunrpc/rpcsvc/klm_prot.x
+index 7b4c152..aee5b1a 100644
+--- a/sunrpc/rpcsvc/klm_prot.x
++++ b/sunrpc/rpcsvc/klm_prot.x
+@@ -1,9 +1,8 @@
+ /* @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC */
+-/* @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro */
+
+ /*
+ * Kernel/lock manager protocol definition
+- * Copyright (C) 1986 Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -15,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/mount.x b/sunrpc/rpcsvc/mount.x
+index da61c4e..ed3b339 100644
+--- a/sunrpc/rpcsvc/mount.x
++++ b/sunrpc/rpcsvc/mount.x
+@@ -1,7 +1,7 @@
+ /* @(#)mount.x 2.1 88/08/01 4.0 RPCSRC */
+-/* @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro */
+
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+@@ -114,7 +114,7 @@ program MOUNTPROG {
+
+ /*
+ * If fhs_status is 0, then fhs_fhandle contains the
+- * file handle for the directory. This file handle may
++ * file handle for the directory. This file handle may
+ * be used in the NFS protocol. This procedure also adds
+ * a new entry to the mount list for this client mounting
+ * the directory.
+diff --git a/sunrpc/rpcsvc/nfs_prot.x b/sunrpc/rpcsvc/nfs_prot.x
+index 2a68540..ad992e2 100644
+--- a/sunrpc/rpcsvc/nfs_prot.x
++++ b/sunrpc/rpcsvc/nfs_prot.x
+@@ -2,7 +2,7 @@
+
+ /*
+ * nfs_prot.x 1.2 87/10/12
+- * Copyright 1987 Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/nlm_prot.x b/sunrpc/rpcsvc/nlm_prot.x
+index e60c931..81ff137 100644
+--- a/sunrpc/rpcsvc/nlm_prot.x
++++ b/sunrpc/rpcsvc/nlm_prot.x
+@@ -1,9 +1,34 @@
+ /* @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC */
+-/* @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro */
+
+ /*
+ * Network lock manager protocol definition
+- * Copyright (C) 1986 Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions are
++ * met:
++ *
++ * * Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ * * Redistributions in binary form must reproduce the above
++ * copyright notice, this list of conditions and the following
++ * disclaimer in the documentation and/or other materials
++ * provided with the distribution.
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
++ * contributors may be used to endorse or promote products derived
++ * from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
++ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
++ * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
++ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
++ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
++ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * protocol used between local lock manager and remote lock manager
+ */
+diff --git a/sunrpc/rpcsvc/rex.x b/sunrpc/rpcsvc/rex.x
+index 253b8a7..b5baf15 100644
+--- a/sunrpc/rpcsvc/rex.x
++++ b/sunrpc/rpcsvc/rex.x
+@@ -1,7 +1,7 @@
+ /* @(#)rex.x 2.1 88/08/01 4.0 RPCSRC */
+-/* @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro */
+
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/rstat.x b/sunrpc/rpcsvc/rstat.x
+index b2c6b6e..9b7b102 100644
+--- a/sunrpc/rpcsvc/rstat.x
++++ b/sunrpc/rpcsvc/rstat.x
+@@ -1,7 +1,7 @@
+ /* @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC */
+-/* @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro */
+
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/rusers.x b/sunrpc/rpcsvc/rusers.x
+index bcf5fd2..476ed74 100644
+--- a/sunrpc/rpcsvc/rusers.x
++++ b/sunrpc/rpcsvc/rusers.x
+@@ -1,4 +1,5 @@
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -9,7 +10,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/sm_inter.x b/sunrpc/rpcsvc/sm_inter.x
+index 9c20383..767f0e0 100644
+--- a/sunrpc/rpcsvc/sm_inter.x
++++ b/sunrpc/rpcsvc/sm_inter.x
+@@ -1,6 +1,6 @@
+ /*
+ * Status monitor protocol specification
+- * Copyright (C) 1986 Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/spray.x b/sunrpc/rpcsvc/spray.x
+index 2830722..68b7c48 100644
+--- a/sunrpc/rpcsvc/spray.x
++++ b/sunrpc/rpcsvc/spray.x
+@@ -1,7 +1,7 @@
+ /* @(#)spray.x 2.1 88/08/01 4.0 RPCSRC */
+-/* @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro */
+
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rpcsvc/yppasswd.x b/sunrpc/rpcsvc/yppasswd.x
+index b8ff7c2..34e3efe 100644
+--- a/sunrpc/rpcsvc/yppasswd.x
++++ b/sunrpc/rpcsvc/yppasswd.x
+@@ -1,7 +1,7 @@
+ /* @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC */
+-/* @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro */
+
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -12,7 +12,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/rtime.c b/sunrpc/rtime.c
+index 790bf4b..768c621 100644
+--- a/sunrpc/rtime.c
++++ b/sunrpc/rtime.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1988 by Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svc.c b/sunrpc/svc.c
+index d389a52..f745417 100644
+--- a/sunrpc/svc.c
++++ b/sunrpc/svc.c
+@@ -5,7 +5,7 @@
+ * for handling transport handles. The svc routines handle the
+ * list of service routines.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -17,7 +17,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svc_auth.c b/sunrpc/svc_auth.c
+index 11555c5..2ccfdaa 100644
+--- a/sunrpc/svc_auth.c
++++ b/sunrpc/svc_auth.c
+@@ -1,7 +1,7 @@
+ /*
+ * svc_auth.c, Server-side rpc authenticator interface.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svc_authux.c b/sunrpc/svc_authux.c
+index 477ff25..1de08bc 100644
+--- a/sunrpc/svc_authux.c
++++ b/sunrpc/svc_authux.c
+@@ -6,7 +6,7 @@
+ * _svcauth_short uses a shorthand auth to index into a cache of longhand auths.
+ * Note: the shorthand has been gutted for efficiency.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -18,7 +18,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svc_raw.c b/sunrpc/svc_raw.c
+index 924135b..3dd4827 100644
+--- a/sunrpc/svc_raw.c
++++ b/sunrpc/svc_raw.c
+@@ -4,7 +4,7 @@
+ * This lets us simulate rpc and get rpc (round trip) overhead, without
+ * any interference from the kernel.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -16,7 +16,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c
+index 1bb8c87..de6c3c7 100644
+--- a/sunrpc/svc_run.c
++++ b/sunrpc/svc_run.c
+@@ -1,4 +1,5 @@
+ /*
++ * Copyright (c) 2010, Oracle America, Inc.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+@@ -9,7 +10,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svc_simple.c b/sunrpc/svc_simple.c
+index 1d6f515..4b178bf 100644
+--- a/sunrpc/svc_simple.c
++++ b/sunrpc/svc_simple.c
+@@ -2,7 +2,7 @@
+ * svc_simple.c
+ * Simplified front end to rpc.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
+index 2048fdf..dd66485 100644
+--- a/sunrpc/svc_tcp.c
++++ b/sunrpc/svc_tcp.c
+@@ -1,7 +1,7 @@
+ /*
+ * svc_tcp.c, Server side for TCP/IP based RPC.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
+index b9fccab..f989484 100644
+--- a/sunrpc/svc_udp.c
++++ b/sunrpc/svc_udp.c
+@@ -3,7 +3,7 @@
+ * Server side for UDP/IP based RPC. (Does some caching in the hopes of
+ * achieving execute-at-most-once semantics.)
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -15,7 +15,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
+index f22a23a..29b71b2 100644
+--- a/sunrpc/svc_unix.c
++++ b/sunrpc/svc_unix.c
+@@ -1,7 +1,7 @@
+ /*
+ * svc_unix.c, Server side for TCP/IP based RPC.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c
+index 573891e..19d0f54 100644
+--- a/sunrpc/svcauth_des.c
++++ b/sunrpc/svcauth_des.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1988 by Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/xcrypt.c b/sunrpc/xcrypt.c
+index f430a1d..337fd2c 100644
+--- a/sunrpc/xcrypt.c
++++ b/sunrpc/xcrypt.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 1986-1991 by Sun Microsystems Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -11,7 +11,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
+index c5e961f..d8e782e 100644
+--- a/sunrpc/xdr.c
++++ b/sunrpc/xdr.c
+@@ -1,7 +1,7 @@
+ /*
+ * xdr.c, Generic XDR routines implementation.
+ *
+- * Copyright (C) 1986, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
+index 02728b0..03df57b 100644
+--- a/sunrpc/xdr_array.c
++++ b/sunrpc/xdr_array.c
+@@ -1,7 +1,7 @@
+ /*
+ * xdr_array.c, Generic XDR routines implementation.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/xdr_float.c b/sunrpc/xdr_float.c
+index 75dc70c..3925f5b 100644
+--- a/sunrpc/xdr_float.c
++++ b/sunrpc/xdr_float.c
+@@ -1,7 +1,7 @@
+ /*
+ * xdr_float.c, Generic XDR routines implementation.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c
+index f9a0b14..c4f4715 100644
+--- a/sunrpc/xdr_mem.c
++++ b/sunrpc/xdr_mem.c
+@@ -1,7 +1,7 @@
+ /*
+- * xdr_mem.h, XDR implementation using memory buffers.
++ * xdr_mem.c, XDR implementation using memory buffers.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
+index a66462c..977b0bb 100644
+--- a/sunrpc/xdr_rec.c
++++ b/sunrpc/xdr_rec.c
+@@ -2,7 +2,7 @@
+ * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
+ * layer above tcp (for rpc's use).
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -14,7 +14,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c
+index e2acb84..dda40ab 100644
+--- a/sunrpc/xdr_ref.c
++++ b/sunrpc/xdr_ref.c
+@@ -1,7 +1,7 @@
+ /*
+ * xdr_reference.c, Generic XDR routines implementation.
+ *
+- * Copyright (C) 1987, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/xdr_sizeof.c b/sunrpc/xdr_sizeof.c
+index d4bada3..270121b 100644
+--- a/sunrpc/xdr_sizeof.c
++++ b/sunrpc/xdr_sizeof.c
+@@ -1,7 +1,7 @@
+ /*
+ * xdr_sizeof.c
+ *
+- * Copyright 1990 Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
+index f58465a..9488601 100644
+--- a/sunrpc/xdr_stdio.c
++++ b/sunrpc/xdr_stdio.c
+@@ -1,7 +1,7 @@
+ /*
+ * xdr_stdio.c, XDR implementation on standard i/o file.
+ *
+- * Copyright (C) 1984, Sun Microsystems, Inc.
++ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+@@ -13,7 +13,7 @@
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials
+ * provided with the distribution.
+- * * Neither the name of Sun Microsystems, Inc. nor the names of its
++ * * Neither the name of the "Oracle America, Inc." nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2010-08-31 21:29:20 UTC (rev 4394)
+++ glibc-package/trunk/debian/patches/series 2010-08-31 21:34:40 UTC (rev 4395)
@@ -253,3 +253,4 @@
any/cvs-flush-cache-textrels.diff
any/cvs-__block.diff
any/cvs-etc-resolv.conf.diff
+any/cvs-sunrpc-license.diff
Reply to: