From: Amos Jeffries Date: Sat, 13 Sep 2014 13:20:21 +0000 (+1200) Subject: Boilerplate: update copyright blurbs for Squid tools X-Git-Tag: SQUID_3_5_0_1~69 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f623035d3b75e86a6720dc01d18443dd85eff68;p=thirdparty%2Fsquid.git Boilerplate: update copyright blurbs for Squid tools --- diff --git a/tools/Makefile.am b/tools/Makefile.am index 66d30c713b..26917904a6 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,8 +1,9 @@ -# -# Makefile for the Squid Object Cache server -# -# Uncomment and customize the following to suit your needs: -# +## 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 $(top_srcdir)/src/Common.am diff --git a/tools/cachemgr.cc b/tools/cachemgr.cc index d5b998ee3d..b852f11f18 100644 --- a/tools/cachemgr.cc +++ b/tools/cachemgr.cc @@ -1,33 +1,9 @@ /* - * DEBUG: section -- CGI Cache Manager - * AUTHOR: Duane Wessels - * - * SQUID Web Proxy Cache http://www.squid-cache.org/ - * ---------------------------------------------------------- - * - * Squid is the result of efforts by numerous individuals from - * the Internet community; see the CONTRIBUTORS file for full - * details. Many organizations have provided support for Squid's - * development; see the SPONSORS file for full details. Squid is - * Copyrighted (C) 2001 by the Regents of the University of - * California; see the COPYRIGHT file for full details. Squid - * incorporates software developed and/or copyrighted by other - * sources; see the CREDITS file for full details. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * 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" diff --git a/tools/cachemgr.cgi.8.in b/tools/cachemgr.cgi.8.in index 0a0416100f..1248f88bb5 100644 --- a/tools/cachemgr.cgi.8.in +++ b/tools/cachemgr.cgi.8.in @@ -55,7 +55,12 @@ National Laboratory for Applied Network Research and funded by the National Science Foundation. . .SH COPYRIGHT -Distributed under the GNU General Public License (GNU GPL) version 2 or later (GPLv2+). +.PP + * 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. . .SH QUESTIONS Questions on the usage of this program can be sent to the diff --git a/tools/helper-mux.pl b/tools/helper-mux.pl index 49fcee5495..18028f67b5 100755 --- a/tools/helper-mux.pl +++ b/tools/helper-mux.pl @@ -1,4 +1,12 @@ #!/usr/bin/perl +# +## 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. +## +# # helper multiplexer. Talks to squid using the multiplexed variant of # the helper protocol, and maintains a farm of synchronous helpers # helpers are lazily started, as many as needed. @@ -6,14 +14,6 @@ # # AUTHOR: Francesco Chemolli # -# SQUID Web Proxy Cache http://www.squid-cache.org/ -# ---------------------------------------------------------- -# -# Squid is the result of efforts by numerous individuals from -# the Internet community; see the CONTRIBUTORS file for full -# details. Many organizations have provided support for Squid's -# development; see the SPONSORS file for full details. -# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or diff --git a/tools/helper-ok-dying.pl b/tools/helper-ok-dying.pl index 30fc8d8bfa..5ee026d246 100755 --- a/tools/helper-ok-dying.pl +++ b/tools/helper-ok-dying.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl +# +## 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. +## $|=1; while (<>) { diff --git a/tools/helper-ok.pl b/tools/helper-ok.pl index dd7af8ba5e..6f81e356a3 100755 --- a/tools/helper-ok.pl +++ b/tools/helper-ok.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl +# +## 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. +## $|=1; while (<>) { diff --git a/tools/purge/Makefile.am b/tools/purge/Makefile.am index 2cd43f1caf..5b87ebc4e2 100644 --- a/tools/purge/Makefile.am +++ b/tools/purge/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. +## + include $(top_srcdir)/src/Common.am if !ENABLE_WIN32SPECIFIC diff --git a/tools/purge/conffile.cc b/tools/purge/conffile.cc index 7c4116156d..ea6d36c9c0 100644 --- a/tools/purge/conffile.cc +++ b/tools/purge/conffile.cc @@ -1,4 +1,10 @@ -#include "squid.h" +/* + * 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. + */ // Author: Jens-S. V?ckler // @@ -33,7 +39,8 @@ // Revision 1.1 2000/09/21 09:44:53 voeckler // Initial revision // -// + +#include "squid.h" #include "conffile.hh" #include diff --git a/tools/purge/conffile.hh b/tools/purge/conffile.hh index f34bf7168b..1077b8fdec 100644 --- a/tools/purge/conffile.hh +++ b/tools/purge/conffile.hh @@ -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. + */ + // Author: Jens-S. V?ckler // // File: conffile.hh diff --git a/tools/purge/convert.cc b/tools/purge/convert.cc index a2cf4fe378..d019ae8cca 100644 --- a/tools/purge/convert.cc +++ b/tools/purge/convert.cc @@ -1,4 +1,10 @@ -#include "squid.h" +/* + * 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. + */ // Author: Jens-S. V?ckler // @@ -39,8 +45,8 @@ // Revision 1.1 1998/08/13 21:38:04 voeckler // Initial revision // -// +#include "squid.h" #include "convert.hh" #include diff --git a/tools/purge/convert.hh b/tools/purge/convert.hh index 5cd39b7454..d9a821b0ac 100644 --- a/tools/purge/convert.hh +++ b/tools/purge/convert.hh @@ -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. + */ + // Author: Jens-S. V?ckler // // File: convert.hh diff --git a/tools/purge/copyout.cc b/tools/purge/copyout.cc index a8d62571a7..9902ac2ebd 100644 --- a/tools/purge/copyout.cc +++ b/tools/purge/copyout.cc @@ -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. + */ + // Author: Jens-S. V?ckler // // File: copyout.cc diff --git a/tools/purge/copyout.hh b/tools/purge/copyout.hh index 5440490900..1a769937e2 100644 --- a/tools/purge/copyout.hh +++ b/tools/purge/copyout.hh @@ -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. + */ + // Author: Jens-S. V?ckler // // File: copyout.hh diff --git a/tools/purge/purge.cc b/tools/purge/purge.cc index 039a906c16..ff1c8fb3db 100644 --- a/tools/purge/purge.cc +++ b/tools/purge/purge.cc @@ -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. + */ + // Author: Jens-S. V?ckler // // File: purge.cc diff --git a/tools/purge/signal.cc b/tools/purge/signal.cc index 4672d9265d..77038639ae 100644 --- a/tools/purge/signal.cc +++ b/tools/purge/signal.cc @@ -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. + */ + // Author: Jens-S. V?ckler // File: signal.cc // Date: Sat Feb 28 1998 @@ -40,7 +48,7 @@ // Revision 1.1 1998/08/13 21:51:58 voeckler // Initial revision // -// + #include "squid.h" #include "signal.hh" diff --git a/tools/purge/signal.hh b/tools/purge/signal.hh index f43557b575..c7716df1ed 100644 --- a/tools/purge/signal.hh +++ b/tools/purge/signal.hh @@ -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. + */ + // Author: Jens-S. V?ckler // File: signal.hh // Date: Sat Feb 28 1998 diff --git a/tools/purge/socket.cc b/tools/purge/socket.cc index 9450edd891..352075a5e8 100644 --- a/tools/purge/socket.cc +++ b/tools/purge/socket.cc @@ -1,4 +1,11 @@ -#include "squid.h" +/* + * 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. + */ + // Author: Jens-S. V?ckler // // File: socket.hh @@ -41,7 +48,8 @@ // Revision 1.1 1998/08/13 21:52:55 voeckler // Initial revision // -// + +#include "squid.h" #include "socket.hh" #include diff --git a/tools/purge/socket.hh b/tools/purge/socket.hh index c1631bc74f..57b64542b5 100644 --- a/tools/purge/socket.hh +++ b/tools/purge/socket.hh @@ -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. + */ + // Author: Jens-S. V?ckler // // File: socket.hh diff --git a/tools/purge/squid-tlv.cc b/tools/purge/squid-tlv.cc index bf3d41d518..b1953b4720 100644 --- a/tools/purge/squid-tlv.cc +++ b/tools/purge/squid-tlv.cc @@ -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. + */ + // Author: Jens-S. V?ckler // // File: squid-tlv.cc @@ -31,7 +39,7 @@ // Revision 1.1 1999/06/15 21:10:16 voeckler // Initial revision // -// + #include "squid.h" #include "squid-tlv.hh" diff --git a/tools/purge/squid-tlv.hh b/tools/purge/squid-tlv.hh index fdaec97ffd..08ddecc38a 100644 --- a/tools/purge/squid-tlv.hh +++ b/tools/purge/squid-tlv.hh @@ -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. + */ + // Author: Jens-S. V?ckler // // File: squid-tlv.hh diff --git a/tools/squidclient/Makefile.am b/tools/squidclient/Makefile.am index 499acf3db9..bd0ab73221 100644 --- a/tools/squidclient/Makefile.am +++ b/tools/squidclient/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. +## + include $(top_srcdir)/src/Common.am AUTOMAKE_OPTIONS = subdir-objects diff --git a/tools/squidclient/Parameters.h b/tools/squidclient/Parameters.h index 27253cfefd..e597fb3ae8 100644 --- a/tools/squidclient/Parameters.h +++ b/tools/squidclient/Parameters.h @@ -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. + */ + #ifndef _SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H #define _SQUID_TOOLS_SQUIDCLIENT_PARAMETERS_H diff --git a/tools/squidclient/Ping.cc b/tools/squidclient/Ping.cc index 46e5a4c828..9f5f9d09d1 100644 --- a/tools/squidclient/Ping.cc +++ b/tools/squidclient/Ping.cc @@ -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" #include "SquidTime.h" #include "tools/squidclient/Parameters.h" diff --git a/tools/squidclient/Ping.h b/tools/squidclient/Ping.h index 5e03192046..7e7ccdf9a3 100644 --- a/tools/squidclient/Ping.h +++ b/tools/squidclient/Ping.h @@ -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. + */ + #ifndef _SQUID_TOOLS_CLIENT_PING_H #define _SQUID_TOOLS_CLIENT_PING_H diff --git a/tools/squidclient/Transport.cc b/tools/squidclient/Transport.cc index 1c62d088e1..1abeada100 100644 --- a/tools/squidclient/Transport.cc +++ b/tools/squidclient/Transport.cc @@ -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" #include "ip/Address.h" #include "tools/squidclient/Ping.h" diff --git a/tools/squidclient/Transport.h b/tools/squidclient/Transport.h index 2e9eb649e0..7bc08dc851 100644 --- a/tools/squidclient/Transport.h +++ b/tools/squidclient/Transport.h @@ -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. + */ + #ifndef SQUID_TOOLS_SQUIDCLIENT_TRANSPORT_H #define SQUID_TOOLS_SQUIDCLIENT_TRANSPORT_H diff --git a/tools/squidclient/gssapi_support.cc b/tools/squidclient/gssapi_support.cc index 6440a06eb2..3733f9193e 100644 --- a/tools/squidclient/gssapi_support.cc +++ b/tools/squidclient/gssapi_support.cc @@ -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_GSSAPI diff --git a/tools/squidclient/gssapi_support.h b/tools/squidclient/gssapi_support.h index 7d2f598e10..46d65d97cf 100644 --- a/tools/squidclient/gssapi_support.h +++ b/tools/squidclient/gssapi_support.h @@ -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. + */ + #ifndef _SQUID_TOOLS_SQUIDCLIENT_GSSAPI_H #define _SQUID_TOOLS_SQUIDCLIENT_GSSAPI_H diff --git a/tools/squidclient/squidclient.1 b/tools/squidclient/squidclient.1 index 2a1f95613b..dcabebee7d 100644 --- a/tools/squidclient/squidclient.1 +++ b/tools/squidclient/squidclient.1 @@ -233,7 +233,12 @@ National Laboratory for Applied Network Research and funded by the National Science Foundation. . .SH COPYRIGHT -Distributed under the GNU General Public License (GNU GPL) version 2 or later (GPLv2+). +.PP + * 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. . .SH QUESTIONS Questions on the usage of this program can be sent to the diff --git a/tools/squidclient/squidclient.cc b/tools/squidclient/squidclient.cc index d36ac64bd7..db62555cb6 100644 --- a/tools/squidclient/squidclient.cc +++ b/tools/squidclient/squidclient.cc @@ -1,33 +1,9 @@ /* - * DEBUG: section -- WWW Client - * AUTHOR: Harvest Derived - * - * SQUID Web Proxy Cache http://www.squid-cache.org/ - * ---------------------------------------------------------- - * - * Squid is the result of efforts by numerous individuals from - * the Internet community; see the CONTRIBUTORS file for full - * details. Many organizations have provided support for Squid's - * development; see the SPONSORS file for full details. Squid is - * Copyrighted (C) 2001 by the Regents of the University of - * California; see the COPYRIGHT file for full details. Squid - * incorporates software developed and/or copyrighted by other - * sources; see the CREDITS file for full details. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. + * 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"