zookeeper 1.4.8-java → 1.4.9-java

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MzdjNmI0ZTBiZmQzOTRkYTRlZjEzZThmZWU2ZDZjYzY1NjA5ZDYzZg==
+  data.tar.gz: !binary |-
+    YjA1NTJjN2IxOTQxNDExNTdkMmI0NjY0YjFiMDAzNjI5YzIwNmUyZA==
+SHA512:
+  metadata.gz: !binary |-
+    NzIwODQyNTMwN2VjZWY4ZGRmZDk3MTA3YWNlMDQwZjUwYzI5YjZjNjIzZTM5
+    MjcwMGIyYjk1Y2Q3ZTVkYWI4ODQ4ZTM3NDA5ZTExYTZhMzU4ZDE3N2E3ZGRj
+    ODg1YThiNDNkZGNjY2RjZDRjNjg2Njg1N2MyMDg0MGE3YmZjZWU=
+  data.tar.gz: !binary |-
+    N2M1MjVkZmMwYzAxYjljOTJiMGU5ODNiZTJjZmVmZjJjNmJmMGE5OGIxYTM5
+    MTllZjEzNTRiZGJkMjdiZTFkNTI2MzIwMzg1YmMwZjY4NDBhYzUxYWMyOTU2
+    MDJmZTM0MTVhZTM1NTYxNTIwNWQwNWQ5NDYxNTg4MGUzYzBmOTk=

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.4.9
+
+  * Fix for build on OS-X 10.10 by @e0en
+
 v1.4.8
 
   * Fix deadlock related to state checks that can happen during reconnecting

data/ext/patches/zkc-3.4.5-yosemite-htonl-fix.patch

