[SCM] libanyevent-xmpp-perl Debian packaging branch, master, updated. debian/0.52-1-5-g9a4f2aa

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 2a1d150386ef8beb18dbc3132e60f99551e199a2
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Oct 15 13:23:33 2012 +0200

    Drop both patches: Adopted upstream.

diff --git a/debian/patches/1001_use_Digest-SHA.patch b/debian/patches/1001_use_Digest-SHA.patch
deleted file mode 100644
index 7767359..0000000
--- a/debian/patches/1001_use_Digest-SHA.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Use Digest::SHA instead of Digest::SHA1.
- .
- Digest::SHA is part of the standard perl distribution since perl v5.9.3
- so this reduces the number of external dependencies by one.
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2011-05-23
---- a/lib/AnyEvent/XMPP.pm
-+++ b/lib/AnyEvent/XMPP.pm
-@@ -93,7 +93,7 @@
- 
- For stringprep profiles to handle JIDs.
- 
--=item L<Digest::SHA1>
-+=item L<Digest::SHA>
- 
- For component authentication and old-style authentication.
- 
---- a/lib/AnyEvent/XMPP/Connection.pm
-+++ b/lib/AnyEvent/XMPP/Connection.pm
-@@ -9,7 +9,7 @@
- use AnyEvent::XMPP::Extendable;
- use AnyEvent::XMPP::Error;
- use Object::Event;
--use Digest::SHA1 qw/sha1_hex/;
-+use Digest::SHA qw/sha1_hex/;
- use Encode;
- 
- our @ISA = qw/AnyEvent::XMPP::SimpleConnection Object::Event AnyEvent::XMPP::Extendable/;
---- a/lib/AnyEvent/XMPP/Ext/VCard.pm
-+++ b/lib/AnyEvent/XMPP/Ext/VCard.pm
-@@ -4,7 +4,7 @@
- use strict;
- 
- use MIME::Base64;
--use Digest::SHA1 qw/sha1_hex/;
-+use Digest::SHA qw/sha1_hex/;
- use Scalar::Util;
- use AnyEvent::XMPP::Namespaces qw/xmpp_ns/;
- use AnyEvent::XMPP::Util qw/prep_bare_jid/;
---- a/lib/AnyEvent/XMPP/Writer.pm
-+++ b/lib/AnyEvent/XMPP/Writer.pm
-@@ -5,7 +5,7 @@
- use MIME::Base64;
- use AnyEvent::XMPP::Namespaces qw/xmpp_ns/;
- use AnyEvent::XMPP::Util qw/simxml filter_xml_chars filter_xml_attr_hash_chars/;
--use Digest::SHA1 qw/sha1_hex/;
-+use Digest::SHA qw/sha1_hex/;
- use Encode;
- 
- =head1 NAME
---- a/t/z_08_vcard_hook.t
-+++ b/t/z_08_vcard_hook.t
-@@ -3,7 +3,7 @@
- use strict;
- no warnings;
- use Test::More;
--use Digest::SHA1 qw/sha1_hex/;
-+use Digest::SHA qw/sha1_hex/;
- use AnyEvent::XMPP;
- use AnyEvent::XMPP::TestClient;
- use AnyEvent::XMPP::Namespaces qw/xmpp_ns/;
diff --git a/debian/patches/1002_fix_auth_error.patch b/debian/patches/1002_fix_auth_error.patch
deleted file mode 100644
index acc7591..0000000
--- a/debian/patches/1002_fix_auth_error.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-Description: Fix parser error on auth failure
- When I create a connection that has a bad password, I encounter the
- following error (via warn) after receiving the sasl_error and
- disconnect events:
- .
- parser error: Can't call method "NamespaceEnd" on an undefined value at
- /usr/lib/perl5/vendor_perl/XML/Parser/Expat.pm line 614.
- on [<failure xmlns='urn:ietf:params:xml:ns:xmpp-sasl'><not-
- authorized/><text>The response provided by the client doesn't
- match the one we calculated.</text></failure>]
- .
- What happens is that the AE::XMPP::Parser object gets rids of its expat
- parser member in disconnect in response to the failure tag, but Expat
- wants to keep parsing the string. I have attached a test file and a
- patch to fix the bug.
-Author: RHOELZ [...] cpan.org
-Last-Update: 2011-05-23
-Forwarded: yes
-Origin: https://rt.cpan.org/Ticket/Attachment/789032/408830/patch
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=58296
---- a/lib/AnyEvent/XMPP/Parser.pm
-+++ b/lib/AnyEvent/XMPP/Parser.pm
-@@ -119,8 +119,6 @@
- sub cleanup {
-    my ($self) = @_;
- 
--   $self->{parser}->release;
--
-    for (qw(stanza_cb error_cb stream_cb parser)) {
-       delete $self->{$_};
-    }
-@@ -247,4 +245,9 @@
- 
- =cut
- 
-+sub DESTROY {
-+    my ($self) = @_;
-+    $self->{parser}->release;
-+}
-+
- 1; # End of AnyEvent::XMPP
---- /dev/null
-+++ b/t/z_parser_error.t
-@@ -0,0 +1,49 @@
-+#!perl
-+
-+use strict;
-+no warnings;
-+use Test::More;
-+use AnyEvent::XMPP::Connection;
-+
-+unless($ENV{NET_XMPP2_TEST}) {
-+    plan skip_all => 'Define NET_XMPP2_TEST to jid:password to test this';
-+    exit 0;
-+}
-+plan tests => 3;
-+my ( $jid ) = split /:/, $ENV{NET_XMPP2_TEST};
-+
-+my $conn = AnyEvent::XMPP::Connection->new(
-+    jid => $jid,
-+    password => '',
-+);
-+
-+my $seen_warn = 0;
-+my $seen_stream_ready = 0;
-+my $seen_sasl_error = 0;
-+
-+$SIG{__WARN__} = sub {
-+    $seen_warn = 1;
-+};
-+
-+my $cond = AnyEvent->condvar;
-+
-+$conn->reg_cb(
-+    stream_ready => sub {
-+        $seen_stream_ready = 1;
-+        $conn->disconnect;
-+    },
-+    sasl_error => sub {
-+        $seen_sasl_error = 1;
-+    },
-+    disconnect => sub {
-+        $cond->broadcast;
-+    },
-+);
-+
-+$conn->connect;
-+
-+$cond->wait;
-+
-+ok(! $seen_stream_ready, 'auth should fail');
-+ok(! $seen_warn, 'no warnings should be emitted');
-+ok($seen_sasl_error, 'I should see a SASL error');
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 189b17e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-1001_use_Digest-SHA.patch
-1002_fix_auth_error.patch

-- 
libanyevent-xmpp-perl Debian packaging