Commit 321839f0 authored by Julian Andres Klode's avatar Julian Andres Klode Committed by Lorenzo "Palinuro" Faletra

Import Debian version 1.8.4

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
parent 853f11bf
include: https://nest.parrotsec.org/parrot-organization/ci/raw/master/deb-build.yml
image: debian:testing
variables:
DEBIAN_FRONTEND: noninteractive
test as root:
stage: test
script:
- adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000
- rm -f /etc/dpkg/dpkg.cfg.d/excludes
- apt-get update
- apt-get install -qq build-essential expect gcovr sudo
- chmod -R o+rwX $PWD
- ./prepare-release travis-ci
- sudo -u travis mkdir build
- sudo -u travis env -C build cmake -DCMAKE_BUILD_TYPE=Coverage -G Ninja ..
- sudo -u travis ninja -C build
- CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test
- unbuffer ./test/integration/run-tests -q -j 4
- gcovr
test as user:
stage: test
script:
- adduser --home /home/travis travis --quiet --disabled-login --gecos "" --uid 1000
- rm -f /etc/dpkg/dpkg.cfg.d/excludes
- apt-get update
- apt-get install -qq build-essential expect gcovr sudo
- chmod 755 /root
- chmod -R o+rwX $PWD
- ./prepare-release travis-ci
- sudo -u travis mkdir build
- sudo -u travis env -C build cmake -DCMAKE_BUILD_TYPE=Coverage -G Ninja ..
- sudo -u travis ninja -C build
- sudo -u travis CTEST_OUTPUT_ON_FAILURE=1 ninja -C build test
- sudo -u travis unbuffer ./test/integration/run-tests -q -j 4
- sudo -u travis gcovr
......@@ -69,6 +69,7 @@ add_optional_compile_options(Wnoexcept)
add_optional_compile_options(Wsign-promo)
add_optional_compile_options(Wundef)
add_optional_compile_options(Wdouble-promotion)
add_optional_compile_options(Werror=return-type)
# apt-ftparchive dependencies
find_package(BerkeleyDB REQUIRED)
......@@ -193,7 +194,7 @@ check_cxx_target(HAVE_FMV_SSE42_AND_CRC32DI "sse4.2" "__builtin_ia32_crc32di(0,
# Configure some variables like package, version and architecture.
set(PACKAGE ${PROJECT_NAME})
set(PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>")
set(PACKAGE_VERSION "1.8.3")
set(PACKAGE_VERSION "1.8.4")
if (NOT DEFINED DPKG_DATADIR)
execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
......
......@@ -1790,6 +1790,7 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress)
case Item::Remove:
case Item::Purge:
ADDARGC("--force-depends");
ADDARGC("--abort-after=1");
if (std::any_of(I, J, ItemIsEssential))
{
ADDARGC("--force-remove-essential");
......
......@@ -84,7 +84,7 @@ check_stamp()
return 0
fi
if [ "$interval" -eq 0 ]; then
if [ "$interval" = 0 ]; then
debug_echo "check_stamp: interval=0"
# treat as no time has passed
return 1
......@@ -237,7 +237,7 @@ do_cache_backup()
BackupArchiveInterval="$1"
if [ "$BackupArchiveInterval" = always ]; then
:
elif [ "$BackupArchiveInterval" -eq 0 ]; then
elif [ "$BackupArchiveInterval" = 0 ]; then
return
fi
......@@ -415,12 +415,12 @@ if [ $UpdateInterval = always ] ||
[ $AutocleanInterval = always ] ||
[ $CleanInterval = always ] ; then
:
elif [ $UpdateInterval -eq 0 ] &&
[ $DownloadUpgradeableInterval -eq 0 ] &&
[ $UnattendedUpgradeInterval -eq 0 ] &&
[ $BackupArchiveInterval -eq 0 ] &&
[ $AutocleanInterval -eq 0 ] &&
[ $CleanInterval -eq 0 ] ; then
elif [ $UpdateInterval = 0 ] &&
[ $DownloadUpgradeableInterval = 0 ] &&
[ $UnattendedUpgradeInterval = 0 ] &&
[ $BackupArchiveInterval = 0 ] &&
[ $AutocleanInterval = 0 ] &&
[ $CleanInterval = 0 ] ; then
# check cache size
check_size_constraints
......
apt (1.8.3+parrot2) rolling; urgency=medium
apt (1.8.4) unstable; urgency=medium
* Rebuild package for rolling branch.
* 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
-- 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
-- Julian Andres Klode <jak@debian.org> Thu, 19 Sep 2019 22:06:45 +0200
apt (1.8.3) unstable; urgency=medium
......@@ -21,19 +19,6 @@ apt (1.8.3) unstable; urgency=medium
-- 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 ]
......@@ -56,13 +41,6 @@ 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
......
......@@ -268,7 +268,7 @@
">
<!-- this will be updated by 'prepare-release' -->
<!ENTITY apt-product-version "1.8.3">
<!ENTITY apt-product-version "1.8.4">
<!-- (Code)names for various things used all over the place -->
<!ENTITY debian-oldstable-codename "stretch">
......
......@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: apt-doc 1.8.3\n"
"Project-Id-Version: apt-doc 1.8.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
"POT-Creation-Date: 2019-08-09 11:16+0200\n"
"POT-Creation-Date: 2019-09-19 22:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
......@@ -373,9 +373,6 @@ 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('+');
......
......@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: apt 1.8.3\n"
"Project-Id-Version: apt 1.8.4\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
"POT-Creation-Date: 2019-08-09 11:16+0200\n"
"POT-Creation-Date: 2019-09-19 22:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......
#!/bin/sh
set -e
TESTDIR="$(readlink -f "$(dirname "$0")")"
. "$TESTDIR/framework"
setupenvironment
configarchitecture 'i386'
buildsimplenativepackage 'alpha' 'all' '1' 'unstable' 'Depends: beta'
buildsimplenativepackage 'beta' 'all' '1' 'unstable'
setupaptarchive
testsuccess aptget install alpha -y
cat > rootdir/var/lib/dpkg/info/alpha.prerm << EOF
#!/bin/sh
exit 42
EOF
chmod 755 rootdir/var/lib/dpkg/info/alpha.prerm
testdpkginstalled 'alpha' 'beta'
testfailure aptget remove -y beta
# Beta should not be removed because alpha failed to be removed and depends on it
testdpkginstalled 'alpha' 'beta'
set(PROJECT_TEST_LIBRARIES apt-private apt-inst)
find_path(GTEST_ROOT src/gtest.cc
/usr/src/googletest/googletest
/usr/src/googletest
/usr/src/gtest
)
find_package(GTest)
......
Markdown is supported
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