Skip to content

Commit d25dc17

Browse files
committed
License: address review feedback on the rc2 fixes
Follow-up to the review of the previous commit: - README.apache.md: list the Greenplum-era companies as copyright holders, not as contributors under the Apache License 2.0. Metapa had become part of Greenplum long before Greenplum Database was released under the Apache License 2.0 in 2015. Put the list in date order. - LICENSE, Greenplum section: call the Metapa notice a legacy notice instead of an "older" one: its 2005 date is not older than the Greenplum notices around it. Leave the merger year out. Move the Apache License statement to the start of the section and point it to the top of this file rather than to "(see LICENSE)". With that statement first, the sentence saying the files are covered by the same license is no longer needed, so drop it, along with a stray second "All Rights Reserved." line. - LICENSE, BSD section: src/include/getopt_long.h and src/include/pg_getopt.h carry only a "Portions Copyright ... The Regents of the University of California" line, with no BSD license text. List them on their own as headers derived from BSD getopt. - LICENSE, build system section: list the top-level configure script, which carries the FSF's unlimited-permission notice, under the FSF All-Permissive License, and retitle the section to match. - pom.xml: config/ax_pthread.m4 is GPL-3.0-or-later with the Autoconf Macro exception, but its RAT exclude sat under a GPLv2 comment. Give it a comment of its own. Word the Metapa comment in the Greenplum license family the same way as LICENSE. Assisted-by: Claude Code
1 parent 42668b0 commit d25dc17

3 files changed

Lines changed: 34 additions & 26 deletions

File tree

‎LICENSE‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,7 @@ The PostgreSQL software includes:
244244
Code from the BSD C library, each file under its own University of
245245
California copyright notice and the 3-clause BSD terms (in some
246246
files the rescinded advertising clause is left as a numbered gap):
247-
src/include/getopt_long.h
248247
src/include/lib/sort_template.h
249-
src/include/pg_getopt.h
250248
src/port/bsearch_arg.c
251249
src/port/fls.c
252250
src/port/getopt.c
@@ -255,6 +253,13 @@ The PostgreSQL software includes:
255253
src/port/pgmkdirp.c
256254
see licenses/LICENSE-bsd3-regents.txt
257255

256+
Headers derived from BSD getopt, which carry only a "Portions
257+
Copyright (c) 1987, 1993, 1994 The Regents of the University of
258+
California" line:
259+
src/include/getopt_long.h
260+
src/include/pg_getopt.h
261+
see licenses/LICENSE-bsd3-regents.txt
262+
258263
MD5 and SHA-1 implementations from the KAME project:
259264
src/common/md5.c
260265
src/common/md5_int.h
@@ -481,26 +486,22 @@ Greenplum Database
481486

482487
Copyright (c) 2004-2020 VMware, Inc. or its affiliates. All Rights Reserved.
483488

484-
All Rights Reserved.
489+
Greenplum Database is licensed under the Apache License Version 2.0 (see
490+
the top of this file) and is based on the PostgreSQL Database Management
491+
System.
485492

486493
Files that came from Greenplum Database carry the copyright notice of
487494
whoever owned the code when they were written: Greenplum, Inc., EMC
488495
Corporation, Pivotal Software, VMware, Inc., or, for some ORCA query
489496
optimizer files added in 2024, "Copyright (C) 2024 Broadcom" or
490497
"Copyright (C) 2024 VMware by Broadcom". Three management scripts carry
491-
an older "Copyright (c) Metapa 2005" notice; Metapa merged with Didera in
492-
2003 to form Greenplum:
498+
a legacy "Copyright (c) Metapa 2005" notice; Metapa was one of the two
499+
companies that merged to form Greenplum:
493500

494501
gpMgmt/bin/gpinitsystem
495502
gpMgmt/bin/lib/gp_bash_functions.sh
496503
gpMgmt/bin/lib/gpcreateseg.sh
497504

498-
All of these files are part of Greenplum Database and are covered by the
499-
same license.
500-
501-
Greenplum Database is licensed under the Apache License Version 2.0
502-
(see LICENSE) and is based on the PostgreSQL Database Management System.
503-
504505
The Greenplum Database software includes:
505506

