--------------------- PatchSet 12102 Date: 2008/05/04 23:28:42 Author: hno Branch: SQUID_2_7 Tag: (none) Log: Author: serassio Removed advertisement clause from BSD licensed sources According to the new revised (3-clause) BSD license: ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change the advertisement clause (3) of old (4-clause) BSD license can be deleted. Members: CREDITS:1.11.6.2->1.11.6.3 include/radix.h:1.16->1.16.6.1 lib/inet_ntoa.c:1.2->1.2.12.1 lib/radix.c:1.21->1.21.6.1 Index: squid/CREDITS =================================================================== RCS file: /cvsroot/squid/squid/CREDITS,v retrieving revision 1.11.6.2 retrieving revision 1.11.6.3 diff -u -r1.11.6.2 -r1.11.6.3 --- squid/CREDITS 4 May 2008 23:26:30 -0000 1.11.6.2 +++ squid/CREDITS 4 May 2008 23:28:42 -0000 1.11.6.3 @@ -1,4 +1,4 @@ -$Id: CREDITS,v 1.11.6.2 2008/05/04 23:26:30 hno Exp $ +$Id: CREDITS,v 1.11.6.3 2008/05/04 23:28:42 hno Exp $ ============================================================================== @@ -212,11 +212,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -277,11 +273,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Index: squid/include/radix.h =================================================================== RCS file: /cvsroot/squid/squid/include/radix.h,v retrieving revision 1.16 retrieving revision 1.16.6.1 diff -u -r1.16 -r1.16.6.1 --- squid/include/radix.h 25 May 2006 03:00:33 -0000 1.16 +++ squid/include/radix.h 4 May 2008 23:28:42 -0000 1.16.6.1 @@ -1,5 +1,5 @@ /* - * $Id: radix.h,v 1.16 2006/05/25 03:00:33 hno Exp $ + * $Id: radix.h,v 1.16.6.1 2008/05/04 23:28:42 hno Exp $ */ #ifndef SQUID_RADIX_H @@ -17,11 +17,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Index: squid/lib/inet_ntoa.c =================================================================== RCS file: /cvsroot/squid/squid/lib/inet_ntoa.c,v retrieving revision 1.2 retrieving revision 1.2.12.1 diff -u -r1.2 -r1.2.12.1 --- squid/lib/inet_ntoa.c 15 Apr 1999 06:15:37 -0000 1.2 +++ squid/lib/inet_ntoa.c 4 May 2008 23:28:44 -0000 1.2.12.1 @@ -10,11 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * Index: squid/lib/radix.c =================================================================== RCS file: /cvsroot/squid/squid/lib/radix.c,v retrieving revision 1.21 retrieving revision 1.21.6.1 diff -u -r1.21 -r1.21.6.1 --- squid/lib/radix.c 2 Jun 2006 17:32:44 -0000 1.21 +++ squid/lib/radix.c 4 May 2008 23:28:44 -0000 1.21.6.1 @@ -1,5 +1,5 @@ /* - * $Id: radix.c,v 1.21 2006/06/02 17:32:44 serassio Exp $ + * $Id: radix.c,v 1.21.6.1 2008/05/04 23:28:44 hno Exp $ * * DEBUG: section 53 Radix tree data structure implementation * AUTHOR: NetBSD Derived @@ -45,11 +45,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. *