Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9dd3ec6

Browse files
committed
Remove advertising clause from Berkeley BSD-licensed files, per
instructions from Berkeley.
1 parent 357be8c commit 9dd3ec6

File tree

12 files changed

+19
-67
lines changed

12 files changed

+19
-67
lines changed

src/backend/port/darwin/system.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@
1414
* 2. Redistributions in binary form must reproduce the above copyright
1515
* notice, this list of conditions and the following disclaimer in the
1616
* documentation and/or other materials provided with the distribution.
17-
* 3. All advertising materials mentioning features or use of this software
18-
* must display the following acknowledgement:
19-
* This product includes software developed by the University of
20-
* California, Berkeley and its contributors.
21-
* 4. Neither the name of the University nor the names of its contributors
17+
* 3. Neither the name of the University nor the names of its contributors
2218
* may be used to endorse or promote products derived from this software
2319
* without specific prior written permission.
2420
*

src/backend/port/dynloader/freebsd.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/backend/port/dynloader/freebsd.c,v 1.26 2007/01/05 22:19:35 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/src/backend/port/dynloader/freebsd.c,v 1.27 2007/03/26 21:44:11 momjian Exp $ */
22

33
/*
44
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
@@ -13,11 +13,7 @@
1313
* 2. Redistributions in binary form must reproduce the above copyright
1414
* notice, this list of conditions and the following disclaimer in the
1515
* documentation and/or other materials provided with the distribution.
16-
* 3. All advertising materials mentioning features or use of this software
17-
* must display the following acknowledgement:
18-
* This product includes software developed by the University of
19-
* California, Berkeley and its contributors.
20-
* 4. Neither the name of the University nor the names of its contributors
16+
* 3. Neither the name of the University nor the names of its contributors
2117
* may be used to endorse or promote products derived from this software
2218
* without specific prior written permission.
2319
*

src/backend/port/dynloader/netbsd.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Portions Copyright (c) 1990 The Regents of the University of California.
44
* All rights reserved.
55
*
6-
* $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.c,v 1.20 2007/01/05 22:19:35 momjian Exp $
6+
* $PostgreSQL: pgsql/src/backend/port/dynloader/netbsd.c,v 1.21 2007/03/26 21:44:11 momjian Exp $
77
*
88
* Redistribution and use in source and binary forms, with or without
99
* modification, are permitted provided that the following conditions
@@ -13,11 +13,7 @@
1313
* 2. Redistributions in binary form must reproduce the above copyright
1414
* notice, this list of conditions and the following disclaimer in the
1515
* documentation and/or other materials provided with the distribution.
16-
* 3. All advertising materials mentioning features or use of this software
17-
* must display the following acknowledgement:
18-
* This product includes software developed by the University of
19-
* California, Berkeley and its contributors.
20-
* 4. Neither the name of the University nor the names of its contributors
16+
* 3. Neither the name of the University nor the names of its contributors
2117
* may be used to endorse or promote products derived from this software
2218
* without specific prior written permission.
2319
*

src/backend/port/dynloader/openbsd.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Portions Copyright (c) 1990 The Regents of the University of California.
44
* All rights reserved.
55
*
6-
* $PostgreSQL: pgsql/src/backend/port/dynloader/openbsd.c,v 1.20 2007/01/05 22:19:35 momjian Exp $
6+
* $PostgreSQL: pgsql/src/backend/port/dynloader/openbsd.c,v 1.21 2007/03/26 21:44:11 momjian Exp $
77
*
88
* Redistribution and use in source and binary forms, with or without
99
* modification, are permitted provided that the following conditions
@@ -13,11 +13,7 @@
1313
* 2. Redistributions in binary form must reproduce the above copyright
1414
* notice, this list of conditions and the following disclaimer in the
1515
* documentation and/or other materials provided with the distribution.
16-
* 3. All advertising materials mentioning features or use of this software
17-
* must display the following acknowledgement:
18-
* This product includes software developed by the University of
19-
* California, Berkeley and its contributors.
20-
* 4. Neither the name of the University nor the names of its contributors
16+
* 3. Neither the name of the University nor the names of its contributors
2117
* may be used to endorse or promote products derived from this software
2218
* without specific prior written permission.
2319
*

src/backend/utils/mb/wstrcmp.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@
1313
* 2. Redistributions in binary form must reproduce the above copyright
1414
* notice, this list of conditions and the following disclaimer in the
1515
* documentation and/or other materials provided with the distribution.
16-
* 3. All advertising materials mentioning features or use of this software
17-
* must display the following acknowledgement:
18-
* This product includes software developed by the University of
19-
* California, Berkeley and its contributors.
20-
* 4. Neither the name of the University nor the names of its contributors
16+
* 3. Neither the name of the University nor the names of its contributors
2117
* may be used to endorse or promote products derived from this software
2218
* without specific prior written permission.
2319
*

src/backend/utils/mb/wstrncmp.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
* 2. Redistributions in binary form must reproduce the above copyright
1313
* notice, this list of conditions and the following disclaimer in the
1414
* documentation and/or other materials provided with the distribution.
15-
* 3. All advertising materials mentioning features or use of this software
16-
* must display the following acknowledgement:
17-
* This product includes software developed by the University of
18-
* California, Berkeley and its contributors.
19-
* 4. Neither the name of the University nor the names of its contributors
15+
* 3. Neither the name of the University nor the names of its contributors
2016
* may be used to endorse or promote products derived from this software
2117
* without specific prior written permission.
2218
*

src/port/getopt.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/port/getopt.c,v 1.10 2006/03/11 04:38:40 momjian Exp $ */
1+
/* $PostgreSQL: pgsql/src/port/getopt.c,v 1.11 2007/03/26 21:44:11 momjian Exp $ */
22

