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

Commit b44e5fc

Browse files
committed
Sync pg_bsd_indent's copyright notices with Postgres practice.
To avoid confusion, make the copyright notices in these files match the 3-clause form of the BSD license, per the blanket policy update that UC Berkeley issued years ago. Discussion: https://postgr.es/m/3935719.1675967430@sss.pgh.pa.us Discussion: https://postgr.es/m/20230123011002.fzcaa3krql3mqsfn@awork3.anarazel.de
1 parent 4e831f4 commit b44e5fc

File tree

9 files changed

+45
-40
lines changed

9 files changed

+45
-40
lines changed

src/tools/pg_bsd_indent/README

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1+
The FreeBSD originals of the files in this directory bear the
2+
"4-clause" version of the BSD license. We have removed the
3+
"advertising" clauses, as per UC Berkeley's directive here:
4+
ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
5+
which reads:
6+
7+
July 22, 1999
8+
9+
To All Licensees, Distributors of Any Version of BSD:
10+
11+
As you know, certain of the Berkeley Software Distribution ("BSD") source
12+
code files require that further distributions of products containing all or
13+
portions of the software, acknowledge within their advertising materials
14+
that such products contain software developed by UC Berkeley and its
15+
contributors.
16+
17+
Specifically, the provision reads:
18+
19+
" * 3. All advertising materials mentioning features or use of this software
20+
* must display the following acknowledgement:
21+
* This product includes software developed by the University of
22+
* California, Berkeley and its contributors."
23+
24+
Effective immediately, licensees and distributors are no longer required to
25+
include the acknowledgement within advertising materials. Accordingly, the
26+
foregoing paragraph of those BSD Unix files containing it is hereby deleted
27+
in its entirety.
28+
29+
William Hoskins
30+
Director, Office of Technology Licensing
31+
University of California, Berkeley
32+
33+
----------
34+
35+
What follows is the README file as maintained by FreeBSD indent.
36+
37+
----------
138

239
$FreeBSD: head/usr.bin/indent/README 105244 2002-10-16 13:58:39Z charnier $
340

src/tools/pg_bsd_indent/args.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/tools/pg_bsd_indent/indent.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/tools/pg_bsd_indent/indent_codes.h

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/tools/pg_bsd_indent/indent_globs.h

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/tools/pg_bsd_indent/io.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/tools/pg_bsd_indent/lexi.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/tools/pg_bsd_indent/parse.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/tools/pg_bsd_indent/pr_comment.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
*

0 commit comments

Comments
 (0)