Import Debian changes 1.23-1

sendxmpp (1.23-1) unstable; urgency=low

  * New upstream release.
  * Replace debian/rules with dh sequencer.
  * Bump Standards-Version and debian/compat.

diff --git a/Changes b/Changes
index 4657b7e..ccd9c72 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,11 @@
+2012-10-28:
+       - release version 1.23
+       - added options --no-tls-verify and --tls-ca-path, thanks to Alexander Weidinger <aw AT sz9i.net>
+
+2012-10-20:
+       - CVS repository of sendxmpp migrated to Git repository https://github.com/lhost/sendxmpp
+       - Homepage URL changed to http://sendxmpp.hostname.sk
+
 2008-10-21:
        - Added support for 'chat' message type. Implemented modified version of
          messsage-type-chat.patch from Marc Mims <marc AT questright.com>

diff --git a/INSTALL b/INSTALL
index 3add5de..104a712 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,16 +1,15 @@
 INSTALL
 -------
-sendxmpp requires perl 5.x, Getopt::Long and Net::XMPP.
-
-$ tar xvfz sendxmpp-(version).tar.gz
-$ cd sendxmpp-(version)
-$ perl Makefile.PL
-$ make
-$ make install
 
-This will install under /usr/local; to install under another prefix, for exampl;e "/usr", do:
+Installation from Git repository:
+---------------------------------
 
-$ perl Makefile.PL PREFIX=/usr
+       cd /tmp
+       git clone https://github.com/lhost/sendxmpp.git
+       cd sendxmpp/
+       perl Makefile.PL
+       make
+       make install
 
-instead.
+sendxmpp requires perl 5.x, Getopt::Long and Net::XMPP.
 

diff --git a/META.yml b/META.yml
index becf49d..35c0dba 100644 (file)
--- a/META.yml
+++ b/META.yml
@@ -1,7 +1,5 @@
-# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         sendxmpp
-version:      0.0.8
+version:      1.23
 version_from: sendxmpp
 installdirs:  site
 requires:

diff --git a/README b/README
index e132c82..6db4c75 100644 (file)
--- a/README
+++ b/README
@@ -21,7 +21,7 @@ sent.
 
 I am interested in hearing about other uses.
 
-Homepage: http://sendxmpp.platon.sk
+Homepage: http://sendxmpp.hostname.sk
 
 Lubomir Host 'rajo' <rajo AT platon.sk>
 Jabber: <rajo AT jabber.platon.sk> (IM)

diff --git a/debian/changelog b/debian/changelog
index a862342..0ecb6ab 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sendxmpp (1.23-1) unstable; urgency=low
+
+  * New upstream release.
+  * Replace debian/rules with dh sequencer.
+  * Bump Standards-Version and debian/compat.
+
+ -- Guus Sliepen <guus@debian.org>  Sun, 05 May 2013 11:44:57 +0200
+
 sendxmpp (1.22-1) unstable; urgency=low
 
   * New upstream release. Closes: #607074

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9

diff --git a/debian/control b/debian/control
index 68253e6..7ef0daa 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: sendxmpp
 Section: net
 Priority: optional
 Maintainer: Guus Sliepen <guus@debian.org>
-Build-Depends: debhelper (>= 7.0.0), perl
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), perl
+Standards-Version: 3.9.3
 
 Package: sendxmpp
 Architecture: all

diff --git a/debian/rules b/debian/rules
index f96d9fb..2d33f6a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,75 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-       CFLAGS += -O0
-else
-       CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-
-       touch configure-stamp
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp: configure-stamp 
-       dh_testdir
-
-       pod2man sendxmpp > sendxmpp.1
-
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-
-       rm -f sendxmpp.1
-
-       dh_clean 
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs
-
-       install sendxmpp debian/sendxmpp/usr/bin/
-       install -m 422 sendxmpp.1 debian/sendxmpp/usr/share/man/man1/
-
-
-# Build architecture-independent files here.
-binary-arch: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-indep: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs Changes
-       dh_installdocs
-       dh_installexamples
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_perl
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+       dh $@

