zookeeper 1.4.3-java → 1.4.4-java

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.4.4 fix build under FreeBSD (h/t: stass)
+
+  * https://github.com/slyphon/zookeeper/pull/40 
+
 v1.4.3 fix build for ruby 2.0.0-rc2
 
   * https://github.com/slyphon/zookeeper/pull/34

data/ext/Rakefile

@@ -36,6 +36,7 @@ GENERATE_GVL_CODE_RB = 'generate_gvl_code.rb'
 
 file 'c' => TARBALL do
   sh "tar -zxf #{TARBALL}"
+  sh "patch -p0 < patch-zookeeper"
 end
 
 file GENERATE_GVL_CODE_RB => 'c'

data/ext/extconf.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 
 HERE = File.expand_path(File.dirname(__FILE__))
 BUNDLE = Dir.glob("zkc-*.tar.gz").first
+ZKPATCH = "patch-zookeeper"
 
 BUNDLE_PATH = File.join(HERE, 'c')
 
@@ -57,7 +58,7 @@ Dir.chdir(HERE) do
     puts "Building zkc."
 
     unless File.exists?('c')
-      puts(cmd = "tar xzf #{BUNDLE} 2>&1")
+      puts(cmd = "tar xzf #{BUNDLE} 2>&1 && patch -p0 < #{ZKPATCH} 2>&1")
       raise "'#{cmd}' failed" unless system(cmd)
     end
 

data/ext/patch-zookeeper

@@ -0,0 +1,24 @@
+--- c/src/zookeeper.c.orig	2013-04-22 16:20:14.000000000 -0700
++++ c/src/zookeeper.c	2013-04-22 16:21:36.000000000 -0700
+@@ -413,7 +413,9 @@
+ static int getaddrinfo_errno(int rc) { 
+     switch(rc) {
+     case EAI_NONAME:
++#ifdef EAI_NODATA
+     case EAI_NODATA:
++#endif
+         return ENOENT;
+     case EAI_MEMORY:
+         return ENOMEM;
+@@ -546,7 +548,11 @@
+             //EAI_BADFLAGS or EAI_ADDRFAMILY with AF_UNSPEC and 
+             // ai_flags as AI_ADDRCONFIG
+             if ((hints.ai_flags == AI_ADDRCONFIG) && 
++#ifdef EAI_ADDRFAMILY
+                 ((rc ==EAI_BADFLAGS) || (rc == EAI_ADDRFAMILY))) {
++#else
++                (rc ==EAI_BADFLAGS)) {
++#endif
+                 //reset ai_flags to null
+                 hints.ai_flags = 0;
+                 //retry getaddrinfo

data/lib/zookeeper/version.rb

@@ -1,4 +1,4 @@
 module Zookeeper
-  VERSION = '1.4.3'
+  VERSION = '1.4.4'
   DRIVER_VERSION = '3.3.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 4
-  - 3
-  version: 1.4.3
+  - 4
+  version: 1.4.4
 platform: java
 authors: 
 - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-19 00:00:00 Z
+date: 2013-04-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: slyphon-log4j
@@ -93,6 +93,7 @@ files:
 - ext/event_lib.h
 - ext/extconf.rb
 - ext/generate_gvl_code.rb
+- ext/patch-zookeeper
 - ext/zkc-3.3.5.tar.gz
 - ext/zkrb.c
 - ext/zkrb_wrapper.c