mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-22 15:32:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

apt: Support old resolver as fallback

Browse Source 
Not all C libraries implement the new resolver APIs e.g. musl, therefore
keep the old interfaces around and choose using __RES version macro
which is meant for this kind of work.

(From OE-Core rev: 7450cae1d886abe0d6c7b738a9001579c2b530e0)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2021-03-20 14:49:55 -07:00
committed by Richard Purdie
parent 94fa96262a
commit ad43cc66d2
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
meta/recipes-devtools/apt/apt/0001-srvrec-Keep-support-for-older-resolver.patch Normal file
View File

@@ -0,0 +1,44 @@
From f98c12b9f04ef3a9daec822c210044095b41a0ac Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 20 Mar 2021 12:33:34 -0700
Subject: [PATCH] srvrec: Keep support for older resolver
Some C libraries e.g. musl do not implement the new res_n* APIs
therefore keep the old implementation as fallback and check __RES
version macro to determine the API level
Upstream-Status: Submitted [https://github.com/Debian/apt/pull/129]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Julian Andres Klode <julian.klode@canonical.com>
---
apt-pkg/contrib/srvrec.cc | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/apt-pkg/contrib/srvrec.cc b/apt-pkg/contrib/srvrec.cc
index 4ca208273..3eb5f1d4c 100644
--- a/apt-pkg/contrib/srvrec.cc
+++ b/apt-pkg/contrib/srvrec.cc
@@ -62,6 +62,7 @@ bool GetSrvRecords(std::string name, std::vector<SrvRec> &Result)
unsigned char answer[PACKETSZ];
int answer_len, compressed_name_len;
int answer_count;
+#if __RES >= 19991006
struct __res_state res;
if (res_ninit(&res) != 0)
@@ -71,6 +72,12 @@ bool GetSrvRecords(std::string name, std::vector<SrvRec> &Result)
std::shared_ptr<void> guard(&res, res_nclose);
answer_len = res_nquery(&res, name.c_str(), C_IN, T_SRV, answer, sizeof(answer));
+#else
+ if (res_init() != 0)
+ return _error->Errno("res_init", "Failed to init resolver");
+
+ answer_len = res_query(name.c_str(), C_IN, T_SRV, answer, sizeof(answer));
+#endif //__RES >= 19991006
if (answer_len == -1)
return false;
if (answer_len < (int)sizeof(HEADER))
--
2.31.0

3
meta/recipes-devtools/apt/apt_2.2.2.bb
View File

@@ -10,8 +10,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/${BPN}_${PV}.tar.xz \
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-srvrec-Keep-support-for-older-resolver.patch \
"
SRC_URI_append_class-native = " \
file://0001-Do-not-init-tables-from-dpkg-configuration.patch \
file://0001-Revert-always-run-dpkg-configure-a-at-the-end-of-our.patch \