diff options
author | Gunnar Wolf <gwolf@debian.org> | 2018-09-20 11:40:56 -0500 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2019-12-05 16:35:31 -0500 |
commit | a3d503717e7773114934bdc529b9446a8c12834b (patch) | |
tree | a4861f1c941301203bd98d5cfbc211a1747ddaea | |
parent | 42ddd69717fad55c3c06e5fe8693e4b4237f8dcd (diff) | |
download | listadmin-a3d503717e7773114934bdc529b9446a8c12834b.tar.bz2 listadmin-a3d503717e7773114934bdc529b9446a8c12834b.tar.xz listadmin-a3d503717e7773114934bdc529b9446a8c12834b.tar.zst |
Import Debian changes 2.42-1.2debian/2.42-1.2
listadmin (2.42-1.2) unstable; urgency=medium
* Non-maintainer upload.
* My patch for #873287 caused logging to stop working. Fixed
it. (Closes: #909236)
-rw-r--r-- | debian/changelog | 8 | ||||
-rw-r--r-- | debian/patches/follow_https_redirects | 16 |
2 files changed, 21 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index d7ad9f4..3e19231 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +listadmin (2.42-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * My patch for #873287 caused logging to stop working. Fixed + it. (Closes: #909236) + + -- Gunnar Wolf <gwolf@debian.org> Thu, 20 Sep 2018 11:40:56 -0500 + listadmin (2.42-1.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/patches/follow_https_redirects b/debian/patches/follow_https_redirects index e9ba02b..c54fbe6 100644 --- a/debian/patches/follow_https_redirects +++ b/debian/patches/follow_https_redirects @@ -2,18 +2,28 @@ Description: Make listadmin properly follow redirects to HTTPS-using mailmans Author: Gunnar Wolf <gwolf@debian.org> Bug: https://bugs.debian.org/873287 Forwarded: No -Last-Update: 2018-09-05 +Last-Update: 2018-09-20 Index: listadmin-2.42/listadmin.pl =================================================================== --- listadmin-2.42.orig/listadmin.pl +++ listadmin-2.42/listadmin.pl -@@ -659,9 +659,30 @@ sub mailman_url { +@@ -643,6 +643,9 @@ sub uio_adminurl { + sub mailman_url { + my ($list, $pattern, $params, $action) = @_; + ++ # Calling mailman_url with $pattern often requires the redirects ++ # _NOT_ to be resolved (i.e. for logging) ++ my $nopattern = !( defined($pattern) or $pattern ) + my ($lp, $domain) = split ('@', $list); + + $pattern ||= uio_adminurl ($domain); +@@ -659,9 +662,30 @@ sub mailman_url { $url .= "/$action"; } $url .= "?$params" if $params; + -+ $url = resolve_redirects($url); ++ $url = resolve_redirects($url) unless $nopattern; return $url; } |