From 7943955d0c6187f22dc66c4a159892855e383cfa Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 10 Jun 2022 11:20:28 +0200 Subject: [PATCH 1/2] app-crypt/adcli: move adcli from coreos-overlay To fix build issues that happen in adcli 0.9 with glibc 2.34, we should sync adcli with upstream Gentoo, where the build issue is already fixed. As Gentoo has the ebuild under the category `app-crypt`, we simply move from adcli from coreos-overlay to portage-stable, move adcli to the app-crypt category, and update the version to 0.9.1-r2. --- .../portage-stable/app-crypt/adcli/Manifest | 1 + .../app-crypt/adcli/adcli-0.9.1-r2.ebuild | 40 +++++++++++++++++++ .../files/adcli-0.9.1-glibc-2.34-resolv.patch | 32 +++++++++++++++ ...library-include-endian.h-for-le32toh.patch | 21 ++++++++++ .../app-crypt/adcli/metadata.xml | 15 +++++++ 5 files changed, 109 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.1-r2.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch create mode 100644 sdk_container/src/third_party/portage-stable/app-crypt/adcli/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest new file mode 100644 index 0000000000..f3ecd53d43 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/Manifest @@ -0,0 +1 @@ +DIST adcli-0.9.1.tar.bz2 89684 BLAKE2B deaf6d3a13ad29c77a35b9f9c195dd646f384ad7c9782c15b50b26efceabae268bbb287d488ec7ed8d783d92ce7d8399f05898d30201d0d7fab7c0369c22fce1 SHA512 7e41fb51bfcb8837f9e5f6fd1fceacece0762c237dbc0f58dd581e2be8841d7a613d57507aea4534a66a2bd10ef4d01c4e04885437038c71238739db6e357d6e diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.1-r2.ebuild new file mode 100644 index 0000000000..4e27d477b6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/adcli-0.9.1-r2.ebuild @@ -0,0 +1,40 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Tool for performing actions on an Active Directory domain" +HOMEPAGE="https://www.freedesktop.org/software/realmd/adcli/adcli.html" +SRC_URI="https://gitlab.freedesktop.org/realmd/adcli/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc" + +DEPEND=" + app-crypt/mit-krb5 + net-nds/openldap:=[sasl]" +RDEPEND="${DEPEND}" +BDEPEND=" + doc? ( + app-text/docbook-xml-dtd:4.3 + app-text/xmlto + dev-libs/libxslt + )" + +PATCHES=( + "${FILESDIR}"/${P}-glibc-2.34-resolv.patch + "${FILESDIR}"/${P}-library-include-endian.h-for-le32toh.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_enable doc) +} diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch new file mode 100644 index 0000000000..105a4c407b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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 +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 ], +- [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 diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch new file mode 100644 index 0000000000..b901796d8d --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/830325 +https://gitlab.freedesktop.org/realmd/adcli/-/merge_requests/47 + +From: Henning Schild +Date: Tue, 11 Jan 2022 08:22:55 +0100 +Subject: [PATCH] library: include endian.h for le32toh + +upstream commit 938065a751c0876eb837a27f8c1443fc7d0d2551 + +linking against musl libc we need to include that specifically, actually +also according to "man 3 endian". +--- a/library/adutil.c ++++ b/library/adutil.c +@@ -29,6 +29,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/sdk_container/src/third_party/portage-stable/app-crypt/adcli/metadata.xml b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/metadata.xml new file mode 100644 index 0000000000..aa63ecdac2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-crypt/adcli/metadata.xml @@ -0,0 +1,15 @@ + + + + + henning@hennsch.de + Henning Schild + + + proxy-maint@gentoo.org + Proxy Maintainers + + + https://gitlab.freedesktop.org/realmd/adcli + + From ca0e6ba32e9f01e7a2b2790859219698d067a2d2 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 10 Jun 2022 11:20:32 +0200 Subject: [PATCH 2/2] changelog/updates: add changelog for packages needed by glibc 2.34 Add changelog for packages needed by glibc 2.34. --- .../portage-stable/changelog/updates/2022-06-13-glibc-2.34.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 sdk_container/src/third_party/portage-stable/changelog/updates/2022-06-13-glibc-2.34.md diff --git a/sdk_container/src/third_party/portage-stable/changelog/updates/2022-06-13-glibc-2.34.md b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-06-13-glibc-2.34.md new file mode 100644 index 0000000000..9ed22e00b7 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/changelog/updates/2022-06-13-glibc-2.34.md @@ -0,0 +1 @@ +- adcli ([0.9.1](https://gitlab.freedesktop.org/realmd/adcli/-/releases#0.9.1))