r10561 - in /trunk/libxml-stream-perl: debian/ debian/changelog debian/compat debian/control debian/copyright debian/libxml-stream-perl.docs debian/rules debian/watch lib/XML/Stream.pm
vdanjean at users.alioth.debian.org
vdanjean at users.alioth.debian.org
Sat Dec 1 12:39:46 UTC 2007
Author: vdanjean
Date: Sat Dec 1 12:39:46 2007
New Revision: 10561
URL: http://svn.debian.org/wsvn/?sc=1&rev=10561
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
trunk/libxml-stream-perl/debian/
trunk/libxml-stream-perl/debian/changelog
trunk/libxml-stream-perl/debian/compat
trunk/libxml-stream-perl/debian/control
trunk/libxml-stream-perl/debian/copyright
trunk/libxml-stream-perl/debian/libxml-stream-perl.docs
trunk/libxml-stream-perl/debian/rules (with props)
trunk/libxml-stream-perl/debian/watch
Modified:
trunk/libxml-stream-perl/lib/XML/Stream.pm
Added: trunk/libxml-stream-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libxml-stream-perl/debian/changelog?rev=10561&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/changelog (added)
+++ trunk/libxml-stream-perl/debian/changelog Sat Dec 1 12:39:46 2007
@@ -1,0 +1,153 @@
+libxml-stream-perl (1.22-3) unstable; urgency=low
+
+ * Thanks to Andreas for the upload (Closes: #427071)
+ * Added Suggests: libnet-dns-perl
+ * Accepted patch from Pablo Barbachano. Thanks! (Closes: #395395)
+ * Updated debian/watch so that uupdate will work
+ * Policy-version bump to 3.7.2.2 (no other changes)
+ * Updated debhelper into Build-Depends instead of -Indep for lintian
+ * Only conditionally ignore make clean, also for lintian
+
+ -- Jay Bonci <jaybonci at debian.org> Sat, 07 Jul 2007 17:53:40 -0400
+
+libxml-stream-perl (1.22-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix GSSAPI SASL authentication. Closes: #427071
+
+ -- Andreas Barth <aba at not.so.argh.org> Tue, 3 Jul 2007 20:24:26 +0000
+
+libxml-stream-perl (1.22-2) unstable; urgency=low
+
+ * Fixes FTBFS. (Build) Dep on libauthen-sasl-perl (Closes: #276283)
+
+ -- Jay Bonci <jaybonci at debian.org> Wed, 13 Oct 2004 03:44:13 -0400
+
+libxml-stream-perl (1.22-1) unstable; urgency=low
+
+ * New upstream version (Closes: #272847)
+ * Adds debian/watch file so uscan will actually work
+
+ -- Jay Bonci <jaybonci at debian.org> Thu, 30 Sep 2004 10:27:21 -0400
+
+libxml-stream-perl (1.17-1) unstable; urgency=low
+
+ * New upstream version (Closes: #215615)
+ * New Maintainer (Closes: #210545)
+ * Clarified license as GPL-only
+ * Updated to policy version 3.6.1.0 (no other changes)
+ * Removed install file as it is no longer needed
+
+ -- Jay Bonci <jaybonci at debian.org> Mon, 15 Mar 2004 15:31:53 -0500
+
+libxml-stream-perl (1.16-2) unstable; urgency=low
+
+ * debian/rules: moved debhelper compatibility level setting to
+ 'debian/compat' per latest debhelper best practices
+ * debian/control: updated sections according to latest archive changes:
+ - 'libxml-stream-perl' from 'interpreters' to 'perl'
+ * debian/control: upgraded build dependency on 'debhelper' to '>= 4.1'
+ * debian/control: upgraded to Debian Policy 3.6.0 (no changes)
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Mon, 1 Sep 2003 12:06:16 -0500
+
+libxml-stream-perl (1.16-1) unstable; urgency=low
+
+ * New upstream release
+ - skip tests requiring Internet connection if none present
+ (closes: Bug#165170)
+ * debian/control: removed obsolete (build) dependency on
+ 'libunicode-string-perl'
+ * debian/control: upgraded to Debian Policy 3.5.7 (no changes)
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Sun, 10 Nov 2002 19:27:58 -0600
+
+libxml-stream-perl (1.15-2) unstable; urgency=low
+
+ * debian/rules: upgraded to debhelper v4
+ * debian/control: changed build dependency on debhelper accordingly
+ * debian/rules: migrated from 'dh_movefiles' to 'dh_install'
+ * debian/rules: split off 'install' target from 'binary-indep' target
+ * debian/copyright: added pointer to license
+ (closes: Bug#157679)
+ * debian/control: added (build) dependency on 'libio-socket-ssl-perl'
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Sat, 21 Sep 2002 13:29:05 -0500
+
+libxml-stream-perl (1.15-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Sat, 15 Jun 2002 12:58:28 -0500
+
+libxml-stream-perl (1.14-2) unstable; urgency=low
+
+ * Stream/Parser.pm: applied another patch to silence perl when running
+ with the '-w' option
+ (closes: Bug#125745) (thanks Michael)
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Fri, 21 Dec 2001 19:57:40 -0600
+
+libxml-stream-perl (1.14-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Sun, 11 Nov 2001 10:56:33 -0600
+
+libxml-stream-perl (1.13-1) unstable; urgency=low
+
+ * New upstream release
+ (closes: Bug#118020)
+ * Stream/Parser.pm: applied patch to silence perl when running with the
+ '-w' option
+ (closes: Bug#118029) (thanks Michael)
+ * debian/control: removed obsolete (build) dependency on
+ 'libxml-parser-perl'
+ * debian/control: added missing (build) dependency on
+ 'libunicode-string-perl'
+ * debian/control: upgraded to Debian Policy 3.5.6
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Sat, 3 Nov 2001 13:43:54 -0600
+
+libxml-stream-perl (1.12-2) unstable; urgency=low
+
+ * debian/control: upgraded to Debian Policy 3.5.5
+ * debian/control: upgraded to Debian Perl Policy 1.20
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Sun, 2 Sep 2001 17:52:34 -0500
+
+libxml-stream-perl (1.12-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Sun, 27 May 2001 22:53:59 -0500
+
+libxml-stream-perl (1.11-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control: updated 'debhelper' dependency to remove 'dh_testversion'
+ * debian/control: upgraded to Debian Policy 3.5.2
+ * debian/control: upgraded to Debian Perl Policy 1.17
+ * debian/rules: upgraded to Debian Perl Policy 1.17
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Sun, 15 Apr 2001 19:24:58 -0500
+
+libxml-stream-perl (1.10-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control: upgraded to Debian Policy 3.2.1
+ * debian/rules: upgraded to debhelper v3
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Wed, 17 Jan 2001 13:57:34 -0600
+
+libxml-stream-perl (1.09-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Sat, 14 Oct 2000 19:28:03 -0500
+
+libxml-stream-perl (1.05-1) unstable; urgency=low
+
+ * Initial Release
+
+ -- Ardo van Rangelrooij <ardo at debian.org> Fri, 21 Jul 2000 11:39:59 +0200
Added: trunk/libxml-stream-perl/debian/compat
URL: http://svn.debian.org/wsvn/trunk/libxml-stream-perl/debian/compat?rev=10561&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/compat (added)
+++ trunk/libxml-stream-perl/debian/compat Sat Dec 1 12:39:46 2007
@@ -1,0 +1,1 @@
+4
Added: trunk/libxml-stream-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libxml-stream-perl/debian/control?rev=10561&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/control (added)
+++ trunk/libxml-stream-perl/debian/control Sat Dec 1 12:39:46 2007
@@ -1,0 +1,21 @@
+Source: libxml-stream-perl
+Section: perl
+Priority: optional
+Maintainer: Jay Bonci <jaybonci at debian.org>
+Standards-Version: 3.7.2.2
+Build-Depends: debhelper (>= 4.1)
+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
+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
+ more information about XML Streams, and the group that created them,
+ please visit:
+ .
+ http://etherx.jabber.org/streams
Added: trunk/libxml-stream-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libxml-stream-perl/debian/copyright?rev=10561&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/copyright (added)
+++ trunk/libxml-stream-perl/debian/copyright Sat Dec 1 12:39:46 2007
@@ -1,0 +1,19 @@
+This package was debianized by Ardo van Rangelrooij <ardo at debian.org>
+on Fri, Jul 21, 2000, 12:32:28 +0200.
+
+It was downloaded from the Comprehensive Perl Archive Network (CPAN).
+Visit <http://www.cpan.org/> to find a CPAN site near you.
+
+Upstream Authors: Ryan Eatmon <reatmon at ti.com>
+
+Copyright:
+
+Copyright (c) 2000 Jabber.org Project
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2, or (at your option) any
+ later version.
+
+ See:
+
+ /usr/share/common-licenses/GPL
Added: trunk/libxml-stream-perl/debian/libxml-stream-perl.docs
URL: http://svn.debian.org/wsvn/trunk/libxml-stream-perl/debian/libxml-stream-perl.docs?rev=10561&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/libxml-stream-perl.docs (added)
+++ trunk/libxml-stream-perl/debian/libxml-stream-perl.docs Sat Dec 1 12:39:46 2007
@@ -1,0 +1,2 @@
+INFO
+README
Added: trunk/libxml-stream-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libxml-stream-perl/debian/rules?rev=10561&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/rules (added)
+++ trunk/libxml-stream-perl/debian/rules Sat Dec 1 12:39:46 2007
@@ -1,0 +1,53 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This is the debhelper compatibility version to use.
+# export DH_COMPAT=4
+
+PACKAGE=`pwd | sed -e "s/.*\/\\(.*\\)-.*/\\1/"`
+
+
+build:
+ dh_testdir
+ # Add here commands to compile the package.
+ perl Makefile.PL verbose INSTALLDIRS=vendor
+clean:
+ dh_testdir
+ dh_testroot
+
+ [ ! -f Makefile ] || $(MAKE) clean
+ rm -f Makefile.old
+ dh_clean
+
+install:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) PREFIX=$(CURDIR)/debian/$(PACKAGE)/usr OPTIMIZE="-O2 -g -Wall" test install
+ -find $(CURDIR)/debian -type d | xargs rmdir -p --ignore-fail-on-non-empty
+
+binary-arch:;
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installman
+ dh_installchangelogs CHANGES
+ dh_link
+ dh_strip
+ 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
Propchange: trunk/libxml-stream-perl/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/libxml-stream-perl/debian/watch
URL: http://svn.debian.org/wsvn/trunk/libxml-stream-perl/debian/watch?rev=10561&op=file
==============================================================================
--- trunk/libxml-stream-perl/debian/watch (added)
+++ trunk/libxml-stream-perl/debian/watch Sat Dec 1 12:39:46 2007
@@ -1,0 +1,3 @@
+version=2
+http://www.cpan.org/modules/by-module/XML/XML-Stream-([0-9].*)\.tar.gz \
+ debian uupdate
Modified: trunk/libxml-stream-perl/lib/XML/Stream.pm
URL: http://svn.debian.org/wsvn/trunk/libxml-stream-perl/lib/XML/Stream.pm?rev=10561&op=diff
==============================================================================
--- trunk/libxml-stream-perl/lib/XML/Stream.pm (original)
+++ trunk/libxml-stream-perl/lib/XML/Stream.pm Sat Dec 1 12:39:46 2007
@@ -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)
@@ -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;
More information about the Pkg-perl-cvs-commits
mailing list