summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-devtools/apt
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2023-05-05 19:29:21 +0300
committerAndrew Geissler <geissonator@yahoo.com>2023-05-19 16:11:41 +0300
commit028142bd6118b39dd3928195162e5f1cf2a8f3ce (patch)
treede3fc1d81a0e7046980dd4ab7829942b08d4db3e /poky/meta/recipes-devtools/apt
parentd452b77b0ed98c8f3dcd413078e87f25ab4a3b1d (diff)
downloadopenbmc-028142bd6118b39dd3928195162e5f1cf2a8f3ce.tar.xz
subtree updates
poky: cce6db2a59..76cec94fad: Alex Kiernan (1): rust: Upgrade 1.68.2 -> 1.69.0 Alexander Kanavin (10): selftest/distrodata: clean up exception lists in recipe maintainers test dhcpcd: use git instead of tarballs perl: patch out build paths from native binaries binutils: backport a patch to address failures when time64.inc is in use time64.inc: add glibc-testsuite to 'special cases' bitbake.conf: set minimum required target kernel to 5.15 time64.inc: add a comment about how to simulate Y2038 in qemu oeqa/sdk/assimp: run only when zlib is in the SDK insane.bbclass: simplify exceptions for 32 bit time API check vulkan: add a comment explaining upstream version policy Andrey Zhizhikin (1): cryptodev: upgrade to 1.13 Armin Kuster (2): maintainers.inc: remove myself from assignment os-release: Add CPE_NAME Changhyeok Bae (1): iproute2: upgrade 6.2.0 -> 6.3.0 Enrico Jörns (1): package_manager/ipk: fix config path generation in _create_custom_config() Frederic Martinsons (3): ptest-cargo.bbclass: create class python3-bcrypt: enable build of unit tests zvariant: add ptest feature for zvariant test suite Jamin Lin (2): kernel-fitimage: support 64 bits address uboot-sign: support 64bits address Joe Slater (1): ghostscript: fix CVE-2023-28879 Johannes Schrimpf (1): python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting Khem Raj (8): musl: Update to latest master gpgme: Reset ac_cv_sys_file_offset_bits on musl mpg123: Reset ac_cv_sys_file_offset_bits on musl quilt: Fix merge.test race condition systemd: Fix timesyncd runtime assertions with 64bit time_t qtwebkitgtk: Backport a build fix for GCC 13 cmake: Upgrade to 3.26.3 piglit: Fix c++11-narrowing warnings in tests Lee Chee Yang (1): release-notes-4.2: remove/merge duplicates entries Markus Volk (2): gtk4: update 4.10.0 -> 4.10.3 gcr: update 4.0.0 -> 4.1.0 Martin Jansa (2): populate_sdk_ext.bbclass: redirect stderr to stdout so that both end in LOGFILE image_types_wic: Remove incorrect MLPREFIX to already prefixed virtual/ Martin Siegumfeldt (1): systemd-systemctl: fix instance template WantedBy symlink construction Michael Halstead (1): docs: add support for mickledore (4.2) release Michael Opdenacker (3): dev-manual: init-manager.rst: add summary ref-manual: system-requirements.rst: fix AlmaLinux variable name ref-manual: variables.rst: don't mention the INIT_MANAGER "none" option Ming Liu (1): weston: add xwayland to DEPENDS for PACKAGECONFIG xwayland Otavio Salvador (2): glide: remove as 'go mod' has become standard mesa: 23.0.2 -> 23.0.3 Patrick Williams (1): perl-version: remove PERL* assignments Paul Gortmaker (1): scripts: fix buildstats diff/summary hard bound to host python3 Peter Bergin (1): update-alternatives.bbclass: fix old override syntax Peter Kjellerstedt (1): license.bbclass: Include LICENSE in the output when it fails to parse Petr Kubizňák (1): devicetree.bbclass: Allow selection of dts files to build Qiu Tingting (1): lz4: Add ptest support Randolph Sapp (1): kernel-devicetree: allow specification of dtb directory Ranjitsinh Rathod (1): libbsd: Add correct license for all packages Richard Purdie (13): bitbake: cooker: Log config and parse cache status changes binutils: Drop crosssdk suffix from virtual provides to improve dependency handling gcc/go: Drop crosssdk suffix from virtual provides to improve dependency handling oeqa/runtime/ptest: Make returning no test results a failure python3-psutil: Drop nativesdk class extension due to breakage maintainers.inc: Move apt/dpkg to unassigned patchelf: Upgrade 0.17.2 -> 0.18.0 maintainers.inc: Fix email address typo qemu: Add fix for powerpc instruction fallback issue qemu: Upgrade 7.2.0 -> 8.0.0 maintainers.inc: Move repo to unassigned recipes: Default to https git protocol where possible bitbake: tests/fetch: Default to https git protocol where possible Ross Burton (13): python3-pytest: add missing tomllib RDEPENDS libinput: upgrade to 1.23.0 gtk+3: upgrade 3.24.36 -> 3.24.37 piglit: upgrade to latest revision dmidecode: upgrade to 3.5 connman: backport fix for CVE-2023-28488 vulkan-samples: update to latest SHA glslang: upgrade to 1.3.243 vulkan-headers: upgrade to 1.3.243 vulkan-loader: upgrade to 1.3.243 vulkan-tools: upgrade to 1.3.243 spirv-headers: remove description spirv-tools: remove redundant python3native inherit Sergei Zhmylev (1): wic: add support for proper kernel name to bootimg-pcbios Sudip Mukherjee (5): apt: Upgrade to v2.6.0 libxt: Upgrade to v1.3.0 libxfixes: Upgrade to v6.0.1 xwininfo: upgrade to v1.1.6 xinput: upgrade to v1.6.4 Tim Orling (1): libmodule-build-perl: upgrade 0.4232 -> 0.4234 Upgrade Helper (1): waffle: upgrade 1.7.0 -> 1.7.2 Virendra Thakur (1): qemu: Whitelist CVE-2023-0664 hen Qi (1): unfs3: fix symlink time setting issue meta-openembedded: c5f330bc9a..f3cdc9d7ee: Andrew Geissler (3): etcd: add recipe etcd: use v2.1.2 xhash to fix build issue etcd: remove gobin requirement for build Bergin, Peter (1): freediameter: fix typo and old overide syntax Bhargav Das (2): tslib: Add native & nativestdk package support pointercal: Add native & nativestdk package support Gianfranco Costamagna (1): dlt-daemon: upgrade 2.18.8 -> 2.18.9 (commit: 9a2312d3512a27620d41b9a325338b6e7b3d42de) Khem Raj (24): unixODBC: Update SRC_URI to use updated location of tarball ttf-arphic-uming: Update to 0.2.20080216-2 thrift: Upgrade to 0.18.1 unicode-ucd: Update license URI to reflect renamed license libtimezonemap: Point to a working SRC_URI libx86: Point to working SRC_URI ctapi-common: Point to working SRC_URI locations netkit-ftp: Update to debian patch 34 nicstat: Use SOURCEFORGE_MIRROR in SRC_URI rp-pppoe: Point SRC_URI to valid location ttf-mplus: Point to valid download location for SRC_URI geary: Use sysroot prefix with pkg-config in meson srecord: Upgrade to 1.65.0 ttf-lklug: Point SRC_URI to a working location radiusclient-ng: Point SRC_URI to archive.ubuntu.com httpfs2: Do not use S during compile/install tasks p910nd: Switch to using github for SRC_URI mosh: Point SRC_URI to https://mosh.org/ xdotool: Upgrade to 3.20211022.1 release faenza-icon-theme: Switch to a valid download location for SRC_URI debootstrap: Update SRC_URI to point to valid URL debootstrap: Use DEBIAN_MIRROR for SRC_URI ttf-gentium: Switch to debian archive mirror for SRC_URI nfacct: Update SRC_URI to point to valid URL Petr Gotthard (1): gensio: fix QA issue: non -staticdev package with .a libraries meta-arm: c60d7865dd..0b5724266a: Rui Miguel Silva (1): arm-bsp/u-boot: corstone1000: remove debug messages and fix env Signed-off-by: Andrew Geissler <geissonator@yahoo.com> Change-Id: I89bb649b388963a4e16080db6caa8ae1ac2cb3c2
Diffstat (limited to 'poky/meta/recipes-devtools/apt')
-rw-r--r--poky/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch6
-rw-r--r--poky/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch8
-rw-r--r--poky/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch35
-rw-r--r--poky/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch9
-rw-r--r--poky/meta/recipes-devtools/apt/apt/0001-typecast-time_t-and-suseconds_t-from-std-chrono.patch64
-rw-r--r--poky/meta/recipes-devtools/apt/apt/0002-interactive-helper-Undefine-_FORTIFY_SOURCE.patch27
-rw-r--r--poky/meta/recipes-devtools/apt/apt_2.6.0.bb (renamed from poky/meta/recipes-devtools/apt/apt_2.4.5.bb)7
7 files changed, 13 insertions, 143 deletions
diff --git a/poky/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch b/poky/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch
index 8b28ede8a8..5443ff6caa 100644
--- a/poky/meta/recipes-devtools/apt/apt/0001-Disable-documentation-directory-altogether.patch
+++ b/poky/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/poky/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch b/poky/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch
index 3065210a04..15b036b90d 100644
--- a/poky/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch
+++ b/poky/meta/recipes-devtools/apt/apt/0001-Remove-using-std-binary_function.patch
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
-index 87ce9153c..56fdc2246 100644
+index 0f6587281..0a253b12b 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -48,6 +48,11 @@
@@ -33,19 +33,19 @@ index 87ce9153c..56fdc2246 100644
bool SrcDone;
time_t ContentsMTime;
-- struct ContentsCompare : public binary_function<PackageMap,PackageMap,bool>
+- struct ContentsCompare
- {
- inline bool operator() (const PackageMap &x,const PackageMap &y)
- {return x.ContentsMTime < y.ContentsMTime;};
- };
-
-- struct DBCompare : public binary_function<PackageMap,PackageMap,bool>
+- struct DBCompare
- {
- inline bool operator() (const PackageMap &x,const PackageMap &y)
- {return x.BinCacheDB < y.BinCacheDB;};
- };
-
-- struct SrcDBCompare : public binary_function<PackageMap,PackageMap,bool>
+- struct SrcDBCompare
- {
- inline bool operator() (const PackageMap &x,const PackageMap &y)
- {return x.SrcCacheDB < y.SrcCacheDB;};
diff --git a/poky/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch b/poky/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch
deleted file mode 100644
index 44aa8a5873..0000000000
--- a/poky/meta/recipes-devtools/apt/apt/0001-add-missing-cstdint-for-uint16_t.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 960d10e89cf60d39998dae6fdcd4f0866b753a79 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 23 Jan 2023 12:31:35 -0800
-Subject: [PATCH] add missing <cstdint> for uint16_t
-
-This fixes build problems with gcc 13 snapshot [1]
-
-Fixes
-| include/apt-pkg/pkgcache.h:257:23: warning: cast from 'char*' to 'const uint16_t*' {aka 'const short unsigned int*'} increases required alignment of target type [-Wcast-align]
-| 257 | uint16_t len = *reinterpret_cast<const uint16_t*>(name - sizeof(uint16_t));
-| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html
-
-Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/276]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- apt-pkg/contrib/mmap.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
-index 642e20473..0568e1cd0 100644
---- a/apt-pkg/contrib/mmap.cc
-+++ b/apt-pkg/contrib/mmap.cc
-@@ -23,6 +23,7 @@
- #include <apt-pkg/macros.h>
- #include <apt-pkg/mmap.h>
-
-+#include <cstdint>
- #include <cstring>
- #include <string>
- #include <errno.h>
---
-2.39.1
-
diff --git a/poky/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch b/poky/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch
index 2837b7f1b3..036ce35963 100644
--- a/poky/meta/recipes-devtools/apt/apt/0001-cmake-Do-not-build-po-files.patch
+++ b/poky/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/poky/meta/recipes-devtools/apt/apt/0001-typecast-time_t-and-suseconds_t-from-std-chrono.patch b/poky/meta/recipes-devtools/apt/apt/0001-typecast-time_t-and-suseconds_t-from-std-chrono.patch
deleted file mode 100644
index fc3509d336..0000000000
--- a/poky/meta/recipes-devtools/apt/apt/0001-typecast-time_t-and-suseconds_t-from-std-chrono.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From b7a1a4d3259557f2587f7d5d47502691d94c21c2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 16 Sep 2022 20:00:30 -0700
-Subject: [PATCH 1/2] typecast time_t and suseconds_t from std::chrono
-
-This fixes build on some architectures like mips
-progress.cc:125:31: error: non-constant-expression cannot be narrowed from type 'std::chrono::duration<long long>::rep' (aka 'long long') to '__time_t' (aka 'long') in initializer list [-Wc++11-narrowing]
- struct timeval NowTime = { Now_sec.count(), Now_usec.count() };
-
-Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/259]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- apt-pkg/acquire.cc | 4 ++--
- apt-pkg/contrib/progress.cc | 2 +-
- ftparchive/apt-ftparchive.cc | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
-index 100ccde..dd0624a 100644
---- a/apt-pkg/acquire.cc
-+++ b/apt-pkg/acquire.cc
-@@ -53,11 +53,11 @@
- using namespace std;
-
- // helper to convert time_point to a timeval
--static struct timeval SteadyDurationToTimeVal(std::chrono::steady_clock::duration Time)
-+constexpr struct timeval SteadyDurationToTimeVal(std::chrono::steady_clock::duration Time)
- {
- auto const Time_sec = std::chrono::duration_cast<std::chrono::seconds>(Time);
- auto const Time_usec = std::chrono::duration_cast<std::chrono::microseconds>(Time - Time_sec);
-- return {Time_sec.count(), Time_usec.count()};
-+ return timeval{static_cast<time_t>(Time_sec.count()), static_cast<suseconds_t>(Time_usec.count())};
- }
-
- std::string pkgAcquire::URIEncode(std::string const &part) /*{{{*/
-diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
-index 03f88d4..eb688b9 100644
---- a/apt-pkg/contrib/progress.cc
-+++ b/apt-pkg/contrib/progress.cc
-@@ -122,7 +122,7 @@ bool OpProgress::CheckChange(float Interval)
- auto const Now = std::chrono::steady_clock::now().time_since_epoch();
- auto const Now_sec = std::chrono::duration_cast<std::chrono::seconds>(Now);
- auto const Now_usec = std::chrono::duration_cast<std::chrono::microseconds>(Now - Now_sec);
-- struct timeval NowTime = { Now_sec.count(), Now_usec.count() };
-+ struct timeval NowTime = { static_cast<time_t>(Now_sec.count()), static_cast<suseconds_t>(Now_usec.count()) };
-
- std::chrono::duration<decltype(Interval)> Delta =
- std::chrono::seconds(NowTime.tv_sec - LastTime.tv_sec) +
-diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
-index 56fdc22..0a253b1 100644
---- a/ftparchive/apt-ftparchive.cc
-+++ b/ftparchive/apt-ftparchive.cc
-@@ -58,7 +58,7 @@ static struct timeval GetTimevalFromSteadyClock() /*{{{*/
- auto const Time = std::chrono::steady_clock::now().time_since_epoch();
- auto const Time_sec = std::chrono::duration_cast<std::chrono::seconds>(Time);
- auto const Time_usec = std::chrono::duration_cast<std::chrono::microseconds>(Time - Time_sec);
-- return { Time_sec.count(), Time_usec.count() };
-+ return { static_cast<time_t>(Time_sec.count()), static_cast<suseconds_t>(Time_usec.count()) };
- }
- /*}}}*/
- static auto GetTimeDeltaSince(struct timeval StartTime) /*{{{*/
---
-2.37.3
-
diff --git a/poky/meta/recipes-devtools/apt/apt/0002-interactive-helper-Undefine-_FORTIFY_SOURCE.patch b/poky/meta/recipes-devtools/apt/apt/0002-interactive-helper-Undefine-_FORTIFY_SOURCE.patch
deleted file mode 100644
index 18c4641b22..0000000000
--- a/poky/meta/recipes-devtools/apt/apt/0002-interactive-helper-Undefine-_FORTIFY_SOURCE.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 891076c2cf4298b5d587545497f4831f0d21caa1 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 16 Sep 2022 20:04:43 -0700
-Subject: [PATCH 2/2] interactive-helper: Undefine _FORTIFY_SOURCE
-
-This ensures that it compiles when clang compiler is passing
--DFORTIFY_SOURCES=2
-
-Upstream-Status: Submitted [https://salsa.debian.org/apt-team/apt/-/merge_requests/259]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- test/interactive-helper/libnoprofile.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/interactive-helper/libnoprofile.c b/test/interactive-helper/libnoprofile.c
-index f11b898..b26ec2a 100644
---- a/test/interactive-helper/libnoprofile.c
-+++ b/test/interactive-helper/libnoprofile.c
-@@ -1,4 +1,5 @@
- #define _GNU_SOURCE
-+#undef _FORTIFY_SOURCE
- #include <stdarg.h>
- #include <stdlib.h>
- #include <string.h>
---
-2.37.3
-
diff --git a/poky/meta/recipes-devtools/apt/apt_2.4.5.bb b/poky/meta/recipes-devtools/apt/apt_2.6.0.bb
index 429cf6e659..b872be8371 100644
--- a/poky/meta/recipes-devtools/apt/apt_2.4.5.bb
+++ b/poky/meta/recipes-devtools/apt/apt_2.6.0.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"
@@ -14,9 +14,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
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 \
- file://0001-typecast-time_t-and-suseconds_t-from-std-chrono.patch \
- file://0002-interactive-helper-Undefine-_FORTIFY_SOURCE.patch \
- file://0001-add-missing-cstdint-for-uint16_t.patch \
"
SRC_URI:append:class-native = " \
@@ -29,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] = "43467d1ca7de6c0955fd991925433e22fa66230870e5f66c4498675d01776c2a"
LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263"
# the package is taken from snapshots.debian.org; that source is static and goes stale