zookeeper 1.4.3-java → 1.4.4-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/CHANGELOG +4 -0
  2. data/ext/Rakefile +1 -0
  3. data/ext/extconf.rb +2 -1
  4. data/ext/patch-zookeeper +24 -0
  5. data/lib/zookeeper/version.rb +1 -1
  6. metadata +5 -4
data/CHANGELOG CHANGED
@@ -1,3 +1,7 @@
1
+ v1.4.4 fix build under FreeBSD (h/t: stass)
2
+
3
+ * https://github.com/slyphon/zookeeper/pull/40
4
+
1
5
  v1.4.3 fix build for ruby 2.0.0-rc2
2
6
 
3
7
  * https://github.com/slyphon/zookeeper/pull/34
data/ext/Rakefile CHANGED
@@ -36,6 +36,7 @@ GENERATE_GVL_CODE_RB = 'generate_gvl_code.rb'
36
36
 
37
37
  file 'c' => TARBALL do
38
38
  sh "tar -zxf #{TARBALL}"
39
+ sh "patch -p0 < patch-zookeeper"
39
40
  end
40
41
 
41
42
  file GENERATE_GVL_CODE_RB => 'c'
data/ext/extconf.rb CHANGED
@@ -4,6 +4,7 @@ require 'fileutils'
4
4
 
5
5
  HERE = File.expand_path(File.dirname(__FILE__))
6
6
  BUNDLE = Dir.glob("zkc-*.tar.gz").first
7
+ ZKPATCH = "patch-zookeeper"
7
8
 
8
9
  BUNDLE_PATH = File.join(HERE, 'c')
9
10
 
@@ -57,7 +58,7 @@ Dir.chdir(HERE) do
57
58
  puts "Building zkc."
58
59
 
59
60
  unless File.exists?('c')
60
- puts(cmd = "tar xzf #{BUNDLE} 2>&1")
61
+ puts(cmd = "tar xzf #{BUNDLE} 2>&1 && patch -p0 < #{ZKPATCH} 2>&1")
61
62
  raise "'#{cmd}' failed" unless system(cmd)
62
63
  end
63
64
 
data/ext/patch-zookeeper ADDED
@@ -0,0 +1,24 @@
1
+ --- c/src/zookeeper.c.orig 2013-04-22 16:20:14.000000000 -0700
2
+ +++ c/src/zookeeper.c 2013-04-22 16:21:36.000000000 -0700
3
+ @@ -413,7 +413,9 @@
4
+ static int getaddrinfo_errno(int rc) {
5
+ switch(rc) {
6
+ case EAI_NONAME:
7
+ +#ifdef EAI_NODATA
8
+ case EAI_NODATA:
9
+ +#endif
10
+ return ENOENT;
11
+ case EAI_MEMORY:
12
+ return ENOMEM;
13
+ @@ -546,7 +548,11 @@
14
+ //EAI_BADFLAGS or EAI_ADDRFAMILY with AF_UNSPEC and
15
+ // ai_flags as AI_ADDRCONFIG
16
+ if ((hints.ai_flags == AI_ADDRCONFIG) &&
17
+ +#ifdef EAI_ADDRFAMILY
18
+ ((rc ==EAI_BADFLAGS) || (rc == EAI_ADDRFAMILY))) {
19
+ +#else
20
+ + (rc ==EAI_BADFLAGS)) {
21
+ +#endif
22
+ //reset ai_flags to null
23
+ hints.ai_flags = 0;
24
+ //retry getaddrinfo
data/lib/zookeeper/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module Zookeeper
2
- VERSION = '1.4.3'
2
+ VERSION = '1.4.4'
3
3
  DRIVER_VERSION = '3.3.5'
4
4
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: zookeeper
3
3
  version: !ruby/object:Gem::Version
4
- hash: 1
4
+ hash: 15
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 4
9
- - 3
10
- version: 1.4.3
9
+ - 4
10
+ version: 1.4.4
11
11
  platform: java
12
12
  authors:
13
13
  - Phillip Pearson
@@ -20,7 +20,7 @@ autorequire:
20
20
  bindir: bin
21
21
  cert_chain: []
22
22
 
23
- date: 2013-02-19 00:00:00 Z
23
+ date: 2013-04-27 00:00:00 Z
24
24
  dependencies:
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: slyphon-log4j
@@ -93,6 +93,7 @@ files:
93
93
  - ext/event_lib.h
94
94
  - ext/extconf.rb
95
95
  - ext/generate_gvl_code.rb
96
+ - ext/patch-zookeeper
96
97
  - ext/zkc-3.3.5.tar.gz
97
98
  - ext/zkrb.c
98
99
  - ext/zkrb_wrapper.c