Release Notes: update SPONSORS list

The SPONSORS file is supposed to:

* list Sponsors who paid for significant developments in the squid code,
  donated hardware for devleopment etc.
* exclude cash donations to the project (only cash to a developer for
  specific work)
* in an ordered list broken down in reverse-chronological order of the
  latest release they sponsored anything.

For simplicity of maintenance I'm adding @Squid-X.Y labels at the
boundaries for the bzr copy. They should be stripped out automatically
by the "make dist" process for release packaging.

diff --git a/Makefile.am b/Makefile.am
index d839afef42f7145ddc0bc955b37f3c446b48418f..20a944415cc09322a551d530321e24c609457d55 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,10 +43,13 @@ EXTRA_DIST = \
        INSTALL \
        QUICKSTART \
        README \
-       SPONSORS \
+       SPONSORS.txt \
        bootstrap.sh \
        po4a.conf
 
+SPONSORS.txt: SPONSORS
+       sed -e 's/@Squid-[0-9\.]*://' <$(top_srcdir)/SPONSORS > $@ || ($(RM) -f $@ && exit 1)
+
 install-pinger:
        chown root $(DESTDIR)$(DEFAULT_PINGER)
        chmod 4711 $(DESTDIR)$(DEFAULT_PINGER)

diff --git a/SPONSORS b/SPONSORS
index 1c570e925fa3e28b322ab32d57b07aebbebe5be3..1608e864eb76252dcdaf42973611596ce6237614 100644 (file)
--- a/SPONSORS
+++ b/SPONSORS
@@ -1,90 +1,111 @@
 In addition to the numerous volunteer developers (see CONTRIBUTORS),
-the following organizations have provided financial or other support for
-Squid:
+the following organizations have provided non-financial support for
+the Squid Project:
 
-The National Science Foundation
+@Squid-3.2:
+iiNet Ltd - http://www.iinet.net.au/
 
