Import Debian version 2.0.2+parrot1

apt (2.0.2+parrot1) rolling-testing; urgency=medium

  * Import new Debian version.
  * Apply https->http redirection patch.

debian/changelog

+apt (2.0.2+parrot1) rolling-testing; urgency=medium
+
+  * Import new Debian version.
+  * Apply https->http redirection patch.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Sat, 18 Apr 2020 23:24:11 +0200
+
 apt (2.0.2) unstable; urgency=medium
 
   [ Boyuan Yang ]
@@ -21,6 +28,13 @@ apt (2.0.2) unstable; urgency=medium
 
  -- Julian Andres Klode <jak@debian.org>  Thu, 09 Apr 2020 12:21:07 +0200
 
+apt (2.0.1+parrot1) rolling-testing; urgency=medium
+
+  * Import new Debian version.
+  * Apply https->http redirection patch
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@localhost.localdomain>  Sat, 04 Apr 2020 15:43:29 +0200
+
 apt (2.0.1) unstable; urgency=medium
 
   [ David Kalnischkies ]
@@ -36,6 +50,12 @@ apt (2.0.1) unstable; urgency=medium
 
  -- Julian Andres Klode <jak@debian.org>  Tue, 24 Mar 2020 11:53:30 +0100
 
+apt (2.0.0+parrot1) rolling-testing; urgency=medium
+
+  * Apply https->http redirection patch on new version.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@localhost.localdomain>  Tue, 31 Mar 2020 04:44:44 +0200
+
 apt (2.0.0) unstable; urgency=medium
 
   * Upload to unstable - Happy APT 2.0 day!
@@ -310,6 +330,66 @@ apt (1.9.0) experimental; urgency=medium
 
  -- Julian Andres Klode <jak@debian.org>  Mon, 17 Jun 2019 11:36:56 +0200
 
+apt (1.8.4+parrot1+lts1) lts-updates; urgency=medium
+
+  * Import new Parrot Rolling release.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Mon, 03 Feb 2020 03:32:42 +0100
+
+apt (1.8.4+parrot1) rolling; urgency=medium
+
+  * Import new Debian version.
+  * Re-allow https-to-http downgrades.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Wed, 25 Sep 2019 09:02:18 +0200
+
+apt (1.8.4) unstable; urgency=medium
+
+  * CMake: Pass -Werror=return-type to gcc
+  * apt.systemd.daily: Do not numerically check if intervals equal 0
+    (LP: #1840995)
+  * Pass --abort-after=1 to dpkg when using --force-depends (Closes: #935910)
+    (LP: #1844634)
+  * Fix use of GTest to adjust for GTest 1.9
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 19 Sep 2019 22:06:45 +0200
+
+apt (1.8.3+parrot2) rolling; urgency=medium
+
+  * Rebuild package for rolling branch.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Sun, 18 Aug 2019 17:58:22 +0200
+
+apt (1.8.3+parrot1) rolling; urgency=medium
+
+  * Import new Debian release.
+  * Re-allow https-to-http downgrades.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Thu, 15 Aug 2019 23:29:08 +0200
+
+apt (1.8.3) unstable; urgency=medium
+
+  [ Simon Körner ]
+  * http: Fix Host header in proxied https connections (LP: #1838771)
+
+  [ Brian Murray ]
+  * Do not include squashfs file systems in df output. (LP: #1756595)
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 09 Aug 2019 11:16:15 +0200
+
+apt (1.8.2+parrot2) testing; urgency=medium
+
+  * Update CI Configuration.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Wed, 05 Jun 2019 16:27:38 +0200
+
+apt (1.8.2+parrot1) testing; urgency=medium
+
+  * Import new Debian release.
+  * Re-apply https downgrade patch.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Wed, 05 Jun 2019 15:47:44 +0200
+
 apt (1.8.2) unstable; urgency=medium
 
   [ Alwin Henseler ]
@@ -332,6 +412,13 @@ apt (1.8.2) unstable; urgency=medium
 
  -- Julian Andres Klode <jak@debian.org>  Tue, 28 May 2019 16:40:29 +0200
 
+apt (1.8.1+parrot1) testing; urgency=medium
+
+  * Import new Debian release.
+  * Re-apply https downgrade patch.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Fri, 10 May 2019 21:47:56 +0200
+
 apt (1.8.1) unstable; urgency=medium
 
   * Add test case for local-only packages pinned to never
@@ -3762,7 +3849,7 @@ apt (0.9.14.3~exp4) experimental; urgency=medium
     - add Description tag for deb822 sources
     - add support for Enabled: no in deb822 sources.list
     - add support for multiple URIs in deb822 style sources.list
-    - add support for multiple types in one line
+    - add support for multipl types in one line
   * add integration test for apt search and apt show
   * do not ignore ioctl(TIOCSCTTY) errors
 

methods/basehttp.cc

@@ -372,6 +372,9 @@ BaseHttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)
 	 // as well as http to https
 	 else if ((Uri.Access == "http" || Uri.Access == "https+http") && tmpURI.Access == "https")
 	    return TRY_AGAIN_OR_REDIRECT;
+	 	 // allow https to http redirects (for https mirrordirectors with http mirrors)
+	 else if ((Uri.Access == "https" || Uri.Access == "https+http") && tmpURI.Access == "http")
+	 	return TRY_AGAIN_OR_REDIRECT;
 	 else
 	 {
 	    auto const tmpplus = tmpURI.Access.find('+');