------------------------------------------------------------ revno: 13576 revision-id: squid3@treenet.co.nz-20140913132021-397go4n0fyypj3f5 parent: squid3@treenet.co.nz-20140912230048-16y1tkq5t12nowhs committer: Amos Jeffries branch nick: trunk timestamp: Sun 2014-09-14 01:20:21 +1200 message: Boilerplate: update copyright blurbs for Squid tools ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140913132021-397go4n0fyypj3f5 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: ef29bf11d895d18d8243e4f3dd2b0375dd4575cf # timestamp: 2014-09-15 10:53:02 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140912230048-\ # 16y1tkq5t12nowhs # # Begin patch === modified file 'tools/Makefile.am' --- tools/Makefile.am 2014-09-02 01:08:58 +0000 +++ tools/Makefile.am 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/cachemgr.cc' --- tools/cachemgr.cc 2014-09-02 01:08:58 +0000 +++ tools/cachemgr.cc 2014-09-13 13:20:21 +0000 @@ -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" === modified file 'tools/cachemgr.cgi.8.in' --- tools/cachemgr.cgi.8.in 2012-04-05 01:15:20 +0000 +++ tools/cachemgr.cgi.8.in 2014-09-13 13:20:21 +0000 @@ -55,7 +55,12 @@ 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 === modified file 'tools/helper-mux.pl' --- tools/helper-mux.pl 2010-05-27 11:16:08 +0000 +++ tools/helper-mux.pl 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/helper-ok-dying.pl' --- tools/helper-ok-dying.pl 2010-05-27 11:16:08 +0000 +++ tools/helper-ok-dying.pl 2014-09-13 13:20:21 +0000 @@ -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 (<>) { === modified file 'tools/helper-ok.pl' --- tools/helper-ok.pl 2010-05-27 11:16:08 +0000 +++ tools/helper-ok.pl 2014-09-13 13:20:21 +0000 @@ -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 (<>) { === modified file 'tools/purge/Makefile.am' --- tools/purge/Makefile.am 2012-10-08 07:16:04 +0000 +++ tools/purge/Makefile.am 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/conffile.cc' --- tools/purge/conffile.cc 2014-09-02 01:08:58 +0000 +++ tools/purge/conffile.cc 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/conffile.hh' --- tools/purge/conffile.hh 2014-09-02 01:08:58 +0000 +++ tools/purge/conffile.hh 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/convert.cc' --- tools/purge/convert.cc 2014-09-02 01:08:58 +0000 +++ tools/purge/convert.cc 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/convert.hh' --- tools/purge/convert.hh 2013-08-25 06:36:13 +0000 +++ tools/purge/convert.hh 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/copyout.cc' --- tools/purge/copyout.cc 2014-09-02 01:08:58 +0000 +++ tools/purge/copyout.cc 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/copyout.hh' --- tools/purge/copyout.hh 2013-08-25 06:36:13 +0000 +++ tools/purge/copyout.hh 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/purge.cc' --- tools/purge/purge.cc 2014-09-02 01:08:58 +0000 +++ tools/purge/purge.cc 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/signal.cc' --- tools/purge/signal.cc 2014-09-02 01:08:58 +0000 +++ tools/purge/signal.cc 2014-09-13 13:20:21 +0000 @@ -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" === modified file 'tools/purge/signal.hh' --- tools/purge/signal.hh 2014-09-02 01:08:58 +0000 +++ tools/purge/signal.hh 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/socket.cc' --- tools/purge/socket.cc 2014-09-02 01:08:58 +0000 +++ tools/purge/socket.cc 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/socket.hh' --- tools/purge/socket.hh 2013-08-25 06:36:13 +0000 +++ tools/purge/socket.hh 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/purge/squid-tlv.cc' --- tools/purge/squid-tlv.cc 2014-09-02 01:08:58 +0000 +++ tools/purge/squid-tlv.cc 2014-09-13 13:20:21 +0000 @@ -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" === modified file 'tools/purge/squid-tlv.hh' --- tools/purge/squid-tlv.hh 2013-08-25 06:36:13 +0000 +++ tools/purge/squid-tlv.hh 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/squidclient/Makefile.am' --- tools/squidclient/Makefile.am 2014-04-18 15:47:24 +0000 +++ tools/squidclient/Makefile.am 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/squidclient/Parameters.h' --- tools/squidclient/Parameters.h 2014-04-18 15:47:24 +0000 +++ tools/squidclient/Parameters.h 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/squidclient/Ping.cc' --- tools/squidclient/Ping.cc 2014-02-20 23:33:29 +0000 +++ tools/squidclient/Ping.cc 2014-09-13 13:20:21 +0000 @@ -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" === modified file 'tools/squidclient/Ping.h' --- tools/squidclient/Ping.h 2014-02-20 13:03:07 +0000 +++ tools/squidclient/Ping.h 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/squidclient/Transport.cc' --- tools/squidclient/Transport.cc 2014-04-19 12:12:06 +0000 +++ tools/squidclient/Transport.cc 2014-09-13 13:20:21 +0000 @@ -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" === modified file 'tools/squidclient/Transport.h' --- tools/squidclient/Transport.h 2014-05-07 14:40:05 +0000 +++ tools/squidclient/Transport.h 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/squidclient/gssapi_support.cc' --- tools/squidclient/gssapi_support.cc 2014-03-30 04:20:16 +0000 +++ tools/squidclient/gssapi_support.cc 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/squidclient/gssapi_support.h' --- tools/squidclient/gssapi_support.h 2014-09-02 01:08:58 +0000 +++ tools/squidclient/gssapi_support.h 2014-09-13 13:20:21 +0000 @@ -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 === modified file 'tools/squidclient/squidclient.1' --- tools/squidclient/squidclient.1 2014-09-02 01:08:58 +0000 +++ tools/squidclient/squidclient.1 2014-09-13 13:20:21 +0000 @@ -233,7 +233,12 @@ 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 === modified file 'tools/squidclient/squidclient.cc' --- tools/squidclient/squidclient.cc 2014-09-02 01:08:58 +0000 +++ tools/squidclient/squidclient.cc 2014-09-13 13:20:21 +0000 @@ -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"