[rusers/f14/master] replace sun rpc license with bsd

Thu Aug 26 20:08:26 UTC 2010

commit 346459ec2805bdc4c825bc5496f71111afb218f8
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Thu Aug 26 16:08:25 2010 -0400

    replace sun rpc license with bsd

 netkit-rusers-0.17-new-rpc-license.patch |   72 ++++++++++++++++++++++++++++++
 rusers.spec                              |    8 +++-
 2 files changed, 79 insertions(+), 1 deletions(-)
---

diff --git a/netkit-rusers-0.17-new-rpc-license.patch b/netkit-rusers-0.17-new-rpc-license.patch
new file mode 100644
index 0000000..2432875
--- /dev/null
+++ b/netkit-rusers-0.17-new-rpc-license.patch
@@ -0,0 +1,72 @@
+diff -up netkit-rusers-0.17/rpc.rstatd/rstat_proc.c.oldlicense netkit-rusers-0.17/rpc.rstatd/rstat_proc.c
+--- netkit-rusers-0.17/rpc.rstatd/rstat_proc.c.oldlicense	2010-08-26 15:56:26.984457003 -0400
++++ netkit-rusers-0.17/rpc.rstatd/rstat_proc.c	2010-08-26 15:56:30.621457002 -0400
+@@ -1,33 +1,36 @@
+ /*	$OpenBSD: rstat_proc.c,v 1.10 1998/07/10 08:06:10 deraadt Exp $	*/
+ 
+-/*
+- * 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.
++/* 
++ * Copyright (c) 2010, Oracle America, Inc.
+  *
+- * 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.
++ * All rights reserved.
++ * Redistribution and use in source and binary forms, with or without 
++ * modification, are permitted provided that the following conditions are met:
+  *
+- * 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.
++ * - Redistributions of source code must retain the above copyright notice, 
++ * this list of conditions and the following disclaimer.
+  *
+- * 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
++ * - 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.
+  */
++
+ #ifndef lint
+ /*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/
+ /*static char sccsid[] = "from: @(#)rstat_proc.c	2.2 88/08/01 4.0 RPCSRC";*/
+@@ -37,7 +40,6 @@ static char rcsid[] = "$OpenBSD: rstat_p
+ /*
+  * rstat service:  built with rstat.x and derived from rpc.rstatd.c
+  *
+- * Copyright (c) 1984 by Sun Microsystems, Inc.
+  */
+ 
+ #include <stdio.h>
diff --git a/rusers.spec b/rusers.spec
index 75c803a..b0ce510 100644
--- a/rusers.spec
+++ b/rusers.spec
@@ -5,7 +5,7 @@
 Summary: Displays the users logged into machines on the local network
 Name: rusers
 Version: 0.17
-Release: 59%{?dist}
+Release: 60%{?dist}
 License: BSD
 Group: System Environment/Daemons
 Source: ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rusers-%{version}.tar.gz
@@ -28,6 +28,8 @@ Patch12: netkit-rusers-0.17-bigendian.patch
 Patch13: netkit-rusers-0.17-return.patch
 Patch14: netkit-rusers-0.17-procdiskstats.patch
 Patch15: netkit-rusers-0.17-rusersd-droppriv.patch
+# Oracle explicitly gave permission for this relicensing on August 18, 2010.
+Patch16: netkit-rusers-0.17-new-rpc-license.patch
 Buildroot: %{_tmppath}/%{name}-root
 BuildRequires: procps libselinux-devel
 
@@ -74,6 +76,7 @@ who is logged into your machine.
 %patch13 -p1 -b .return
 %patch14 -p1 -b .procdiskstats
 %patch15 -p1 -b .dropprivs
+%patch16 -p1 -b .licensefix
 
 %build
 cat > MCONFIG <<EOF
@@ -147,6 +150,9 @@ fi
 %config /etc/rc.d/init.d/rstatd
 
 %changelog
+* Thu Aug 26 2010 Tom "spot" Callaway <tcallawa at redhat.com> - -0.17-60
+- replace SunRPC license with BSD (thanks to Oracle)
+
 * Wed Feb 26 2010 Jiri Moskovcak <jmoskovc at redhat.com> - 0.17-59
 - added README
 
