From 37b677ca59e4ff675ff65a034222484722a70019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 23 Sep 2019 12:26:27 +0200 Subject: [PATCH 1/6] Remove Japan Network Information Center from COPYRIGHT, the code was removed --- COPYRIGHT | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index a283708a68..2eaa229a11 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -363,49 +363,6 @@ SOFTWARE. ----------------------------------------------------------------------------- -Copyright (c) 2000-2002 Japan Network Information Center. All rights reserved. - -By using this file, you agree to the terms and conditions set forth bellow. - - LICENSE TERMS AND CONDITIONS - -The following License Terms and Conditions apply, unless a different -license is obtained from Japan Network Information Center ("JPNIC"), -a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda, -Chiyoda-ku, Tokyo 101-0047, Japan. - -1. Use, Modification and Redistribution (including distribution of any - modified or derived work) in source and/or binary forms is permitted - under this License Terms and Conditions. - -2. Redistribution of source code must retain the copyright notices as they - appear in each source code file, this License Terms and Conditions. - -3. Redistribution in binary form must reproduce the Copyright Notice, - this License Terms and Conditions, in the documentation and/or other - materials provided with the distribution. For the purposes of binary - distribution the "Copyright Notice" refers to the following language: - "Copyright (c) 2000-2002 Japan Network Information Center. All rights - reserved." - -4. The name of JPNIC may not be used to endorse or promote products - derived from this Software without specific prior written approval of - JPNIC. - -5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC - "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 JPNIC 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 DAMAGES. - - ----------------------------------------------------------------------------- - Copyright (C) 2004 Nominet, Ltd. Permission to use, copy, modify, and distribute this software for any From acf1cfe15d8603a685db42e74c27c5b2694851d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 23 Sep 2019 12:27:29 +0200 Subject: [PATCH 2/6] Remove Rice University from COPYRIGHT, the code was removed --- COPYRIGHT | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 2eaa229a11..817cf8393c 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -207,41 +207,6 @@ SUCH DAMAGE. ----------------------------------------------------------------------------- -Copyright ((c)) 2002, Rice University -All rights reserved. - -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 Rice University (RICE) 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 RICE and the contributors on an "as is" -basis, without any representations or warranties of any kind, express -or implied including, but not limited to, representations or -warranties of non-infringement, merchantability or fitness for a -particular purpose. In no event shall RICE 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. - - ----------------------------------------------------------------------------- - Copyright (c) 1993 by Digital Equipment Corporation. Permission to use, copy, modify, and distribute this software for any From e179d083d41952076dd38d0e00766d076e1710c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 23 Sep 2019 12:27:55 +0200 Subject: [PATCH 3/6] Remove Aaron D. Gifford from COPYRIGHT, the code was removed --- COPYRIGHT | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 817cf8393c..e439eacd3e 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -227,34 +227,6 @@ SOFTWARE. ----------------------------------------------------------------------------- -Copyright 2000 Aaron D. Gifford. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. 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. -3. Neither the name of the copyright holder nor the names of contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``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 AUTHOR(S) OR CONTRIBUTOR(S) 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. - - ----------------------------------------------------------------------------- - Copyright (c) 1998 Doug Rabson. Copyright (c) 2001 Jake Burkholder. All rights reserved. From 52c10b78f16dd8389ff7536439f3d72e0f82683c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 23 Sep 2019 12:28:52 +0200 Subject: [PATCH 4/6] Remove Doug Rabson and Jake Burkholder from COPYRIGHT, the code was removed --- COPYRIGHT | 53 ----------------------------------------------------- 1 file changed, 53 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index e439eacd3e..9bdc1c316d 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -181,32 +181,6 @@ SUCH DAMAGE. ----------------------------------------------------------------------------- -Copyright (c) 1998 Doug Rabson -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. 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. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - - ----------------------------------------------------------------------------- - Copyright (c) 1993 by Digital Equipment Corporation. Permission to use, copy, modify, and distribute this software for any @@ -227,33 +201,6 @@ SOFTWARE. ----------------------------------------------------------------------------- -Copyright (c) 1998 Doug Rabson. -Copyright (c) 2001 Jake Burkholder. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. 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. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. - - ----------------------------------------------------------------------------- - Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. All rights reserved. From f761a80842159f18321774dde5140ed869192de1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 23 Sep 2019 12:35:23 +0200 Subject: [PATCH 5/6] Cleanup the last bits copyrighted to RSA Security and remove them from COPYRIGHT file --- COPYRIGHT | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index 9bdc1c316d..e6bf6ac94e 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -263,24 +263,6 @@ PERFORMANCE OF THIS SOFTWARE. ----------------------------------------------------------------------------- -Portions Copyright RSA Security Inc. - -License to copy and use this software is granted provided that it is -identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface -(Cryptoki)" in all material mentioning or referencing this software. - -License is also granted to make and use derivative works provided that -such works are identified as "derived from the RSA Security Inc. PKCS #11 -Cryptographic Token Interface (Cryptoki)" in all material mentioning or -referencing the derived work. - -RSA Security Inc. makes no representations concerning either the -merchantability of this software or the suitability of this software for -any particular purpose. It is provided "as is" without express or implied -warranty of any kind. - - ----------------------------------------------------------------------------- - Copyright (c) 1996, David Mazieres Copyright (c) 2008, Damien Miller From fc997e571d1bbce39f8e89ac7993bebc54d8adeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 23 Sep 2019 12:36:44 +0200 Subject: [PATCH 6/6] Remove The OpenSSL Project from COPYRIGHT, the OpenSSL patches were removed --- COPYRIGHT | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index e6bf6ac94e..28df97ae70 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -280,54 +280,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ----------------------------------------------------------------------------- -Copyright (c) 2000-2001 The OpenSSL Project. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. 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. - -3. All advertising materials mentioning features or use of this - software must display the following acknowledgment: - "This product includes software developed by the OpenSSL Project - for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" - -4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - endorse or promote products derived from this software without - prior written permission. For written permission, please contact - licensing@OpenSSL.org. - -5. Products derived from this software may not be called "OpenSSL" - nor may "OpenSSL" appear in their names without prior written - permission of the OpenSSL Project. - -6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes software developed by the OpenSSL Project - for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" - -THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY -EXPRESSED 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 OpenSSL PROJECT OR -ITS 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. - ------------------------------------------------------------------------------ - Copyright (c) 1995, 1997, 1998 The NetBSD Foundation, Inc. All rights reserved.