From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 28 Aug 2014 15:10:54 +0000 (-0700)
Subject: Boilerplate: update copyright blurbs on lib/snmplib
X-Git-Tag: SQUID_3_5_0_1~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c04fda28c767caa345691658c63a21792341f560;p=thirdparty%2Fsquid.git

Boilerplate: update copyright blurbs on lib/snmplib

* Add Squid Software Foundation blurbs

* update CREDITS to meet Carnegie Mellon license requirements
---

diff --git a/CREDITS b/CREDITS
index e2b880b0b5..ea518b2cd5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -654,7 +654,15 @@ include/snmp_msg.h,
 include/snmp_pdu.h,
 include/snmp_session.h,
 include/snmp_vars.h,
-include/snmp.h:
+include/snmp.h,
+lib/snmplib/asn1.c,
+lib/snmplib/coexistence.c,
+lib/snmplib/snmp_api.c,
+lib/snmplib/snmp_api_error.c,
+lib/snmplib/snmp_error.c,
+lib/snmplib/snmp_msg.c,
+lib/snmplib/snmp_pdu.c,
+lib/snmplib/snmp_vars.c,
 
  *           Copyright 1997 by Carnegie Mellon University
  *
@@ -695,7 +703,8 @@ lib/md5.c:
 ==============================================================================
 
 include/parse.h,
-include/snmp_api.h:
+include/snmp_api.h,
+lib/snmplib/parse.c
 
 /***********************************************************
         Copyright 1989 by Carnegie Mellon University
@@ -762,7 +771,8 @@ include/rfc2617.h:
 ==============================================================================
 
 include/snmp_client.h,
-include/snmp_impl.h:
+include/snmp_impl.h,
+lib/snmplib/mib.c,
 
 /***********************************************************
         Copyright 1988, 1989 by Carnegie Mellon University
@@ -823,36 +833,6 @@ Modified to work with strings instead of files.
 
 ==============================================================================
 
-lib/snmplib/*:
-
-The SNMP library code is developed by Carnegie Mellon University.
-
-/***************************************************************************
- *
- *           Copyright 1997 by Carnegie Mellon University
- * 
- *                       All Rights Reserved
- * 
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of CMU not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.
- * 
- * CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * 
- ***************************************************************************/
-
-==============================================================================
-
 lib/drand48.c:
 
 From Linux libc-5.4.46.
diff --git a/lib/snmplib/Makefile.am b/lib/snmplib/Makefile.am
index d00bcee380..e354bd42f2 100644
--- a/lib/snmplib/Makefile.am
+++ b/lib/snmplib/Makefile.am
@@ -1,3 +1,10 @@
+## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+##
+## Squid software is distributed under GPLv2+ license and includes
+## contributions from numerous individuals and organizations.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
+
 ## Process this file with automake to produce Makefile.in
 ##
 ## Makefile for libsnmp.
diff --git a/lib/snmplib/asn1.c b/lib/snmplib/asn1.c
index 34fc659cad..6dd638dffa 100644
--- a/lib/snmplib/asn1.c
+++ b/lib/snmplib/asn1.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 /*
  * Abstract Syntax Notation One, ASN.1
  * As defined in ISO/IS 8824 and ISO/IS 8825
diff --git a/lib/snmplib/coexistance.c b/lib/snmplib/coexistance.c
index 9fab1a7a73..914fbdc24a 100644
--- a/lib/snmplib/coexistance.c
+++ b/lib/snmplib/coexistance.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 /*
  * RFC 1908: Coexistence between SNMPv1 and SNMPv2
  */
diff --git a/lib/snmplib/mib.c b/lib/snmplib/mib.c
index 0eba06a713..14cd25bf3d 100644
--- a/lib/snmplib/mib.c
+++ b/lib/snmplib/mib.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
 
 /***********************************************************
 	Copyright 1988, 1989 by Carnegie Mellon University
diff --git a/lib/snmplib/parse.c b/lib/snmplib/parse.c
index fad5a8d544..5a1aea8b1a 100644
--- a/lib/snmplib/parse.c
+++ b/lib/snmplib/parse.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 /***********************************************************
 	Copyright 1989 by Carnegie Mellon University
 
@@ -20,9 +28,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 ******************************************************************/
 
-/*
- * parse.c
- */
 #include "squid.h"
 #include "asn1.h"
 #include "cache_snmp.h"
diff --git a/lib/snmplib/snmp_api.c b/lib/snmplib/snmp_api.c
index c5ddbc7ba6..4813767ae7 100644
--- a/lib/snmplib/snmp_api.c
+++ b/lib/snmplib/snmp_api.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
 
 /**********************************************************************
  *
diff --git a/lib/snmplib/snmp_api_error.c b/lib/snmplib/snmp_api_error.c
index bebf939ed1..06001e2d9f 100644
--- a/lib/snmplib/snmp_api_error.c
+++ b/lib/snmplib/snmp_api_error.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 /*
  * Error routines concerning the error status of the SNMP API.
  *
@@ -33,10 +41,6 @@
 #include "squid.h"
 #include "snmp_api_error.h"
 
-/***************************************************************************
- *
- ***************************************************************************/
-
 int snmp_errno = 0;
 
 static const char *api_errors[17] = {
diff --git a/lib/snmplib/snmp_error.c b/lib/snmplib/snmp_error.c
index 1af437b5eb..6b61b1c745 100644
--- a/lib/snmplib/snmp_error.c
+++ b/lib/snmplib/snmp_error.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 /*
  * The possible SNMP Error messages, from the SNMP Protocol Operations
  * [ RFC 1905 ]
diff --git a/lib/snmplib/snmp_msg.c b/lib/snmplib/snmp_msg.c
index 04c98aebc4..e084cfb3ea 100644
--- a/lib/snmplib/snmp_msg.c
+++ b/lib/snmplib/snmp_msg.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 /*
  * SNMP Message Encoding Routines
  *
diff --git a/lib/snmplib/snmp_pdu.c b/lib/snmplib/snmp_pdu.c
index 4b783c4e65..b10ff0a183 100644
--- a/lib/snmplib/snmp_pdu.c
+++ b/lib/snmplib/snmp_pdu.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 /*
  * SNMP PDU Encoding
  *
diff --git a/lib/snmplib/snmp_vars.c b/lib/snmplib/snmp_vars.c
index 6413ed571e..5f068087d4 100644
--- a/lib/snmplib/snmp_vars.c
+++ b/lib/snmplib/snmp_vars.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
 
 /*
  * SNMP Variable Binding.  Complies with:
diff --git a/lib/snmplib/snmplib_debug.c b/lib/snmplib/snmplib_debug.c
index 809e19b21f..7be554af22 100644
--- a/lib/snmplib/snmplib_debug.c
+++ b/lib/snmplib/snmplib_debug.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
+ */
+
 #include "squid.h"
 
 #if HAVE_SYS_TYPES_H