Merge pull request #340 from flatcar-linux/dongsu/glibc-2.34-p1

app-crypt/adcli: move adcli from coreos-overlay
This commit is contained in:
Dongsu Park 2022-07-01 15:05:32 +02:00 committed by GitHub
commit e06c3dca28
6 changed files with 110 additions and 0 deletions

View File

@ -0,0 +1 @@
DIST adcli-0.9.1.tar.bz2 89684 BLAKE2B deaf6d3a13ad29c77a35b9f9c195dd646f384ad7c9782c15b50b26efceabae268bbb287d488ec7ed8d783d92ce7d8399f05898d30201d0d7fab7c0369c22fce1 SHA512 7e41fb51bfcb8837f9e5f6fd1fceacece0762c237dbc0f58dd581e2be8841d7a613d57507aea4534a66a2bd10ef4d01c4e04885437038c71238739db6e357d6e

View File

@ -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)
}

View File

@ -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

View File

@ -0,0 +1,21 @@
https://bugs.gentoo.org/830325
https://gitlab.freedesktop.org/realmd/adcli/-/merge_requests/47
From: Henning Schild <henning@hennsch.de>
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 <assert.h>
#include <ctype.h>
+#include <endian.h>
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>

View File

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person" proxied="yes">
<email>henning@hennsch.de</email>
<name>Henning Schild</name>
</maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
<upstream>
<remote-id type="gitlab">https://gitlab.freedesktop.org/realmd/adcli</remote-id>
</upstream>
</pkgmetadata>

View File

@ -0,0 +1 @@
- adcli ([0.9.1](https://gitlab.freedesktop.org/realmd/adcli/-/releases#0.9.1))