[Freeipa-devel] [PATCH 02261] Revert 389 DS BuildRequires version

[Petr Vobornik]

On 05/29/2015 10:43 AM, Lukas Slebodnik wrote:
> On (29/05/15 10:33), Martin Basti wrote:
>> On 29/05/15 09:23, Lukas Slebodnik wrote:
>>> On (12/05/15 21:03), Martin Basti wrote:
>>>> On 12/05/15 18:23, Martin Basti wrote:
>>>>> https://fedorahosted.org/freeipa/ticket/4921
>>>>>
>>>>> To test this, the mkosek/freeipa-master copr repo with 389-ds-base 1.3.4.0
>>>>> is needed.
>>>>>
>>>>> All previous changes to uniqueness plugins were made just in master branch
>>>>> so upgrade will not work correctly from master to newer master.
>>>> >From IPA 4.1 to master should work as expected.
>>>>> Patch attached.
>>>>>
>>>>>
>>>>>
>>>> Updated patch attached.
>>>>
>>>> --
>>>> Martin Basti
>>>>
>>> >From df2f521473a7e4f2438f675e4328ee59c8cf4617 Mon Sep 17 00:00:00 2001
>>>> From: Martin Basti <mbasti at redhat.com>
>>>> Date: Tue, 12 May 2015 18:11:07 +0200
>>>> Subject: [PATCH] Server Upgrade: Fix uniqueness plugins
>>>>
>>>> Due previous changes (in master branch only) the uniqueness plugins
>>>> became misconfigured.
>>>>
>>>> After this patch:
>>>> * whole $SUFFIX will be checked by unique plugins
>>>> * just staged users are exluded from check
>>>>
>>>> This reverts some changes in commit
>>>> 52b7101c1148618d5c8e2ec25576cc7ad3e9b7bb
>>>>
>>>> Since 389-ds-base 1.3.4.a1 new attribute 'uniqueness-exclude-subtrees'
>>>> can be used.
>>>>
>>>> https://fedorahosted.org/freeipa/ticket/4921
>>>> ---
>>>> freeipa.spec.in                      |  6 +++---
>>>> install/share/unique-attributes.ldif | 12 ++++++------
>>>> install/updates/10-uniqueness.update | 20 ++++++--------------
>>>> 3 files changed, 15 insertions(+), 23 deletions(-)
>>>>
>>>> diff --git a/freeipa.spec.in b/freeipa.spec.in
>>>> index 2bf14ef9e14f96b3100d45dd47d749b6bc3b4816..73736455655a100a2febef8e86db2c5a2f2419c9 100644
>>>> --- a/freeipa.spec.in
>>>> +++ b/freeipa.spec.in
>>>> @@ -34,7 +34,7 @@ Source0:        freeipa-%{version}.tar.gz
>>>> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>>>>
>>>> %if ! %{ONLY_CLIENT}
>>>> -BuildRequires:  389-ds-base-devel >= 1.3.3.9
>>>> +BuildRequires:  389-ds-base-devel >= 1.3.4.a1
>>> Please revert this change. FreeIPA can be built 1.3.3.9 as well.
>>> and it block scanning pacakge with static analysers even on fedora-rawhide.
>>>
>>> I managed to build pacakges with 389-ds-base 1.3.3.9.
>>> It should be sufficient to have Requires for 1.3.4.a1.
>>>
>>>
>>>
>>>> BuildRequires:  svrcore-devel
>>>> BuildRequires:  policycoreutils >= 2.1.12-5
>>>> BuildRequires:  systemd-units
>>>> @@ -109,7 +109,7 @@ Group: System Environment/Base
>>>> Requires: %{name}-python = %{version}-%{release}
>>>> Requires: %{name}-client = %{version}-%{release}
>>>> Requires: %{name}-admintools = %{version}-%{release}
>>>> -Requires: 389-ds-base >= 1.3.3.9
>>>> +Requires: 389-ds-base >= 1.3.4.a1
>>>> Requires: openldap-clients > 2.4.35-4
>>>> Requires: nss >= 3.14.3-12.0
>>>> Requires: nss-tools >= 3.14.3-12.0
>>>> @@ -144,7 +144,7 @@ Requires: zip
>>>> Requires: policycoreutils >= 2.1.12-5
>>>> Requires: tar
>>>> Requires(pre): certmonger >= 0.76.8
>>>> -Requires(pre): 389-ds-base >= 1.3.3.9
>>>> +Requires(pre): 389-ds-base >= 1.3.4.a1
>>>> Requires: fontawesome-fonts
>>>> Requires: open-sans-fonts
>>>> Requires: openssl
>>> LS
>> Patch attached.
>>
>> --
>> Martin Basti
>>
>
>>From 58e24b762c78f995d44ebf89e995df2360e9c055 Mon Sep 17 00:00:00 2001
>> From: Martin Basti <mbasti at redhat.com>
>> Date: Fri, 29 May 2015 10:29:15 +0200
>> Subject: [PATCH] Revert 389-DS BuildRequires version to 1.3.3.9
>>
>> ---
>> freeipa.spec.in | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/freeipa.spec.in b/freeipa.spec.in
>> index 7dc576256865fb04b3f322b2094a5e3ece7776a5..d2943547bf4d967bac031b02eb74ab4693cb9872 100644
>> --- a/freeipa.spec.in
>> +++ b/freeipa.spec.in
>> @@ -34,7 +34,7 @@ Source0:        freeipa-%{version}.tar.gz
>> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>>
>> %if ! %{ONLY_CLIENT}
>> -BuildRequires:  389-ds-base-devel >= 1.3.4.a1
>> +BuildRequires:  389-ds-base-devel >= 1.3.3.9
>> BuildRequires:  svrcore-devel
>> BuildRequires:  policycoreutils >= 2.1.12-5
>> BuildRequires:  systemd-units
>
> Thank you.
> rpms can be built on fedora-rawhide
>
> ACK

Pushed to master: 6a92b32bf2dfe49e3f219beb6042e9fa71e18dcc


>
> LS
>
-- 
Petr Vobornik