r50554 - in /trunk/libxml-stream-perl/debian: changelog patches/gssapi.patch patches/resolver.patch patches/series
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Jan 9 17:34:52 UTC 2010
Author: jawnsy-guest
Date: Sat Jan 9 17:34:45 2010
New Revision: 50554
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50554
Log:
* Remove resolver.patch, applied upstream
* Refresh parts of gssapi.patch not applied upstream
Removed:
trunk/libxml-stream-perl/debian/patches/resolver.patch
Modified:
trunk/libxml-stream-perl/debian/changelog
trunk/libxml-stream-perl/debian/patches/gssapi.patch
trunk/libxml-stream-perl/debian/patches/series
Modified: trunk/libxml-stream-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/changelog?rev=50554&op=diff
==============================================================================
--- trunk/libxml-stream-perl/debian/changelog (original)
+++ trunk/libxml-stream-perl/debian/changelog Sat Jan 9 17:34:45 2010
@@ -2,6 +2,8 @@
* New upstream release
* Update copyright information and clauses
+ * Remove resolver.patch, applied upstream
+ * Refresh parts of gssapi.patch not applied upstream
-- Jonathan Yu <jawnsy at cpan.org> Fri, 08 Jan 2010 10:51:36 -0500
Modified: trunk/libxml-stream-perl/debian/patches/gssapi.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/patches/gssapi.patch?rev=50554&op=diff
==============================================================================
--- trunk/libxml-stream-perl/debian/patches/gssapi.patch (original)
+++ trunk/libxml-stream-perl/debian/patches/gssapi.patch Sat Jan 9 17:34:45 2010
@@ -4,7 +4,7 @@
--- a/lib/XML/Stream.pm
+++ b/lib/XML/Stream.pm
-@@ -2057,7 +2057,12 @@ sub SASLAnswerChallenge
+@@ -2075,7 +2075,12 @@
$response = $self->{SIDS}->{$sid}->{sasl}->{client}->client_step($challenge);
}
@@ -18,21 +18,3 @@
$self->SASLResponse($sid,$response64);
}
-@@ -2107,6 +2112,8 @@ sub SASLClient
- my $username = shift;
- my $password = shift;
-
-+ my $service = "xmpp";
-+ my $hostname = $self->{SIDS}->{$sid}->{hostname};
- my $mechanisms = $self->GetStreamFeature($sid,"xmpp-sasl");
-
- return unless defined($mechanisms);
-@@ -2120,7 +2127,7 @@ sub SASLClient
- }
- );
-
-- $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new();
-+ $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new($service, $hostname);
- $self->{SIDS}->{$sid}->{sasl}->{username} = $username;
- $self->{SIDS}->{$sid}->{sasl}->{password} = $password;
- $self->{SIDS}->{$sid}->{sasl}->{authed} = 0;
Modified: trunk/libxml-stream-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/patches/series?rev=50554&op=diff
==============================================================================
--- trunk/libxml-stream-perl/debian/patches/series (original)
+++ trunk/libxml-stream-perl/debian/patches/series Sat Jan 9 17:34:45 2010
@@ -1,2 +1,1 @@
-resolver.patch
gssapi.patch
More information about the Pkg-perl-cvs-commits
mailing list