summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-10-26 05:55:00 +0100
committerSam James <sam@gentoo.org>2021-10-26 05:55:40 +0100
commit01db544de893262e857685e11b33c2a74210181f (patch)
tree2337ea06ab31d79bd03ced3e5b5796912d6f5884 /app-crypt
parentdev-python/APScheduler: Suppress setuptools warning (diff)
downloadgentoo-01db544de893262e857685e11b33c2a74210181f.tar.gz
gentoo-01db544de893262e857685e11b33c2a74210181f.tar.bz2
gentoo-01db544de893262e857685e11b33c2a74210181f.zip
app-crypt/adcli: add glibc-2.34 patch
Let's revbump as Henning needed it anyway for internal purposes and I'd rather know immediately if there's any problems. Closes: https://github.com/gentoo/gentoo/pull/22702 Closes: https://bugs.gentoo.org/820224 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/adcli/adcli-0.9.1-r1.ebuild (renamed from app-crypt/adcli/adcli-0.9.1.ebuild)4
-rw-r--r--app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch32
2 files changed, 36 insertions, 0 deletions
diff --git a/app-crypt/adcli/adcli-0.9.1.ebuild b/app-crypt/adcli/adcli-0.9.1-r1.ebuild
index 8dd6b2412c4e..5224249d5001 100644
--- a/app-crypt/adcli/adcli-0.9.1.ebuild
+++ b/app-crypt/adcli/adcli-0.9.1-r1.ebuild
@@ -25,6 +25,10 @@ BDEPEND="
dev-libs/libxslt
)"
+PATCHES=(
+ "${FILESDIR}"/${P}-glibc-2.34-resolv.patch
+)
+
src_prepare() {
default
eautoreconf
diff --git a/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch b/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch
new file mode 100644
index 000000000000..105a4c407bab
--- /dev/null
+++ b/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch
@@ -0,0 +1,32 @@
+https://gitlab.freedesktop.org/realmd/adcli/-/commit/e841ba7513f3f8b6393183d2dea9adcbf7ba2e44
+https://bugs.gentoo.org/820224
+
+From: Sumit Bose <sbose@redhat.com>
+Date: Wed, 28 Jul 2021 12:55:16 +0200
+Subject: [PATCH] configure: check for ns_get16 and ns_get32 as well
+
+With newer versions of glibc res_query() might ba already available in
+glibc with ns_get16() and ns_get32() still requires libresolv.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984891
+--- a/configure.ac
++++ b/configure.ac
+@@ -98,13 +98,15 @@ AC_SUBST(LDAP_CFLAGS)
+ # -------------------------------------------------------------------
+ # resolv
+
+-AC_MSG_CHECKING(for which library has res_query)
++AC_MSG_CHECKING([for which library has res_query, ns_get16 and ns_get32])
+ for lib in "" "-lresolv"; do
+ saved_LIBS="$LIBS"
+ LIBS="$LIBS $lib"
+ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([#include <resolv.h>],
+- [res_query (0, 0, 0, 0, 0)])
++ [res_query (0, 0, 0, 0, 0);
++ ns_get32 (NULL);
++ ns_get16 (NULL);])
+ ],
+ [ AC_MSG_RESULT(${lib:-libc}); have_res_query="yes"; break; ],
+ [ LIBS="$saved_LIBS" ])
+GitLab