From bb98abcb4d71404ce031b9dd166bf678f3703874 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Fri, 16 Jul 2010 20:23:18 +0000 Subject: [PATCH] Add back SISSL license attribution --- libtirpc-0.2.1-SISSL-license.patch | 76 ++++++++++++++++++++++++++++++ libtirpc.spec | 9 +++- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 libtirpc-0.2.1-SISSL-license.patch diff --git a/libtirpc-0.2.1-SISSL-license.patch b/libtirpc-0.2.1-SISSL-license.patch new file mode 100644 index 0000000..6b5b64b --- /dev/null +++ b/libtirpc-0.2.1-SISSL-license.patch @@ -0,0 +1,76 @@ +commit ea26246defdf9aace0dedca1a5cc9104ba1d3936 +Author: Tom "spot" Callaway +Date: Fri Jul 16 16:09:14 2010 -0400 + + Add back SISSL license attribution. + + Signed-off-by: Steve Dickson + +diff --git a/src/clnt_generic.c b/src/clnt_generic.c +index f1dcfa2..9c31680 100644 +--- a/src/clnt_generic.c ++++ b/src/clnt_generic.c +@@ -1,4 +1,17 @@ + /* ++ * The contents of this file are subject to the Sun Standards ++ * License Version 1.0 the (the "License";) You may not use ++ * this file except in compliance with the License. You may ++ * obtain a copy of the License at lib/libc/rpc/LICENSE ++ * ++ * Software distributed under the License is distributed on ++ * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either ++ * express or implied. See the License for the specific ++ * language governing rights and limitations under the License. ++ * ++ * In addition, this file contains code from Sun RPC which is ++ * subject to the below terms: ++ * + * Copyright (c) 2009, Sun Microsystems, Inc. + * All rights reserved. + * +diff --git a/src/rpcb_clnt.c b/src/rpcb_clnt.c +index 218ff7c..a800128 100644 +--- a/src/rpcb_clnt.c ++++ b/src/rpcb_clnt.c +@@ -1,4 +1,17 @@ + /* ++ * The contents of this file are subject to the Sun Standards ++ * License Version 1.0 the (the "License";) You may not use ++ * this file except in compliance with the License. You may ++ * obtain a copy of the License at lib/libc/rpc/LICENSE ++ * ++ * Software distributed under the License is distributed on ++ * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either ++ * express or implied. See the License for the specific ++ * language governing rights and limitations under the License. ++ * ++ * In addition, this file contains code from Sun RPC which is ++ * subject to the below terms: ++ * + * Copyright (c) 2009, Sun Microsystems, Inc. + * All rights reserved. + * +diff --git a/tirpc/rpc/clnt.h b/tirpc/rpc/clnt.h +index e7bb43f..6d2f7dd 100644 +--- a/tirpc/rpc/clnt.h ++++ b/tirpc/rpc/clnt.h +@@ -1,6 +1,19 @@ + /* $NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $ */ + + /* ++ * The contents of this file are subject to the Sun Standards ++ * License Version 1.0 the (the "License";) You may not use ++ * this file except in compliance with the License. You may ++ * obtain a copy of the License at lib/libc/rpc/LICENSE ++ * ++ * Software distributed under the License is distributed on ++ * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either ++ * express or implied. See the License for the specific ++ * language governing rights and limitations under the License. ++ * ++ * In addition, this file contains code from Sun RPC which is ++ * subject to the below terms: ++ * + * Copyright (c) 2009, Sun Microsystems, Inc. + * All rights reserved. + * diff --git a/libtirpc.spec b/libtirpc.spec index 2ac8a02..10fec19 100644 --- a/libtirpc.spec +++ b/libtirpc.spec @@ -1,6 +1,6 @@ Name: libtirpc Version: 0.2.1 -Release: 3.1%{?dist} +Release: 4%{?dist} Summary: Transport Independent RPC Library Group: System Environment/Libraries License: SISSL and BSD @@ -8,6 +8,8 @@ URL: http://nfsv4.bullopensource.org/ Patch001: libtirpc-0-2-2-rc2.patch +Patch100: libtirpc-0.2.1-SISSL-license.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2 @@ -42,6 +44,8 @@ developing programs which use the tirpc library. %patch001 -p1 +%patch100 -p1 + # Remove .orig files find . -name "*.orig" | xargs rm -f @@ -126,6 +130,9 @@ rm -rf %{buildroot} %{_mandir}/*/* %changelog +* Fri Jul 16 2010 Steve Dickson 0.2.1-4 +- Add back SISSL license attribution + * Fri Jul 09 2010 Mike McGrath 0.2.1-3.1 - Rebuild to fix broken man dep s/man/man-db/