@@ -0,0 +1,102 @@
+diff -ur zkc-3.4.5-orig/c/include/recordio.h zkc-3.4.5/c/include/recordio.h
+--- zkc-3.4.5-orig/c/include/recordio.h	2012-09-30 13:53:32.000000000 -0400
++++ zkc-3.4.5/c/include/recordio.h	2014-07-29 03:13:27.000000000 -0400
+@@ -73,7 +73,7 @@
+ char *get_buffer(struct oarchive *);
+ int get_buffer_len(struct oarchive *);
+ 
+-int64_t htonll(int64_t v);
++int64_t zk_htonll(int64_t v);
+ 
+ #ifdef __cplusplus
+ }
+diff -ur zkc-3.4.5-orig/c/src/recordio.c zkc-3.4.5/c/src/recordio.c
+--- zkc-3.4.5-orig/c/src/recordio.c	2012-09-30 13:53:32.000000000 -0400
++++ zkc-3.4.5/c/src/recordio.c	2014-07-29 03:13:35.000000000 -0400
+@@ -80,7 +80,7 @@
+     priv->off+=sizeof(i);
+     return 0;
+ }
+-int64_t htonll(int64_t v)
++int64_t zk_htonll(int64_t v)
+ {
+     int i = 0;
+     char *s = (char *)&v;
+@@ -98,7 +98,7 @@
+ 
+ int oa_serialize_long(struct oarchive *oa, const char *tag, const int64_t *d)
+ {
+-    const int64_t i = htonll(*d);
++    const int64_t i = zk_htonll(*d);
+     struct buff_struct *priv = oa->priv;
+     if ((priv->len - priv->off) < sizeof(i)) {
+         int rc = resize_buffer(priv, priv->len + sizeof(i));
+@@ -207,7 +207,7 @@
+     }
+     memcpy(count, priv->buffer+priv->off, sizeof(*count));
+     priv->off+=sizeof(*count);
+-    v = htonll(*count); // htonll and  ntohll do the same
++    v = zk_htonll(*count); // zk_htonll and  ntohll do the same
+     *count = v;
+     return 0;
+ }
+diff -ur zkc-3.4.5-orig/c/src/zookeeper.c zkc-3.4.5/c/src/zookeeper.c
+--- zkc-3.4.5-orig/c/src/zookeeper.c	2012-09-30 13:53:32.000000000 -0400
++++ zkc-3.4.5/c/src/zookeeper.c	2014-07-29 03:13:45.000000000 -0400
+@@ -1408,7 +1408,7 @@
+     memcpy(buffer + offset, &req->protocolVersion, sizeof(req->protocolVersion));
+     offset = offset +  sizeof(req->protocolVersion);
+ 
+-    req->lastZxidSeen = htonll(req->lastZxidSeen);
++    req->lastZxidSeen = zk_htonll(req->lastZxidSeen);
+     memcpy(buffer + offset, &req->lastZxidSeen, sizeof(req->lastZxidSeen));
+     offset = offset +  sizeof(req->lastZxidSeen);
+ 
+@@ -1416,7 +1416,7 @@
+     memcpy(buffer + offset, &req->timeOut, sizeof(req->timeOut));
+     offset = offset +  sizeof(req->timeOut);
+ 
+-    req->sessionId = htonll(req->sessionId);
++    req->sessionId = zk_htonll(req->sessionId);
+     memcpy(buffer + offset, &req->sessionId, sizeof(req->sessionId));
+     offset = offset +  sizeof(req->sessionId);
+ 
+@@ -1447,7 +1447,7 @@
+      memcpy(&req->sessionId, buffer + offset, sizeof(req->sessionId));
+      offset = offset +  sizeof(req->sessionId);
+ 
+-     req->sessionId = htonll(req->sessionId);
++     req->sessionId = zk_htonll(req->sessionId);
+      memcpy(&req->passwd_len, buffer + offset, sizeof(req->passwd_len));
+      offset = offset +  sizeof(req->passwd_len);
+ 
+diff -ur zkc-3.4.5-orig/c/tests/ZKMocks.cc zkc-3.4.5/c/tests/ZKMocks.cc
+--- zkc-3.4.5-orig/c/tests/ZKMocks.cc	2012-09-30 13:53:32.000000000 -0400
++++ zkc-3.4.5/c/tests/ZKMocks.cc	2014-07-29 03:13:59.000000000 -0400
+@@ -41,7 +41,7 @@
+     int offset=sizeof(req->protocolVersion);
+     
+     memcpy(&req->lastZxidSeen,buf.data()+offset,sizeof(req->lastZxidSeen));
+-    req->lastZxidSeen = htonll(req->lastZxidSeen);
++    req->lastZxidSeen = zk_htonll(req->lastZxidSeen);
+     offset+=sizeof(req->lastZxidSeen);
+     
+     memcpy(&req->timeOut,buf.data()+offset,sizeof(req->timeOut));
+@@ -49,7 +49,7 @@
+     offset+=sizeof(req->timeOut);
+     
+     memcpy(&req->sessionId,buf.data()+offset,sizeof(req->sessionId));
+-    req->sessionId = htonll(req->sessionId);
++    req->sessionId = zk_htonll(req->sessionId);
+     offset+=sizeof(req->sessionId);
+     
+     memcpy(&req->passwd_len,buf.data()+offset,sizeof(req->passwd_len));
+@@ -322,7 +322,7 @@
+     buf.append((char*)&tmp,sizeof(tmp));
+     tmp=htonl(timeOut);
+     buf.append((char*)&tmp,sizeof(tmp));
+-    int64_t tmp64=htonll(sessionId);
++    int64_t tmp64=zk_htonll(sessionId);
+     buf.append((char*)&tmp64,sizeof(sessionId));
+     tmp=htonl(passwd_len);
+     buf.append((char*)&tmp,sizeof(tmp));

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.4.8'
+  VERSION = '1.4.9'
   DRIVER_VERSION = '3.4.5'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zookeeper
 version: !ruby/object:Gem::Version
-  version: 1.4.8
-  prerelease: 
+  version: 1.4.9
 platform: java
 authors:
 - Phillip Pearson
@@ -14,12 +13,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slyphon-log4j
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -27,7 +25,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -35,7 +32,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: slyphon-zookeeper_jar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -43,7 +39,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -93,6 +88,7 @@ files:
 - ext/generate_gvl_code.rb
 - ext/patches/zkc-3.3.5-network.patch
 - ext/patches/zkc-3.4.5-logging.patch
+- ext/patches/zkc-3.4.5-yosemite-htonl-fix.patch
 - ext/zkc-3.4.5.tar.gz
 - ext/zkrb.c
 - ext/zkrb_wrapper.c
@@ -147,28 +143,27 @@ files:
 - zoomonkey/zoomonkey.rb
 homepage: https://github.com/slyphon/zookeeper
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - java
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Apache ZooKeeper driver for Rubies
 test_files:
 - spec/c_zookeeper_spec.rb