and related metafiles. No functionality or licensing changes are intended.
Once completed, the changes will consistently declare Squid contributors
(listed in CONTRIBUTORS and represented by the Squid Software Foundation) as
Squid copyright owners while referring the reader to the COPYING file for GPL
licensing details. The boilerplate with the above information is provided.
These changes do not affect copyright rights of individuals or organizations.
We are simply confirming the fact that there are many Squid copyright owners,
just like there are many Linux kernel copyright owners. We are also providing
a simple, consistent way to document that fact.
In this particular commit:
* Enlarged CONTRIBUTORS file scope to include all Squid code contributors, not
just individual volunteers. Added known organizations that contributed Squid
code. We could have two separate files for individuals and organizations,
but there is probably no difference between the two as far as copyright is
concerned so why complicate things?
Ideally, it would be best to isolate non-code contributors (or, to be more
precise, contributors without copyright claims) from the rest of the group,
but doing so is impractical at this point IMHO. We do not state that all
listed contributors have a copyright claim on Squid so our statements remain
correct, albeit not precise.
* Fixed SPONSOR[.list] scope to include those who funded development. The
file entries already included many such sponsors but the preamble excluded
them. If some of those sponsors retained copyright for the developed code,
they should be also listed in the CONTRIBUTORS file. More work is probably
needed to make the latter true as I could only audit entries I know about.
* Explicitly defined CREDITS file scope. Removed Squid copyright/licensing
statement from that file as out of scope (parts of it belong to README,
COPYING, and boilerplates). Polished Harvest/cached entry description,
removing no longer valid URL (that is still mentioned in the Harvest
license, which is preserved "as is", of course).
* Removed COPYRIGHT file. It was very stale, non standard (GNU uses COPYING),
and inaccurate. The Regents of the University of California, a rightful
Squid co-owner have been moved to the CONTRIBUTORS file. Historical facts
about UCSD and NSF NLANR grants is already available in the SPONSORS file.
* Updated README with the standard boilerplate text. That file needs more
polishing work outside this project scope.
* Fixed custom scripts/formater.pl boilerplate.
-Special thanks go to people who have volunteered their time, effort,
-and ideas to make this software available.
+This file contains a list of Squid contributors: people and organizations that
+have volunteered their time, effort, code, and ideas to make Squid software.
+Thank you!
Adam Ciarcinski
Adrian Chadd <adrian@squid-cache.org>
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Ralph Loader <loader@maths.ox.ac.uk>
Regardt van de Vyver <squid@vdvyver.net>
+ Regents of the University of California (UCSD)
Reinhard Sojka <reinhard.sojka@parlament.gv.at>
Rene Geile <rene.geile@t-online.de>
Reuben Farrelly <reuben@reub.net>
Svenx <svensven@gmail.com>
Taavi Talvik <taavi@uninet.ee>
Taketo Kabe <kabe@shiratori.riec.tohoku.ac.jp>
+ The Measurement Factory <info@measurement-factory.com>
Thomas Ristic <thr@bootet.net>
Thomas-Martin Seck <tmseck@netcologne.de>
Tim Starling <tstarling@wikimedia.org>
+++ /dev/null
-By accepting this notice, you agree to be bound by the following
-agreements:
-
-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.
-
-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.
-
-You should have received a copy of the GNU General Public License along
-with this program; if not, write to:
-
- The Free Software Foundation
- 59 Temple Place
- Suite 330
- Boston, MA 02111, USA
-
-Or contact info@squid-cache.org
-==============================================================================
-
-SQUID Internet Object Cache http://www.squid-cache.org
---------------------------------------------------------
-
- Squid is the result of efforts by numerous individuals from the
- Internet community. Development is led by Duane Wessels of the
- National Laboratory for Applied Network Research and funded by
- the National Science Foundation.
-
- 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., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-Squid is derived from the ``cached'' software from the ARPA-funded
-Harvest research project. The Harvest home page is
-http://harvest.cs.colorado.edu/.
-
-Squid is originally derived from the Harvest Information Discovery and
-Access System. The Harvest copyright text follows to acknowledge the origin:
+This file contains copyright and licensing information for 3rd party software
+imported into Squid. Squid software itself is copyrighted by The Squid
+Software Foundation and contributors. Please see the COPYING and CONTRIBUTORS
+files for details.
+==============================================================================
+Squid is derived from the ``cached'' software developed by the ARPA-funded
+research project called The Harvest Information Discovery and Access System:
/*
* Copyright (c) 1994, 1995. All rights reserved.
ChangeLog \
CONTRIBUTORS \
COPYING \
- COPYRIGHT \
CREDITS \
INSTALL \
QUICKSTART \
-SQUID Web Proxy Cache http://www.squid-cache.org/
---------------------------------------------------------
+SQUID Web Proxy Cache http://www.squid-cache.org/
+-------------------------------------------------------------------------
+
+Copyright (C) 1996-2013 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 program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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.
-
-Squid is derived from the ``cached'' software from the ARPA-funded
-Harvest research project. Squid includes software copyrighted
-by others. See the COPYRIGHT file for details.
-
Please use our mailing lists for questions, feedback and bug fixes:
squid-users@squid-cache.org # general questions, pubilc forum
-In addition to the numerous volunteer developers (see CONTRIBUTORS),
-the following organizations have provided non-financial support for
-the Squid Project:
+The following organizations have supported the Squid Project by providing
+their resources or funding various Squid development activities:
@Squid-3.4:
LaunchPad - http://launchpad.net/
--- /dev/null
+/*
+ * Copyright (C) 1996-2013 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.
+ */
# by the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
-# The ldap_manager library is distributed in the hope that it will be useful,
+# 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
# Library General Public License for more details.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# See LICENSE or http://www.gnu.org/licenses/gpl.html for details .
+# See COPYING or http://www.gnu.org/licenses/gpl.html for details.
#
projects / thirdparty / squid.git / commitdiff
