diff --git a/freeipa.spec b/freeipa.spec index c95a9b7..f78061f 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -207,7 +207,7 @@ Name: %{package_name} Version: %{IPA_VERSION} -Release: 15%{?rc_version:.%rc_version}.0.1%{?dist}.1 +Release: 15%{?rc_version:.%rc_version}%{?dist}.1 Summary: The Identity, Policy and Audit system License: GPL-3.0-or-later @@ -307,12 +307,9 @@ Patch0066: 0066-ipatests-on-rhel10-do-not-install-firefox.patch Patch0067: 0067-Configure-the-pki-tomcatd-service-systemd-timeout.patch Patch0068: 0068-Align-startup_timeout-with-the-systemd-default-and-d.patch Patch0069: 0069-dns-only-disable-unbound-when-DoT-is-enabled.patch +Patch0070: 10001-kdb-keep-ipadb_get_connection-from-succeeding-with-n.patch +Patch0071: 10002-Set-krbCanonicalName-admin-REALM-on-the-admin-user.patch Patch1001: 1001-Change-branding-to-IPA-and-Identity-Management.patch - -#Oracle patches -Patch10001: 10001-kdb-keep-ipadb_get_connection-from-succeeding-with-n.patch -Patch10002: 10002-Set-krbCanonicalName-admin-REALM-on-the-admin-user.patch - %endif %endif # RHEL spec file only: END @@ -644,7 +641,6 @@ BuildArch: noarch Requires: %{name}-client-common = %{version}-%{release} Requires: httpd >= %{httpd_version} Requires: systemd-units >= %{systemd_version} -Requires: bind >= %{bind_version} %if 0%{?rhel} >= 8 && ! 0%{?eln} Requires: system-logos-ipa >= 80.4 %endif @@ -1116,8 +1112,7 @@ autoreconf -ivf %{enable_server_option} \ %{with_ipatests_option} \ %{with_ipa_join_xml_option} \ - %{linter_options} \ - --with-ipaplatform=rhel + %{linter_options} # run build in default dir # -Onone is workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1398405 @@ -1959,10 +1954,6 @@ fi %endif %changelog -* Fri Jun 27 2025 EL Errata - 4.12.2-15.0.1.el10_0.1 -- Set IPAPLATFORM=rhel when build on Oracle Linux [Orabug: 29516674] -- Add bind to ipa-server-common Requires [Orabug: 36518596] - * Thu Jun 26 2025 Alex Burmashev - 4.12.2-15.el10_0.1 - Resolves: RHEL-89908 EMBARGOED CVE-2025-4404 ipa: Privilege escalation from host to domain admin in FreeIPA