[libxml-stream-perl] 07/12: Drop patches applied upstream, refresh and forward remaining patch

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository libxml-stream-perl.

commit 2a71032c081d27f8f20eb28209e322e5e9019ce8
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sun May 3 23:01:47 2015 +0200

    Drop patches applied upstream, refresh and forward remaining patch
---
 .../687059_Use-of-uninitialized-value.patch        | 25 --------
 debian/patches/series                              |  2 -
 debian/patches/t_upstream_tests.diff               | 75 ----------------------
 debian/patches/t_upstream_uninitialized_value.diff |  4 +-
 4 files changed, 2 insertions(+), 104 deletions(-)

diff --git a/debian/patches/687059_Use-of-uninitialized-value.patch b/debian/patches/687059_Use-of-uninitialized-value.patch
deleted file mode 100644
index e2ab5d1..0000000
--- a/debian/patches/687059_Use-of-uninitialized-value.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix "Use of uninitialized value within @_ ..." warning
- XML::Stream::Parser::new is always called with an odd number of
- elements (class name and a hash of arguments), so shifting the class
- name off allows the list to hash conversion to complete without trying
- to pop an element from an empty list.
-Origin: https://github.com/dap/XML-Stream/commit/7902f8334346590babcf5ac7e1a5c03acc9fa6a2
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=56574
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687059
-Reviewed-by: Florian Schlichting <fschlich at zedat.fu-berlin.de>
-
---- a/lib/XML/Stream/Parser.pm
-+++ b/lib/XML/Stream/Parser.pm
-@@ -63,9 +63,11 @@
- 
- sub new
- {
-+    my $class = shift;
-+
-     my $self = { };
- 
--    bless($self);
-+    bless($self, $class);
- 
-     my %args;
-     while($#_ >= 0) { $args{ lc pop(@_) } = pop(@_); }
diff --git a/debian/patches/series b/debian/patches/series
index 53ae408..77568c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 t_upstream_uninitialized_value.diff
-t_upstream_tests.diff
-687059_Use-of-uninitialized-value.patch
diff --git a/debian/patches/t_upstream_tests.diff b/debian/patches/t_upstream_tests.diff
deleted file mode 100644
index 8b7f1e6..0000000
--- a/debian/patches/t_upstream_tests.diff
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Franck Joncourt <franck at debian.org>
-Origin: vendor
-Forwarded: http://rt.cpan.org/Public/Bug/Display.html?id=54151
-Subject: Disable tests which require a network access.
- We disable tests which require network communication. This way we avoid
- FTBFS due to services not available.
-
-Signed-off-by: Franck Joncourt <franck at debian.org>
-
----
- t/tcpip.t     |   34 ++++++++++++++++++++--------------
- t/tcpip2ssl.t |    1 +
- 2 files changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/t/tcpip.t b/t/tcpip.t
-index 9d52680..93081f0 100644
---- a/t/tcpip.t
-+++ b/t/tcpip.t
-@@ -1,22 +1,28 @@
- use lib "t/lib";
- use Test::More tests=>4;
- 
--BEGIN{ use_ok("XML::Stream","Node"); }
- 
--my $stream = new XML::Stream(style=>"node");
--ok( defined($stream), "new()" );
--isa_ok( $stream, "XML::Stream" );
-+SKIP: {
- 
--SKIP:
--{
--    my $sock = IO::Socket::INET->new(PeerAddr=>'jabber.org:5222');
--    skip "Cannot open connection (maybe a firewall?)",1 unless defined($sock);
-+    skip "No network communication allowed", 3 if ($ENV{NO_NETWORK});
-+
-+    BEGIN{ use_ok("XML::Stream","Node"); }
-+
-+    my $stream = new XML::Stream(style=>"node");
-+    ok( defined($stream), "new()" );
-+    isa_ok( $stream, "XML::Stream" );
-+
-+    SKIP:
-+    {
-+        my $sock = IO::Socket::INET->new(PeerAddr=>'jabber.org:5222');
-+        skip "Cannot open connection (maybe a firewall?)",1 unless defined($sock);
-     
--    my $status = $stream->Connect(hostname=>"jabber.org",
--                                  port=>5222,
--                                  namespace=>"jabber:client",
--                                  connectiontype=>"tcpip",
--                                  timeout=>10);
--    ok( defined($status), "Made connection");
-+        my $status = $stream->Connect(hostname=>"jabber.org",
-+                                      port=>5222,
-+                                      namespace=>"jabber:client",
-+                                      connectiontype=>"tcpip",
-+                                      timeout=>10);
-+        ok( defined($status), "Made connection");
-+    }
- }
- 
-diff --git a/t/tcpip2ssl.t b/t/tcpip2ssl.t
-index 43d4b22..8c5ff06 100644
---- a/t/tcpip2ssl.t
-+++ b/t/tcpip2ssl.t
-@@ -6,6 +6,7 @@ SKIP:
- {
-     eval("use IO::Socket::SSL 0.81;");
-     skip "IO::Socket::SSL not installed", 2 if $@;
-+    skip "No network communication allowed", 2 if ($ENV{NO_NETWORK});
- 
-     BEGIN{ use_ok( "XML::Stream","Tree", "Node" ); }
- 
--- 
-tg: (67812e7..) t/upstream/tests (depends on: master)
diff --git a/debian/patches/t_upstream_uninitialized_value.diff b/debian/patches/t_upstream_uninitialized_value.diff
index 27bafed..77e0c4f 100644
--- a/debian/patches/t_upstream_uninitialized_value.diff
+++ b/debian/patches/t_upstream_uninitialized_value.diff
@@ -1,10 +1,10 @@
 Author: Mikael Magnusson <mikma at users.sourceforge.net>
-Forwarded: no
+Forwarded: https://github.com/dap/XML-Stream/issues/14
 Description: Fix an 'uninitialized value' warning
 
 --- a/lib/XML/Stream.pm
 +++ b/lib/XML/Stream.pm
-@@ -2075,7 +2075,12 @@
+@@ -2164,7 +2164,12 @@
          $response = $self->{SIDS}->{$sid}->{sasl}->{client}->client_step($challenge);
      }
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libxml-stream-perl.git