From 985025e0a2dd8d65bafe912590157f9fa6938456 Mon Sep 17 00:00:00 2001
From: rockyautomation <rockyautomation@rockylinux.org>
Date: Mon, 22 Feb 2021 04:02:48 +0100
Subject: [PATCH] import adcli-0.8.2-3.el8
---
SPECS/adcli.spec | 93 ++++++++++++++++++++++++++++++++----------------
1 file changed, 63 insertions(+), 30 deletions(-)
diff --git a/SPECS/adcli.spec b/SPECS/adcli.spec
index c60909d..371dfe4 100644
--- a/SPECS/adcli.spec
+++ b/SPECS/adcli.spec
@@ -1,6 +1,6 @@
Name: adcli
Version: 0.8.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Active Directory enrollment
License: LGPLv2+
URL: http://cgit.freedesktop.org/realmd/adcli
@@ -36,6 +36,60 @@ Patch26: 0002-_adcli_call_external_program-silence-noisy-debug-mes.patch
Patch27: 0003-Do-not-add-service-principals-twice.patch
Patch28: 0004-Do-not-depend-on-default_realm-in-krb5.conf.patch
+# rhbz#1677194 - Realm cannot join domain when hostname is not FQDN
+Patch29: 0001-adutil-add-_adcli_strv_add_unique.patch
+Patch30: 0002-adenroll-use-_adcli_strv_add_unique-for-service-prin.patch
+
+# Forward port of RHEL-7.7 ticket rhbz#1642546 - adcli exports kerberos ticket
+# with old kvno
+Patch31: 0001-Increment-kvno-after-password-change-with-user-creds.patch
+
+# Forward port of RHEL-7.7 ticket rhbz#1595911 - [RFE] Have `adcli join` work
+# without FQDN in `hostname` output
+Patch32: 0001-library-use-getaddrinfo-with-AI_CANONNAME-to-find-a-.patch
+
+# Forward port of RHEL-7.7 ticket rhbz#1644311 - Improve handling of service
+# principals
+Patch33: 0001-join-always-add-service-principals.patch
+Patch34: 0002-library-return-error-if-no-matching-key-was-found.patch
+
+# Forward port of RHEL-7.7 ticket rhbz#1337489 - [RFE] adcli command with
+# --unix-* options doesn't update values in UnixAttributes Tab for user
+Patch35: 0001-create-user-add-nis-domain-option.patch
+Patch36: 0002-create-user-try-to-find-NIS-domain-if-needed.patch
+
+# Forward port of RHEL-7.7 ticket rhbz#1630187 - [RFE] adcli join should
+# preserve SPN added by adcli preset-computer
+Patch37: 0001-ensure_keytab_principals-do-not-leak-memory-when-cal.patch
+Patch38: 0002-library-make-_adcli_strv_has_ex-public.patch
+Patch39: 0003-library-_adcli_krb5_build_principal-allow-principals.patch
+Patch40: 0004-library-make-sure-server-side-SPNs-are-preserved.patch
+
+# Forward port of RHEL-7.7 ticket rhbz#1622583 - [RFE] Need an option for adcli
+# command which will show domain join status.
+Patch41: 0001-Implement-adcli-testjoin.patch
+
+# Forward port of RHEL-7.7 ticket rhbz#1630187 - [RFE] adcli join should
+# preserve SPN added by adcli preset-computer - additional patch
+Patch42: 0001-library-add-missing-strdup.patch
+
+# Forward port of RHEL-7.7 ticket rhbz#1588596 - many adcli-krb5-?????
+# directories are created /tmp
+Patch43: 0001-tools-remove-errx-from-computer-commands.patch
+Patch44: 0002-tools-remove-errx-from-user-and-group-commands.patch
+Patch45: 0003-tools-remove-errx-from-info-commands.patch
+Patch46: 0004-tools-remove-errx-from-adcli_read_password_func.patch
+Patch47: 0005-tools-remove-errx-from-setup_krb5_conf_directory.patch
+Patch48: 0006-tools-entry-remove-errx-from-parse_option.patch
+Patch49: 0007-tools-computer-remove-errx-from-parse_option.patch
+
+# rhbz#1717355 - `adcli join` fails in FIPS enabled environment
+Patch50: 0001-Fix-for-issues-found-by-Coverity.patch
+Patch51: 0001-adenroll-make-sure-only-allowed-enctypes-are-used-in.patch
+Patch52: 0002-adconn-add-adcli_conn_set_krb5_context.patch
+Patch53: 0003-adenroll-add-adcli_enroll_get_permitted_keytab_encty.patch
+Patch54: 0004-adenroll-use-only-enctypes-permitted-by-Kerberos-con.patch
+
BuildRequires: gcc
BuildRequires: intltool pkgconfig
BuildRequires: libtool
@@ -58,35 +112,7 @@ standard LDAP and Kerberos calls.
%define _hardened_build 1
%prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
+%autosetup -p1
%build
autoreconf --force --install --verbose
@@ -124,6 +150,13 @@ documentation.
%doc %{_datadir}/doc/adcli/*
%changelog
+* Fri Jun 14 2019 Sumit Bose <sbose@redhat.com> - 0.8.2-3
+- use autosetup macro to simplify patch handling
+- fixed rpmlint warnings in the spec file
+- join failed if hostname is not FQDN [#1677194]
+- adcli join fails in FIPS enabled environment [#1717355]
+- forward port of RHEL-7.7 fixes and enhancements
+
* Tue Oct 09 2018 Sumit Bose <sbose@redhat.com> - 0.8.2-2
- Do not add service principals twice and related fixes
- Resolves: rhbz#1631734
--
GitLab