Update to 19.2.5

2 files changed, 35 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a6f86a130d2..c80c8817d88c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,53 +1,27 @@
 pkgbase = cockroachdb-bin
 	pkgdesc = An open source, survivable, strongly consistent, scale-out SQL database
-	pkgver = 19.2.2
+	pkgver = 19.2.5
 	pkgrel = 1
 	url = https://www.cockroachlabs.com/
 	arch = x86_64
-	license = BSD
-	license = MIT
+	license = Apache 2.0
 	license = custom:BSL
 	license = custom:CCL
-	license = custom:LevelDB
-	license = custom:OFL
-	license = custom:PostgreSQL
 	depends = glibc
 	provides = cockroachdb
 	conflicts = cockroachdb
-	source = https://binaries.cockroachdb.com/cockroach-v19.2.2.linux-amd64.tgz
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/LICENSE
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/BSD-biogo.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/BSD-golang.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/BSD-grpc.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/BSD-vitess.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/BSL.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/CCL.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/LevelDB.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/MIT-gofrs.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/OFL-inconsolata.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/OFL-lato.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.2/licenses/PostgreSQL.txt
+	source = https://binaries.cockroachdb.com/cockroach-v19.2.5.linux-amd64.tgz
+	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v19.2.5/LICENSE
 	source = cockroach.service
 	source = cockroach.default
 	source = cockroach.sysusers
 	source = cockroach.tmpfiles
-	sha256sums = e167471ca1010cb29d34be1bb5405825d4b1c4110ee92318576ae46e92fa4db7
-	sha256sums = 8a2fba9d26592ff3538f44c96d1b894ef44649058b4d04f3fda49518a9c4ae11
-	sha256sums = b3ef077aa9a0d4b697722de993fa83959f10910ae600de90bcdcdd49fafce371
-	sha256sums = 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067
-	sha256sums = af1c246b8eb8b2d2ee3f1471247569d7f35cefff40e9b967d563622bb04c1e69
-	sha256sums = 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f
-	sha256sums = aee63ff7287ef00a38e33db06c5a27e38443c23941c1266febe67804dd57697e
-	sha256sums = 2cd6aceddb7240c6ef395f7d92e26de4da63f7700504f6ce47e2aab4e39a4122
-	sha256sums = b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485
-	sha256sums = 6932de4a7e8c7877f4d83b6e174d3331f229b1aba4c4490590c8894d0ddf914e
-	sha256sums = 38dabe8206e881aa2fd82d4bc58f09447499894e063678135084614fe3e9bfcb
-	sha256sums = 14b8609fd8281cb961730de7d3b2964dcc6e0e395e759b1422e52e39a0fdc6b2
-	sha256sums = b34067e89373e1a47367b454862f43061ad1680542b39b6d95ed29c354473e15
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	md5sums = 0e2c326a216a6a370135f8e274cfccdb
+	md5sums = 3fc7209c0a232ac26a7bd96c3d74d0d8
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = cockroachdb-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index cb0b93936e4b..0ff7177931e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,40 @@
-# Maintainer: Konrad Tegtmeier <konrad.tegtmeier+aur@gmail.com>
+# Maintainer:  Dimitris Kiziridis <ragouel at outlook dot com>
+# Contributor: Konrad Tegtmeier <konrad.tegtmeier+aur@gmail.com>
 # Contributor: Marcel O'Neil <marcel@marceloneil.com>
 
 pkgname=cockroachdb-bin
 conflicts=('cockroachdb')
 provides=('cockroachdb')
-pkgver=19.2.2
+pkgver=19.2.5
 pkgrel=1
 pkgdesc="An open source, survivable, strongly consistent, scale-out SQL database"
 arch=('x86_64')
 url="https://www.cockroachlabs.com/"
