Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Steve Dickson <steved@redhat.com>
To:     Libtirpc-devel Mailing List <libtirpc-devel@lists.sourceforge.net>
Cc:     Linux NFS Mailing list <linux-nfs@vger.kernel.org>,
        Tom 'spot' Callaway <spotrh@gmail.com>
Subject: [PATCH] Replace the final SunRPC licenses with BSD licenses
Date:   Wed,  5 May 2021 12:49:26 -0400
Message-Id: <20210505164926.29968-1-steved@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Tom 'spot' Callaway <spotrh@gmail.com>

It was noticed there was a couple SunRPC licenses
were left from the work that was done in 2009-2010
(ea26246^..ba3945e). This converts them to BSD licenses.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1955239
Signed-off-by: Steve Dickson <steved@redhat.com>
---
 tirpc/rpc/key_prot.h    | 49 ++++++++++++++--------------
 tirpc/rpcsvc/key_prot.x | 71 ++++++++++++++++++++---------------------
 2 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/tirpc/rpc/key_prot.h b/tirpc/rpc/key_prot.h
index ff852dc..fd5a6c5 100644
--- a/tirpc/rpc/key_prot.h
+++ b/tirpc/rpc/key_prot.h
@@ -13,33 +13,34 @@
 extern "C" {
 #endif
 
-/*
- * 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.
+/* Copyright (c) 2010, Oracle America, Inc.
  *
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * 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.
+ *     * 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.
  *
- * Sun Microsystems, Inc.
- * 2550 Garcia Avenue
- * Mountain View, California  94043
+ *   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.
  */
 #if 0
 #pragma ident "@(#)key_prot.x	1.7	94/04/29 SMI"
diff --git a/tirpc/rpcsvc/key_prot.x b/tirpc/rpcsvc/key_prot.x
index 63c1bbc..9baf943 100644
--- a/tirpc/rpcsvc/key_prot.x
+++ b/tirpc/rpcsvc/key_prot.x
@@ -1,34 +1,33 @@
-%/*
-% * 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.
-% *
-% * Sun Microsystems, Inc.
-% * 2550 Garcia Avenue
-% * Mountain View, California  94043
-% */
 /*
  * 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
+ * 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 keyserver is a public key storage/encryption/decryption service
  * The encryption method used is based on the Diffie-Hellman exponential
@@ -87,7 +86,7 @@ enum keystatus {
 	KEY_SUCCESS,	/* no problems */
 	KEY_NOSECRET,	/* no secret key stored */
 	KEY_UNKNOWN,	/* unknown netname */
-	KEY_SYSTEMERR	/* system error (out of memory, encryption failure) */
+	KEY_SYSTEMERR 	/* system error (out of memory, encryption failure) */
 };
 
 typedef opaque keybuf[HEXKEYBYTES];	/* store key in hex */
@@ -171,7 +170,7 @@ program KEY_PROG {
 
 		/*
 		 * This is my secret key.
-		 * Store it for me.
+	 	 * Store it for me.
 		 */
 		keystatus
 		KEY_SET(keybuf) = 1;
@@ -179,7 +178,7 @@ program KEY_PROG {
 		/*
 		 * I want to talk to X.
 		 * Encrypt a conversation key for me.
-		 */
+	 	 */
 		cryptkeyres
 		KEY_ENCRYPT(cryptkeyarg) = 2;
 
@@ -213,7 +212,7 @@ program KEY_PROG {
 
 		/*
 		 * This is my secret key.
-		 * Store it for me.
+	 	 * Store it for me.
 		 */
 		keystatus
 		KEY_SET(keybuf) = 1;
@@ -221,7 +220,7 @@ program KEY_PROG {
 		/*
 		 * I want to talk to X.
 		 * Encrypt a conversation key for me.
-		 */
+	 	 */
 		cryptkeyres
 		KEY_ENCRYPT(cryptkeyarg) = 2;
 
@@ -248,7 +247,7 @@ program KEY_PROG {
 		/*
 		 * I want to talk to X. and I know X's public key
 		 * Encrypt a conversation key for me.
-		 */
+	 	 */
 		cryptkeyres
 		KEY_ENCRYPT_PK(cryptkeyarg2) = 6;
 
@@ -268,7 +267,7 @@ program KEY_PROG {
 		/*
 		 * Retrieve my public key, netname and private key.
 		 */
-		key_netstres
+ 		key_netstres
 		KEY_NET_GET(void) = 9;
 
 		/*
-- 
2.30.2