From 3431e093ccbab268bd2245efbb7e200851cd0c02 Mon Sep 17 00:00:00 2001
From: "J. Konrad Tegtmeier-Rottach" <jktr@0x16.de>
Date: Thu, 27 Dec 2018 15:09:12 +0100
Subject: [PATCH] bump to 2.1.3 (released on 2018-12-12)

ncurses is now compiled statically, so patching
it is no longer necessary as of 2.1.3.

I've skipped 2.1.1 and 2.1.2.
---
 .SRCINFO | 23 ++++++++++-------------
 PKGBUILD | 12 +++---------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index d9ef1c1..17f22b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = cockroachdb-bin
 	pkgdesc = An open source, survivable, strongly consistent, scale-out SQL database
-	pkgver = 2.1.0
+	pkgver = 2.1.3
 	pkgrel = 1
 	url = https://www.cockroachlabs.com/
 	arch = x86_64
@@ -8,25 +8,22 @@ pkgbase = cockroachdb-bin
 	license = BSD
 	license = custom:PostgreSQL
 	license = custom:CCL
-	makedepends = patchelf
 	depends = glibc
-	depends = ncurses
 	provides = cockroachdb
 	conflicts = cockroachdb
-	options = !strip
-	source = https://binaries.cockroachdb.com/cockroach-v2.1.0.linux-amd64.tgz
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.0/LICENSE
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.0/licenses/BSD-biogo.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.0/licenses/BSD-golang.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.0/licenses/BSD-grpc.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.0/licenses/BSD-vitess.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.0/licenses/CCL.txt
-	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.0/licenses/PostgreSQL.txt
+	source = https://binaries.cockroachdb.com/cockroach-v2.1.3.linux-amd64.tgz
+	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.3/LICENSE
+	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.3/licenses/BSD-biogo.txt
+	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.3/licenses/BSD-golang.txt
+	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.3/licenses/BSD-grpc.txt
+	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.3/licenses/BSD-vitess.txt
+	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.3/licenses/CCL.txt
+	source = https://raw.githubusercontent.com/cockroachdb/cockroach/v2.1.3/licenses/PostgreSQL.txt
 	source = cockroach.service
 	source = cockroach.default
 	source = cockroach.sysusers
 	source = cockroach.tmpfiles
-	sha256sums = cc51fa388908e7942d3f3214a38096756a981b9ce0f577307b3ae390b6a8e8b1
+	sha256sums = 01489f09f9372283a8be43e83357948833beb352940e1c8626b9d3302a8d2f51
 	sha256sums = 68040689c4342e0018adec3eb0fb1f2ae68aaeef918e7b4493518523381b7129
 	sha256sums = b3ef077aa9a0d4b697722de993fa83959f10910ae600de90bcdcdd49fafce371
 	sha256sums = 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067
diff --git a/PKGBUILD b/PKGBUILD
index d025801..c6b6c75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,15 +4,13 @@
 pkgname=cockroachdb-bin
 conflicts=('cockroachdb')
 provides=('cockroachdb')
-pkgver=2.1.0
+pkgver=2.1.3
 pkgrel=1
 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')
-depends=('glibc' 'ncurses')
-makedepends=('patchelf')
-options=('!strip') # XXX breaks the patched binary
+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"
@@ -25,7 +23,7 @@ source=("https://binaries.cockroachdb.com/cockroach-v${pkgver}.linux-amd64.tgz"
         cockroach.default
         cockroach.sysusers
         cockroach.tmpfiles)
-sha256sums=('cc51fa388908e7942d3f3214a38096756a981b9ce0f577307b3ae390b6a8e8b1'
+sha256sums=('01489f09f9372283a8be43e83357948833beb352940e1c8626b9d3302a8d2f51'
             '68040689c4342e0018adec3eb0fb1f2ae68aaeef918e7b4493518523381b7129'
             'b3ef077aa9a0d4b697722de993fa83959f10910ae600de90bcdcdd49fafce371'
             '2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067'
@@ -39,10 +37,6 @@ sha256sums=('cc51fa388908e7942d3f3214a38096756a981b9ce0f577307b3ae390b6a8e8b1'
             'SKIP')
 
 build() {
-    # XXX arch ships a newer, but compatible version of ncurses
-    patchelf --replace-needed libncurses.so.5 libncursesw.so.6 \
-             "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach"
-
     # generate bash completion
     "${srcdir}/cockroach-v${pkgver}.linux-amd64/cockroach" \
         gen autocomplete --out "${srcdir}/cockroach.bash"