[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 stretch
in repository devscripts.

commit 87b774768efa4534ba1fb3b8af0abda3ebf4239a
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 ae2d050..d4ed061 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ devscripts (2.17.6+deb9u2) UNRELEASED; urgency=medium
   * debchange:
     + Update the manpage to mention that --bpo now targets stretch-backports,
       not jessie-backports.  Closes: #877877
+  * uscan:
+    + Apply patch from Stephen Kitt <skitt at debian.org> to support https in the
+      sf.net special redirector.  Closes: #879207
 
  -- Mattia Rizzolo <mattia at debian.org>  Sat, 30 Sep 2017 22:19:56 +0200
 
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 58a11b0..29e8551 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -1044,12 +1044,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.
@@ -2707,9 +2707,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