upgrading package: cockroach 1.1.7 -> 2.0.0

cockroach/cockroach-cert.sh

@@ -23,6 +23,7 @@ if [ ".$cmd" = .ca ]; then
     echo "-- generating: @l_prefix@/etc/cockroach/certs/ca.key"
     su - @l_rusr@ -c \
         "@l_prefix@/bin/cockroach cert create-ca \
+            --overwrite \
             --certs-dir=@l_prefix@/etc/cockroach/certs \
             --ca-key=@l_prefix@/etc/cockroach/certs/ca.key"
 elif [ ".$cmd" = .server ]; then
@@ -34,6 +35,7 @@ elif [ ".$cmd" = .server ]; then
     echo "-- generating: @l_prefix@/etc/cockroach/certs/node.key"
     su - @l_rusr@ -c \
         "@l_prefix@/bin/cockroach cert create-node \
+            --overwrite \
             --certs-dir=@l_prefix@/etc/cockroach/certs \
             --ca-key=@l_prefix@/etc/cockroach/certs/ca.key \
             $*"
@@ -48,6 +50,7 @@ elif [ ".$cmd" = .client ]; then
     echo "-- generating: @l_prefix@/etc/cockroach/certs/client.$username.key"
     su - @l_rusr@ -c \
         "@l_prefix@/bin/cockroach cert create-client \
+            --overwrite \
             --certs-dir=@l_prefix@/etc/cockroach/certs \
             --ca-key=@l_prefix@/etc/cockroach/certs/ca.key \
             $username $*"

cockroach/cockroach.patch

@@ -1,25 +1,12 @@
 Index: src/github.com/cockroachdb/cockroach/Makefile
---- src/github.com/cockroachdb/cockroach/Makefile.orig	2017-10-12 20:22:12.000000000 +0200
-+++ src/github.com/cockroachdb/cockroach/Makefile	2017-10-12 20:32:30.635711000 +0200
-@@ -157,7 +157,7 @@
- 
- $(COCKROACH) build go-install: $(C_LIBS_CCL)
- 
--$(COCKROACH) build buildoss: BUILDMODE = build -i -o $(COCKROACH)
-+$(COCKROACH) build buildoss: BUILDMODE = build -x -i -o $(COCKROACH)
- 
- # The build.utcTime format must remain in sync with TimeFormat in pkg/build/info.go.
- $(COCKROACH) build buildoss go-install check test testshort testrace bench: override LINKFLAGS += \
-@@ -361,13 +361,13 @@
+--- src/github.com/cockroachdb/cockroach/Makefile.orig	2018-02-15 10:30:01.505809000 +0100
++++ src/github.com/cockroachdb/cockroach/Makefile	2018-02-15 10:31:43.131470000 +0100
+@@ -907,10 +907,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
 -	@{ git describe --tags --dirty 2> /dev/null || git rev-parse --short HEAD; } | tr -d \\n > $@
-+	@echo "1.1.1" >$@
- 
- .buildinfo/basebranch: | .buildinfo
--	@git describe --tags --abbrev=0 | tr -d \\n > $@
-+	@echo "release-1.1" >$@
++	@echo "2.0.alpha" >$@
  
  .buildinfo/rev: | .buildinfo
 -	@git rev-parse HEAD > $@
@@ -27,30 +14,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/build/common.mk
---- src/github.com/cockroachdb/cockroach/build/common.mk.orig	2017-10-12 20:22:12.000000000 +0200
-+++ src/github.com/cockroachdb/cockroach/build/common.mk	2017-10-12 20:37:46.516897000 +0200
-@@ -402,7 +402,7 @@
- 	mkdir -p $(SNAPPY_DIR)
- 	@# NOTE: If you change the CMake flags below, bump the version in
- 	@# $(C_DEPS_DIR)/snappy-rebuild. See above for rationale.
--	cd $(SNAPPY_DIR) && cmake $(CMAKE_FLAGS) $(SNAPPY_SRC_DIR)
-+	cd $(SNAPPY_DIR) && cmake $(CMAKE_FLAGS) $(SNAPPY_SRC_DIR) -DCMAKE_CXX_FLAGS="$(CXX)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)"
- 
- $(LIBROACH_DIR)/Makefile: $(C_DEPS_DIR)/libroach-rebuild $(BOOTSTRAP_TARGET)
- 	rm -rf $(LIBROACH_DIR)
-@@ -434,7 +434,7 @@
- 
- .PHONY: librocksdb
- librocksdb: $(ROCKSDB_DIR)/Makefile
--	@$(MAKE) --no-print-directory -C $(ROCKSDB_DIR) rocksdb
-+	@$(MAKE) --no-print-directory -C $(ROCKSDB_DIR) rocksdb FORCE_GIT_SHA=0000
- 
- .PHONY: libroach
- libroach: $(LIBROACH_DIR)/Makefile
 Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go
---- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig	2017-10-12 20:22:13.000000000 +0200
-+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go	2017-10-12 20:32:30.636247000 +0200
+--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig	2018-02-15 10:26:02.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go	2018-02-15 10:30:01.506392000 +0100
 @@ -54,6 +54,7 @@
  // #cgo LDFLAGS: -lprotobuf
  // #cgo LDFLAGS: -lrocksdb

cockroach/cockroach.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Database
 License:      Apache
-Version:      1.1.7
-Release:      20180327
+Version:      2.0.0
+Release:      20180404
 
 #   list of sources
 Source0:      https://binaries.cockroachdb.com/cockroach-v%{version}.src.tgz
@@ -80,6 +80,7 @@ PreReq:       lzo, zlib
 
 %build
     #   build program
+    export HOME=`pwd`
     export GOPATH=`pwd`
     export CGO_CFLAGS="%{l_cflags} %{l_cppflags} -Wno-deprecated-declarations"
     export CGO_CXXFLAGS="%{l_cxxflags} %{l_cppflags} -Wno-deprecated-declarations"
@@ -93,7 +94,7 @@ PreReq:       lzo, zlib
     export LDFLAGS="%{l_ldflags}"
     export PATH="%{l_prefix}/lib/go19/bin:$PATH"
     cd src/github.com/cockroachdb/cockroach
-    %{l_make} %{l_mflags} build GOVERS=".*"
+    %{l_make} %{l_mflags} build IGNORE_GOVERS=1
 
     #   build manual pages
     ./cockroach gen man
@@ -189,9 +190,8 @@ PreReq:       lzo, zlib
           echo "    \$ vi $RPM_INSTALL_PREFIX/etc/cockroach/cockroach.conf"
           echo "    | host=<ipaddress>"
           echo "    | http-host=<ipaddress>"
-          echo "    \$ rm -f $RPM_INSTALL_PREFIX/etc/cockroach/node.{crt,key}"
           echo "    \$ $RPM_INSTALL_PREFIX/bin/cockroach-cert server <hostname> <ipaddress> [...]"
-          echo "    \$ $RPM_INSTALL_PREFIX/bin/openpkg rc cockroach stop"
+          echo "    \$ $RPM_INSTALL_PREFIX/bin/openpkg rc cockroach start"
           echo "Then you have to connect through the external IP address from now on:"
           echo "    \$ $RPM_INSTALL_PREFIX/bin/cockroach sql [--host=<ipaddress>]"
           echo ""