506507
----------------------------
@@ -714,15 +715,17 @@ Apache Cloudberry includes codes from
714715
contrib/pax_storage/src/cpp/contrib/tabulate/utils/amalgamate/LICENSE.md)
715716

716717
================================================================================
717-
Build system files under config/
718+
Build system files
718719

719-
These files come from the GNU Autotools (Autoconf, Automake and
720-
Libtool), pkg-config and the Autoconf Archive. The GPL-licensed ones
721-
carry an exception for use in configure scripts generated by Autoconf,
722-
which is the basis on which the ASF allows such build-tool files in its
723-
distributions (https://www.apache.org/legal/resolved.html#build-tools;
724-
see also LEGAL-290). Each file carries its full license notice, and the
725-
generated configure script includes expansions of these macros.
720+
The files under config/ come from the GNU Autotools (Autoconf, Automake
721+
and Libtool), pkg-config and the Autoconf Archive. The GPL-licensed
722+
ones carry an exception for use in configure scripts generated by
723+
Autoconf, which is the basis on which the ASF allows such build-tool
724+
files in its distributions
725+
(https://www.apache.org/legal/resolved.html#build-tools; see also
726+
LEGAL-290). Each file carries its full license notice. The top-level
727+
configure script is generated by Autoconf, includes expansions of these
728+
macros, and carries its own notice; it is listed below.
726729

727730
----------------------------
728731
GNU General Public License, with an exception for use in configure
@@ -757,6 +760,9 @@ generated configure script includes expansions of these macros.
757760
----------------------------
758761
FSF All-Permissive License
759762

763+
configure, generated by GNU Autoconf 2.69
764+
Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
765+
760766
Macros from the Autoconf Archive:
761767

762768
config/ax_compare_version.m4

‎README.apache.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ This file documents licensing clarifications and exceptions as part of ASF relea
2727

2828
This file is licensed under the GPL (Category X) and has been removed from the source tree to comply with ASF release policy.
2929

30-
## Historical Attribution Under Apache License 2.0
30+
## Historical Copyright Notices in Greenplum-based Code
3131

32-
The following entities have contributed to the Greenplum-based source code under the Apache License 2.0:
32+
Files that came from Greenplum Database carry the copyright notices of the companies that owned the code when it was written:
3333

34-
- Metapa (merged with Didera in 2003 to form Greenplum)
34+
- Metapa (one of the two companies that merged to form Greenplum)
3535
- Greenplum, Inc.
3636
- EMC Corporation
37-
- VMware, Inc.
3837
- Pivotal Software
38+
- VMware, Inc.
3939
- Broadcom Inc.
4040

41-
RAT matchers are used to classify their license headers accordingly.
41+
Greenplum Database was released under the Apache License 2.0 in 2015, and these files are distributed under that license. RAT matchers are used to classify their license headers accordingly.
4242

4343
## Compressed Files in Source
4444

‎pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,11 @@ code or new licensing patterns.
330330
<exclude>config/python.m4</exclude>
331331
<exclude>config/tcl.m4</exclude>
332332

333-
<!-- GPLv2-AUTOEXC -->
333+
<!-- GPLv2-or-later with the Autoconf exception -->
334334
<exclude>config/pkg.m4</exclude>
335335
<exclude>config/libtool.m4</exclude>
336+
337+
<!-- GPLv3-or-later with the Autoconf Macro exception -->
336338
<exclude>config/ax_pthread.m4</exclude>
337339

338340
<exclude>.abi-check/**</exclude>
@@ -2120,7 +2122,7 @@ code or new licensing patterns.
21202122
<pattern>Copyright (c) 2007 Greenplum Inc</pattern>
21212123
<pattern>Copyright (c) 2010, Greenplum Software</pattern>
21222124
<pattern>Copyright (c) Greenplum Inc 2010</pattern>
2123-
<!-- Metapa merged with Didera in 2003 to form Greenplum. -->
2125+
<!-- Metapa was one of the two companies that merged to form Greenplum. -->
21242126
<pattern>Copyright (c) Metapa 2005. All Rights Reserved.</pattern>
21252127
<pattern>Copyright Greenplum 2008</pattern>
21262128
</patterns>

0 commit comments

Comments
 (0)