Commit 5784812e authored by Lorenzo "Palinuro" Faletra's avatar Lorenzo "Palinuro" Faletra Committed by Lorenzo "Palinuro" Faletra
Browse files

Import Debian version 1.8.3+parrot1

apt (1.8.3+parrot1) rolling; urgency=medium

  * Import new Debian release.
  * Re-allow https-to-http downgrades.

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)
parent 6faf7ea5
...@@ -193,7 +193,7 @@ check_cxx_target(HAVE_FMV_SSE42_AND_CRC32DI "sse4.2" "__builtin_ia32_crc32di(0, ...@@ -193,7 +193,7 @@ check_cxx_target(HAVE_FMV_SSE42_AND_CRC32DI "sse4.2" "__builtin_ia32_crc32di(0,
# Configure some variables like package, version and architecture. # Configure some variables like package, version and architecture.
set(PACKAGE ${PROJECT_NAME}) set(PACKAGE ${PROJECT_NAME})
set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>") set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
set(PACKAGE_VERSION "1.8.2") set(PACKAGE_VERSION "1.8.3")
if (NOT DEFINED DPKG_DATADIR) if (NOT DEFINED DPKG_DATADIR)
execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;" execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
......
...@@ -2475,7 +2475,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg) ...@@ -2475,7 +2475,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
{ {
fprintf(report, "Df:\n"); fprintf(report, "Df:\n");
FILE *log = popen("/bin/df -l","r"); FILE *log = popen("/bin/df -l -x squashfs","r");
if(log != NULL) if(log != NULL)
{ {
char buf[1024]; char buf[1024];
......
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 apt (1.8.2+parrot2) testing; urgency=medium
* Update CI Configuration. * Update CI Configuration.
......
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
"> ">
<!-- this will be updated by 'prepare-release' --> <!-- this will be updated by 'prepare-release' -->
<!ENTITY apt-product-version "1.8.2"> <!ENTITY apt-product-version "1.8.3">
<!-- (Code)names for various things used all over the place --> <!-- (Code)names for various things used all over the place -->
<!ENTITY debian-oldstable-codename "stretch"> <!ENTITY debian-oldstable-codename "stretch">
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: apt-doc 1.8.2\n" "Project-Id-Version: apt-doc 1.8.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
"POT-Creation-Date: 2019-05-28 16:41+0200\n" "POT-Creation-Date: 2019-08-09 11:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
......
...@@ -320,14 +320,14 @@ static ResultState UnwrapHTTPConnect(std::string Host, int Port, URI Proxy, std: ...@@ -320,14 +320,14 @@ static ResultState UnwrapHTTPConnect(std::string Host, int Port, URI Proxy, std:
std::string ProperHost; std::string ProperHost;
if (Host.find(':') != std::string::npos) if (Host.find(':') != std::string::npos)
ProperHost = '[' + Proxy.Host + ']'; ProperHost = '[' + Host + ']';
else else
ProperHost = Proxy.Host; ProperHost = Host;
// Build the connect // Build the connect
Req << "CONNECT " << Host << ":" << std::to_string(Port) << " HTTP/1.1\r\n"; Req << "CONNECT " << Host << ":" << std::to_string(Port) << " HTTP/1.1\r\n";
if (Proxy.Port != 0) if (Proxy.Port != 0)
Req << "Host: " << ProperHost << ":" << std::to_string(Proxy.Port) << "\r\n"; Req << "Host: " << ProperHost << ":" << std::to_string(Port) << "\r\n";
else else
Req << "Host: " << ProperHost << "\r\n"; Req << "Host: " << ProperHost << "\r\n";
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: apt 1.8.2\n" "Project-Id-Version: apt 1.8.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
"POT-Creation-Date: 2019-05-28 16:41+0200\n" "POT-Creation-Date: 2019-08-09 11:16+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
......
#!/bin/sh
set -e
TESTDIR="$(readlink -f "$(dirname "$0")")"
. "$TESTDIR/framework"
setupenvironment
configarchitecture 'amd64'
buildsimplenativepackage 'unrelated' 'all' '0.5~squeeze1' 'unstable'
setupaptarchive
changetowebserver --request-absolute='uri'
msgmsg 'Check that host header we send for CONNECT is for target, not proxy'
echo "deb https://example.example/ example example" > rootdir/etc/apt/sources.list
rm -f rootdir/etc/apt/sources.list.d/*
echo "Acquire::http::Proxy \"http://localhost:${APTHTTPPORT}\";" > rootdir/etc/apt/apt.conf.d/99proxy
aptget update >/dev/null 2>&1
testsuccessequal "CONNECT example.example:443 HTTP/1.1\r
Host: example.example:443\r" grep -A1 "^CONNECT" aptarchive/webserver.log
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment