From 413580e0c6cd651752c93a70fa9b85127cb92606 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Mon, 3 Dec 2018 13:34:40 +0200 Subject: [PATCH] Update to FreeIPA 4.7.2 --- freeipa.spec | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/freeipa.spec b/freeipa.spec index 8a30893..8e9f8b7 100644 --- a/freeipa.spec +++ b/freeipa.spec @@ -76,7 +76,9 @@ %global selinux_policy_version 3.14.1-14 %global slapi_nis_version 0.56.1-4 %global python_ldap_version 3.1.0-1 -%global ds_version 1.4.0.8-1 +# Fix for "Installation fails: Replica Busy" +# https://bugzilla.redhat.com/show_bug.cgi?id=1598478 +%global ds_version 1.3.8.4-15 %else # Fedora %global package_name freeipa @@ -96,13 +98,16 @@ # Fix for "Crash when failing to read from SASL connection" # https://pagure.io/389-ds-base/issue/49639 -%global ds_version 1.4.0.8-1 +# Fix for "Installation fails: Replica Busy" +# https://pagure.io/389-ds-base/issue/49818 +%global ds_version 1.4.0.16-1 %endif # Fedora -# Require Dogtag PKI 10.6.6 to detect when fips is available, -# https://pagure.io/freeipa/issue/7608 -%global pki_version 10.6.6 +# Require Dogtag PKI 10.6.7-3 which fixes UpdateNumberRange clone +# installation issue; https://pagure.io/freeipa/issue/7654 +# and https://pagure.io/dogtagpki/issue/3073 +%global pki_version 10.6.7-3 # NSS release with fix for CKA_LABEL import bug in shared SQL database. # https://bugzilla.redhat.com/show_bug.cgi?id=1568271 @@ -123,7 +128,7 @@ # Work-around fact that RPM SPEC parser does not accept # "Version: @VERSION@" in freeipa.spec.in used for Autoconf string replacement -%define IPA_VERSION 4.7.1 +%define IPA_VERSION 4.7.2 %define AT_SIGN @ # redefine IPA_VERSION only if its value matches the Autoconf placeholder %if "%{IPA_VERSION}" == "%{AT_SIGN}VERSION%{AT_SIGN}" @@ -132,7 +137,7 @@ Name: %{package_name} Version: %{IPA_VERSION} -Release: 4%{?dist} +Release: 1%{?dist} Summary: The Identity, Policy and Audit system Group: System Environment/Base @@ -140,9 +145,6 @@ License: GPLv3+ URL: http://www.freeipa.org/ Source0: https://releases.pagure.org/freeipa/freeipa-%{version}.tar.gz Source1: https://releases.pagure.org/freeipa/freeipa-%{version}.tar.gz.asc -# Fix authselect command invocation (breaks with authselect 1.0.2) -# https://github.com/freeipa/freeipa/pull/2610 -Patch0: 2610.patch # For the timestamp trick in patch application BuildRequires: diffstat BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -290,6 +292,7 @@ BuildRequires: python3-jinja2 BuildRequires: python3-jwcrypto >= 0.4.2 BuildRequires: python3-ldap >= %{python_ldap_version} BuildRequires: python3-ldap >= %{python_ldap_version} +BuildRequires: python3-lib389 >= %{ds_version} BuildRequires: python3-libipa_hbac BuildRequires: python3-libsss_nss_idmap BuildRequires: python3-lxml @@ -301,7 +304,12 @@ BuildRequires: python3-polib BuildRequires: python3-pyasn1 BuildRequires: python3-pyasn1-modules BuildRequires: python3-pycodestyle +%if 0%{?fedora} >= 29 +# https://bugzilla.redhat.com/show_bug.cgi?id=1648299 +BuildRequires: python3-pylint >= 2.1.1-2 +%else BuildRequires: python3-pylint >= 1.7 +%endif BuildRequires: python3-pytest-multihost BuildRequires: python3-pytest-sourceorder BuildRequires: python3-qrcode-core >= 5.0.0 @@ -1736,6 +1744,9 @@ fi %changelog +* Mon Dec 03 2018 Alexander Bokovoy - 4.7.2-1 +- Upstream release FreeIPA 4.7.2 + * Wed Nov 28 2018 Adam Williamson - 4.7.1-4 - Update PR #2610 patch to tiran's modified version