33
/* This is used by psql under Win32 */
44

@@ -14,11 +14,7 @@
1414
* 2. Redistributions in binary form must reproduce the above copyright
1515
* notice, this list of conditions and the following disclaimer in the
1616
* documentation and/or other materials provided with the distribution.
17-
* 3. All advertising materials mentioning features or use of this software
18-
* must display the following acknowledgement:
19-
* This product includes software developed by the University of
20-
* California, Berkeley and its contributors.
21-
* 4. Neither the name of the University nor the names of its contributors
17+
* 3. Neither the name of the University nor the names of its contributors
2218
* may be used to endorse or promote products derived from this software
2319
* without specific prior written permission.
2420
*

src/port/getopt_long.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
* 2. Redistributions in binary form must reproduce the above copyright
1616
* notice, this list of conditions and the following disclaimer in the
1717
* documentation and/or other materials provided with the distribution.
18-
* 3. All advertising materials mentioning features or use of this software
19-
* must display the following acknowledgement:
20-
* This product includes software developed by the University of
21-
* California, Berkeley and its contributors.
22-
* 4. Neither the name of the University nor the names of its contributors
18+
* 3. Neither the name of the University nor the names of its contributors
2319
* may be used to endorse or promote products derived from this software
2420
* without specific prior written permission.
2521
*
@@ -35,7 +31,7 @@
3531
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
3632
* SUCH DAMAGE.
3733
*
38-
* $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.5 2005/10/15 02:49:51 momjian Exp $
34+
* $PostgreSQL: pgsql/src/port/getopt_long.c,v 1.6 2007/03/26 21:44:11 momjian Exp $
3935
*/
4036

4137
#include "c.h"

src/port/inet_aton.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $PostgreSQL: pgsql/src/port/inet_aton.c,v 1.9 2006/06/07 22:24:46 momjian Exp $
1+
/* $PostgreSQL: pgsql/src/port/inet_aton.c,v 1.10 2007/03/26 21:44:11 momjian Exp $
22
*
33
* This inet_aton() function was taken from the GNU C library and
44
* incorporated into Postgres for those systems which do not have this
@@ -22,11 +22,7 @@
2222
* 2. Redistributions in binary form must reproduce the above copyright
2323
* notice, this list of conditions and the following disclaimer in the
2424
* documentation and/or other materials provided with the distribution.
25-
* 3. All advertising materials mentioning features or use of this software
26-
* must display the following acknowledgement:
27-
* This product includes software developed by the University of
28-
* California, Berkeley and its contributors.
29-
* 4. Neither the name of the University nor the names of its contributors
25+
* 3. Neither the name of the University nor the names of its contributors
3026
* may be used to endorse or promote products derived from this software
3127
* without specific prior written permission.
3228
*

src/port/snprintf.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
* 2. Redistributions in binary form must reproduce the above copyright
1212
* notice, this list of conditions and the following disclaimer in the
1313
* documentation and/or other materials provided with the distribution.
14-
* 3. All advertising materials mentioning features or use of this software
15-
* must display the following acknowledgement:
16-
* This product includes software developed by the University of
17-
* California, Berkeley and its contributors.
18-
* 4. Neither the name of the University nor the names of its contributors
14+
* 3. Neither the name of the University nor the names of its contributors
1915
* may be used to endorse or promote products derived from this software
2016
* without specific prior written permission.
2117
*
@@ -31,7 +27,7 @@
3127
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
3228
* SUCH DAMAGE.
3329
*
34-
* $PostgreSQL: pgsql/src/port/snprintf.c,v 1.33 2006/11/28 01:12:34 adunstan Exp $
30+
* $PostgreSQL: pgsql/src/port/snprintf.c,v 1.34 2007/03/26 21:44:11 momjian Exp $
3531
*/
3632

3733
#include "c.h"

src/port/strtol.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
* 2. Redistributions in binary form must reproduce the above copyright
1212
* notice, this list of conditions and the following disclaimer in the
1313
* documentation and/or other materials provided with the distribution.
14-
* 3. All advertising materials mentioning features or use of this software
15-
* must display the following acknowledgement:
16-
* This product includes software developed by the University of
17-
* California, Berkeley and its contributors.
18-
* 4. Neither the name of the University nor the names of its contributors
14+
* 3. Neither the name of the University nor the names of its contributors
1915
* may be used to endorse or promote products derived from this software
2016
* without specific prior written permission.
2117
*

src/port/strtoul.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
* 2. Redistributions in binary form must reproduce the above copyright
1111
* notice, this list of conditions and the following disclaimer in the
1212
* documentation and/or other materials provided with the distribution.
13-
* 3. All advertising materials mentioning features or use of this software
14-
* must display the following acknowledgement:
15-
* This product includes software developed by the University of
16-
* California, Berkeley and its contributors.
17-
* 4. Neither the name of the University nor the names of its contributors
13+
* 3. Neither the name of the University nor the names of its contributors
1814
* may be used to endorse or promote products derived from this software
1915
* without specific prior written permission.
2016
*

0 commit comments

Comments
 (0)