diff --git a/.adcli.metadata b/.adcli.metadata
index fda023adf66e2972be202da9a0355210e5247dfe..871cb5674a01b83daec73c5c893104ff887063e5 100644
--- a/.adcli.metadata
+++ b/.adcli.metadata
@@ -1 +1 @@
-f3f9537502eba38a22889fbab6e1100c32175ca2 SOURCES/adcli-0.8.2.tar.gz
+5aba9ae88ad5a75f8ce143372cb8678b96ca5773 SOURCES/adcli-0.9.2.tar.gz
diff --git a/.gitignore b/.gitignore
index d651b5a22a09986246f589f2aca9183016ccda87..e330f41d7f6667089e25ba5807156dc411e57eb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/adcli-0.8.2.tar.gz
+SOURCES/adcli-0.9.2.tar.gz
diff --git a/SPECS/adcli.spec b/SPECS/adcli.spec
index 3fc795c69d488895b506b2bc3c7433e13ec3febc..a67807ea3d7a76771510fb87cd0557394050a242 100644
--- a/SPECS/adcli.spec
+++ b/SPECS/adcli.spec
@@ -1,187 +1,27 @@
-Name: adcli
-Version: 0.8.2
-Release: 12%{?dist}
-Summary: Active Directory enrollment
-License: LGPLv2+
-URL: http://cgit.freedesktop.org/realmd/adcli
-Source0: http://www.freedesktop.org/software/realmd/releases/adcli-%{version}.tar.gz
-
-Patch1: 0001-Remove-upper-case-only-check-when-looking-for-the-Ne.patch
-Patch2: 0002-Use-strdup-if-offset-are-used.patch
-Patch3: 0003-correct-spelling-of-adcli_tool_computer_delete-descr.patch
-Patch4: 0004-doc-explain-that-all-credential-cache-types-are-supp.patch
-Patch5: 0005-library-add-adcli_conn_is_writeable.patch
-Patch6: 0006-Handle-kvno-increment-for-RODCs.patch
-Patch7: 0007-Fix-memory-leak-in-test_check_nt_time_string_lifetim.patch
-Patch8: 0008-library-add-_adcli_bin_sid_to_str.patch
-Patch9: 0009-library-add-_adcli_call_external_program.patch
-Patch10: 0010-library-add-_adcli_ldap_parse_sid.patch
-Patch11: 0011-library-add-lookup_domain_sid.patch
-Patch12: 0012-library-add-adcli_conn_get_domain_sid.patch
-Patch13: 0013-tools-add-option-add-samba-data.patch
-Patch14: 0014-tools-store-Samba-data-if-requested.patch
-Patch15: 0015-make-Samba-data-tool-configurable.patch
-Patch16: 0016-Add-trusted-for-delegation-option.patch
-Patch17: 0017-Only-update-attributes-given-on-the-command-line.patch
-Patch18: 0018-update-allow-to-add-service-names.patch
-Patch19: 0019-Calculate-enctypes-in-a-separate-function.patch
-Patch20: 0020-join-add-all-attributes-while-creating-computer-obje.patch
-Patch21: 0021-util-add-_adcli_strv_remove_unsorted.patch
-Patch22: 0022-Add-add-service-principal-and-remove-service-princip.patch
-Patch23: 0023-adcli_conn_is_writeable-do-not-crash-id-domain_disco.patch
-Patch24: 0024-doc-fix-typos-in-the-adcli-man-page.patch
-
-Patch25: 0001-fix-typo-in-flag-value.patch
-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
-
-# rhbz#1745931 - adcli update --add-samba-data does not work as expected
-Patch55: 0001-doc-explain-how-to-force-password-reset.patch
-Patch56: 0001-man-move-note-to-the-right-section.patch
-
-# rhbz#1745932 - Issue is that with arcfour-hmac as first encryption type
-Patch57: 0001-Do-not-use-arcfour-hmac-md5-when-discovering-the-sal.patch
-
-Patch58: 0001-Fix-for-issue-found-by-Coverity.patch
-
-# rhbz#1737342 - [RFE] enhancement adcli to set description attribute and to
-# show all AD attributes
-Patch59: 0001-tools-add-show-computer-command.patch
-Patch60: 0002-add-description-option-to-join-and-update.patch
-
-Patch61: 0001-Use-GSS-SPNEGO-if-available.patch
-Patch62: 0002-add-option-use-ldaps.patch
-
-# rhbz#1806260 - [abrt] [faf] adcli: raise(): /usr/sbin/adcli killed by 6
-Patch63: 0001-Make-adcli-info-DC-location-mechanism-more-compliant.patch
-Patch64: 0001-discovery-fix.patch
-
-# rhbz#1846882 - No longer able to delete computer from AD using adcli
-Patch65: 0001-delete-do-not-exit-if-keytab-cannot-be-read.patch
-
-# rhbz#1846878 - adcli: presetting $computer in $domain domain failed: Cannot
-# set computer password: Authentication error
-Patch66: 0001-tools-disable-SSSD-s-locator-plugin.patch
-
-# rhbz#1791611 - Typo in adcli update --help option
-Patch67: 0001-tools-fix-typo-in-show-password-help-output.patch
-
-# rhbz#1791545 - Manpage and help does not explain the use of "-C" option
-Patch68: 0001-man-explain-optional-parameter-of-login-ccache-bette.patch
-Patch69: 0001-man-make-handling-of-optional-credential-cache-more-.patch
-
-# rhbz#1883467 - Add --use-ldaps option to adcli update as well
-Patch70: 0001-tools-add-missing-use-ldaps-option-to-update-and-tes.patch
-
-# rhbz#1734764 - Cannot join a pre-staged Computer Account on AD in Custom OU
-# using Delegated user
-Patch71: 0001-join-update-set-dNSHostName-if-not-set.patch
-
-# rhbz#1852080 - missing documentation for required AD rights for adcli join
-# and net join
-Patch72: 0001-doc-add-missing-samba_data_tool_path.xml-.in-to-EXTR.patch
-Patch73: 0001-doc-explain-required-AD-permissions.patch
-
-# rhbz#1854112 - [RFE] Add new mode to just create an AD account to be able to
-# connect to LDAP
-Patch74: 0001-enroll-add-is_service-member.patch
-Patch75: 0002-computer-add-create-msa-sub-command.patch
-Patch76: 0003-enroll-use-computer-or-service-in-debug-messages.patch
-Patch77: 0004-enroll-more-filters-for-random-characters.patch
-Patch78: 0005-enroll-make-adcli_enroll_add_keytab_for_service_acco.patch
-Patch79: 0006-enroll-allow-fqdn-for-locate_computer_account.patch
-Patch80: 0007-service-account-add-random-suffix-to-account-name.patch
-
-# rhbz#1906303 - Typo in CREATE A SERVICE ACCOUNT section of man page of adcli
-Patch81: 0001-service-account-fix-typo-in-the-man-page-entry.patch
-
-# rhbz#1889386 - [RFE] Adcli and Realm Error Code Optimization Request
-Patch82: 0001-build-add-with-vendor-error-message-configure-option.patch
-
-# rhbz#1769644 - [RFE] adcli should allow to modify DONT_EXPIRE_PASSWORD attribute
-Patch83: 0001-coverity-add-missing-NULL-checks.patch
-Patch84: 0002-Add-dont-expire-password-option.patch
-Patch85: 0001-Fix-for-dont-expire-password-option-and-join.patch
-
-# rhbz#1952828 - [RFE] Allow adcli to create AD user with password as well as
-# set or reset existing user password
-Patch86: 0001-library-move-UAC-flags-to-a-more-common-header-file.patch
-Patch87: 0002-adcli_entry-add-entry_attrs-with-userAccountControl-.patch
-Patch88: 0003-entry-add-passwd-user-sub-command.patch
-
-# rhbz#1690920 - [RFE] add option to populate "managed by" computer attribute
-Patch89: 0001-Add-setattr-option.patch
-Patch90: 0002-Add-delattr-option.patch
-
-BuildRequires: gcc
-BuildRequires: intltool pkgconfig
-BuildRequires: libtool
-BuildRequires: gettext-devel
-BuildRequires: krb5-devel
-BuildRequires: openldap-devel
-BuildRequires: libxslt
-BuildRequires: xmlto
-
-Requires: cyrus-sasl-gssapi
+Name: adcli
+Version: 0.9.2
+Release: 1%{?dist}
+Summary: Active Directory enrollment
+License: LGPLv2+
+URL: https://gitlab.freedesktop.org/realmd/adcli
+Source0: https://gitlab.freedesktop.org/realmd/adcli/uploads/ea560656ac921b3fe0d455976aaae9be/adcli-%{version}.tar.gz
+
+BuildRequires: gcc
+BuildRequires: intltool pkgconfig
+BuildRequires: libtool
+BuildRequires: gettext-devel
+BuildRequires: krb5-devel
+BuildRequires: openldap-devel
+BuildRequires: libxslt
+BuildRequires: xmlto
+BuildRequires: make
+
+Requires: cyrus-sasl-gssapi
+Conflicts: adcli-doc < %{version}-%{release}
# adcli no longer has a library of development files
# the adcli tool itself is to be used by callers
-Obsoletes: adcli-devel < 0.5
+Obsoletes: adcli-devel < 0.5
%description
adcli is a tool for joining an Active Directory domain using
@@ -208,11 +48,7 @@ make check
make install DESTDIR=%{buildroot}
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%clean
+%ldconfig_scriptlets
%files
%{_sbindir}/adcli
@@ -222,6 +58,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%package doc
Summary: adcli documentation
BuildArch: noarch
+Conflicts: adcli < %{version}-%{release}
%description doc
adcli is a tool for joining an Active Directory domain using
@@ -232,6 +69,10 @@ documentation.
%doc %{_datadir}/doc/adcli/*
%changelog
+* Fri Oct 21 2022 Sumit Bose <sbose@redhat.com> - 0.9.2-1
+- Update to upstream release 0.9.2
+ Resolves: rhbz#1991619, rhbz#2111348, rhbz#2133838
+
* Mon Jun 14 2021 Sumit Bose <sbose@redhat.com> - 0.8.2-12
- [RFE] Allow adcli to create AD user with password as well as set or reset
existing user password [#1952828]