-       The NSF was the primary funding source for Squid development
-       from 1996-2000.  Two grants (#NCR-9616602, #NCR-9521745)
-       received through the Advanced Networking Infrastructure
-       and Research (ANIR) Division were administered by the
-       University of California San Diego.
+       iiNet Ltd contributed significant development resources to
+       Squid during its early stages and was instrumental in its
+       early adoption in the local internet community.
+       In Squid-2.6 and 3.0 iiNet supplied equipment to help develop
+       and test the WCCPv2 implementation.
+       In Squid-3.2 iiNet sponsored development time to resolve
+       authentication problems.
 
-MARA Systems AB - http://www.marasystems.com/
+LaunchPad - http://launchpad.net/
 
-       MARA systems has sponsored the bug fixing and maintentnance for
-       most Squid-2.5 releases, and a number of new features to be found
-       in Squid-3.
+       Provide Bazaar mirroring services and host the Squid-3 developer
+       project code.
 
-Swell Technology - http://www.swelltech.com/
+Messagenet - http://messagenet.it/
 
-       Swell Technology provides ongoing development and testing
-       support to the Squid project, as well as hardware donations
-       for Squid developers.
+       Messagenet donated hardware and bandwidth for the wiki server
+       and most continuous integration testing.
 
-Picture IQ - http://www.pictureiq.com/
+Palisade Systems - http://www.palisadesys.com/
 
-        Bought simple support for the Vary header, to help their
-       accelerator setups.
+       Palisade Systems funded SSL Bump feature development in Squid3.
 
-SGI - http://www.sgi.com/
+The Measurement Factory - http://www.measurement-factory.com/
 
-       SGI has provided hardware donations for Squid developers.
+       Measurement Factory has constributed significant resources
+       toward Squid-3 development and server maintenance.
 
-Zope Corporation - http://www.zope.com/
+Treehouse Networks, NZ - http://treenet.co.nz/
 
-       Zope Corporation funded the development of the ESI protocol
-       (http://www.esi.org) in Squid to provide greater cachability
-       of dynamic and personalized pages by caching common page
-       components. Zope engaged one of the core Squid developers
-       for the project.
+       Treehouse Networks has contributed significant resources
+       toward Squid-3 development and maintenance for their customer
+       gateways and CDN.
 
-craigslist - http://www.craigslist.org/
+@Squid-3.1:
+Barefruit - http://www.barefruit.com/
 
-       craigslist has provided funding in recognition of the vital
-       role squid plays in their web serving architecture.
+       Barefruit has funded Squid-3.0 and 3.1 development and maintenance,
+       with a focus on content adaptation (ICAP and eCAP) support.
+
+BBC (UK) and Siemens IT Solutions and Services (UK)
+
+       Provided developement and testing resources for Solaris /dev/poll
+       support in Squid-3.1.
 
 webwasher AG - http://www.webwasher.com/
 
-       webwasher AG paid for improvements to Squid's iCAP client
-       implementation.  You can find the results of this work
-       at http://devel.squid-cache.org/icap/
+       webwasher AG paid for improvements to Squid-3.1 ICAP client
+       implementation.
 
-iiNet Ltd - http://www.iinet.net.au/
+SourceForge - http://www.sourceforge.net/
 
-        iiNet Ltd contributed significant development resources to
-        Squid during its early stages and was instrumental in its
-        early adoption in the local internet community. iiNet has also
-        recently supplied equipment to help develop and test the WCCPv2
-        implementation in Squid-2.6 and Squid-3.
+       Provide CVS mirroring services and hosted the Squid-2 developer
+       project code.
 
+@Squid-3.0:
 Kaspersky Lab - http://www.kaspersky.com/
 
        Kaspersky Lab funded initial development of ICAP support in
-       Squid-3.
-
-Barefruit - http://www.barefruit.com/
+       Squid-3.0
 
-       Barefruit has funded Squid3 development and maintenance,
-       with a focus on content adaptation (ICAP and eCAP) support.
-
-Palisade Systems - http://www.palisadesys.com/
+MARA Systems AB - http://www.marasystems.com/
 
-       Palisade Systems funded SSL Bump feature development in Squid3.
+       MARA systems has sponsored the bug fixing and maintenance for
+       most Squid-2.5 releases, and a number of new features to be found
+       in Squid-3.0.
 
-Treehouse Networks, NZ - http://treenet.co.nz/
+Zope Corporation - http://www.zope.com/
 
-       Treehouse Networks has contributed significant development resources
-       toward Squid-3 development and maintenance for their customer
-       gateways and CDN.
+       Zope Corporation funded the development of the ESI protocol
+       (http://www.esi.org) in Squid-3.0 to provide greater cachability
+       of dynamic and personalized pages by caching common page
+       components.
 
-BBC (UK) and Siemens IT Solutions and Services (UK)
+@Squid-2.7:
+Picture IQ - http://www.pictureiq.com/
 
-       Provided developement and testing resources for Solaris /dev/poll
-       support.
+       Picture IQ bought simple support for the Vary header to Squid-2.7,
+       to help their accelerator setups.
 
 Yahoo! Inc. - http://www.yahoo.com/
 
        Yahoo! Inc. supported the development of improved refresh
        logics. Many thanks to Yahoo! Inc. for supporting the development
        of these features.
+
+@Squid-2.6:
+Swell Technology - http://www.swelltech.com/
+
+       Swell Technology provided development and testing support to the
+       Squid-2 project, as well as hardware donations for Squid developers.
+
+@Squid-2.4:
+SGI - http://www.sgi.com/
+
+       SGI has provided hardware donations for Squid developers.
+
+@Squid-2.3:
+The National Science Foundation
+
+       The NSF was the primary funding source for Squid development
+       from 1996-2000.  Two grants (#NCR-9616602, #NCR-9521745)
+       received through the Advanced Networking Infrastructure
+       and Research (ANIR) Division were administered by the
+       University of California San Diego.