ZOOKEEPER-471. update zkperl for 3.2.x branch (chris via mahadev)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@794932 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -10,6 +10,8 @@ BUGFIXES:
   ZOOKEEPER-469. make sure CPPUNIT_CFLAGS isn't overwritten (chris via
 mahadev)
 
+  ZOOKEEPER-471. update zkperl for 3.2.x branch (chris via mahadev)
+
 IMPROVEMENTS:
   ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
 "socket reuse" and failure to close client (phunt via mahadev)

src/contrib/zkperl/Changes

@@ -51,5 +51,11 @@ Revision history
         - initial documentation completed, first public release
 
 0.33  Apr 20, 2009
-	- copyright donated to ASF
+        - copyright donated to ASF
+
+0.34  Jul 14, 2009
+        - support ZooKeeper 3.2.0 release
+
+0.35  Jul 15, 2009
+        - support multiple include and library locations
 

src/contrib/zkperl/MANIFEST

@@ -20,3 +20,4 @@ t/40_basic.t
 t/45_class.t
 t/50_access.t
 t/60_watch.t
+t/util.pl

src/contrib/zkperl/Makefile.PL

@@ -22,22 +22,25 @@ use Config;
 use ExtUtils::MakeMaker;
 use Getopt::Long;
 
-my $zk_inc_path;
-my $zk_lib_path;
+my @zk_inc_paths;
+my @zk_lib_paths;
 
 GetOptions(
-    'zookeeper-include=s' => \$zk_inc_path,
-    'zookeeper-lib=s' => \$zk_lib_path
+    'zookeeper-include=s' => \@zk_inc_paths,
+    'zookeeper-lib=s' => \@zk_lib_paths
 );
 
-$zk_inc_path = defined($zk_inc_path) ? "-I$zk_inc_path " : '';
-$zk_lib_path = defined($zk_lib_path) ? "-L$zk_lib_path " : '';
+my $zk_inc_paths = join(' ', map("-I$_", @zk_inc_paths));
+my $zk_lib_paths = join(' ', map("-L$_", @zk_lib_paths));
+
+$zk_inc_paths .= ' ' unless ($zk_inc_paths eq '');
+$zk_lib_paths .= ' ' unless ($zk_lib_paths eq '');
 
 my $cc = $Config{'cc'};
 my $check_file = 'build/check_zk_version';
 
 my $check_out =
-    qx($cc -c $zk_inc_path -I. -c $check_file.c -o $check_file.o 2>&1);
+    qx($cc -c $zk_inc_paths -I. -c $check_file.c -o $check_file.o 2>&1);
 
 if ($?) {
     if ($check_out =~ /zookeeper_version\.h/) {
@@ -50,8 +53,8 @@ if ($?) {
 }
 
 WriteMakefile(
-    'INC'          => "$zk_inc_path-I.",
-    'LIBS'         => [ "$zk_lib_path-lzookeeper_mt" ],
+    'INC'          => "$zk_inc_paths-I.",
+    'LIBS'         => [ "$zk_lib_paths-lzookeeper_mt" ],
     'NAME'         => 'Net::ZooKeeper',
     'VERSION_FROM' => 'ZooKeeper.pm',
     'clean'        => { 'FILES' => 'build/check_zk_version.o' }

src/contrib/zkperl/README

@@ -42,12 +42,18 @@ DEPENDENCIES
 
 Version 3.1.1 of ZooKeeper is required at a minimum.
 
-You may also want to apply some of these additional patches to
-the ZooKeeper C API code:
+For version 3.1.1, you may also want to apply some of these
+additional patches to the ZooKeeper C API code:
 
 https://issues.apache.org/jira/browse/ZOOKEEPER-262
 https://issues.apache.org/jira/browse/ZOOKEEPER-318
 
+For version 3.1.1, you may also want to apply some of these
+additional patches to the ZooKeeper C API code:
+
+https://issues.apache.org/jira/browse/ZOOKEEPER-262
+https://issues.apache.org/jira/browse/ZOOKEEPER-466
+
 This module requires that the multi-threaded version of the
 ZooKeeper C API client library be available on your system.
 

src/contrib/zkperl/ZooKeeper.pm

@@ -26,7 +26,7 @@ package Net::ZooKeeper;
 require Exporter;
 require XSLoader;
 
-our $VERSION = '0.33';
+our $VERSION = '0.35';
 
 our @ISA = qw(Exporter);
 
@@ -299,8 +299,8 @@ array as the value of the C<'acl'> option to the C<create()> method,
 and may be updated by passing an ACL array to the C<set_acl()> method.
 
 When a client connects to a ZooKeeper cluster it is automatically
-assigned authentication credentials based on its IP address and
-hostname.  Additional authentication credentials may be added using
+assigned authentication credentials based on its IP address.
+Additional authentication credentials may be added using
 the C<add_auth()> method.  Once a credential has been added for
 the current session, there is no way to disable it.
 

src/contrib/zkperl/t/50_access.t

@@ -203,8 +203,8 @@ SKIP: {
 
         push @{$digest_acl}, {
             'perms'  => (ZOO_PERM_CREATE | ZOO_PERM_DELETE),
-            'scheme' => 'host',
-            'id'     => 'foo.bar.123'
+            'scheme' => 'ip',
+            'id'     => '0.0.0.0'
         };
 
         $ret = $zkh->set_acl($acl_node_path, $digest_acl);