[OpenSRF-GIT] OpenSRF branch master updated. 0d2c6d74cf60e000646e534a7682b508c84ea55a

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OpenSRF".

The branch, master has been updated
       via  0d2c6d74cf60e000646e534a7682b508c84ea55a (commit)
       via  a53e3878ae172477582ae3cfe3ebd8ec9be14e65 (commit)
      from  2e919d795f0d6c5c17218fef68e894903b168a48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0d2c6d74cf60e000646e534a7682b508c84ea55a
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Apr 10 13:27:34 2014 -0400

    LP#1306044 Removing deprecated jabber register script
    
    This script is no longer user, since ejabberdctrl is used instead.
    What's more, this script uses a Perl package (libnet-jabber-perl) which
    is no longer available in Debian (Jessie).
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/Makefile.am b/Makefile.am
index 79b644a..ed59a61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,6 @@ EXAMPLES_FILES = @srcdir@/examples/fieldmapper2cdbi.xsl \
 				 @srcdir@/examples/math_bench.pl \
 				 @srcdir@/examples/math_client.py \
 				 @srcdir@/examples/multisession-test.pl \
-				 @srcdir@/examples/register.pl \
 				 @srcdir@/examples/srfsh_config.xsd \
 				 @srcdir@/examples/math_xul_client/math \
 				 @srcdir@/examples/math_xul_client/install.js
diff --git a/examples/register.pl b/examples/register.pl
deleted file mode 100755
index dfde4a6..0000000
--- a/examples/register.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/perl
-# ----------------------------------------------------------------------
-# Utility script for registring users on a jabber server.  
-# ----------------------------------------------------------------------
-use Net::Jabber;
-use strict;
-
-if (@ARGV < 4) {
-    print "\nperl $0 <server> <port> <username> <password> \n\n";
-    exit(0);
-}
-
-my $server = $ARGV[0];
-my $port = $ARGV[1];
-my $username = $ARGV[2];
-my $password = $ARGV[3];
-my $resource = "test_${server}_$$";
-
-my $connection = Net::Jabber::Client->new;
-
-my $status = $connection->Connect(hostname=>$server, port=>$port);
-
-my @stat = $connection->RegisterSend(
-	$server, 
-	username => $username,
-	password => $password );
-
-
-print "Register results : @stat\n";
-
-
-if (!defined($status)) {
-    print "ERROR:  Jabber server is down or connection was not allowed.\n";
-    print "        ($!)\n";
-    exit(0);
-}
-
-my @result = $connection->AuthSend(
-	username=>$username, password=>$password, resource=>$resource);
-
-if ($result[0] ne "ok") {
-    print "ERROR: Authorization failed: $result[0] - $result[1]\n";
-    exit(0);
-}
-
-print "Logged in OK to $server:$port\nRegistration succeeded for $username\@$server!\n";
-
-$connection->Disconnect();
-
-

commit a53e3878ae172477582ae3cfe3ebd8ec9be14e65
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Apr 10 12:05:08 2014 -0400

    LP#1306044 Debian Jessie Makefile.install target
    
    * Removes Perl Net::Jabber as a dependency.  There is no Jessie package
      for this and OpenSRF hasn't used it in a long time.
    
    * Leaving Debian Squeeze in place for now
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/README b/README
index 1e72f75..cbe0061 100644
--- a/README
+++ b/README
@@ -39,6 +39,7 @@ make -f src/extras/Makefile.install <osname>
 
 Well-tested values for <osname> include:
 
+  * `debian-jessie` for Debian 8.0
   * `debian-wheezy` for Debian 7.0
   * `debian-squeeze` for Debian 6.0
   * `ubuntu-lucid` for Ubuntu 10.04
diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index f717448..c5aa758 100644
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -4,12 +4,14 @@
 #
 # Makefile to install prerequisites for OpenSRF
 #
-# Currently supports Debian (wheezy/squeeze), Ubuntu (lucid/precise)
+# Currently supports Debian (jessie/wheezy/squeeze), Ubuntu (lucid/precise)
 # and Fedora (16).
 #
 # Installs Perl prereqs, libjs with Perl wrapper
 #
 # usage:
+# 	make -f Makefile.install debian-jessie
+# 	- or -
 # 	make -f Makefile.install debian-wheezy
 # 	- or -
 # 	make -f Makefile.install debian-squeeze
@@ -56,7 +58,6 @@ DEBS =  \
 	liblog-log4perl-perl\
 	libmodule-build-perl\
 	libnet-dns-perl\
-	libnet-jabber-perl\
 	libperl-dev\
 	libreadline-dev\
 	libtemplate-perl\
@@ -123,7 +124,6 @@ FEDORAS = \
 	perl-Log-Log4perl \
 	perl-Module-Build \
 	perl-Net-DNS \
-	perl-Net-Jabber \
 	perl-Net-Server \
 	perl-SQL-Abstract-Limit \
 	perl-Template-Toolkit \
@@ -166,6 +166,13 @@ EXTRA_DEBS_WHEEZY = \
 	libxml-libxslt-perl \
 	libncurses5-dev
 
+EXTRA_DEBS_JESSIE = \
+	libmemcached-dev \
+	libmemcached-tools \
+	libxml-libxml-perl \
+	libxml-libxslt-perl \
+	libncurses5-dev
+
 EXTRA_DEBS_UBUNTU_LUCID = \
 	libmemcached-dev\
 	libxml-libxml-perl \
@@ -183,8 +190,10 @@ all:
 	@echo "please specify an OS" && exit 0
 
 
+debian-jessie: generic_debian jessie
 debian-wheezy: generic_debian wheezy
 debian-squeeze: generic_debian squeeze
+jessie: install_extra_debs_jessie
 wheezy: install_extra_debs_wheezy
 squeeze: install_extra_debs_squeeze
 generic_debian: install_debs debian_sys_config
@@ -218,6 +227,9 @@ install_debs:
 install_extra_debs:
 	$(APT_TOOL) install $(EXTRA_DEBS)
 
+install_extra_debs_jessie: install_extra_debs
+	$(APT_TOOL) install $(EXTRA_DEBS_JESSIE)
+
 install_extra_debs_wheezy: install_extra_debs
 	$(APT_TOOL) install $(EXTRA_DEBS_WHEEZY)
 

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                 |    1 -
 README                      |    1 +
 examples/register.pl        |   50 -------------------------------------------
 src/extras/Makefile.install |   18 +++++++++++++--
 4 files changed, 16 insertions(+), 54 deletions(-)
 delete mode 100755 examples/register.pl


hooks/post-receive
-- 
OpenSRF