-license=('BSD' 'MIT' 'custom:BSL' 'custom:CCL' 'custom:LevelDB' 'custom:OFL' 'custom:PostgreSQL')
+license=('Apache 2.0' 'custom:BSL' 'custom:CCL')
 depends=('glibc')
 source=("https://binaries.cockroachdb.com/cockroach-v${pkgver}.linux-amd64.tgz"
         "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/LICENSE"
-        "https://raw.githubusercontent.com/cockroachdb/cockroach/v${pkgver}/licenses/BSD-biogo.txt"
-        "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/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=('e167471ca1010cb29d34be1bb5405825d4b1c4110ee92318576ae46e92fa4db7'
-            '8a2fba9d26592ff3538f44c96d1b894ef44649058b4d04f3fda49518a9c4ae11'
-            'b3ef077aa9a0d4b697722de993fa83959f10910ae600de90bcdcdd49fafce371'
-            '2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067'
-            'af1c246b8eb8b2d2ee3f1471247569d7f35cefff40e9b967d563622bb04c1e69'
-            '23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f'
-            'aee63ff7287ef00a38e33db06c5a27e38443c23941c1266febe67804dd57697e'
-            '2cd6aceddb7240c6ef395f7d92e26de4da63f7700504f6ce47e2aab4e39a4122'
-            'b568f1f37a5a1d37a3e981e7c8b7fc4856ca33b2ca0a45bc8e847aaaf7afe485'
-            '6932de4a7e8c7877f4d83b6e174d3331f229b1aba4c4490590c8894d0ddf914e'
-            '38dabe8206e881aa2fd82d4bc58f09447499894e063678135084614fe3e9bfcb'
-            '14b8609fd8281cb961730de7d3b2964dcc6e0e395e759b1422e52e39a0fdc6b2'
-            'b34067e89373e1a47367b454862f43061ad1680542b39b6d95ed29c354473e15'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP')
-
-build() {
-    # generate shell completion
-    "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
-        gen autocomplete bash --out "${srcdir}/cockroach.bash"
-    "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
-        gen autocomplete zsh --out "${srcdir}/cockroach.zsh"
-
-    # generate man pages
-    "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
-        gen man --path "${srcdir}/man"
-}
+        'cockroach.service'
+        'cockroach.default'
+        'cockroach.sysusers'
+        'cockroach.tmpfiles')
+md5sums=('0e2c326a216a6a370135f8e274cfccdb'
+         '3fc7209c0a232ac26a7bd96c3d74d0d8'
+         'SKIP'
+         'SKIP'
+         'SKIP'
+         'SKIP')
 
 package() {
+  # generate shell completion
+  "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
+  gen autocomplete bash --out "${srcdir}/cockroach.bash"
+  "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
+  gen autocomplete zsh --out "${srcdir}/cockroach.zsh"
+
+  # generate man pages
+  "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
+  gen man --path "${srcdir}/man"
 
   # binary
   install -Dm755 "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" "${pkgdir}/usr/bin/cockroach"
@@ -80,12 +56,5 @@ package() {
   install -Dm644 cockroach.zsh  "${pkgdir}/usr/share/zsh/site-functions/_cockroach"
 
   # licenses
-  install -Dm644 "${srcdir}/LICENSE"        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -Dm644 "${srcdir}/BSD-biogo.txt"  "${pkgdir}/usr/share/licenses/${pkgname}/BSD-biogo.txt"
-  install -Dm644 "${srcdir}/BSD-golang.txt" "${pkgdir}/usr/share/licenses/${pkgname}/BSD-golang.txt"
-  install -Dm644 "${srcdir}/BSD-grpc.txt"   "${pkgdir}/usr/share/licenses/${pkgname}/BSD-grpc.txt"
-  install -Dm644 "${srcdir}/BSD-vitess.txt" "${pkgdir}/usr/share/licenses/${pkgname}/BSD-vitess.txt"
-  install -Dm644 "${srcdir}/BSD-vitess.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LevelDB.txt"
-  install -Dm644 "${srcdir}/CCL.txt"        "${pkgdir}/usr/share/licenses/${pkgname}/CCL.txt"
-  install -Dm644 "${srcdir}/PostgreSQL.txt" "${pkgdir}/usr/share/licenses/${pkgname}/PostgreSQL.txt"
-}
+  install -Dm644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/cockroachdb/LICENSE"
+}
\ No newline at end of file