Import Debian version 2.1.11+parrot1

apt (2.1.11+parrot1) rolling-testing; urgency=medium . * NImport new Debian release.

Import Debian version 2.1.11+parrot1
apt (2.1.11+parrot1) rolling-testing; urgency=medium . * NImport new Debian release.
9b7508fe · Lorenzo "Palinuro" Faletra · Lorenzo "Palinuro" Faletra · 01923641 · 9b7508fe · 9b7508fe
Commit 9b7508fe authored Nov 16, 2020 by Lorenzo "Palinuro" Faletra Committed by Lorenzo "Palinuro" Faletra Nov 16, 2020
--- a/debian/changelog
+++ b/debian/changelog
+apt (2.1.11+parrot1) rolling-testing; urgency=medium
+
+  * NImport new Debian release.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Mon, 16 Nov 2020 14:01:10 +0100
+
 apt (2.1.11) unstable; urgency=medium

  [ JCGoran ]
@@ -13,6 +19,13 @@ apt (2.1.11) unstable; urgency=medium

 -- Julian Andres Klode <juliank@ubuntu.com>  Wed, 21 Oct 2020 11:53:18 +0200

+
+apt (2.1.10+parrot1) rolling-testing; urgency=medium
+
+  * Import new Debian release.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Fri, 14 Aug 2020 19:29:22 +0200
+
 apt (2.1.10) unstable; urgency=medium

  * Default Acquire::AllowReleaseInfoChange::Suite to "true" (Closes: #931566)
@@ -43,6 +56,12 @@ apt (2.1.9) unstable; urgency=medium

 -- Julian Andres Klode <jak@debian.org>  Mon, 10 Aug 2020 14:16:23 +0200

+apt (2.1.8+parrot1) rolling-testing; urgency=medium
+
+  * Import new Debian release.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Wed, 12 Aug 2020 01:01:03 +0200
+
 apt (2.1.8) unstable; urgency=medium

  [ Julian Andres Klode ]
@@ -67,6 +86,13 @@ apt (2.1.8) unstable; urgency=medium

 -- Julian Andres Klode <jak@debian.org>  Tue, 04 Aug 2020 12:41:28 +0200

+apt (2.1.7+parrot1) rolling-testing; urgency=medium
+
+  * Import new Debian version.
+  * Re-enable https-to-http redirects.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Sat, 18 Jul 2020 16:27:55 +0200
+
 apt (2.1.7) unstable; urgency=medium

  [ David Kalnischkies ]
@@ -168,6 +194,13 @@ apt (2.1.2) unstable; urgency=critical

 -- Julian Andres Klode <jak@debian.org>  Wed, 13 May 2020 22:04:47 +0200

+
+apt (2.1.1+parrot1) rolling; urgency=medium
+
+  * Import new Debian release.
+
+ -- Lorenzo "Palinuro" Faletra <palinuro@parrotsec.org>  Thu, 14 May 2020 19:11:03 +0200
+
 apt (2.1.1) unstable; urgency=medium

  [ David Kalnischkies ]
@@ -203,6 +236,13 @@ apt (2.1.0) unstable; urgency=medium

 -- Julian Andres Klode <jak@debian.org>  Mon, 04 May 2020 15:58:24 +0200

+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 ]
@@ -226,6 +266,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 ]
@@ -241,6 +288,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!
@@ -515,6 +568,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 ]
@@ -537,6 +650,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
@@ -1063,7 +1183,7 @@ apt (1.6~alpha3) unstable; urgency=medium

 apt (1.6~alpha2) unstable; urgency=medium

-  * seccomp: Conditionalize statx() allowlisting
+  * seccomp: Conditionalize statx() whitelisting
  * CMake: methods: Cleanup link libraries, use OBJECT libraries
  * methods: Enable additional syscalls (SYSV IPC) in fakeroot (Closes: #879662)
  * Don't segfault if receiving a method warning on empty queue
@@ -1432,7 +1552,7 @@ apt (1.4~rc1) unstable; urgency=medium
  * make the moo reproducible.
    Thanks to Chris Lamb for initial patch and guru meditation (Closes: #848721)
  * update release mappings in documentation
-  * avoid malloc if option allowlist is disabled (default)
+  * avoid malloc if option whitelist is disabled (default)

  [ Julian Andres Klode ]
  * basehttp: Only read Content-Range on 416 and 206 responses (LP: #1657567)
@@ -1482,7 +1602,7 @@ apt (1.4~beta3) unstable; urgency=medium
    Thanks to Kristian Glass for initial patch! (Closes: #709092)
  * separating state variables regarding server/request (Closes: #440057)
  * fix minimum pkgs option for dpkg --recursive usage
-  * allow warning generation for non-allowlisted options
+  * allow warning generation for non-whitelisted options

  [ Oriol Debian ]
  * Catalan program translation update (Closes: #846514)
@@ -3967,7 +4087,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

@@ -4379,7 +4499,7 @@ apt (0.9.9.3) unstable; urgency=low
  [ Ben Hutchings ]
  * debian/apt.auto-removal.sh:
    - do not include debug symbol packages for the kernel in the 
-      denylist (closes: #717616)
+      blacklist (closes: #717616)
  
  [ Michael Vogt ]
  * debian/apt.postinst:
@@ -6696,7 +6816,7 @@ apt (0.8.11) unstable; urgency=low
  * methods/{gzip,bzip}.cc:
    - print a good error message if FileSize() is zero
  * apt-pkg/aptconfiguration.cc:
-    - remove the inbuilt Translation files allowlist
+    - remove the inbuilt Translation files whitelist
  * cmdline/apt-cache.cc:
    - remove not implemented 'apt-cache add' command
  * doc/apt-cache.8.xml:

--- a/methods/basehttp.cc
+++ b/methods/basehttp.cc
@@ -371,6 +371,9 @@ BaseHttpMethod::DealWithHeaders(FetchResult &Res, RequestState &Req)
 	    return TRY_AGAIN_OR_REDIRECT;
 	 // 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
 	 {