diff mbox series

[meta-networking] adcli: upgrade 0.9.0 -> 0.9.2

Message ID 1679617764-27268-4-git-send-email-wangmy@fujitsu.com
State Under Review
Headers show
Series [meta-networking] adcli: upgrade 0.9.0 -> 0.9.2 | expand

Commit Message

Mingyu Wang (Fujitsu) March 24, 2023, 12:29 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch
Fixed-build-error-on-musl.patch
removed since they're included in 0.9.2.

Changelog:
==========
 - adenroll: set password via LDAP instead Kerberos [#27]
 - disco: fall back to LDAPS if CLDAP ping was not successful [#31]
 - tools: replace getpass() [#10]
 - adenroll: write SID before secret to Samba's db [rhbz#1991619]
 - doc: add clarification to add-member command on doc/adcli.xml
 - tools: Set umask before calling mkdtemp()
 - Avoid undefined behaviour in short option parsing
 - library: include endian.h for le32toh
 - man: Fix typos and use consistent upper case for some keywords
 - doc: avoid gnu-make specific usage of $< [#26]
 - configure: check for ns_get16 and ns_get32 as well [rhbz#1984891]
 - Add setattr and delattr options [rhbz#1690920]
 - entry: add passwd-user sub-command [rhbz#1952828]
 - Add dont-expire-password option [rhbz#1769644]
 - build: add --with-vendor-error-message configure option [rhbz#1889386]
 - tools: add show-computer command [rhbz#1737342]
 - add description option to join and update [rhbz#1737342]
 - Use GSS-SPNEGO if available [rhbz#1762420]
 - add option use-ldaps [rhbz#1762420]
 - tools: disable SSSD's locator plugin [rhbz#1762633]
 - doc: explain required AD permissions [gfo#20]
 - computer: add create-msa sub-command [rhbz#1854112}
 - Add account-disable option [gfo#21]

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 .../adcli/{adcli_0.9.0.bb => adcli_0.9.2.bb}  |  7 +---
 ...ck-for-ns_get16-and-ns_get32-as-well.patch | 39 -------------------
 .../files/Fixed-build-error-on-musl.patch     | 26 -------------
 3 files changed, 2 insertions(+), 70 deletions(-)
 rename meta-networking/recipes-connectivity/adcli/{adcli_0.9.0.bb => adcli_0.9.2.bb} (78%)
 delete mode 100644 meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch
 delete mode 100644 meta-networking/recipes-connectivity/adcli/files/Fixed-build-error-on-musl.patch
diff mbox series

Patch

diff --git a/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb b/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb
similarity index 78%
rename from meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb
rename to meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb
index b9fefa8589..6092823944 100644
--- a/meta-networking/recipes-connectivity/adcli/adcli_0.9.0.bb
+++ b/meta-networking/recipes-connectivity/adcli/adcli_0.9.2.bb
@@ -4,12 +4,9 @@  DESCRIPTION = "A helper library and tools for Active Directory client operations
 HOMEPAGE = "http://cgit.freedesktop.org/realmd/adcli"
 SECTION = "net"
 
-SRCREV = "1b1528038e084a9f81ea108cffca9c2707623b9c"
+SRCREV = "8e88e3590a19006362ea8b8dfdc18bb88b3cb3b5"
 
-SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master \
-           file://Fixed-build-error-on-musl.patch \
-           file://0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch \
-	   "
+SRC_URI = "git://gitlab.freedesktop.org/realmd/adcli;branch=master"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch b/meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch
deleted file mode 100644
index 8cc859318c..0000000000
--- a/meta-networking/recipes-connectivity/adcli/files/0001-configure-check-for-ns_get16-and-ns_get32-as-well.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-From 98660f57a98f45dbf55414cfde46338019adcc33 Mon Sep 17 00:00:00 2001
-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.
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/realmd/adcli/-/commit/e841ba7513f3f8b6393183d2dea9adcbf7ba2e44]
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984891
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- configure.ac | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ebc6cb4..e8775d0 100644
---- 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" ])
---
-2.32.0
diff --git a/meta-networking/recipes-connectivity/adcli/files/Fixed-build-error-on-musl.patch b/meta-networking/recipes-connectivity/adcli/files/Fixed-build-error-on-musl.patch
deleted file mode 100644
index 87bcdfebd7..0000000000
--- a/meta-networking/recipes-connectivity/adcli/files/Fixed-build-error-on-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@ 
-From 0e64782a45cba9753d1210ee7d7c9dbd42f74ceb Mon Sep 17 00:00:00 2001
-From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
-Date: Fri, 12 Jul 2019 12:46:54 +0800
-Subject: [PATCH] Fixed build error on musl.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
----
- library/adutil.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/library/adutil.c b/library/adutil.c
-index 9b0c47f..b673edd 100644
---- a/library/adutil.c
-+++ b/library/adutil.c
-@@ -30,6 +30,7 @@
- #include <assert.h>
- #include <ctype.h>
- #include <errno.h>
-+#include <endian.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--- 
-2.20.1
-