* [gentoo-commits] repo/gentoo:master commit in: app-crypt/adcli/, app-crypt/adcli/files/
@ 2021-10-26 4:55 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-10-26 4:55 UTC (permalink / raw
To: gentoo-commits
commit: 01db544de893262e857685e11b33c2a74210181f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 26 04:55:00 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 04:55:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01db544d
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 <AT> gentoo.org>
.../{adcli-0.9.1.ebuild => adcli-0.9.1-r1.ebuild} | 4 +++
.../files/adcli-0.9.1-glibc-2.34-resolv.patch | 32 ++++++++++++++++++++++
2 files changed, 36 insertions(+)
diff --git a/app-crypt/adcli/adcli-0.9.1.ebuild b/app-crypt/adcli/adcli-0.9.1-r1.ebuild
similarity index 92%
rename from app-crypt/adcli/adcli-0.9.1.ebuild
rename to app-crypt/adcli/adcli-0.9.1-r1.ebuild
index 8dd6b2412c4..5224249d500 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 00000000000..105a4c407ba
--- /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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/adcli/, app-crypt/adcli/files/
@ 2022-01-13 6:02 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-01-13 6:02 UTC (permalink / raw
To: gentoo-commits
commit: 6b33c454fa3ca9eb1aaddc0ecb20c4ae24133cbf
Author: Henning Schild <henning <AT> hennsch <DOT> de>
AuthorDate: Tue Jan 11 10:42:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 13 05:49:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b33c454
app-crypt/adcli: fix musl linking bug
apply a patch which has been merged upstream
Closes: https://bugs.gentoo.org/830325
Signed-off-by: Henning Schild <henning <AT> hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/23739
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-crypt/adcli/adcli-0.9.1-r1.ebuild | 3 ++-
....9.1-library-include-endian.h-for-le32toh.patch | 28 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/app-crypt/adcli/adcli-0.9.1-r1.ebuild b/app-crypt/adcli/adcli-0.9.1-r1.ebuild
index 5224249d5001..f353d5f60544 100644
--- a/app-crypt/adcli/adcli-0.9.1-r1.ebuild
+++ b/app-crypt/adcli/adcli-0.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -27,6 +27,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${P}-glibc-2.34-resolv.patch
+ "${FILESDIR}"/${P}-library-include-endian.h-for-le32toh.patch
)
src_prepare() {
diff --git a/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch b/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch
new file mode 100644
index 000000000000..246ccd990f12
--- /dev/null
+++ b/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch
@@ -0,0 +1,28 @@
+From dfbaa1b7f7cde281e23464ceb24699d4686651ab Mon Sep 17 00:00:00 2001
+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".
+---
+ library/adutil.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/library/adutil.c b/library/adutil.c
+index 9b0c47f3b7e9..4bb06a3a7588 100644
+--- 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>
+--
+2.34.1
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/adcli/, app-crypt/adcli/files/
@ 2023-01-08 9:40 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-01-08 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 1259b354f00b4370ed2b5405cdea9ce8d20bbce4
Author: Henning Schild <henning <AT> hennsch <DOT> de>
AuthorDate: Fri Jan 6 17:25:19 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 09:34:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1259b354
app-crypt/adcli: drop old
Signed-off-by: Henning Schild <henning <AT> hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/28987
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
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 -----------------
....9.1-library-include-endian.h-for-le32toh.patch | 21 ------------
4 files changed, 94 deletions(-)
diff --git a/app-crypt/adcli/Manifest b/app-crypt/adcli/Manifest
index 79c8bda78f38..9dc8e534d160 100644
--- a/app-crypt/adcli/Manifest
+++ b/app-crypt/adcli/Manifest
@@ -1,2 +1 @@
-DIST adcli-0.9.1.tar.bz2 89684 BLAKE2B deaf6d3a13ad29c77a35b9f9c195dd646f384ad7c9782c15b50b26efceabae268bbb287d488ec7ed8d783d92ce7d8399f05898d30201d0d7fab7c0369c22fce1 SHA512 7e41fb51bfcb8837f9e5f6fd1fceacece0762c237dbc0f58dd581e2be8841d7a613d57507aea4534a66a2bd10ef4d01c4e04885437038c71238739db6e357d6e
DIST adcli-0.9.2.tar.bz2 93680 BLAKE2B b5958b276ee43a0ee54aa922f27ed266d4e9fbd1c86e0c007dac9fcf9cc022e1b3ba043b782fceb00066be2577390773dc99fb8d476a6b5e6523d44d008fb667 SHA512 ae8414a0af389b6845dd92d41446a80a9dc1734b874175323c0e491d99944eab442b95ae6d3a29fc69638d2e73bf8d2c369f6fa50e9ed3968527444b78606286
diff --git a/app-crypt/adcli/adcli-0.9.1-r2.ebuild b/app-crypt/adcli/adcli-0.9.1-r2.ebuild
deleted file mode 100644
index 4e27d477b698..000000000000
--- a/app-crypt/adcli/adcli-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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/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
deleted file mode 100644
index 105a4c407bab..000000000000
--- a/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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
diff --git a/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch b/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch
deleted file mode 100644
index b901796d8d6c..000000000000
--- a/app-crypt/adcli/files/adcli-0.9.1-library-include-endian.h-for-le32toh.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-08 9:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-26 4:55 [gentoo-commits] repo/gentoo:master commit in: app-crypt/adcli/, app-crypt/adcli/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2022-01-13 6:02 Sam James
2023-01-08 9:40 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox