From 19cadabd914d1aee2cc12b4876203d8847ad15f6 Mon Sep 17 00:00:00 2001
From: "Ralf S. Engelschall" <rse@openpkg.org>
Date: Thu, 14 May 2020 00:07:36 +0200
Subject: [PATCH] upgrading package: cockroach 19.2.6 -> 20.1.0

---
 cockroach/cockroach.patch | 58 ++++++++++++++++-----------------------
 cockroach/cockroach.spec  |  4 +--
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/cockroach/cockroach.patch b/cockroach/cockroach.patch
index e38266c01c..c85d3af73b 100644
--- a/cockroach/cockroach.patch
+++ b/cockroach/cockroach.patch
@@ -1,30 +1,31 @@
 Index: src/github.com/cockroachdb/cockroach/Makefile
---- src/github.com/cockroachdb/cockroach/Makefile.orig	2019-11-12 05:46:11.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/Makefile	2019-11-13 07:32:06.075798000 +0100
-@@ -322,11 +322,6 @@
- 
+--- src/github.com/cockroachdb/cockroach/Makefile.orig	2020-05-05 01:44:00.000000000 +0200
++++ src/github.com/cockroachdb/cockroach/Makefile	2020-05-13 19:07:01.212575000 +0200
+@@ -40,8 +40,8 @@
+ 	@echo "NCPUS = $$({ getconf _NPROCESSORS_ONLN || sysctl -n hw.ncpu || nproc; } 2>/dev/null)" >> $@.tmp
+ 	@echo "UNAME = $$(uname)" >> $@.tmp
+ 	@echo "HOST_TRIPLE = $$($$($(GO) env CC) -dumpmachine)" >> $@.tmp
+-	@echo "GIT_DIR = $$(git rev-parse --git-dir 2>/dev/null)" >> $@.tmp
+-	@echo "GITHOOKSDIR = $$(test -d .git && echo '.git/hooks' || git rev-parse --git-path hooks)" >> $@.tmp
++	@echo "GIT_DIR = .git" >> $@.tmp
++	@echo "GITHOOKSDIR = .git/hooks" >> $@.tmp
+ 	@echo "have-defs = 1" >> $@.tmp
+ 	@set -e; \
+ 	if ! cmp -s $@.tmp $@; then \
+@@ -64,12 +64,6 @@
+ # checkout.
  .SECONDARY: bin/.submodules-initialized
  bin/.submodules-initialized:
--ifneq ($(GIT_DIR),)
--	git submodule update --init --recursive
--endif
+-	gitdir=$$(git rev-parse --git-dir 2>/dev/null || true); \
+-	if test -n "$$gitdir"; then \
+-	   git submodule update --init --recursive; \
+-	fi
 -	mkdir -p $(@D)
 -	touch $@
  
- IGNORE_GOVERS :=
- 
-@@ -755,8 +750,8 @@
- 	@echo "NCPUS = $$({ getconf _NPROCESSORS_ONLN || sysctl -n hw.ncpu || nproc; } 2>/dev/null)" >> $@
- 	@echo "UNAME = $$(uname)" >> $@
- 	@echo "HOST_TRIPLE = $$($$($(GO) env CC) -dumpmachine)" >> $@
--	@echo "GIT_DIR = $$(git rev-parse --git-dir 2>/dev/null)" >> $@
--	@echo "GITHOOKSDIR = $$(test -d .git && echo '.git/hooks' || git rev-parse --git-path hooks)" >> $@
-+	@echo "GIT_DIR = .git" >> $@
-+	@echo "GITHOOKSDIR = .git/hooks" >> $@
- 	@echo "have-defs = 1" >> $@
- 	$(if $(have-defs),$(info Detected change in build system. Rebooting Make.))
- 
-@@ -1123,10 +1118,10 @@
+ # If the user wants to persist customizations for some variables, they
+ # can do so by defining `customenv.mk` in their work tree.
+@@ -1143,10 +1137,10 @@
  # For details, see the "Possible timestamp problems with diff-files?" thread on
  # the Git mailing list (http://marc.info/?l=git&m=131687596307197).
  .buildinfo/tag: | .buildinfo
@@ -37,20 +38,9 @@ Index: src/github.com/cockroachdb/cockroach/Makefile
  
  ifneq ($(GIT_DIR),)
  # If we're in a Git checkout, we update the buildinfo information on every build
-Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
---- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig	2019-11-12 05:46:12.000000000 +0100
-+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go	2019-11-13 07:32:06.076237000 +0100
-@@ -51,6 +51,7 @@
- // #cgo LDFLAGS: -lprotobuf
- // #cgo LDFLAGS: -lrocksdb
- // #cgo LDFLAGS: -lsnappy
-+// #cgo LDFLAGS: -lstdc++
- // #cgo linux LDFLAGS: -lrt -lpthread
- // #cgo windows LDFLAGS: -lshlwapi -lrpcrt4
- //
 Index: src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go
---- src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go.orig	2019-11-13 07:32:06.076453000 +0100
-+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go	2019-11-13 07:33:44.560035000 +0100
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go.orig	2020-05-05 01:44:21.000000000 +0200
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go	2020-05-13 19:06:20.966970000 +0200
 @@ -25,11 +25,9 @@
  	common "github.com/knz/go-libedit/common"
  )
diff --git a/cockroach/cockroach.spec b/cockroach/cockroach.spec
index 4493db6e57..8b24b345a8 100644
--- a/cockroach/cockroach.spec
+++ b/cockroach/cockroach.spec
@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Database
 License:      Apache
-Version:      19.2.6
-Release:      20200415
+Version:      20.1.0
+Release:      20200514
 
 #   list of sources
 Source0:      https://binaries.cockroachdb.com/cockroach-v%{version}.src.tgz