From: Amos Jeffries Date: Thu, 30 Oct 2014 03:23:47 +0000 (-0700) Subject: Boilerplate: add copyright blurbs on more files X-Git-Tag: merge-candidate-3-v1~525 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a1b46cc0fbfba79628c126d6e34bee7b8684113;p=thirdparty%2Fsquid.git Boilerplate: add copyright blurbs on more files --- diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 0aca4150a0..1ee4ce9169 100644 --- a/contrib/Makefile.am +++ b/contrib/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. +## + # # Makefile for installing Squid startup files on systems # using a SVR4-based startup mechanism/file system layout diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt index ae203a6ca8..ad38f21452 100644 --- a/doc/debug-sections.txt +++ b/doc/debug-sections.txt @@ -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. + */ section 00 Announcement Server section 00 Client Database diff --git a/errors/alias-upgrade b/errors/alias-upgrade index 92754c3a2d..cea11a8ebc 100644 --- a/errors/alias-upgrade +++ b/errors/alias-upgrade @@ -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. +## + # 3.0 Still published with the old language namings. # we leave these alone in case any are configured... az Azerbaijani diff --git a/errors/aliases b/errors/aliases index faeed3a54a..2829953bd7 100644 --- a/errors/aliases +++ b/errors/aliases @@ -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. +## + ar ar-ae ar-bh ar-dz ar-eg ar-iq ar-jo ar-kw ar-lb ar-ly ar-ma ar-om ar-qa ar-sa ar-sy ar-tn ar-ye az az-az bg bg-bg diff --git a/errors/errorpage.css b/errors/errorpage.css index 8ecc4c8279..b0639a03b6 100644 --- a/errors/errorpage.css +++ b/errors/errorpage.css @@ -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. + */ + /* Stylesheet for Squid Error pages Adapted from design by Free CSS Templates diff --git a/helpers/log_daemon/DB/doc/date_day_column.sql b/helpers/log_daemon/DB/doc/date_day_column.sql index b5067b2749..7ea8e91a52 100644 --- a/helpers/log_daemon/DB/doc/date_day_column.sql +++ b/helpers/log_daemon/DB/doc/date_day_column.sql @@ -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. +-- + -- we need a separate column to store the date and time of the request ALTER TABLE access_log ADD COLUMN date_day DATE; ALTER TABLE access_log ADD COLUMN date_time TIME; diff --git a/helpers/log_daemon/DB/doc/views.sql b/helpers/log_daemon/DB/doc/views.sql index b363c3b649..1a9fd0b54b 100644 --- a/helpers/log_daemon/DB/doc/views.sql +++ b/helpers/log_daemon/DB/doc/views.sql @@ -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. +-- + -- -- Sample views -- diff --git a/icons/Makefile.am b/icons/Makefile.am index 9072b97364..63122d4af5 100644 --- a/icons/Makefile.am +++ b/icons/Makefile.am @@ -5,11 +5,11 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -include $(top_srcdir)/icons/list +include $(top_srcdir)/icons/icon.list icondir = $(datadir)/icons/silk icon_DATA = $(ICONS) -EXTRA_DIST = $(ICONS) list SN.png +EXTRA_DIST = $(ICONS) icon.list SN.png DISTCLEANFILES = install-data-local: SN.png install-iconDATA diff --git a/icons/list b/icons/icon.list similarity index 100% rename from icons/list rename to icons/icon.list diff --git a/lib/profiler/xprof_type.h b/lib/profiler/xprof_type.h index da0e36f52c..e927d6960a 100644 --- a/lib/profiler/xprof_type.h +++ b/lib/profiler/xprof_type.h @@ -1,9 +1,16 @@ +/* + * 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 _PROFILER_XPROF_TYPE_H_ #define _PROFILER_XPROF_TYPE_H_ /* AUTO-GENERATED FILE */ #if USE_XPROF_STATS typedef enum { -XPROF_PROF_UNACCOUNTED, + XPROF_PROF_UNACCOUNTED, XPROF_aclCheckFast, XPROF_ACL_matches, XPROF_calloc, @@ -13,6 +20,7 @@ XPROF_comm_check_incoming, XPROF_comm_close, XPROF_comm_connect_addr, XPROF_comm_handle_ready_fd, ++XPROF_commHandleWrite, XPROF_commHandleWrite, XPROF_comm_open, XPROF_comm_poll_normal, diff --git a/src/Comm.dox b/src/Comm.dox index 4bf256a945..31a7deb23b 100644 --- a/src/Comm.dox +++ b/src/Comm.dox @@ -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. + */ + /** \defgroup Comm Comm Module \ingroup Components diff --git a/src/DiskIO/modules.sh b/src/DiskIO/modules.sh index 6baebabd8c..6c2306de45 100755 --- a/src/DiskIO/modules.sh +++ b/src/DiskIO/modules.sh @@ -1,7 +1,16 @@ #!/bin/sh +# +## 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. +## + echo "/* automatically generated by $0 $*" echo " * do not edit" echo " */" +cat `dirname $0`/../../scripts/boilerplate.h echo "#include \"squid.h\"" echo "#include \"DiskIO/DiskIOModule.h\"" for module in "$@"; do diff --git a/src/base/AsyncCalls.dox b/src/base/AsyncCalls.dox index a14008c5f8..37d77f99dc 100644 --- a/src/base/AsyncCalls.dox +++ b/src/base/AsyncCalls.dox @@ -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. + */ + /** \defgroup AsyncCalls Asynchronous Calls \ingroup Components diff --git a/src/base/AsyncJobs.dox b/src/base/AsyncJobs.dox index c8f72c2d7b..fea946827a 100644 --- a/src/base/AsyncJobs.dox +++ b/src/base/AsyncJobs.dox @@ -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. + */ + /** \defgroup AsyncJobs Asynchronous Jobs \ingroup Components diff --git a/src/mime.conf.default b/src/mime.conf.default index 38f47a92fb..79cc9c56fe 100644 --- a/src/mime.conf.default +++ b/src/mime.conf.default @@ -1,16 +1,17 @@ -# This file associates filename extensions (for servers or services -# that don't automatically include them - like ftp) with a mime type -# and a graphical icon. -# -# -# This file has the format : -# regex content-type icon content-encoding transfer-mode -#----------------------------------------------------------------------------------- +## 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. +## # +# This file associates URL patterns for servers or services +# that don't automatically include Content-Type (like ftp) with a mime type +# and a graphical icon. # # Content-Encodings are taken from section 3.1 of RFC2068 (HTTP/1.1) # -# +# This file has the format : # # regexp content-type icon encoding mode actions #-------------------------------------------------------------------------------------------------------- @@ -190,6 +191,6 @@ README text/plain silk/information.png - ascii +download \.xml$ text/xml silk/page_world.png - ascii +download \.xsl$ text/xml silk/layout.png - ascii +download \.xyz$ chemical/x-xyz silk/chart_line.png - image +download - +# # the default . text/plain silk/bullet_red.png - image +download +view diff --git a/src/squid.8.in b/src/squid.8.in index 0d48d788ac..8c759438ad 100644 --- a/src/squid.8.in +++ b/src/squid.8.in @@ -240,20 +240,11 @@ see CREDITS for a list of major code contributing copyright holders. . .SH COPYRIGHT .PP -This software product, SQUID, is developed by a team of individuals, -and copyrighted (C) 2001 by the Regents of the University of -California, with all rights reserved. UCSD administered the NLANR -Cache grants, NCR 9616602 and NCR 9521745 under which most of this -code was developed. -.PP -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License (version 2) as -published by the Free Software Foundation. It 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. -.PP -see the CREDITS file for further copyright licensing of third-party code contributions. + * 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/src/ssl/ssl_crtd.8 b/src/ssl/ssl_crtd.8 index 778f209f92..c50f0a58ac 100644 --- a/src/ssl/ssl_crtd.8 +++ b/src/ssl/ssl_crtd.8 @@ -150,9 +150,12 @@ This manual was written by .if !'po4a'hide' .I Amos Jeffries . .SH COPYRIGHT -This program and documentation is copyright to the authors named above. .PP -Distributed under the GNU General Public License (GNU GPL) version 2 or later (GPLv2+). + * 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/cachemgr.conf b/tools/cachemgr.conf index 17805138b6..42f7d9a13b 100644 --- a/tools/cachemgr.conf +++ b/tools/cachemgr.conf @@ -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. +## + # This file controls which servers may be managed by # the cachemgr.cgi script # @@ -10,4 +17,5 @@ # # hostname is matched using shell filename matching, allowing # * and other shell wildcards. + localhost