From d526962f110cbdcb4ebeef1787e52360f0e746c4 Mon Sep 17 00:00:00 2001 From: "J. Konrad Tegtmeier-Rottach" Date: Fri, 15 Nov 2019 14:09:02 +0100 Subject: [PATCH] fix: cockroachdb has changed their license starting with v19.2 Note that old versions of cockroachdb (>3 years) automatically transition to Apache according to their new scheme, but this cannot be accurately reflected in the PKGBUILD. Some new licenses have also been added. I had not previously included these, so this commit fixes that issue, too. reported by @vasily ref: https://www.cockroachlabs.com/blog/oss-relicensing-cockroachdb/ --- .SRCINFO | 22 ++++++++++++++++------ PKGBUILD | 18 +++++++++++++----- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c3f6d93..8c95474 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,16 @@ pkgbase = cockroachdb-bin pkgdesc = An open source, survivable, strongly consistent, scale-out SQL database pkgver = 19.2.0 - pkgrel = 1 + pkgrel = 2 url = https://www.cockroachlabs.com/ arch = x86_64 - license = Apache license = BSD - license = custom:PostgreSQL + license = MIT + license = custom:BSL license = custom:CCL license = custom:LevelDB + license = custom:OFL + license = custom:PostgreSQL depends = glibc provides = cockroachdb conflicts = cockroachdb @@ -18,21 +20,29 @@ pkgbase = cockroachdb-bin source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/BSD-golang.txt source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/BSD-grpc.txt source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/BSD-vitess.txt - source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/LevelDB.txt + source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/BSL.txt source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/CCL.txt + source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/LevelDB.txt + source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/MIT-gofrs.txt + source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/OFL-inconsolata.txt + source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/OFL-lato.txt source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.0/licenses/PostgreSQL.txt source = cockroach.service source = cockroach.default source = cockroach.sysusers source = cockroach.tmpfiles sha256sums = f775545229b3f967cf8c07d5c3e86f039f7647eb96f7d09766179e4202744971 - sha256sums = 68040689c4342e0018adec3eb0fb1f2ae68aaeef918e7b4493518523381b7129 + sha256sums = 8a2fba9d26592ff3538f44c96d1b894ef44649058b4d04f3fda49518a9c4ae11 sha256sums = b3ef077aa9a0d4b697722de993fa83959f10910ae600de90bcdcdd49fafce371 sha256sums = 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 sha256sums = af1c246b8eb8b2d2ee3f1471247569d7f35cefff40e9b967d563622bb04c1e69 sha256sums = 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f - sha256sums = b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485 + sha256sums = aee63ff7287ef00a38e33db06c5a27e38443c23941c1266febe67804dd57697e sha256sums = 2cd6aceddb7240c6ef395f7d92e26de4da63f7700504f6ce47e2aab4e39a4122 + sha256sums = b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485 + sha256sums = 6932de4a7e8c7877f4d83b6e174d3331f229b1aba4c4490590c8894d0ddf914e + sha256sums = 38dabe8206e881aa2fd82d4bc58f09447499894e063678135084614fe3e9bfcb + sha256sums = 14b8609fd8281cb961730de7d3b2964dcc6e0e395e759b1422e52e39a0fdc6b2 sha256sums = b34067e89373e1a47367b454862f43061ad1680542b39b6d95ed29c354473e15 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index fbaa24c..88effb6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,11 +5,11 @@ pkgname=cockroachdb-bin conflicts=('cockroachdb') provides=('cockroachdb') pkgver=19.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open source, survivable, strongly consistent, scale-out SQL database" arch=('x86_64') url="https://www.cockroachlabs.com/" -license=('Apache' 'BSD' 'custom:PostgreSQL' 'custom:CCL' 'custom:LevelDB') +license=('BSD' 'MIT' 'custom:BSL' 'custom:CCL' 'custom:LevelDB' 'custom:OFL' 'custom:PostgreSQL') depends=('glibc') source=("https://binaries.cockroachdb.com/cockroach-v${pkgver}.linux-amd64.tgz" "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/LICENSE" @@ -17,21 +17,29 @@ source=("https://binaries.cockroachdb.com/cockroach-v${pkgver}.linux-amd64.tgz" "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/BSD-golang.txt" "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/BSD-grpc.txt" "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/BSD-vitess.txt" - "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/LevelDB.txt" + "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/BSL.txt" "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/CCL.txt" + "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/LevelDB.txt" + "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/MIT-gofrs.txt" + "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/OFL-inconsolata.txt" + "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/OFL-lato.txt" "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/PostgreSQL.txt" cockroach.service cockroach.default cockroach.sysusers cockroach.tmpfiles) sha256sums=('f775545229b3f967cf8c07d5c3e86f039f7647eb96f7d09766179e4202744971' - '68040689c4342e0018adec3eb0fb1f2ae68aaeef918e7b4493518523381b7129' + '8a2fba9d26592ff3538f44c96d1b894ef44649058b4d04f3fda49518a9c4ae11' 'b3ef077aa9a0d4b697722de993fa83959f10910ae600de90bcdcdd49fafce371' '2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067' 'af1c246b8eb8b2d2ee3f1471247569d7f35cefff40e9b967d563622bb04c1e69' '23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f' - 'b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485' + 'aee63ff7287ef00a38e33db06c5a27e38443c23941c1266febe67804dd57697e' '2cd6aceddb7240c6ef395f7d92e26de4da63f7700504f6ce47e2aab4e39a4122' + 'b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485' + '6932de4a7e8c7877f4d83b6e174d3331f229b1aba4c4490590c8894d0ddf914e' + '38dabe8206e881aa2fd82d4bc58f09447499894e063678135084614fe3e9bfcb' + '14b8609fd8281cb961730de7d3b2964dcc6e0e395e759b1422e52e39a0fdc6b2' 'b34067e89373e1a47367b454862f43061ad1680542b39b6d95ed29c354473e15' 'SKIP' 'SKIP'