From fda503385db4871b36a893044da4859b894758b5 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Fri, 23 Jun 2017 18:24:51 +0200 Subject: [PATCH 1/9] Initial revision --- _licenses/postgresql.txt | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 _licenses/postgresql.txt diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt new file mode 100644 index 0000000..9705e18 --- /dev/null +++ b/_licenses/postgresql.txt @@ -0,0 +1,50 @@ +--- +title: PostreSQL License +spdx-id: PostgreSQL +source: https://opensource.org/licenses/PostgreSQL +featured: false +hidden: true + +description: A very short, BSD-style license, used specifically for PostgreSQL. + +how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution. + +using: + - PostgreSQL: https://www.postgresql.org/about/licence/ + - PGAudit: https://github.com/pgaudit/pgaudit/blob/master/LICENSE + - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE.txt + +permissions: + - commercial-use + - modifications + - distribution + - private-use + +conditions: + - include-copyright + +limitations: + - liability + - warranty + +--- + +The PostgreSQL Licence (PostgreSQL) + +Copyright (c) [year] [organisation] + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose, without fee, and without a written agreement is +hereby granted, provided that the above copyright notice and this paragraph +and the following two paragraphs appear in all copies. + +IN NO EVENT SHALL [organisation] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, +SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING +OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [organisation] +HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +[organisation] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, +AND ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, +ENHANCEMENTS, OR MODIFICATIONS. From 8625394f3bf659bce9a1771bb97707429a170484 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Fri, 23 Jun 2017 18:30:16 +0200 Subject: [PATCH 2/9] Fix license name --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 9705e18..dff79ee 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -1,5 +1,5 @@ --- -title: PostreSQL License +title: PostgreSQL License spdx-id: PostgreSQL source: https://opensource.org/licenses/PostgreSQL featured: false From 82e4edbb60eebde8a0792a2bdbf1f320db5ff1b7 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Fri, 23 Jun 2017 18:36:26 +0200 Subject: [PATCH 3/9] Use allowed fileds --- _licenses/postgresql.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index dff79ee..f57fd21 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -31,19 +31,19 @@ limitations: The PostgreSQL Licence (PostgreSQL) -Copyright (c) [year] [organisation] +Copyright (c) [year] [fullname] Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies. -IN NO EVENT SHALL [organisation] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, +IN NO EVENT SHALL [fullname] BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING -OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [organisation] +OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF [fullname] HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -[organisation] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT +[fullname] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, From 2e6e50f00f207823ff52eecae50eb5cbcb9d06fe Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Sat, 24 Jun 2017 23:02:26 +0200 Subject: [PATCH 4/9] Provide examples compatible with license template --- _licenses/postgresql.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index f57fd21..6374556 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -10,8 +10,8 @@ description: A very short, BSD-style license, used specifically for PostgreSQL. how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution. using: - - PostgreSQL: https://www.postgresql.org/about/licence/ - - PGAudit: https://github.com/pgaudit/pgaudit/blob/master/LICENSE + - pgBadger: https://github.com/dalibo/pgbadger/blob/master/LICENSE + - pgAdmin: https://github.com/postgres/pgadmin4/blob/master/LICENSE - .NET Access to PostgreSQL: https://github.com/npgsql/npgsql/blob/dev/LICENSE.txt permissions: @@ -29,7 +29,7 @@ limitations: --- -The PostgreSQL Licence (PostgreSQL) +PostgreSQL Licence Copyright (c) [year] [fullname] From b8006f70d1230c2f303450eb9d5092b2222c4c44 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Sun, 25 Jun 2017 13:56:27 -0700 Subject: [PATCH 5/9] rm fields with default values --- _licenses/postgresql.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index 6374556..da677eb 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -2,8 +2,6 @@ title: PostgreSQL License spdx-id: PostgreSQL source: https://opensource.org/licenses/PostgreSQL -featured: false -hidden: true description: A very short, BSD-style license, used specifically for PostgreSQL. From 8d7d579c3aa5ebb2613d58daae40c997afc8d48e Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Mon, 26 Jun 2017 11:13:01 +0200 Subject: [PATCH 6/9] Add missing [fullname] field --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index da677eb..ca924ba 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -44,5 +44,5 @@ HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. [fullname] SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, -AND ORGANISATION HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, +AND [fullname] HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. From 4df304625c524e99e9e19900dd49c3765a9599a1 Mon Sep 17 00:00:00 2001 From: Damien Lecan Date: Mon, 26 Jun 2017 11:20:18 +0200 Subject: [PATCH 7/9] Update according to https://fedoraproject.org/wiki/Licensing/PostgreSQL_License --- _licenses/postgresql.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_licenses/postgresql.txt b/_licenses/postgresql.txt index ca924ba..67e90d7 100644 --- a/_licenses/postgresql.txt +++ b/_licenses/postgresql.txt @@ -29,7 +29,7 @@ limitations: PostgreSQL Licence -Copyright (c) [year] [fullname] +Copyright (c) [year], [fullname] Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is From 0647f1c760b9771911bd32de8d858fe7162b83da Mon Sep 17 00:00:00 2001 From: Rhys Bower Date: Thu, 20 Jul 2017 18:38:14 -0700 Subject: [PATCH 8/9] Switch Travis build badge to svg --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 999e90f..87c5bb6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Choosealicense.com -[![Build Status](https://travis-ci.org/github/choosealicense.com.png?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com) +[![Build Status](https://travis-ci.org/github/choosealicense.com.svg?branch=gh-pages)](https://travis-ci.org/github/choosealicense.com) Like a Choose Your Own Adventure site, but only much less interesting. From fe965f16f6f690d40a738e75a46fad3f41f5daa3 Mon Sep 17 00:00:00 2001 From: Ben Balter <282759+benbalter@users.noreply.github.com> Date: Tue, 25 Jul 2017 11:22:05 -0400 Subject: [PATCH 9/9] s/required/true --- _data/meta.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/meta.yml b/_data/meta.yml index 1668c04..6e6de7b 100644 --- a/_data/meta.yml +++ b/_data/meta.yml @@ -7,7 +7,7 @@ - name: spdx-id description: Short identifier specified by http://spdx.org/licenses/ - required: required + required: true - name: source description: The URL to the license source text