[devscripts] 01/03: Require LWP::Protocol::https instead of Crypt::SSLeay to access https sites.

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit c542f4e35481f2247812b58be98528ca5a5f47ed
Author: James McCoy <jamessan at debian.org>
Date:   Tue Dec 3 21:39:58 2013 -0500

    Require LWP::Protocol::https instead of Crypt::SSLeay to access https sites.
    
    Closes: #624317
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 README           |  2 +-
 debian/changelog | 11 +++++++----
 debian/control   |  3 ++-
 scripts/uscan.pl |  8 ++++----
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 7314ea2..3b5b961 100644
--- a/README
+++ b/README
@@ -227,7 +227,7 @@ And now, in mostly alphabetical order, the scripts:
   version based on the new update.  Whilst uscan could be used to release
   the updated version automatically, it is probably better not to without
   testing it first.  Uscan can also verify detached OpenPGP signatures if 
-  upstream's signing key is known. [libcrypt-ssleay-perl, gpgv,
+  upstream's signing key is known. [gpgv, liblwp-protocol-https-perl,
   libwww-perl, unzip, lzma, xz-utils]
 
 - uupdate: Update the package with an archive or patches from
diff --git a/debian/changelog b/debian/changelog
index f7525b8..3d92529 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,13 @@ devscripts (2.13.5) UNRELEASED; urgency=low
   [ James McCoy ]
   * namecheck: Fix “406 Not Acceptable” error when querying Alioth.  (Closes:
     #725228)
-  * uscan: Allow specifying file exclusion rules in d/copyright so uscan can
-    automatically repack upstream archives which contain non-DFSG content.
-    Thanks to Andreas Tille, gregor herrmann, and Rafael Laboissiere for the
-    patches.  (Closes: #685787)
+  * uscan:
+    + Allow specifying file exclusion rules in d/copyright so uscan can
+      automatically repack upstream archives which contain non-DFSG content.
+      Thanks to Andreas Tille, gregor herrmann, and Rafael Laboissiere for the
+      patches.  (Closes: #685787)
+    + Require LWP::Protocol::https instead of Crypt::SSLeay to access https
+      sites.  (Closes: #624317)
   * test/*:
     + Pass --no-conf to commands which may be influenced by ~/.devscripts
     + Fix a test failure in test_uscan_online due to different version format.
diff --git a/debian/control b/debian/control
index d48f7f2..b86ee5e 100644
--- a/debian/control
+++ b/debian/control
@@ -49,6 +49,7 @@ Recommends: at,
             libdistro-info-perl,
             libencode-locale-perl,
             libjson-perl,
+            liblwp-protocol-https-perl,
             libparse-debcontrol-perl,
             liburi-perl,
             libwww-perl,
@@ -187,7 +188,7 @@ Description: scripts to make the life of a Debian Package maintainer easier
     transitions for which uploads to unstable are currently blocked
     [libwww-perl, libyaml-syck-perl]
   - uscan: scan upstream sites for new releases of packages
-    [libcrypt-ssleay-perl, gpgv, libwww-perl, unzip, lzma, xz-utils]
+    [gpgv, liblwp-protocol-https-perl, libwww-perl, unzip, lzma, xz-utils]
   - uupdate: integrate upstream changes into a source package [patch]
   - what-patch: determine what patch system, if any, a source package is using
     [patchutils]
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index a77385a..22ab185 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -55,7 +55,7 @@ my $modified_conf_msg;
 my $opwd = cwd();
 
 my $haveSSL = 1;
-eval { require Crypt::SSLeay; };
+eval { require LWP::Protocol::https; };
 if ($@) {
     $haveSSL = 0;
 }
@@ -886,7 +886,7 @@ sub process_watchline ($$$$$$)
     # Devscripts::Versort::upstream_versort
     if ($site =~ m%^http(s)?://%) {
 	if (defined($1) and !$haveSSL) {
-	    uscan_die "$progname: you must have the libcrypt-ssleay-perl package installed\nto use https URLs\n";
+	    uscan_die "$progname: you must have the liblwp-protocol-https-perl package installed\nto use https URLs\n";
 	}
 	print STDERR "$progname debug: requesting URL $base\n" if $debug;
 	$request = HTTP::Request->new('GET', $base, $headers);
@@ -1352,7 +1352,7 @@ EOF
     # Download newer package
     if ($upstream_url =~ m%^http(s)?://%) {
 	if (defined($1) and !$haveSSL) {
-	    uscan_die "$progname: you must have the libcrypt-ssleay-perl package installed\nto use https URLs\n";
+	    uscan_die "$progname: you must have the liblwp-protocol-https-perl package installed\nto use https URLs\n";
 	}
 	# substitute HTML entities
 	# Is anything else than "&" required?  I doubt it.
@@ -1668,7 +1668,7 @@ sub newest_dir ($$$$$) {
 
     if ($site =~ m%^http(s)?://%) {
 	if (defined($1) and !$haveSSL) {
-	    uscan_die "$progname: you must have the libcrypt-ssleay-perl package installed\nto use https URLs\n";
+	    uscan_die "$progname: you must have the liblwp-protocol-https-perl package installed\nto use https URLs\n";
 	}
 	print STDERR "$progname debug: requesting URL $base\n" if $debug;
 	$request = HTTP::Request->new('GET', $base);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git