[devscripts] 01/01: uscan: support https in the sf.net special redirector

[Mattia Rizzolo]

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

mattia pushed a commit to branch master
in repository devscripts.

commit 8dc8bf6f8ffbd9cf77509c2473e005396dd28ed4
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Oct 25 00:45:03 2017 +0200

    uscan: support https in the sf.net special redirector
    
    Closes: #879207
    Thanks: Stephen Kitt <skitt at debian.org> for the patch
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/changelog | 3 +++
 scripts/uscan.pl | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 69bdd5a..4d302db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,9 @@ devscripts (2.17.11) UNRELEASED; urgency=medium
   * debrsign:
     + Apply patch from Gilles Filippini <pini at debian.org> to add support for
       .buildinfo files.  Closes: #862324
+  * uscan:
+    + Apply patch from Stephen Kitt <skitt at debian.org> to support https in the
+      sf.net special redirector.  Closes: #879207
 
  -- Chris Lamb <lamby at debian.org>  Wed, 27 Sep 2017 13:24:39 +0100
 
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 63d3381..f1b052d 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1043,12 +1043,12 @@ simpler form of URL. The format below will automatically be rewritten to use
 the redirector with the watch file:
 
   version=4
-  http://sf.net/<project>/ <tar-name>-(.+)\.tar\.gz debian uupdate
+  https://sf.net/<project>/ <tar-name>-(.+)\.tar\.gz debian uupdate
 
 For B<audacity>, set the watch file as:
 
   version=4
-  http://sf.net/audacity/ audacity-minsrc-(.+)\.tar\.gz debian uupdate
+  https://sf.net/audacity/ audacity-minsrc-(.+)\.tar\.gz debian uupdate
 
 Please note, you can still use normal functionalities of B<uscan> to set up a
 watch file for this site without using the redirector.
@@ -2723,9 +2723,9 @@ sub process_watchline ($$$$$$)
 	}
 
 	# Handle sf.net addresses specially
-	if (! $bare and $base =~ m%^http://sf\.net/%) {
+	if (! $bare and $base =~ m%^https?://sf\.net/%) {
 	    uscan_verbose "sf.net redirection to qa.debian.org/watch/sf.php\n";
-	    $base =~ s%^http://sf\.net/%https://qa.debian.org/watch/sf.php/%;
+	    $base =~ s%^https?://sf\.net/%https://qa.debian.org/watch/sf.php/%;
 	    $filepattern .= '(?:\?.*)?';
 	}
 	# Handle pypi.python.org addresses specially

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