r28424 - in /trunk/libnet-ssh2-perl/debian/patches: fix-with-perl-5.10 series

ryan52-guest at users.alioth.debian.org ryan52-guest at users.alioth.debian.org
Sat Dec 20 00:44:17 UTC 2008


Author: ryan52-guest
Date: Sat Dec 20 00:44:14 2008
New Revision: 28424

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28424
Log:
add patch to make it work :)

Added:
    trunk/libnet-ssh2-perl/debian/patches/fix-with-perl-5.10
Modified:
    trunk/libnet-ssh2-perl/debian/patches/series

Added: trunk/libnet-ssh2-perl/debian/patches/fix-with-perl-5.10
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/debian/patches/fix-with-perl-5.10?rev=28424&op=file
==============================================================================
--- trunk/libnet-ssh2-perl/debian/patches/fix-with-perl-5.10 (added)
+++ trunk/libnet-ssh2-perl/debian/patches/fix-with-perl-5.10 Sat Dec 20 00:44:14 2008
@@ -1,0 +1,56 @@
+Patch from http://rt.cpan.org/Public/Bug/Display.html?id=36614
+Thanks RKITOVER!
+
+--- a/SSH2.xs
++++ b/SSH2.xs
+@@ -1006,7 +1006,7 @@
+                 debug("- [%d] = channel\n", i);
+                 pollfd[i].type = LIBSSH2_POLLFD_CHANNEL;
+                 pollfd[i].fd.channel =
+-                 ((SSH2_CHANNEL*)SvIVX(SvRV(*handle)))->channel;
++                 ((SSH2_CHANNEL*)SvIVX(GvSV((GV*)SvRV(*handle))))->channel;
+             } else if(strEQ(package, "Net::SSH2::Listener")) {
+                 debug("- [%d] = listener\n", i);
+                 pollfd[i].type = LIBSSH2_POLLFD_LISTENER;
+--- a/typemap
++++ b/typemap
+@@ -29,9 +29,9 @@
+     const char* name = form("_GEN_%ld", (long)net_ch_gensym++);
+     SvUPGRADE((SV*)gv, SVt_PVGV);
+     SvUPGRADE((SV*)io, SVt_PVIO);
+-    SvIVX(gv) = PTR2IV($var);
+     gv_init(gv, gv_stashpv("Net::SSH2::Channel", 0/*create*/),
+      name, strlen(name), 0/*multi*/);
++    GvSV(gv) = newSViv(PTR2IV($var));
+     GvIOp(gv) = io;
+     sv_magic((SV*)io, newRV((SV*)gv), PERL_MAGIC_tiedscalar, Nullch, 0);
+     }
+@@ -49,9 +49,9 @@
+     const char* name = form("_GEN_%ld", (long)net_fi_gensym++);
+     SvUPGRADE((SV*)gv, SVt_PVGV);
+     SvUPGRADE((SV*)io, SVt_PVIO);
+-    SvIVX(gv) = PTR2IV($var);
+     gv_init(gv, gv_stashpv("Net::SSH2::File", 0/*create*/),
+      name, strlen(name), 0/*multi*/);
++    GvSV(gv) = newSViv(PTR2IV($var));
+     GvIOp(gv) = io;
+     sv_magic((SV*)io, newRV((SV*)gv), PERL_MAGIC_tiedscalar, Nullch, 0);
+     }
+@@ -80,7 +80,7 @@
+ 
+ O_CHANNEL
+     if(sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVGV))
+-        $var = ($type)SvIVX((SV*)SvRV($arg));
++        $var = ($type)SvIVX(GvSV((GV*)SvRV($arg)));
+     else
+         croak(\"${Package}::$func_name() - invalid channel object\");
+ 
+@@ -98,7 +98,7 @@
+ 
+ O_FILE
+     if(sv_isobject($arg) && (SvTYPE(SvRV($arg)) == SVt_PVGV))
+-        $var = ($type)SvIVX((SV*)SvRV($arg));
++        $var = ($type)SvIVX(GvSV((GV*)SvRV($arg)));
+     else
+         croak(\"${Package}::$func_name() - invalid SFTP file object\");
+ 

Modified: trunk/libnet-ssh2-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnet-ssh2-perl/debian/patches/series?rev=28424&op=diff
==============================================================================
--- trunk/libnet-ssh2-perl/debian/patches/series (original)
+++ trunk/libnet-ssh2-perl/debian/patches/series Sat Dec 20 00:44:14 2008
@@ -1,0 +1,1 @@
+fix-with-perl-5.10




More information about the Pkg-perl-cvs-commits mailing list