upgrading package: cockroach 20161119 -> 20161127

cockroach/cockroach.patch

@@ -1,7 +1,114 @@
-Index: src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h
---- src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h.orig	2016-10-15 10:51:31.000000000 +0200
-+++ src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h	2016-10-15 11:11:14.279349610 +0200
-@@ -606,10 +606,7 @@
+Index: src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go
+--- src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go.orig	2016-11-27 12:13:10.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go	2016-11-27 12:21:20.407531382 +0100
+@@ -23,6 +23,7 @@
+ // #cgo linux CPPFLAGS: -I../../vendor/github.com/cockroachdb/c-jemalloc/linux_includes/internal/include
+ // #cgo darwin LDFLAGS: -Wl,-undefined -Wl,dynamic_lookup
+ // #cgo linux LDFLAGS: -Wl,-unresolved-symbols=ignore-all
++// #cgo freebsd LDFLAGS: -Wl,-unresolved-symbols=ignore-all
+ //
+ // #include <jemalloc/jemalloc.h>
+ // #include <stddef.h>
+Index: src/github.com/cockroachdb/cockroach/pkg/server/config.go
+--- src/github.com/cockroachdb/cockroach/pkg/server/config.go.orig	2016-11-27 12:13:10.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/pkg/server/config.go	2016-11-27 12:21:20.407531382 +0100
+@@ -248,7 +248,7 @@
+ 	}
+ 
+ 	// The max open file descriptor limit is too low.
+-	if rLimit.Max < minimumOpenFileLimit {
++	if uint64(rLimit.Max) < minimumOpenFileLimit {
+ 		return 0, fmt.Errorf("hard open file descriptor limit of %d is under the minimum required %d\n%s",
+ 			rLimit.Max,
+ 			minimumOpenFileLimit,
+@@ -257,24 +257,24 @@
+ 
+ 	// If current open file descriptor limit is higher than the recommended
+ 	// value, we can just use the default value.
+-	if rLimit.Cur > recommendedOpenFileLimit {
++	if uint64(rLimit.Cur) > recommendedOpenFileLimit {
+ 		return engine.DefaultMaxOpenFiles, nil
+ 	}
+ 
+ 	// If the current limit is less than the recommended limit, set the current
+ 	// limit to the minimum of the max limit or the recommendedOpenFileLimit.
+ 	var newCurrent uint64
+-	if rLimit.Max > recommendedOpenFileLimit {
++	if uint64(rLimit.Max) > recommendedOpenFileLimit {
+ 		newCurrent = recommendedOpenFileLimit
+ 	} else {
+-		newCurrent = rLimit.Max
++		newCurrent = uint64(rLimit.Max)
+ 	}
+-	if rLimit.Cur < newCurrent {
++	if uint64(rLimit.Cur) < newCurrent {
+ 		if log.V(1) {
+ 			log.Infof(context.TODO(), "setting the soft limit for open file descriptors from %d to %d",
+ 				rLimit.Cur, newCurrent)
+ 		}
+-		rLimit.Cur = newCurrent
++		rLimit.Cur = int64(newCurrent)
+ 		if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
+ 			return 0, err
+ 		}
+@@ -289,7 +289,7 @@
+ 	}
+ 
+ 	// The current open file descriptor limit is still too low.
+-	if rLimit.Cur < minimumOpenFileLimit {
++	if uint64(rLimit.Cur) < minimumOpenFileLimit {
+ 		return 0, fmt.Errorf("soft open file descriptor limit of %d is under the minimum required %d and cannot be increased\n%s",
+ 			rLimit.Cur,
+ 			minimumOpenFileLimit,
+@@ -297,7 +297,7 @@
+ 	}
+ 
+ 	// If we have the desired number, just use the default values.
+-	if rLimit.Cur >= recommendedOpenFileLimit {
++	if uint64(rLimit.Cur) >= recommendedOpenFileLimit {
+ 		return engine.DefaultMaxOpenFiles, nil
+ 	}
+ 
+@@ -316,7 +316,7 @@
+ 	// If we have more than enough file descriptors to hit the recommend number
+ 	// for each store, than only constrain the network ones by giving the stores
+ 	// their full recommended number.
+-	if rLimit.Cur >= networkConstrainedFileLimit {
++	if uint64(rLimit.Cur) >= networkConstrainedFileLimit {
+ 		return engine.DefaultMaxOpenFiles, nil
+ 	}
+ 
+Index: src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go
+--- src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go.orig	2016-11-27 12:13:10.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go	2016-11-27 12:21:20.407531382 +0100
+@@ -23,6 +23,7 @@
+ // #cgo linux CPPFLAGS: -I../../../vendor/github.com/cockroachdb/c-jemalloc/linux_includes/internal/include
+ // #cgo darwin LDFLAGS: -Wl,-undefined -Wl,dynamic_lookup
+ // #cgo linux LDFLAGS: -Wl,-unresolved-symbols=ignore-all
++// #cgo freebsd LDFLAGS: -Wl,-unresolved-symbols=ignore-all
+ //
+ // #include <jemalloc/jemalloc.h>
+ //
+Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb/db.cc
+--- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb/db.cc.orig	2016-11-27 12:13:10.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb/db.cc	2016-11-27 12:21:20.407531382 +0100
+@@ -1847,10 +1847,10 @@
+     (int64_t)s->getTickerCount(rocksdb::BLOOM_FILTER_PREFIX_USEFUL);
+   stats->memtable_hits = (int64_t)s->getTickerCount(rocksdb::MEMTABLE_HIT);
+   stats->memtable_misses = (int64_t)s->getTickerCount(rocksdb::MEMTABLE_MISS);
+-  stats->memtable_total_size = std::stoll(memtable_total_size);
++  stats->memtable_total_size = std::strtol(memtable_total_size.c_str(), NULL, 10);
+   stats->flushes = (int64_t)event_listener->GetFlushes();
+   stats->compactions = (int64_t)event_listener->GetCompactions();
+-  stats->table_readers_mem_estimate = std::stoll(table_readers_mem_estimate);
++  stats->table_readers_mem_estimate = std::strtol(table_readers_mem_estimate.c_str(), NULL, 10);
+   return kSuccess;
+ }
+ 
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h	2016-11-27 12:21:20.397573831 +0100
+@@ -613,10 +613,7 @@
        }
      }
  
@@ -13,9 +120,9 @@ Index: src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/map.h
      template<class NodeType, class... Args>
      void construct(NodeType* p, Args&&... args) {
        // Clang 3.6 doesn't compile static casting to void* directly. (Issue
-Index: src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathlimits.h
---- src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathlimits.h.orig	2016-10-15 10:51:31.000000000 +0200
-+++ src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathlimits.h	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathlimits.h
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathlimits.h.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathlimits.h	2016-11-27 12:21:20.397573831 +0100
 @@ -48,7 +48,7 @@
  // include <cmath> because that breaks the definition of isinf with gcc 4.9.
  //
@@ -42,9 +149,9 @@ Index: src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/
  #endif
  
  // We can't put floating-point constant values in the header here because
-Index: src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h
---- src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h.orig	2016-10-15 10:51:31.000000000 +0200
-+++ src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/mathutil.h	2016-11-27 12:21:20.397573831 +0100
 @@ -31,7 +31,7 @@
  #define GOOGLE_PROTOBUF_STUBS_MATHUTIL_H_
  
@@ -72,9 +179,9 @@ Index: src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/
  #endif
  }
  
-Index: src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h
---- src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h.orig	2016-10-15 10:51:31.000000000 +0200
-+++ src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/shared_ptr.h	2016-11-27 12:21:20.397573831 +0100
 @@ -50,7 +50,7 @@
  #define UTIL_GTL_USE_STD_SHARED_PTR 1
  #endif
@@ -84,9 +191,9 @@ Index: src/github.com/cockroachdb/c-protobuf/internal/src/google/protobuf/stubs/
  
  // These are transitional.  They will be going away soon.
  // Please just #include <memory> and just type std::shared_ptr yourself, instead
-Index: src/github.com/cockroachdb/c-rocksdb/cgo_flags.go
---- src/github.com/cockroachdb/c-rocksdb/cgo_flags.go.orig	2016-10-15 10:51:35.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/cgo_flags.go	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/cgo_flags.go
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/cgo_flags.go.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/cgo_flags.go	2016-11-27 12:21:20.397573831 +0100
 @@ -11,9 +11,7 @@
  // #cgo linux CPPFLAGS: -DOS_LINUX -fno-builtin-memcmp -DROCKSDB_FALLOCATE_PRESENT -DROCKSDB_MALLOC_USABLE_SIZE
  // #cgo freebsd CPPFLAGS: -DOS_FREEBSD
@@ -98,9 +205,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/cgo_flags.go
 -// #cgo dragonfly CXXFLAGS: -Wshorten-64-to-32
  // #cgo windows LDFLAGS: -lrpcrt4
  import "C"
-Index: src/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform
---- src/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform.orig	2016-10-15 10:52:24.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_platform	2016-11-27 12:21:20.397573831 +0100
 @@ -374,18 +374,6 @@
      fi
  fi
@@ -120,9 +227,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/build_tools/build_detect_pl
  # shall we use HDFS?
  
  if test "$USE_HDFS"; then
-Index: src/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh
---- src/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh.orig	2016-10-15 10:52:24.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.sh	2016-11-27 12:21:20.397573831 +0100
 @@ -126,7 +126,7 @@
  EXEC_LDFLAGS+=" $LIBUNWIND"
  EXEC_LDFLAGS+=" -Wl,-rpath=/usr/local/fbcode/gcc-4.9-glibc-2.20/lib"
@@ -132,9 +239,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/build_tools/fbcode_config.s
  
  EXEC_LDFLAGS_SHARED="$SNAPPY_LIBS $ZLIB_LIBS $BZIP_LIBS $LZ4_LIBS $ZSTD_LIBS $GFLAGS_LIBS"
  
-Index: src/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h
---- src/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h.orig	2016-10-15 10:52:24.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h	2016-11-27 12:21:20.397573831 +0100
 @@ -27,7 +27,7 @@
      #define PLATFORM_IS_LITTLE_ENDIAN \
          (__DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN)
@@ -153,9 +260,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/port/port_posix.h
    #include <sys/endian.h>
    #include <sys/types.h>
    #define PLATFORM_IS_LITTLE_ENDIAN (_BYTE_ORDER == _LITTLE_ENDIAN)
-Index: src/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc
---- src/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc.orig	2016-10-15 10:52:24.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc	2016-11-27 12:21:20.397573831 +0100
 @@ -52,6 +52,11 @@
  #include "util/thread_local.h"
  #include "util/thread_status_updater.h"
@@ -168,9 +275,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/util/env_posix.cc
  #if !defined(TMPFS_MAGIC)
  #define TMPFS_MAGIC 0x01021994
  #endif
-Index: src/github.com/cockroachdb/c-rocksdb/internal/util/options_builder.cc
---- src/github.com/cockroachdb/c-rocksdb/internal/util/options_builder.cc.orig	2016-10-15 10:52:24.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/util/options_builder.cc	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_builder.cc
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_builder.cc.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_builder.cc	2016-11-27 12:21:20.397573831 +0100
 @@ -26,7 +26,7 @@
    // Otherwise, calculate a score based on threshold and expected value of
    // two styles, weighing reads 4X important than writes.
@@ -191,9 +298,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/util/options_builder.cc
  
    int level0_stop_writes_trigger =
        read_amplification_threshold - expected_levels_one_level0_file;
-Index: src/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc
---- src/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc.orig	2016-10-15 10:52:24.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc	2016-11-27 12:21:20.397573831 +0100
 @@ -160,7 +160,7 @@
  
  uint64_t ParseUint64(const std::string& value) {
@@ -221,9 +328,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/util/options_helper.cc
    return std::stod(value);
  #else
    return std::strtod(value.c_str(), 0);
-Index: src/github.com/cockroachdb/c-rocksdb/internal/util/string_util.h
---- src/github.com/cockroachdb/c-rocksdb/internal/util/string_util.h.orig	2016-10-15 10:52:24.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/util/string_util.h	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/string_util.h
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/string_util.h.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/string_util.h	2016-11-27 12:21:20.397573831 +0100
 @@ -16,15 +16,9 @@
  
  template <typename T>
@@ -240,9 +347,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/util/string_util.h
  }
  
  }  // namespace rocksdb
-Index: src/github.com/cockroachdb/c-rocksdb/internal/util/thread_posix.cc
---- src/github.com/cockroachdb/c-rocksdb/internal/util/thread_posix.cc.orig	2016-10-15 10:52:24.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/util/thread_posix.cc	2016-10-15 11:11:14.289456621 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/thread_posix.cc
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/thread_posix.cc.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/thread_posix.cc	2016-11-27 12:21:20.397573831 +0100
 @@ -10,6 +10,7 @@
  #include "util/thread_posix.h"
  #include <atomic>
@@ -251,9 +358,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/util/thread_posix.cc
  #ifdef OS_LINUX
  #include <sys/syscall.h>
  #endif
-Index: src/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc
---- src/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc.orig	2016-10-15 10:51:35.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.cc	2016-11-27 12:21:20.407531382 +0100
 @@ -94,7 +94,7 @@
  
      if (s.ok()) {
@@ -272,9 +379,9 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/util/transaction_test_util.
        if (int_value == 0 || int_value == ULONG_MAX) {
          fprintf(stderr, "Iter returned unexpected value: %s\n",
                  value.ToString().c_str());
-Index: src/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc
---- src/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc.orig	2016-10-15 10:51:35.000000000 +0200
-+++ src/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc	2016-10-15 11:11:14.279349610 +0200
+Index: src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc
+--- src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc.orig	2016-11-27 12:13:18.000000000 +0100
++++ src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.cc	2016-11-27 12:21:20.407531382 +0100
 @@ -354,7 +354,7 @@
  
    // how many level of details to look for
@@ -293,110 +400,3 @@ Index: src/github.com/cockroachdb/c-rocksdb/internal/utilities/geodb/geodb_impl.
    double mapSize = MapSize(levelOfDetail);
    double X = std::floor(clip(x * mapSize + 0.5, 0, mapSize - 1));
    double Y = std::floor(clip(y * mapSize + 0.5, 0, mapSize - 1));
-Index: src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go
---- src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go.orig	2016-10-15 11:11:14.279349000 +0200
-+++ src/github.com/cockroachdb/cockroach/pkg/cli/start_jemalloc.go	2016-10-15 11:12:13.499401251 +0200
-@@ -23,6 +23,7 @@
- // #cgo linux CPPFLAGS: -I../../../c-jemalloc/linux_includes/internal/include
- // #cgo darwin LDFLAGS: -Wl,-undefined -Wl,dynamic_lookup
- // #cgo linux LDFLAGS: -Wl,-unresolved-symbols=ignore-all
-+// #cgo freebsd LDFLAGS: -Wl,-unresolved-symbols=ignore-all
- //
- // #include <jemalloc/jemalloc.h>
- // #include <stddef.h>
-Index: src/github.com/cockroachdb/cockroach/pkg/server/config.go
---- src/github.com/cockroachdb/cockroach/pkg/server/config.go.orig	2016-10-15 10:50:14.000000000 +0200
-+++ src/github.com/cockroachdb/cockroach/pkg/server/config.go	2016-10-15 11:11:14.279349610 +0200
-@@ -243,7 +243,7 @@
- 	}
- 
- 	// The max open file descriptor limit is too low.
--	if rLimit.Max < minimumOpenFileLimit {
-+	if uint64(rLimit.Max) < minimumOpenFileLimit {
- 		return 0, fmt.Errorf("hard open file descriptor limit of %d is under the minimum required %d\n%s",
- 			rLimit.Max,
- 			minimumOpenFileLimit,
-@@ -252,24 +252,24 @@
- 
- 	// If current open file descriptor limit is higher than the recommended
- 	// value, we can just use the default value.
--	if rLimit.Cur > recommendedOpenFileLimit {
-+	if uint64(rLimit.Cur) > recommendedOpenFileLimit {
- 		return engine.DefaultMaxOpenFiles, nil
- 	}
- 
- 	// If the current limit is less than the recommended limit, set the current
- 	// limit to the minimum of the max limit or the recommendedOpenFileLimit.
- 	var newCurrent uint64
--	if rLimit.Max > recommendedOpenFileLimit {
-+	if uint64(rLimit.Max) > recommendedOpenFileLimit {
- 		newCurrent = recommendedOpenFileLimit
- 	} else {
--		newCurrent = rLimit.Max
-+		newCurrent = uint64(rLimit.Max)
- 	}
--	if rLimit.Cur < newCurrent {
-+	if uint64(rLimit.Cur) < newCurrent {
- 		if log.V(1) {
- 			log.Infof(context.TODO(), "setting the soft limit for open file descriptors from %d to %d",
- 				rLimit.Cur, newCurrent)
- 		}
--		rLimit.Cur = newCurrent
-+		rLimit.Cur = int64(newCurrent)
- 		if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
- 			return 0, err
- 		}
-@@ -284,7 +284,7 @@
- 	}
- 
- 	// The current open file descriptor limit is still too low.
--	if rLimit.Cur < minimumOpenFileLimit {
-+	if uint64(rLimit.Cur) < minimumOpenFileLimit {
- 		return 0, fmt.Errorf("soft open file descriptor limit of %d is under the minimum required %d and cannot be increased\n%s",
- 			rLimit.Cur,
- 			minimumOpenFileLimit,
-@@ -292,7 +292,7 @@
- 	}
- 
- 	// If we have the desired number, just use the default values.
--	if rLimit.Cur >= recommendedOpenFileLimit {
-+	if uint64(rLimit.Cur) >= recommendedOpenFileLimit {
- 		return engine.DefaultMaxOpenFiles, nil
- 	}
- 
-@@ -311,7 +311,7 @@
- 	// If we have more than enough file descriptors to hit the recommend number
- 	// for each store, than only constrain the network ones by giving the stores
- 	// their full recommended number.
--	if rLimit.Cur >= networkConstrainedFileLimit {
-+	if uint64(rLimit.Cur) >= networkConstrainedFileLimit {
- 		return engine.DefaultMaxOpenFiles, nil
- 	}
- 
-Index: src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go
---- src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go.orig	2016-10-15 11:11:14.279349000 +0200
-+++ src/github.com/cockroachdb/cockroach/pkg/server/status/runtime_jemalloc.go	2016-10-15 11:12:31.309357963 +0200
-@@ -23,6 +23,7 @@
- // #cgo linux CPPFLAGS: -I../../../../c-jemalloc/linux_includes/internal/include
- // #cgo darwin LDFLAGS: -Wl,-undefined -Wl,dynamic_lookup
- // #cgo linux LDFLAGS: -Wl,-unresolved-symbols=ignore-all
-+// #cgo freebsd LDFLAGS: -Wl,-unresolved-symbols=ignore-all
- //
- // #include <jemalloc/jemalloc.h>
- //
-Index: src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb/db.cc
---- src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb/db.cc.orig	2016-10-15 10:50:14.000000000 +0200
-+++ src/github.com/cockroachdb/cockroach/pkg/storage/engine/rocksdb/db.cc	2016-10-15 11:11:14.279349610 +0200
-@@ -1730,10 +1730,10 @@
-     (int64_t)s->getTickerCount(rocksdb::BLOOM_FILTER_PREFIX_USEFUL);
-   stats->memtable_hits = (int64_t)s->getTickerCount(rocksdb::MEMTABLE_HIT);
-   stats->memtable_misses = (int64_t)s->getTickerCount(rocksdb::MEMTABLE_MISS);
--  stats->memtable_total_size = std::stoll(memtable_total_size);
-+  stats->memtable_total_size = std::strtol(memtable_total_size.c_str(), NULL, 10);
-   stats->flushes = (int64_t)event_listener->GetFlushes();
-   stats->compactions = (int64_t)event_listener->GetCompactions();
--  stats->table_readers_mem_estimate = std::stoll(table_readers_mem_estimate);
-+  stats->table_readers_mem_estimate = std::strtol(table_readers_mem_estimate.c_str(), NULL, 10);
-   return kSuccess;
- }
- 

cockroach/cockroach.spec

@@ -22,8 +22,8 @@
 ##
 
 #   package version
-%define       V_cockroach_base 20161119
-%define       V_cockroach_snap 20161119
+%define       V_cockroach_base 20161127
+%define       V_cockroach_snap 20161127
 
 #   package information
 Name:         cockroach
@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Network
 License:      Apache
 Version:      %{V_cockroach_base}
-Release:      20161119
+Release:      20161127
 
 #   list of sources
 Source0:      http://download.openpkg.org/components/versioned/cockroach/cockroach-%{V_cockroach_snap}.tar.xz
@@ -82,7 +82,7 @@ PreReq:       OpenPKG, openpkg >= 20160101
 
 %build
     #   bootstrap jemalloc
-    (   cd src/github.com/cockroachdb/c-jemalloc/internal
+    (   cd src/github.com/cockroachdb/cockroach/vendor/github.com/cockroachdb/c-jemalloc/internal
         sh autogen.sh
     ) || exit $?