Bug#638190: pu: package shelldap/0.2-1+squeeze1

[Salvatore Bonaccorso <carnil@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: pu

Dear Release Team

In the case one would like to use shelldap with --tls and
libio-socket-ssl-perl is not installed, shelldap will fail. With
upstream there was a fix, to make the error message a bit clearer.

Is it possible that I can upload an updated package with 1) upstreams
fix on the error message, and 2) furthermore add of Recommends on                                                                                          
libio-socket-ssl-perl?

See [1] and [2].

 [1] http://bugs.debian.org/614350
 [2] http://bugs.debian.org/638062

Attached is the proposed debdiff.

Please let me know if you agree with this, and if I could upload in
case.

Regards
Salvatore

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/8 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash

diff -u shelldap-0.2/debian/changelog shelldap-0.2/debian/changelog
--- shelldap-0.2/debian/changelog
+++ shelldap-0.2/debian/changelog
@@ -1,3 +1,13 @@
+shelldap (0.2-1+squeeze1) stable; urgency=low
+
+  * Add ssl-errmsg.patch to exit with a nicer error message if IO::Socket::SSL
+    isnt installed, but the user is requesting SSL/TLS.
+    (Closes: #614350, #638062).
+  * debian/control: Add libio-socket-ssl-perl to Recommends.
+  * Email change: Salvatore Bonaccorso -> carnil@debian.org
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Wed, 17 Aug 2011 16:25:18 +0200
+
 shelldap (0.2-1) unstable; urgency=low
 
   * Initial release (Closes: #548271)
diff -u shelldap-0.2/debian/copyright shelldap-0.2/debian/copyright
--- shelldap-0.2/debian/copyright
+++ shelldap-0.2/debian/copyright
@@ -30,7 +30,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: 2009, Salvatore Bonaccorso <salvatore.bonaccorso@gmail.com>
+Copyright: 2009, Salvatore Bonaccorso <carnil@debian.org>
 License: BSD
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
diff -u shelldap-0.2/debian/control shelldap-0.2/debian/control
--- shelldap-0.2/debian/control
+++ shelldap-0.2/debian/control
@@ -1,7 +1,7 @@
 Source: shelldap
 Section: utils
 Priority: optional
-Maintainer: Salvatore Bonaccorso <salvatore.bonaccorso@gmail.com>
+Maintainer: Salvatore Bonaccorso <carnil@debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7)
 Build-Depends-Indep: perl
@@ -13,6 +13,7 @@
 Depends: ${misc:Depends}, ${perl:Depends}, 
  libyaml-syck-perl, libterm-shell-perl, libnet-ldap-perl,
  libalgorithm-diff-perl, libterm-readkey-perl, libterm-readline-gnu-perl
+Recommends: libio-socket-ssl-perl
 Description: shell-like interface for browsing LDAP servers and editing their content
  Shelldap lets you browse and edit an LDAP tree as if it were a filesystem.  It
  keeps command history, has sane autocompletes, credential caching, site-wide
diff -u shelldap-0.2/debian/patches/series shelldap-0.2/debian/patches/series
--- shelldap-0.2/debian/patches/series
+++ shelldap-0.2/debian/patches/series
@@ -1,0 +2 @@
+ssl-errmsg.patch
only in patch2:
unchanged:
--- shelldap-0.2.orig/debian/patches/ssl-errmsg.patch
+++ shelldap-0.2/debian/patches/ssl-errmsg.patch
@@ -0,0 +1,30 @@
+Description: Exit with a nicer error message if IO::Socket::SSL isn't
+ installed, but the user is requesting SSL/TLS. (this is normally
+ required by Net::LDAP.)
+Origin: vendor, http://projects.martini.nu/shelldap/attachment/ticket/8/ssl-errmsg.patch
+Bug: http://projects.martini.nu/shelldap/ticket/8
+Bug-Debian: http://bugs.debian.org/614350
+Forwarded: no
+Author: Mahlon E. Smith <mahlon@martini.nu>
+Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2011-08-17
+
+--- a/shelldap
++++ b/shelldap
+@@ -425,6 +425,16 @@
+ 	
+ 	# fill in potentially missing info
+ 	die "No server specified.\n" unless $conf->{'server'};
++
++	# Emit a nicer error message if IO::Socket::SSL is
++	# not installed and Net::LDAP decides it is required.
++	#
++	if ( $conf->{'tls'} || $conf->{'server'} =~ m|ldaps://| ) {
++		eval 'use IO::Socket::SSL';
++		die qq{IO::Socket::SSL not installed, but is required for SSL or TLS connections.
++You may try connecting insecurely, or install the module and try again.\n} if $@;
++	}
++
+ 	if ( $conf->{'binddn'} && ! $conf->{'bindpass'} ) {
+ 		print "Bind password: ";
+ 		Term::ReadKey::ReadMode 2;