diff --git a/examples/send-url.xml b/examples/send-url.xml
index ac20bde..120cf68 100644 (file)
--- a/examples/send-url.xml
+++ b/examples/send-url.xml
@@ -1,6 +1,6 @@
 <message to='rajo@server.somewhere.sk'>
        <body>Check out the new sendxmpp website!</body>
        <x xmlns='jabber:x:oob'>
-               <url>http://sendxmpp.platon.sk/</url>
+               <url>http://sendxmpp.hostname.sk/</url>
        </x>
 </message>

diff --git a/examples/sendxmpp-raw-messages b/examples/sendxmpp-raw-messages
index dde029e..e5b93df 100644 (file)
--- a/examples/sendxmpp-raw-messages
+++ b/examples/sendxmpp-raw-messages
@@ -10,7 +10,7 @@
 <message to='foo@server.com'>
        <body>Check out the new sendxmpp website!</body>
        <x xmlns='jabber:x:oob'>
-               <url>http://sendxmpp.platon.sk/</url>
+               <url>http://sendxmpp.hostname.sk/</url>
        </x>
 </message>
 

diff --git a/sendxmpp b/sendxmpp
index b78fbc2..8348398 100755 (executable)
--- a/sendxmpp
+++ b/sendxmpp
@@ -10,14 +10,12 @@ if 0; # not running under some shell
 # Author:     Dirk-Jan C. Binnema <djcb AT djcbsoftware.nl>
 # Maintainer: Lubomir Host 'rajo' <rajo AT platon.sk>
 # Copyright (c) 2004 - 2005 Dirk-Jan C. Binnema
-# Copyright (c) 2006 - 2009 Lubomir Host 'rajo'
+# Copyright (c) 2006 - 2012 Lubomir Host 'rajo'
 #
-# Homepage: http://sendxmpp.platon.sk
+# Homepage: http://sendxmpp.hostname.sk
 #
 # Released under the terms of the GNU General Public License v2
 #
-# $Platon: sendxmpp/sendxmpp,v 1.22 2010-10-03 19:36:35 rajo Exp $
-# $Id: $
 
 use Authen::SASL qw(Perl); # authentication broken if Authen::SASL::Cyrus module installed
 use Net::XMPP;
@@ -28,7 +26,7 @@ use open ':utf8';
 use open ':std';
 
 # subroutines decls
-sub xmpp_login($$$$$$$$$);
+sub xmpp_login($$$$$$$$$$$);
 sub xmpp_send ($$$$);
 sub xmpp_send_raw_xml($$);
 sub xmpp_send_message($$$$$$);
@@ -44,7 +42,7 @@ sub terminate();
 sub main();
 
 my # MakeMaker
-$VERSION       = [ q$Revision: 1.22 $ =~ m/(\S+)\s*$/g ]->[0];
+$VERSION       = [ q$Revision: 1.23 $ =~ m/(\S+)\s*$/g ]->[0];
 my $RESOURCE = 'sendxmpp';
 my $VERBOSE  = 0;
 my $DEBUG    = 0;
@@ -76,8 +74,10 @@ sub main () {
                           $$cmdline{'username'} || $$config{'username'},
                           $$cmdline{'password'} || $$config{'password'},
                           $$cmdline{'component'}|| $$config{'component'},
-                          $$cmdline{'resource'},
-                          $$cmdline{'tls'},
+                          $$cmdline{'resource'},
+                          $$cmdline{'tls'} || $$config{'tls'},
+                          $$cmdline{'no-tls-verify'} || $$config{'no-tls-verify'},
+                          $$cmdline{'tls-ca-path'} || $$config{'tls-ca-path'} || '',
                           $$cmdline{'ssl'},
                           $$cmdline{'debug'})
       or error_exit("cannot login: $!");
