diff -Nru apt-1.2.25/configure apt-1.2.26/configure --- apt-1.2.25/configure 2017-09-26 14:32:05.000000000 +0000 +++ apt-1.2.26/configure 2018-03-06 08:47:58.000000000 +0000 @@ -2455,7 +2455,7 @@ PACKAGE="apt" -PACKAGE_VERSION="1.2.25" +PACKAGE_VERSION="1.2.26" PACKAGE_MAIL="APT Development Team " cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" diff -Nru apt-1.2.25/configure.ac apt-1.2.26/configure.ac --- apt-1.2.25/configure.ac 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/configure.ac 2018-03-06 08:46:09.000000000 +0000 @@ -19,7 +19,7 @@ AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) PACKAGE="apt" -PACKAGE_VERSION="1.2.25" +PACKAGE_VERSION="1.2.26" PACKAGE_MAIL="APT Development Team " AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE_VERSION,"$PACKAGE_VERSION") diff -Nru apt-1.2.25/debian/changelog apt-1.2.26/debian/changelog --- apt-1.2.25/debian/changelog 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/debian/changelog 2018-03-06 08:46:09.000000000 +0000 @@ -1,3 +1,11 @@ +apt (1.2.26) xenial; urgency=medium + + * Revert "http: A response with Content-Length: 0 has no content" + - broke Content-Length: 0 redirects (in xenial only) (LP: #1751225) + * travis: Migrate to Docker to make CI work again + + -- Julian Andres Klode Tue, 06 Mar 2018 09:43:16 +0100 + apt (1.2.25) xenial; urgency=medium * Microrelease covering 1.4.7 (LP: #1702326) and 1.4.8 diff -Nru apt-1.2.25/doc/apt-verbatim.ent apt-1.2.26/doc/apt-verbatim.ent --- apt-1.2.25/doc/apt-verbatim.ent 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/apt-verbatim.ent 2018-03-06 08:46:09.000000000 +0000 @@ -237,7 +237,7 @@ "> - + diff -Nru apt-1.2.25/doc/po/apt-doc.pot apt-1.2.26/doc/po/apt-doc.pot --- apt-1.2.25/doc/po/apt-doc.pot 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/apt-doc.pot 2018-03-06 08:46:09.000000000 +0000 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt-doc 1.2.25\n" +"Project-Id-Version: apt-doc 1.2.26\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru apt-1.2.25/doc/po/de.po apt-1.2.26/doc/po/de.po --- apt-1.2.25/doc/po/de.po 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/de.po 2018-03-06 08:46:09.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.8\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: 2014-09-14 14:46+0200\n" "Last-Translator: Chris Leick \n" "Language-Team: German \n" diff -Nru apt-1.2.25/doc/po/es.po apt-1.2.26/doc/po/es.po --- apt-1.2.25/doc/po/es.po 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/es.po 2018-03-06 08:46:09.000000000 +0000 @@ -38,7 +38,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: 2014-07-04 01:31+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" diff -Nru apt-1.2.25/doc/po/fr.po apt-1.2.26/doc/po/fr.po --- apt-1.2.25/doc/po/fr.po 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/fr.po 2018-03-06 08:46:09.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: 2014-11-15 17:26+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" diff -Nru apt-1.2.25/doc/po/it.po apt-1.2.26/doc/po/it.po --- apt-1.2.25/doc/po/it.po 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/it.po 2018-03-06 08:46:09.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: 2015-12-27 21:26+0200\n" "Last-Translator: Beatrice Torracca \n" "Language-Team: Italian \n" diff -Nru apt-1.2.25/doc/po/ja.po apt-1.2.26/doc/po/ja.po --- apt-1.2.25/doc/po/ja.po 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/ja.po 2018-03-06 08:46:09.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.6\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: 2016-03-23 09:39+0900\n" "Last-Translator: Takuma Yamada \n" "Language-Team: Japanese \n" diff -Nru apt-1.2.25/doc/po/nl.po apt-1.2.26/doc/po/nl.po --- apt-1.2.25/doc/po/nl.po 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/nl.po 2018-03-06 08:46:09.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.1.10-nl\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: 2016-02-01 16:17+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" diff -Nru apt-1.2.25/doc/po/pl.po apt-1.2.26/doc/po/pl.po --- apt-1.2.25/doc/po/pl.po 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/pl.po 2018-03-06 08:46:09.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: 2014-07-04 02:13+0200\n" "Last-Translator: Robert Luberda \n" "Language-Team: Polish \n" diff -Nru apt-1.2.25/doc/po/pt_BR.po apt-1.2.26/doc/po/pt_BR.po --- apt-1.2.25/doc/po/pt_BR.po 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/pt_BR.po 2018-03-06 08:46:09.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes \n" "Language-Team: \n" diff -Nru apt-1.2.25/doc/po/pt.po apt-1.2.26/doc/po/pt.po --- apt-1.2.25/doc/po/pt.po 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/doc/po/pt.po 2018-03-06 08:46:09.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: apt-doc 1.0.7\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2017-09-26 16:16+0200\n" +"POT-Creation-Date: 2018-03-06 08:45+0000\n" "PO-Revision-Date: 2014-08-29 00:34+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" diff -Nru apt-1.2.25/Dockerfile apt-1.2.26/Dockerfile --- apt-1.2.25/Dockerfile 1970-01-01 00:00:00.000000000 +0000 +++ apt-1.2.26/Dockerfile 2018-03-06 08:46:09.000000000 +0000 @@ -0,0 +1,11 @@ +FROM ubuntu:xenial +COPY . /tmp +WORKDIR /tmp +RUN sed -i s#://deb.debian.org#://cdn-fastly.deb.debian.org# /etc/apt/sources.list \ + && apt-get update \ + && adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000 \ + && env DEBIAN_FRONTEND=noninteractive apt-get install build-essential ccache expect curl git moreutils -q -y \ + && env DEBIAN_FRONTEND=noninteractive ./prepare-release travis-ci \ + && dpkg-reconfigure ccache \ + && rm -r /tmp/* \ + && apt-get clean diff -Nru apt-1.2.25/methods/server.cc apt-1.2.26/methods/server.cc --- apt-1.2.25/methods/server.cc 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/methods/server.cc 2018-03-06 08:46:09.000000000 +0000 @@ -163,9 +163,6 @@ if (stringcasecmp(Tag,"Content-Length:") == 0) { - auto ContentLength = strtoull(Val.c_str(), NULL, 10); - if (ContentLength == 0) - return true; if (Encoding == Closes) Encoding = Stream; HaveContent = true; @@ -174,7 +171,7 @@ if (Result == 416) DownloadSizePtr = &JunkSize; - *DownloadSizePtr = ContentLength; + *DownloadSizePtr = strtoull(Val.c_str(), NULL, 10); if (*DownloadSizePtr >= std::numeric_limits::max()) return _error->Errno("HeaderLine", _("The HTTP server sent an invalid Content-Length header")); else if (*DownloadSizePtr == 0) diff -Nru apt-1.2.25/.travis.yml apt-1.2.26/.travis.yml --- apt-1.2.25/.travis.yml 2017-09-26 14:31:00.000000000 +0000 +++ apt-1.2.26/.travis.yml 2018-03-06 08:46:09.000000000 +0000 @@ -1,21 +1,15 @@ language: cpp sudo: required -dist: trusty +services: + - docker env: - - TEST_SUITE=user - - TEST_SUITE=root -before_install: - - sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu/ wily main universe' -y - - | - sudo sh -c '/bin/echo -e "Package: *\nPin: release n=wily\nPin-Priority: 1" > /etc/apt/preferences.d/wily' - - sudo apt-get update -qq + - USER=travis + - USER=root install: - - sudo apt-get -qq -y -t wily install libstdc++-5-dev g++ - - sudo ./prepare-release travis-ci - - sudo apt-get -qq -y -t wily install gettext liblz4-dev python3-apt - - make + - sed -i -e "s#1000#$(id -u)#g" Dockerfile + - docker build --tag=apt-ci . +before_script: + - docker run --rm -w $PWD -v $HOME/.ccache:$HOME/.ccache -v $PWD:$PWD --user=travis apt-ci make script: - - make test - - test "$TEST_SUITE" != "user" || ./test/integration/run-tests -q - - sudo adduser --force-badname --system --home /nonexistent --no-create-home --quiet _apt || true - - test "$TEST_SUITE" != "root" || sudo ./test/integration/run-tests -q + - docker run --rm -w $PWD -v $PWD:$PWD --user=travis apt-ci env make test + - docker run --rm -w $PWD -v $PWD:$PWD --user=$USER --tmpfs /tmp:suid,exec apt-ci unbuffer ./test/integration/run-tests -q -j 4