Package: release.debian.org Severity: normal Tags: buster User: release.debian.org@packages.debian.org Usertags: pu X-Debbugs-Cc: deity@lists.debian.org [ Reason ] Allow Suite value to change in Release files [ Impact ] buster users will stop receiving updates once buster becomes oldstable [ Tests ] Regression tests test it all, change has been in testing/unstable [ Risks ] It is just swapping false for true, it's trivial. [ Checklist ] [x] *all* changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in (old)stable [x] the issue is verified as fixed in unstable [ Changes ] Swap false to true for allowreleaseinfochanges::suite. [ Other info ] N/A -- debian developer - deb.li/jak | jak-linux.org - free software dev ubuntu core developer i speak de, en
diff -Nru apt-1.8.2.2/apt-pkg/acquire-item.cc apt-1.8.2.3/apt-pkg/acquire-item.cc
--- apt-1.8.2.2/apt-pkg/acquire-item.cc 2020-12-07 12:31:04.000000000 +0100
+++ apt-1.8.2.3/apt-pkg/acquire-item.cc 2021-04-19 18:41:13.000000000 +0200
@@ -1828,7 +1828,7 @@
{ "Origin", AllowInfoChange, &metaIndex::GetOrigin },
{ "Label", AllowInfoChange, &metaIndex::GetLabel },
{ "Version", true, &metaIndex::GetVersion }, // numbers change all the time, that is okay
- { "Suite", AllowInfoChange, &metaIndex::GetSuite },
+ { "Suite", true, &metaIndex::GetSuite },
{ "Codename", AllowInfoChange, &metaIndex::GetCodename },
{ nullptr, false, nullptr }
};
diff -Nru apt-1.8.2.2/CMakeLists.txt apt-1.8.2.3/CMakeLists.txt
--- apt-1.8.2.2/CMakeLists.txt 2020-12-07 12:31:04.000000000 +0100
+++ apt-1.8.2.3/CMakeLists.txt 2021-04-19 18:41:13.000000000 +0200
@@ -193,7 +193,7 @@
# 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.2.2")
+set(PACKAGE_VERSION "1.8.2.3")
if (NOT DEFINED DPKG_DATADIR)
execute_process(COMMAND ${PERL_EXECUTABLE} -MDpkg -e "print $Dpkg::DATADIR;"
diff -Nru apt-1.8.2.2/debian/changelog apt-1.8.2.3/debian/changelog
--- apt-1.8.2.2/debian/changelog 2020-12-07 12:31:04.000000000 +0100
+++ apt-1.8.2.3/debian/changelog 2021-04-19 18:41:13.000000000 +0200
@@ -1,3 +1,9 @@
+apt (1.8.2.3) buster; urgency=medium
+
+ * Default Acquire::AllowReleaseInfoChange::Suite to "true" (Closes: #931566)
+
+ -- Julian Andres Klode <jak@debian.org> Mon, 19 Apr 2021 18:41:13 +0200
+
apt (1.8.2.2) buster-security; urgency=high
* SECURITY UPDATE: Integer overflow in parsing (LP: #1899193)
diff -Nru apt-1.8.2.2/doc/apt-verbatim.ent apt-1.8.2.3/doc/apt-verbatim.ent
--- apt-1.8.2.2/doc/apt-verbatim.ent 2020-12-07 12:31:04.000000000 +0100
+++ apt-1.8.2.3/doc/apt-verbatim.ent 2021-04-19 18:41:13.000000000 +0200
@@ -268,7 +268,7 @@
">
<!-- this will be updated by 'prepare-release' -->
-<!ENTITY apt-product-version "1.8.2.2">
+<!ENTITY apt-product-version "1.8.2.3">
<!-- (Code)names for various things used all over the place -->
<!ENTITY debian-oldstable-codename "stretch">
diff -Nru apt-1.8.2.2/doc/po/apt-doc.pot apt-1.8.2.3/doc/po/apt-doc.pot
--- apt-1.8.2.2/doc/po/apt-doc.pot 2020-12-07 12:31:04.000000000 +0100
+++ apt-1.8.2.3/doc/po/apt-doc.pot 2021-04-19 18:41:13.000000000 +0200
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt-doc 1.8.2.2\n"
+"Project-Id-Version: apt-doc 1.8.2.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-12-02 17:16+0000\n"
+"POT-Creation-Date: 2021-04-19 16:47+0000\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"
diff -Nru apt-1.8.2.2/po/apt-all.pot apt-1.8.2.3/po/apt-all.pot
--- apt-1.8.2.2/po/apt-all.pot 2020-12-07 12:31:04.000000000 +0100
+++ apt-1.8.2.3/po/apt-all.pot 2021-04-19 18:41:13.000000000 +0200
@@ -5,9 +5,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: apt 1.8.2.2\n"
+"Project-Id-Version: apt 1.8.2.3\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2020-12-02 17:16+0000\n"
+"POT-Creation-Date: 2021-04-19 16:47+0000\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"
diff -Nru apt-1.8.2.2/test/integration/test-apt-update-releaseinfo-changes apt-1.8.2.3/test/integration/test-apt-update-releaseinfo-changes
--- apt-1.8.2.2/test/integration/test-apt-update-releaseinfo-changes 2020-12-07 12:31:04.000000000 +0100
+++ apt-1.8.2.3/test/integration/test-apt-update-releaseinfo-changes 2021-04-19 18:41:13.000000000 +0200
@@ -78,3 +78,17 @@
testequal "All packages are up to date.
N: Repository 'file:$APTARCHIVE earth InRelease' changed its default priority for apt_preferences(5) from 1 to 500.
N: More information about this can be found online in the Release notes at: https://example.org/mars/release-notes"; tail -n 3 rootdir/tmp/testsuccesswithnotice.output
+
+# Suite testing also needs codename adjustment, otherwise complaints about
+# mismatch between sources.list and Release file.
+sed -i -e 's#^Suite: earth#Suite: mars#' $(find ./aptarchive -name 'Release')
+sed -i -e 's#^Codename: colony#Codename: earth#' $(find ./aptarchive -name 'Release')
+signreleasefiles
+testfailuremsg "E: Repository 'file:$APTARCHIVE earth InRelease' changed its 'Suite' value from 'earth' to 'mars'
+E: Repository 'file:$APTARCHIVE earth InRelease' changed its 'Codename' value from 'colony' to 'earth'
+N: More information about this can be found online in the Release notes at: https://example.org/mars/release-notes
+N: This must be accepted explicitly before updates for this repository can be applied. See apt-secure(8) manpage for details." apt update --no-allow-releaseinfo-change-suite
+testsuccesswithnotice apt update --allow-releaseinfo-change-codename
+testequal "N: Repository 'file:$APTARCHIVE earth InRelease' changed its 'Suite' value from 'earth' to 'mars'
+N: Repository 'file:$APTARCHIVE earth InRelease' changed its 'Codename' value from 'colony' to 'earth'
+N: More information about this can be found online in the Release notes at: https://example.org/mars/release-notes"; tail -n 3 rootdir/tmp/testsuccesswithnotice.output
Attachment:
signature.asc
Description: PGP signature