@@ -207,7 +207,9 @@ sub parse_cmdline () {
     usage() unless (scalar(@ARGV));
 
        my ($subject,$file,$resource,$jserver,$port,$username,$password,$component,
-       $message, $chatroom, $headline, $debug, $tls, $ssl, $interactive, $help, $raw, $verbose);
+       $message, $chatroom, $headline, $debug, $tls, $ssl,
+       $no_tls_verify, $tls_ca_path,
+       $interactive, $help, $raw, $verbose);
     my $res = GetOptions ('subject|s=s'    => \$subject,
                          'file|f=s'       => \$file,
                          'resource|r=s'   => \$resource,
@@ -220,6 +222,8 @@ sub parse_cmdline () {
                          'message-type=s' => \$message_type,
                          'chatroom|c'     => \$chatroom,
                          'tls|t'          => \$tls,
+                         'no-tls-verify|n' => \$no_tls_verify,
+                         'tls-ca-path|a=s' => \$tls_ca_path,
                          'ssl|e'          => \$ssl,
                          'interactive|i'  => \$interactive,
                          'help|usage|h'   => \$help,
@@ -279,6 +283,8 @@ sub parse_cmdline () {
                'message-type'    => $message_type,
                'interactive' => ($interactive or 0),
                'tls'         => ($tls or 0),
+               'no-tls-verify' => ($no_tls_verify or 0),
+               'tls-ca-path' => ($tls_ca_path or ''),
                'ssl'         => ($ssl or 0),
                'debug'       => ($debug or 0),
                'verbose'     => ($verbose or 0),
@@ -301,18 +307,26 @@ sub parse_cmdline () {
 # input: hostname,port,username,password,resource,tls,ssl,debug
 # output: an XMPP connection object
 #
-sub xmpp_login ($$$$$$$$$) {
+sub xmpp_login ($$$$$$$$$$$) {
 
-    my ($host, $port, $user, $pw, $comp, $res, $tls, $ssl, $debug) = @_;
+    my ($host, $port, $user, $pw, $comp, $res, $tls, $no_tls_verify, $tls_ca_path, $ssl, $debug) = @_;
     my $cnx = new Net::XMPP::Client(debuglevel=>($debug?2:0));
     error_exit "could not create XMPP client object: $!"
        unless ($cnx);
 
+       my $ssl_verify = 0x01;
+       if ($no_tls_verify) { $ssl_verify = 0x00; }
+       debug_print "ssl_verify: $ssl_verify";
+
+       debug_print "tls_ca_path: $tls_ca_path";
+
     my @res;
        my $arghash = {
                hostname                => $host,
                port            => $port,
                tls                             => $tls,
+               ssl_verify              => $ssl_verify,
+               ssl_ca_path             => $tls_ca_path,
                ssl             => $ssl,
                connectiontype  => 'tcpip',
                componentname   => $comp
@@ -595,6 +609,14 @@ Connect securely, using TLS
 
 Connect securely, using SSL
 
+=item B<-n>,B<--no-tls-verify>
+
+Deactivate the verification of SSL certificates. Better way is to use parameter B<--tls-ca-path> with the needed path to CA certificates.
+
+=item B<-a>,B<--tls-ca-path>
+
+Path to your custom CA certificates, so you can verificate SSL certificates during connecting.
+
 =item B<-l>,B<--headline>
 
 Backward compatibility option. You should use B<--message-type=headline> instead. Send a headline type message (not stored in offline messages)
@@ -691,12 +713,12 @@ Documentation for the L<Net::XMPP> module
 
 The jabber homepage: L<http://www.jabber.org/>
 
-The sendxmpp homepage: L<http://sendxmpp.platon.sk>
+The sendxmpp homepage: L<http://sendxmpp.hostname.sk>
 
 =head1 AUTHOR
 
 sendxmpp has been written by Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>, and uses
 the L<Net::XMPP> modules written by Ryan Eatmon. Current maintainer is
-Lubomir Host 'rajo' <rajo AT platon.sk>, L<http://rajo.platon.sk>
+Lubomir Host 'rajo' <rajo AT platon.sk>, L<http://blog.hostname.sk>
 
 =cut