r22034 - in /trunk/libxml-stream-perl: debian/changelog debian/control debian/libxml-stream-perl.docs debian/patches/ debian/patches/gssapi.patch debian/patches/resolver.patch debian/patches/series debian/rules lib/XML/Stream.pm
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Jun 21 12:30:55 UTC 2008
Author: gregoa
Date: Sat Jun 21 12:30:55 2008
New Revision: 22034
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=22034
Log:
* Split out changes in lib/XML/Stream.pm into patches; add quilt framework.
* Refresh debian/rules, no functional changes.
* Remove debian/libxml-stream-perl.docs, install INFO via debian/rules,
don't install README any more.
* debian/control: move Suggests from source to binary stanza.
Added:
trunk/libxml-stream-perl/debian/patches/
trunk/libxml-stream-perl/debian/patches/gssapi.patch
trunk/libxml-stream-perl/debian/patches/resolver.patch
trunk/libxml-stream-perl/debian/patches/series
Removed:
trunk/libxml-stream-perl/debian/libxml-stream-perl.docs
Modified:
trunk/libxml-stream-perl/debian/changelog
trunk/libxml-stream-perl/debian/control
trunk/libxml-stream-perl/debian/rules
trunk/libxml-stream-perl/lib/XML/Stream.pm
Modified: trunk/libxml-stream-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/changelog?rev=22034&op=diff
==============================================================================
--- trunk/libxml-stream-perl/debian/changelog (original)
+++ trunk/libxml-stream-perl/debian/changelog Sat Jun 21 12:30:55 2008
@@ -5,6 +5,11 @@
* Set Maintainer to Debian Perl Group.
* Use dist-based URL in debian/watch.
* debian/rules: delete /usr/lib/perl5 only if it exists.
+ * Split out changes in lib/XML/Stream.pm into patches; add quilt framework.
+ * Refresh debian/rules, no functional changes.
+ * Remove debian/libxml-stream-perl.docs, install INFO via debian/rules,
+ don't install README any more.
+ * debian/control: move Suggests from source to binary stanza.
-- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 01 Dec 2007 18:55:46 +0100
Modified: trunk/libxml-stream-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/control?rev=22034&op=diff
==============================================================================
--- trunk/libxml-stream-perl/debian/control (original)
+++ trunk/libxml-stream-perl/debian/control Sat Jun 21 12:30:55 2008
@@ -7,15 +7,15 @@
Homepage: http://search.cpan.org/dist/XML-Stream/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libxml-stream-perl/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/
-Build-Depends: debhelper (>= 4.1)
+Build-Depends: debhelper (>= 4.1), quilt (>= 0.40)
Build-Depends-Indep: perl (>= 5.6.0-16), libio-socket-ssl-perl, libauthen-sasl-perl
-Suggests: libnet-dns-perl
Package: libxml-stream-perl
Section: perl
Priority: optional
Architecture: all
Depends: ${perl:Depends}, libio-socket-ssl-perl, libauthen-sasl-perl
+Suggests: libnet-dns-perl
Description: Perl module for accessing XML Streams
This module provides access to XML Streams. An XML Stream is just
that: A stream of XML over a connection between two computers. For
Added: 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=22034&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/patches/gssapi.patch (added)
+++ trunk/libxml-stream-perl/debian/patches/gssapi.patch Sat Jun 21 12:30:55 2008
@@ -1,0 +1,38 @@
+Author: Mikael Magnusson <mikma at users.sourceforge.net>
+Description: GSSAPI SASL authentication
+Bug: #427071
+
+--- libxml-stream-perl.orig/lib/XML/Stream.pm
++++ libxml-stream-perl/lib/XML/Stream.pm
+@@ -2057,7 +2057,12 @@
+ $response = $self->{SIDS}->{$sid}->{sasl}->{client}->client_step($challenge);
+ }
+
+- my $response64 = MIME::Base64::encode_base64($response,"");
++ my $response64 = "";
++ if (defined $response)
++ {
++ $response64 = MIME::Base64::encode_base64($response,"");
++ }
++
+ $self->SASLResponse($sid,$response64);
+ }
+
+@@ -2107,6 +2112,8 @@
+ 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 @@
+ }
+ );
+
+- $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;
Added: trunk/libxml-stream-perl/debian/patches/resolver.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/patches/resolver.patch?rev=22034&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/patches/resolver.patch (added)
+++ trunk/libxml-stream-perl/debian/patches/resolver.patch Sat Jun 21 12:30:55 2008
@@ -1,0 +1,15 @@
+Author: Jay Bonci <jaybonci at debian.org>
+Description: Accepted patch from Pablo Barbachano.
+Bug: #395395
+
+--- libxml-stream-perl.orig/lib/XML/Stream.pm
++++ libxml-stream-perl/lib/XML/Stream.pm
+@@ -680,7 +680,7 @@
+ $self->debug(1,"Connect: srv requested");
+ if ($NETDNS)
+ {
+- my $res = new Net::DNS::Resolver();
++ my $res = Net::DNS::Resolver->new();
+ my $query = $res->query($self->{SIDS}->{newconnection}->{srv}.".".$self->{SIDS}->{newconnection}->{hostname},"SRV");
+
+ if ($query)
Added: trunk/libxml-stream-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/patches/series?rev=22034&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/patches/series (added)
+++ trunk/libxml-stream-perl/debian/patches/series Sat Jun 21 12:30:55 2008
@@ -1,0 +1,2 @@
+resolver.patch
+gssapi.patch
Modified: trunk/libxml-stream-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/debian/rules?rev=22034&op=diff
==============================================================================
--- trunk/libxml-stream-perl/debian/rules (original)
+++ trunk/libxml-stream-perl/debian/rules Sat Jun 21 12:30:55 2008
@@ -1,53 +1,62 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This is the debhelper compatibility version to use.
-# export DH_COMPAT=4
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
-PACKAGE=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
+include /usr/share/quilt/quilt.make
+PERL ?= /usr/bin/perl
+PACKAGE = $(shell dh_listpackages)
+TMP = $(CURDIR)/debian/$(PACKAGE)
-build:
+build: build-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
- # Add here commands to compile the package.
- perl Makefile.PL verbose INSTALLDIRS=vendor
-clean:
+ $(PERL) Makefile.PL INSTALLDIRS=vendor
+ $(MAKE)
+ $(MAKE) test
+ touch $@
+
+clean: unpatch
dh_testdir
dh_testroot
+ dh_clean build-stamp install-stamp
+ [ ! -f Makefile ] || $(MAKE) realclean
- [ ! -f Makefile ] || $(MAKE) clean
- rm -f Makefile.old
- dh_clean
-
-install:
+install: install-stamp
+install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- dh_installdirs
+ $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+ [ ! -d $(TMP)/usr/lib/perl5 ] || \
+ rmdir --ignore-fail-on-non-empty --parents --verbose \
+ $(TMP)/usr/lib/perl5
+ touch $@
- $(MAKE) PREFIX=$(CURDIR)/debian/$(PACKAGE)/usr OPTIMIZE="-O2 -g -Wall" test install
- [ ! -d $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(shell dh_listpackages)/usr/lib/perl5
+binary-arch:
+# We have nothing to do here for an architecture-independent package
-binary-arch:;
binary-indep: build install
dh_testdir
dh_testroot
- dh_installdocs
- dh_installman
+ dh_installdocs INFO
dh_installchangelogs CHANGES
- dh_link
- dh_strip
+ dh_perl
dh_compress
dh_fixperms
dh_installdeb
- dh_perl
dh_gencontrol
dh_md5sums
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install
Modified: trunk/libxml-stream-perl/lib/XML/Stream.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-stream-perl/lib/XML/Stream.pm?rev=22034&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream.pm Sat Jun 21 12:30:55 2008
@@ -680,7 +680,7 @@
$self->debug(1,"Connect: srv requested");
if ($NETDNS)
{
- my $res = Net::DNS::Resolver->new();
+ my $res = new Net::DNS::Resolver();
my $query = $res->query($self->{SIDS}->{newconnection}->{srv}.".".$self->{SIDS}->{newconnection}->{hostname},"SRV");
if ($query)
@@ -2057,12 +2057,7 @@
$response = $self->{SIDS}->{$sid}->{sasl}->{client}->client_step($challenge);
}
- my $response64 = "";
- if (defined $response)
- {
- $response64 = MIME::Base64::encode_base64($response,"");
- }
-
+ my $response64 = MIME::Base64::encode_base64($response,"");
$self->SASLResponse($sid,$response64);
}
@@ -2112,8 +2107,6 @@
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);
@@ -2127,7 +2120,7 @@
}
);
- $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new($service, $hostname);
+ $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new();
$self->{SIDS}->{$sid}->{sasl}->{username} = $username;
$self->{SIDS}->{$sid}->{sasl}->{password} = $password;
$self->{SIDS}->{$sid}->{sasl}->{authed} = 0;
More information about the Pkg-perl-cvs-commits
mailing list