[libnet-xmpp-perl] 05/06: Drop all patches applied upstream
Axel Beckert
abe at deuxchevaux.org
Sat Aug 8 19:23:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository libnet-xmpp-perl.
commit 7b03b321552d20cf8c1eed078155babdd45082ff
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sat Aug 8 21:17:16 2015 +0200
Drop all patches applied upstream
disable_networking_tests.patch is the only one left.
---
debian/changelog | 2 +
..._check-definedness-of-hash-key-before-use.patch | 18 ------
debian/patches/digest-sha.patch | 68 --------------------
debian/patches/dns-srv.patch | 73 ----------------------
.../missing-import-of-Net::XMPP::Debug.patch | 18 ------
debian/patches/series | 5 --
debian/patches/spelling.patch | 40 ------------
7 files changed, 2 insertions(+), 222 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 098645f..5016dbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libnet-xmpp-perl (1.05-1) UNRELEASED; urgency=medium
* Add debian/upstream/metadata
* Import upstream version 1.05
+ + All patches except the disabling of network tests were applied
+ upstream and hence dropped from the package.
-- Axel Beckert <abe at debian.org> Sat, 08 Aug 2015 21:06:03 +0200
diff --git a/debian/patches/626897_check-definedness-of-hash-key-before-use.patch b/debian/patches/626897_check-definedness-of-hash-key-before-use.patch
deleted file mode 100644
index 95c0140..0000000
--- a/debian/patches/626897_check-definedness-of-hash-key-before-use.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Check definedness of hash key before use
- An annoying warning is emitted since Perl 5.12, revealing sloppy coding.
-Origin: http://github.com/dap/Net-XMPP/commit/2d1164d7c50d7c034f3d1efb03ad9319b24dfd24
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=58333
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626897
-Reviewed-by: Florian Schlichting <fschlich at zedat.fu-berlin.de>
-
---- a/lib/Net/XMPP/Debug.pm
-+++ b/lib/Net/XMPP/Debug.pm
-@@ -151,7 +151,7 @@
- my %args;
- while($#_ >= 0) { $args{ lc pop(@_) } = pop(@_); }
-
-- delete($args{file}) if (lc($args{file}) eq "stdout");
-+ delete($args{file}) if (defined $args{file} && lc($args{file}) eq "stdout");
-
- $args{time} = 0 if !exists($args{time});
- $args{setdefault} = 0 if !exists($args{setdefault});
diff --git a/debian/patches/digest-sha.patch b/debian/patches/digest-sha.patch
deleted file mode 100644
index 4b55817..0000000
--- a/debian/patches/digest-sha.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: use Digest::SHA instead of Digest::SHA1
-Origin: vendor
-Bug: https://rt.cpan.org/Ticket/Display.html?id=68181
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=94649
-Author: gregor herrmann <gregoa at debian.org>
-Reviewed-by: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-04-11
-
---- a/Build.PL
-+++ b/Build.PL
-@@ -10,7 +10,7 @@
- dist_version_from => 'lib/Net/XMPP.pm',
- requires => {
- 'XML::Stream' => 1.22,
-- 'Digest::SHA1' => 1.02,
-+ 'Digest::SHA' => 0,
- },
- create_makefile_pl => 'passthrough',
- );
---- a/lib/Net/XMPP/Protocol.pm
-+++ b/lib/Net/XMPP/Protocol.pm
-@@ -1880,12 +1880,12 @@
- #--------------------------------------------------------------------------
- if ($authType eq "zerok")
- {
-- my $hashA = Digest::SHA1::sha1_hex(delete($args{password}));
-- $args{hash} = Digest::SHA1::sha1_hex($hashA.$token);
-+ my $hashA = Digest::SHA::sha1_hex(delete($args{password}));
-+ $args{hash} = Digest::SHA::sha1_hex($hashA.$token);
-
- for (1..$sequence)
- {
-- $args{hash} = Digest::SHA1::sha1_hex($args{hash});
-+ $args{hash} = Digest::SHA::sha1_hex($args{hash});
- }
- }
-
-@@ -1900,7 +1900,7 @@
- if ($authType eq "digest")
- {
- my $password = delete($args{password});
-- $args{digest} = Digest::SHA1::sha1_hex($self->GetStreamID().$password);
-+ $args{digest} = Digest::SHA::sha1_hex($self->GetStreamID().$password);
- }
-
- #--------------------------------------------------------------------------
---- a/META.yml
-+++ b/META.yml
-@@ -9,7 +9,7 @@
- license: |-
- http://opensource.org/licenses/artistic-license.php
- requires:
-- Digest::SHA1: 1.02
-+ Digest::SHA: 0
- XML::Stream: 1.22
- provides:
- Net::XMPP:
---- a/lib/Net/XMPP.pm
-+++ b/lib/Net/XMPP.pm
-@@ -219,7 +219,7 @@
- use XML::Stream 1.22 qw( Node );
- use Time::Local;
- use Carp;
--use Digest::SHA1;
-+use Digest::SHA;
- use Authen::SASL;
- use MIME::Base64;
- use POSIX;
diff --git a/debian/patches/dns-srv.patch b/debian/patches/dns-srv.patch
deleted file mode 100644
index f2995d4..0000000
--- a/debian/patches/dns-srv.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Bug: https://rt.cpan.org/Public/Bug/Display.html?id=18539
-Bug-Debian: https://bugs.debian.org/325658
-Origin: https://github.com/dap/Net-XMPP/commit/a4abb36a222d4face4e2478e98e9457c03e05a14
-From a4abb36a222d4face4e2478e98e9457c03e05a14 Mon Sep 17 00:00:00 2001
-From: Darian Anthony Patrick <dap at darianpatrick.com>
-Date: Sat, 18 Sep 2010 18:30:41 -0400
-Subject: [PATCH] RT#37129, RT#18539 Support for virtual domains
-
-Support for virtual domains already exists to a certain extent
-in Net::XMPP::Connection and XML::Stream but is poorly documented
-and maybe slightly cumbersome. This adds an srv parameter to Connect()
-as well as documents the existing componentname parameter.
----
- lib/Net/XMPP/Client.pm | 20 +++++++++++++++++---
- lib/Net/XMPP/Connection.pm | 4 ++++
- 2 files changed, 21 insertions(+), 3 deletions(-)
-
-diff --git a/lib/Net/XMPP/Client.pm b/lib/Net/XMPP/Client.pm
-index 8f33196..dc5c946 100644
---- a/lib/Net/XMPP/Client.pm
-+++ b/lib/Net/XMPP/Client.pm
-@@ -86,9 +86,9 @@ Net::XMPP::Client - XMPP Client Module
- port=>integer, listed in the hostname (default
- timeout=>int localhost), on the port (default
- connectiontype=>string, 5222) listed, using the
-- tls=>0|1) connectiontype listed (default
-- tcpip). The two connection types
-- available are:
-+ tls=>0|1, connectiontype listed (default
-+ srv=>0|1, tcpip). The two connection types
-+ componentname=>string) available are:
- tcpip standard TCP socket
- http TCP socket, but with the
- headers needed to talk
-@@ -97,6 +97,20 @@ Net::XMPP::Client - XMPP Client Module
- will be used if it is available
- as a feature.
-
-+ If srv is specified AND Net::DNS is
-+ installed and can be loaded, then
-+ an SRV query is sent to srv.hostname
-+ and the results processed to replace
-+ the hostname and port. If the lookup
-+ fails, or Net::DNS cannot be loaded,
-+ then hostname and port are left alone
-+ as the defaults.
-+
-+ Alternatively, you may manually specify
-+ componentname as the domain portion of the
-+ jid and leave hostname set to the actual
-+ hostname of the XMPP server.
-+
- Execute(hostname=>string, - Generic inner loop to handle
- port=>int, connecting to the server, calling
- tls=>0|1, Process, and reconnecting if the
-diff --git a/lib/Net/XMPP/Connection.pm b/lib/Net/XMPP/Connection.pm
-index 134ee82..7d00a05 100644
---- a/lib/Net/XMPP/Connection.pm
-+++ b/lib/Net/XMPP/Connection.pm
-@@ -145,6 +145,10 @@ sub Connect
- (to => $self->{SERVER}->{componentname}) :
- ()
- ),
-+ (defined($self->{SERVER}->{srv}) ?
-+ (srv => '_xmpp-client._tcp') :
-+ ()
-+ ),
- );
-
- if ($self->{SESSION})
---
-1.9.1
-
diff --git a/debian/patches/missing-import-of-Net::XMPP::Debug.patch b/debian/patches/missing-import-of-Net::XMPP::Debug.patch
deleted file mode 100644
index ce3273b..0000000
--- a/debian/patches/missing-import-of-Net::XMPP::Debug.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Net::XMPP::Stanza needs to 'use Net::XMPP::Debug'
- Without it, loading Net::XMPP::Stanza fails.
- .
- This was discovered while running automated continuous integration tests for
- Debian, part of which is to try to load each module in the package.
-Author: Damyan Ivanov <dmn at debian.org>
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=105126
-Bug: https://rt.cpan.org/Ticket/Display.html?id=105126
---- a/lib/Net/XMPP/Stanza.pm
-+++ b/lib/Net/XMPP/Stanza.pm
-@@ -212,6 +212,7 @@ under the LGPL.
-
- use strict;
- use Carp;
-+use Net::XMPP::Debug;
- use Net::XMPP::Namespaces;
- use vars qw( $AUTOLOAD %FUNCTIONS $DEBUG );
-
diff --git a/debian/patches/series b/debian/patches/series
index 33b1119..faecb55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
disable_networking_tests.patch
-digest-sha.patch
-spelling.patch
-626897_check-definedness-of-hash-key-before-use.patch
-dns-srv.patch
-missing-import-of-Net::XMPP::Debug.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index 3fcf8ba..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: fix some spelling mistakes
-Origin: vendor
-Bug: https://rt.cpan.org/Ticket/Display.html?id=94650
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=94650
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2014-04-11
-
---- a/lib/Net/XMPP.pm
-+++ b/lib/Net/XMPP.pm
-@@ -68,7 +68,7 @@
- directly in your code. Instead you will instantiate objects that call
- functions from this module to do work. The three main objects that
- you will work with are the Message, Presence, and IQ modules. Each one
-- corresponds to the Jabber equivilant and allows you get and set all
-+ corresponds to the Jabber equivalent and allows you get and set all
- parts of those packets.
-
- There are a few functions that are the same across all of the objects:
---- a/lib/Net/XMPP/Namespaces.pm
-+++ b/lib/Net/XMPP/Namespaces.pm
-@@ -118,7 +118,7 @@
-
- In jabber:iq:roster, the <item/> tag can be repeated multiple times,
- and is sort of like a mini-namespace in itself. To that end, we treat
-- it like a seperate namespace and defined a __netxmpp__:iq:roster:item
-+ it like a separate namespace and defined a __netxmpp__:iq:roster:item
- namespace to hold it. What happens is this, in my code I define that
- the <item/>s tag is "item" and anything with that tag name is to create
- a new Net::XMPP::Stanza object with the namespace
---- a/lib/Net/XMPP/Protocol.pm
-+++ b/lib/Net/XMPP/Protocol.pm
-@@ -283,7 +283,7 @@
- send=>function, <message/>, <presence/>, and
- receive=>function, <iq/>. If a packet is received
- update=>function) with an ID which is found in the
-- registerd ID list (see RegisterID
-+ registered ID list (see RegisterID
- below) then it is not sent to
- these functions, instead it
- is inserted into a LIST and can
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libnet-xmpp-perl.git
More information about the Pkg-perl-cvs-commits
mailing list