diff options
Diffstat (limited to 'meta/recipes-devtools/apt')
| -rw-r--r-- | meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch | 87 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch | 9 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt_2.6.1.bb (renamed from meta/recipes-devtools/apt/apt_2.4.5.bb) | 10 |
6 files changed, 103 insertions, 17 deletions
diff --git a/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch b/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch index 8b28ede8a8..5443ff6caa 100644 --- a/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch +++ b/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch @@ -13,11 +13,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9745c13..7cfc9ee 100644 +index 668e2d762..62f441bfa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -239,7 +239,7 @@ add_subdirectory(apt-pkg) - add_subdirectory(apt-private) +@@ -246,7 +246,7 @@ add_subdirectory(apt-private) + endif() add_subdirectory(cmdline) add_subdirectory(completions) -add_subdirectory(doc) diff --git a/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch b/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch index 59b9cd190f..37a3133010 100644 --- a/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch +++ b/meta/recipes-devtools/apt/apt/0001-Do-not-init-tables-from-dpkg-configuration.patch @@ -1,4 +1,4 @@ -From 11ba49594ae9d11f0070198c146b5e437fa83022 Mon Sep 17 00:00:00 2001 +From b84280fec4e1d0d33eca78e76556023f8f8fe5b7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Fri, 10 May 2019 16:47:38 +0200 Subject: [PATCH] Do not init tables from dpkg configuration @@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc -index b9d9b15..1725c59 100644 +index b9d9b15d2..1725c5966 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -281,8 +281,8 @@ bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys) diff --git a/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch b/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch new file mode 100644 index 0000000000..15b036b90d --- /dev/null +++ b/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch @@ -0,0 +1,87 @@ +From e91fb0618ce0a5d42f239d0fca602544858f0819 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 16 Aug 2022 08:44:18 -0700 +Subject: [PATCH] Remove using std::binary_function + +std::binary_function and std::unary_function are deprecated since c++11 +and removed in c++17, therefore remove it and use lambda functions to get same +functionality implemented. + +Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/253] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ftparchive/apt-ftparchive.cc | 33 ++++++++++----------------------- + 1 file changed, 10 insertions(+), 23 deletions(-) + +diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc +index 0f6587281..0a253b12b 100644 +--- a/ftparchive/apt-ftparchive.cc ++++ b/ftparchive/apt-ftparchive.cc +@@ -48,6 +48,11 @@ + using namespace std; + unsigned Quiet = 0; + ++auto ContentsCompare = [](const auto &a, const auto &b) { return a.ContentsMTime < b.ContentsMTime; }; ++auto DBCompare = [](const auto &a, const auto &b) { return a.BinCacheDB < b.BinCacheDB; }; ++auto SrcDBCompare = [](const auto &a, const auto &b) { return a.SrcCacheDB < b.SrcCacheDB; }; ++ ++ + static struct timeval GetTimevalFromSteadyClock() /*{{{*/ + { + auto const Time = std::chrono::steady_clock::now().time_since_epoch(); +@@ -116,24 +121,6 @@ struct PackageMap + bool SrcDone; + time_t ContentsMTime; + +- struct ContentsCompare +- { +- inline bool operator() (const PackageMap &x,const PackageMap &y) +- {return x.ContentsMTime < y.ContentsMTime;}; +- }; +- +- struct DBCompare +- { +- inline bool operator() (const PackageMap &x,const PackageMap &y) +- {return x.BinCacheDB < y.BinCacheDB;}; +- }; +- +- struct SrcDBCompare +- { +- inline bool operator() (const PackageMap &x,const PackageMap &y) +- {return x.SrcCacheDB < y.SrcCacheDB;}; +- }; +- + void GetGeneral(Configuration &Setup,Configuration &Block); + bool GenPackages(Configuration &Setup,struct CacheDB::Stats &Stats); + bool GenSources(Configuration &Setup,struct CacheDB::Stats &Stats); +@@ -869,7 +856,7 @@ static bool DoGenerateContents(Configuration &Setup, + else + I->ContentsMTime = A.st_mtime; + } +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::ContentsCompare()); ++ stable_sort(PkgList.begin(),PkgList.end(),ContentsCompare); + + /* Now for Contents.. The process here is to do a make-like dependency + check. Each contents file is verified to be newer than the package files +@@ -941,8 +928,8 @@ static bool Generate(CommandLine &CmdL) + LoadBinDir(PkgList,Setup); + + // Sort by cache DB to improve IO locality. +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare()); +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::SrcDBCompare()); ++ stable_sort(PkgList.begin(),PkgList.end(),DBCompare); ++ stable_sort(PkgList.begin(),PkgList.end(),SrcDBCompare); + + // Generate packages + if (_config->FindB("APT::FTPArchive::ContentsOnly", false) == false) +@@ -993,8 +980,8 @@ static bool Clean(CommandLine &CmdL) + LoadBinDir(PkgList,Setup); + + // Sort by cache DB to improve IO locality. +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::DBCompare()); +- stable_sort(PkgList.begin(),PkgList.end(),PackageMap::SrcDBCompare()); ++ stable_sort(PkgList.begin(),PkgList.end(),DBCompare); ++ stable_sort(PkgList.begin(),PkgList.end(),SrcDBCompare); + + string CacheDir = Setup.FindDir("Dir::CacheDir"); + diff --git a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch index 593ed7d096..6f4d5b6e72 100644 --- a/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch +++ b/meta/recipes-devtools/apt/apt/0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch @@ -1,4 +1,4 @@ -From 47c2b42af60ceefd8ed52b32a3a365facf0e05b8 Mon Sep 17 00:00:00 2001 +From a2dd661484536492b47d4c88998f2bf516749bc8 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 21 May 2020 20:13:25 +0000 Subject: [PATCH] Revert "always run 'dpkg --configure -a' at the end of our @@ -20,7 +20,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc -index 93effa9..4375781 100644 +index 93effa959..4375781d1 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -1199,12 +1199,6 @@ void pkgDPkgPM::BuildPackagesProgressMap() diff --git a/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch b/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch index 2837b7f1b3..036ce35963 100644 --- a/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch +++ b/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch @@ -15,16 +15,18 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3c8ec3f..821a24f 100644 +index be157a55f..54163ae6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -245,13 +245,6 @@ add_subdirectory(ftparchive) +@@ -252,15 +252,6 @@ add_subdirectory(ftparchive) add_subdirectory(methods) add_subdirectory(test) -if (USE_NLS) -add_subdirectory(po) +-endif() - +-if(TARGET update-po AND TARGET update-po4a) -# Link update-po4a into the update-po target -add_dependencies(update-po update-po4a) -endif() @@ -32,6 +34,3 @@ index 3c8ec3f..821a24f 100644 # Create our directories. install_empty_directories( ${CONF_DIR}/apt.conf.d --- -2.31.0 - diff --git a/meta/recipes-devtools/apt/apt_2.4.5.bb b/meta/recipes-devtools/apt/apt_2.6.1.bb index 53849f80a3..68bd7c5407 100644 --- a/meta/recipes-devtools/apt/apt_2.4.5.bb +++ b/meta/recipes-devtools/apt/apt_2.6.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Advanced front-end for dpkg" DESCRIPTION = "APT is the Advanced Package Tool, an advanced interface to the Debian packaging system which provides the apt-get program." -HOMEPAGE = "https://packages.debian.org/jessie/apt" +HOMEPAGE = "https://packages.debian.org/sid/apt" LICENSE = "GPL-2.0-or-later" SECTION = "base" @@ -13,6 +13,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \ file://0001-cmake-Do-not-build-po-files.patch \ file://0001-Hide-fstatat64-and-prlimit64-defines-on-musl.patch \ file://0001-aptwebserver.cc-Include-array.patch \ + file://0001-Remove-using-std-binary_function.patch \ " SRC_URI:append:class-native = " \ @@ -25,7 +26,7 @@ SRC_URI:append:class-nativesdk = " \ file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \ " -SRC_URI[sha256sum] = "5552f175c3a3924f5cda0c079b821b30f68a2521959f2c30ab164d2ec7993ecf" +SRC_URI[sha256sum] = "86b888c901fa2e78f1bf52a2aaa2f400ff82a472b94ff0ac6631939ee68fa6fd" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" # the package is taken from snapshots.debian.org; that source is static and goes stale @@ -35,8 +36,6 @@ UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apt/" # is considered stable, e.g. 1.0, 1.4, 1.8, 2.2, 2.6, etc. As there is no way # to express 'divisible by 4 plus 2' in regex (that I know of), let's hardcode a few. UPSTREAM_CHECK_REGEX = "[^\d\.](?P<pver>((2\.2)|(2\.6)|(3\.0)|(3\.4)|(3\.8)|(4\.2))(\.\d+)+)\.tar" -# needs be marked as unknown until 2.6 is out -UPSTREAM_VERSION_UNKNOWN = "1" inherit cmake perlnative bash-completion useradd @@ -50,7 +49,7 @@ DEPENDS += "db gnutls lz4 zlib bzip2 xz libgcrypt xxhash" EXTRA_OECMAKE:append = " -DCURRENT_VENDOR=debian -DWITH_DOC=False \ -DDPKG_DATADIR=${datadir}/dpkg \ - -DTRIEHASH_EXECUTABLE=${WORKDIR}/triehash \ + -DTRIEHASH_EXECUTABLE=${UNPACKDIR}/triehash \ -DCMAKE_DISABLE_FIND_PACKAGE_ZSTD=True \ -DCMAKE_DISABLE_FIND_PACKAGE_SECCOMP=True \ -DWITH_TESTS=False \ @@ -123,6 +122,7 @@ do_install:append:class-native() { do_install:append:class-nativesdk() { customize_apt_conf_sample + rm -rf ${D}${localstatedir}/log } do_install:append:class-target() { |