apt: upgrade 2.6.1 -> 3.0.3
PATCH v3 1/1 apt: upgrade 2.6.1 -> 3.0.3
Changelog:
https://metadata.ftp-master.debian.org/changelogs/main/a/apt/apt_3.0.3_changelog
Dropped patches which are included in this release, or became obsolete:
0001-Fix-compilation-error-with-clang-libc-18.patch - included in this release 0001-Fix-musl-build.patch - included in this release 0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch - included in this release 0001-Remove-using-std-binary_function.patch - became obsolete, fixed upstream 0001-aptwebserver.cc-Include-array.patch - became obsolete, fixed upstream 0001-strutl-Add-missing-include-cstdint-gcc-15.patch - included in this release
Added a new patch to avoid compilation error with musl:
error: 'basename' was not declared in this scope; did you mean 'rename'?
Adapted DEPENDS list - gnutls and gcrypt dependencies were dropped in favor of openssl in version 2.9.19.
Added a new PACKAGECONFIG, 'usrmerge', which displays a gentle warning if the system isn't a usrmerge system during package installation.
Added new COMMON_ARCH CMake argument - if it is not defined, CMake is trying to determine the value of this variable by running dpkg, which is usually a futile endeavour. It is used in config creation, and to print some system info.
Also adapt a self test: the apt-key command has been deprecated since a while, and in this release it was completely removed. Instead sources.list file contains the signature data, on a per-repository basis.
---
v3: adapt self-test. apt-key has been removed from this version, so make the test
use an alternative method to indicate the signature location
v2: changed the status 0001-fix-compilation-with-musl.patch from Pending to Submitted
meta/lib/oeqa/runtime/cases/apt.py | 2 +-
...void-changing-install-paths-based-on.patch | 2 +-
...e-documentation-directory-altogether.patch | 2 +-
...-init-tables-from-dpkg-configuration.patch | 2 +-
...compilation-error-with-clang-libc-18.patch | 29 -------
.../apt/apt/0001-Fix-musl-build.patch | 28 ------
...mum_required-to-3.13-to-avoid-warnin.patch | 47 ----------
...001-Remove-using-std-binary_function.patch | 87 -------------------
...n-dpkg-configure-a-at-the-end-of-our.patch | 4 +-
.../0001-aptwebserver.cc-Include-array.patch | 30 -------
.../0001-cmake-Do-not-build-po-files.patch | 6 +-
.../apt/0001-fix-compilation-with-musl.patch | 49 +++++++++++
...l-Add-missing-include-cstdint-gcc-15.patch | 26 ------
.../apt/{apt_2.6.1.bb => apt_3.0.3.bb} | 17 ++--
14 files changed, 67 insertions(+), 264 deletions(-)
delete mode 100644 meta/recipes-devtools/apt/apt/0001-Fix-compilation-error-with-clang-libc-18.patch
delete mode 100644 meta/recipes-devtools/apt/apt/0001-Fix-musl-build.patch
delete mode 100644 meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch
delete mode 100644 meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch
delete mode 100644 meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch
create mode 100644 meta/recipes-devtools/apt/apt/0001-fix-compilation-with-musl.patch
delete mode 100644 meta/recipes-devtools/apt/apt/0001-strutl-Add-missing-include-cstdint-gcc-15.patch
rename meta/recipes-devtools/apt/{apt_2.6.1.bb => apt_3.0.3.bb} (88%)meta/lib/oeqa/runtime/cases/apt.py +1 -1
@@ -54,7 +54,7 @@ class AptRepoTest(AptTest): def setup_key(self): # the key is found on the target /etc/pki/packagefeed-gpg/ # named PACKAGEFEED-GPG-KEY-poky-branch - self.target.run('cd %s; apt-key add P*' % ('/etc/pki/packagefeed-gpg')) + self.target.run('KEY_FILE=`realpath /etc/pki/packagefeed-gpg/P*`; sed -i "s|^deb |deb \[signed-by=$KEY_FILE\] |g" /etc/apt/sources.list; cat /etc/apt/sources.list') @skipIfNotFeature('package-management', 'Test requires package-management to be in IMAGE_FEATURES')
meta/recipes-devtools/apt/apt/0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch +1 -1
@@ -14,7 +14,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cd4f8e..4759812 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -21,9 +21,9 @@ set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-lgcov") +@@ -28,9 +28,9 @@ set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-lgcov") set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "-lgcov") # Work around bug in GNUInstallDirs
meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch +1 -1
@@ -16,7 +16,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 668e2d762..62f441bfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -246,7 +246,7 @@ add_subdirectory(apt-private) +@@ -251,7 +251,7 @@ add_subdirectory(apt-private) endif() add_subdirectory(cmdline) add_subdirectory(completions)
meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch +1 -1
@@ -16,7 +16,7 @@ diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index b9d9b15d2..1725c5966 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc -@@ -281,8 +281,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) +@@ -295,8 +295,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) return _error->Error(_("Unable to determine a suitable packaging system type")); }
meta/recipes-devtools/apt/apt/0001-Fix-compilation-error-with-clang-libc-18.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From b4488583424b33f51cb031562a9e8df820ffda23 Mon Sep 17 00:00:00 2001 -From: Chongyun Lee <[email protected]> -Date: Thu, 15 Aug 2024 21:31:24 +0800 -Subject: [PATCH] Fix compilation error with clang/libc++ 18 - -Upstream-Status: Backport [https://salsa.debian.org/apt-team/apt/-/commit/b4488583424b33f51cb031562a9e8df820ffda23] -Signed-off-by: Khem Raj <[email protected]> ---- - apt-pkg/cacheset.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h -index 5dbb9bf08..1c67a65d6 100644 ---- a/apt-pkg/cacheset.h -+++ b/apt-pkg/cacheset.h -@@ -218,11 +218,11 @@ public: - operator container_iterator(void) const { return _iter; } - inline iterator_type& operator++() { ++_iter; return static_cast<iterator_type&>(*this); } - inline iterator_type operator++(int) { iterator_type tmp(*this); operator++(); return tmp; } -- inline iterator_type operator+(typename container_iterator::difference_type const &n) { return iterator_type(_iter + n); } -+ inline iterator_type operator+(typename container_iterator::difference_type const &n) const { return iterator_type(_iter + n); } - inline iterator_type operator+=(typename container_iterator::difference_type const &n) { _iter += n; return static_cast<iterator_type&>(*this); } - inline iterator_type& operator--() { --_iter;; return static_cast<iterator_type&>(*this); } - inline iterator_type operator--(int) { iterator_type tmp(*this); operator--(); return tmp; } -- inline iterator_type operator-(typename container_iterator::difference_type const &n) { return iterator_type(_iter - n); } -+ inline iterator_type operator-(typename container_iterator::difference_type const &n) const { return iterator_type(_iter - n); } - inline typename container_iterator::difference_type operator-(iterator_type const &b) { return (_iter - b._iter); } - inline iterator_type operator-=(typename container_iterator::difference_type const &n) { _iter -= n; return static_cast<iterator_type&>(*this); } - inline bool operator!=(iterator_type const &i) const { return _iter != i._iter; }
meta/recipes-devtools/apt/apt/0001-Fix-musl-build.patch deleted +0 -28
@@ -1,28 +0,0 @@ -From 6b8547161b902b01b639d05a4cdf849d7694556f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Fri, 22 May 2020 15:29:23 +0000 -Subject: [PATCH] apt-pkg/contrib/srvrec.h: Explicitly include sys/types.h - -This avoids type errors with musl C library. - -Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/200] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - apt-pkg/contrib/srvrec.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/apt-pkg/contrib/srvrec.h b/apt-pkg/contrib/srvrec.h -index e5d0f43..2010184 100644 ---- a/apt-pkg/contrib/srvrec.h -+++ b/apt-pkg/contrib/srvrec.h -@@ -9,6 +9,7 @@ - #ifndef SRVREC_H - #define SRVREC_H - -+#include <sys/types.h> - #include <string> - #include <vector> - #include <arpa/nameser.h> --- -2.20.1 -
meta/recipes-devtools/apt/apt/0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch deleted +0 -47
47 lines not on this page · raw message
meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch deleted +0 -87
87 lines not on this page · raw message
meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +2 -2
@@ -23,7 +23,7 @@ diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 93effa959..4375781d1 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc -@@ -1199,12 +1199,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() +@@ -1210,12 +1210,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() } } }
@@ -36,7 +36,7 @@ index 93effa959..4375781d1 100644 } /*}}}*/ void pkgDPkgPM::StartPtyMagic() /*{{{*/ -@@ -1741,7 +1735,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) +@@ -1752,7 +1746,8 @@ bool pkgDPkgPM::Go(APT::Progress::PackageManager *progress) // support subpressing of triggers processing for special // cases like d-i that runs the triggers handling manually
meta/recipes-devtools/apt/apt/0001-aptwebserver.cc-Include-array.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 5985f366750a73c81c7d86893a2b959b4af062a5 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Wed, 26 May 2021 22:12:46 -0700 -Subject: [PATCH] aptwebserver.cc: Include <array> - -This helps getting std::array definition - -Fixes -test/interactive-helper/aptwebserver.cc:36:55: error: constexpr variable cannot have non-literal type 'const std::array<std::array<const char *, 2>, 6>' - constexpr std::array<std::array<char const *,2>,6> htmlencode = {{ - -Upstream-Status: Submitted [https://github.com/Debian/apt/pull/133] -Signed-off-by: Khem Raj <[email protected]> - ---- - test/interactive-helper/aptwebserver.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/interactive-helper/aptwebserver.cc b/test/interactive-helper/aptwebserver.cc -index f4f8d95..361c7a9 100644 ---- a/test/interactive-helper/aptwebserver.cc -+++ b/test/interactive-helper/aptwebserver.cc -@@ -23,6 +23,7 @@ - - #include <array> - #include <algorithm> -+#include <array> - #include <fstream> - #include <iostream> - #include <list>
meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch +3 -3
@@ -11,14 +11,14 @@ Fixes Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Khem Raj <[email protected]> --- - CMakeLists.txt | 7 ------- - 1 file changed, 7 deletions(-) + CMakeLists.txt | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be157a55f..54163ae6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -252,15 +252,6 @@ add_subdirectory(ftparchive) +@@ -257,15 +257,6 @@ add_subdirectory(ftparchive) add_subdirectory(methods) add_subdirectory(test)
meta/recipes-devtools/apt/apt/0001-fix-compilation-with-musl.patch new file +49 -0
49 lines not on this page · raw message
meta/recipes-devtools/apt/apt/0001-strutl-Add-missing-include-cstdint-gcc-15.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 9da1b0dbdcc90455bc9de49f73a96e7d18f83493 Mon Sep 17 00:00:00 2001 -From: Julian Andres Klode <[email protected]> -Date: Tue, 18 Feb 2025 10:29:40 +0100 -Subject: [PATCH] strutl: Add missing #include <cstdint> [gcc 15] - -Closes: #1096322 - -Upstream-Status: Backport [https://salsa.debian.org/apt-team/apt/-/commit/f82dcd7e4ebb3f70d28e9feb3621676f8c0cc024] - -Signed-off-by: Khem Raj <[email protected]> ---- - apt-pkg/contrib/strutl.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc -index 67100f1..c0a1cbc 100644 ---- a/apt-pkg/contrib/strutl.cc -+++ b/apt-pkg/contrib/strutl.cc -@@ -26,6 +26,7 @@ - - #include <algorithm> - #include <array> -+#include <cstdint> - #include <iomanip> - #include <limits> - #include <locale>
meta/recipes-devtools/apt/apt_3.0.3.bb renamed from meta/recipes-devtools/apt/apt_2.6.1.bb +9 -8
@@ -8,14 +8,9 @@ SECTION = "base" SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://triehash \ file://0001-Disable-documentation-directory-altogether.patch \ - file://0001-Fix-musl-build.patch \ file://0001-CMakeLists.txt-avoid-changing-install-paths-based-on.patch \ file://0001-cmake-Do-not-build-po-files.patch \ - file://0001-aptwebserver.cc-Include-array.patch \ - file://0001-Remove-using-std-binary_function.patch \ - file://0001-strutl-Add-missing-include-cstdint-gcc-15.patch \ - file://0001-Raise-cmake_minimum_required-to-3.13-to-avoid-warnin.patch \ - file://0001-Fix-compilation-error-with-clang-libc-18.patch \ + file://0001-fix-compilation-with-musl.patch \ " SRC_URI:append:class-native = " \
@@ -28,7 +23,7 @@ SRC_URI:append:class-nativesdk = " \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " -SRC_URI[sha256sum] = "86b888c901fa2e78f1bf52a2aaa2f400ff82a472b94ff0ac6631939ee68fa6fd" +SRC_URI[sha256sum] = "5b5f6f6d26121742a83aa80d4ed0eb0c6ce9bea259518db412edefd95760e4ef" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale
@@ -47,7 +42,7 @@ USERADD_PARAM:${PN} = "--system --home /nonexistent --no-create-home _apt" BBCLASSEXTEND = "native nativesdk" -DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" +DEPENDS += "db lz4 zlib bzip2 xz xxhash openssl" EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ -DDPKG_DATADIR=${datadir}/dpkg \
@@ -55,8 +50,14 @@ EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \ -DCMAKE_DISABLE_FIND_PACKAGE_SECCOMP=True \ -DWITH_TESTS=False \ + -DCOMMON_ARCH=${DPKG_ARCH} \ " +PACKAGECONFIG ??= "" +# usrmerge displays a runtime warning during package installation in case +# the system doesn't have merged /usr folders. +PACKAGECONFIG[usrmerge] = "-DREQUIRE_MERGED_USR=ON,-DREQUIRE_MERGED_USR=OFF" + do_configure:prepend() { echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH )" >> ${WORKDIR}/toolchain.cmake }