diff --git a/cockroach/cockroach.patch b/cockroach/cockroach.patch index 6d03ebb369..400b9640b3 100644 --- a/cockroach/cockroach.patch +++ b/cockroach/cockroach.patch @@ -1,6 +1,6 @@ Index: src/github.com/cockroachdb/cockroach/Makefile ---- src/github.com/cockroachdb/cockroach/Makefile.orig 2018-08-13 19:50:07.000000000 +0200 -+++ src/github.com/cockroachdb/cockroach/Makefile 2018-08-14 11:10:05.939113000 +0200 +--- src/github.com/cockroachdb/cockroach/Makefile.orig 2018-10-01 15:51:18.000000000 +0200 ++++ src/github.com/cockroachdb/cockroach/Makefile 2018-10-01 21:13:56.487475000 +0200 @@ -706,7 +706,7 @@ $(COCKROACH) build go-install gotestdashi generate lint lintshort: $(C_LIBS_CCL) $(COCKROACH) build go-install generate: $(UI_ROOT)/distccl/bindata.go @@ -24,8 +24,8 @@ 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/c-deps/rocksdb/CMakeLists.txt ---- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/CMakeLists.txt.orig 2018-08-13 19:50:25.000000000 +0200 -+++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/CMakeLists.txt 2018-08-14 11:11:06.028994000 +0200 +--- src/github.com/cockroachdb/cockroach/c-deps/rocksdb/CMakeLists.txt.orig 2018-10-01 15:51:20.000000000 +0200 ++++ src/github.com/cockroachdb/cockroach/c-deps/rocksdb/CMakeLists.txt 2018-10-01 21:13:56.487799000 +0200 @@ -209,7 +209,7 @@ add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL) endif() @@ -36,8 +36,8 @@ Index: src/github.com/cockroachdb/cockroach/c-deps/rocksdb/CMakeLists.txt if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go ---- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2018-08-13 19:50:08.000000000 +0200 -+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2018-08-14 11:10:05.939493000 +0200 +--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go.orig 2018-10-01 15:51:18.000000000 +0200 ++++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go 2018-10-01 21:13:56.488310000 +0200 @@ -54,6 +54,7 @@ // #cgo LDFLAGS: -lprotobuf // #cgo LDFLAGS: -lrocksdb @@ -47,8 +47,8 @@ Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb.go // #cgo windows LDFLAGS: -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 2018-08-13 19:50:25.000000000 +0200 -+++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go 2018-08-14 11:10:05.939669000 +0200 +--- src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go.orig 2018-10-01 21:13:56.488623000 +0200 ++++ src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/unix/editline_unix.go 2018-10-01 21:21:01.685055000 +0200 @@ -12,11 +12,9 @@ "github.com/knz/go-libedit/unix/sigtramp" ) @@ -57,10 +57,10 @@ Index: src/github.com/cockroachdb/cockroach/vendor/github.com/knz/go-libedit/uni -// #cgo openbsd netbsd freebsd dragonfly darwin CPPFLAGS: -Ishim -// #cgo linux LDFLAGS: -lncurses -// #cgo linux CFLAGS: -Wno-unused-result --// #cgo linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build +-// #cgo linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build -D_GNU_SOURCE +// #cgo freebsd linux LDFLAGS: -lncurses +// #cgo freebsd linux CFLAGS: -Wno-unused-result -+// #cgo freebsd linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build ++// #cgo freebsd linux CPPFLAGS: -Isrc -Isrc/c-libedit -Isrc/c-libedit/editline -Isrc/c-libedit/linux-build -D_GNU_SOURCE // #cgo darwin CPPFLAGS: -D__darwin__=1 // // #include diff --git a/cockroach/cockroach.spec b/cockroach/cockroach.spec index eb2ac0085a..f1f1faf3bd 100644 --- a/cockroach/cockroach.spec +++ b/cockroach/cockroach.spec @@ -31,8 +31,8 @@ Distribution: OpenPKG Community Class: EVAL Group: Database License: Apache -Version: 2.0.5 -Release: 20180905 +Version: 2.0.6 +Release: 20181001 # list of sources Source0: https://binaries.cockroachdb.com/cockroach-v%{version}.src.tgz