Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spec file: bump sssd version #6561

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 12 additions & 2 deletions freeipa.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@
%global httpd_version 2.4.37-21
%global bind_version 9.11.20-6

# Fix for https://github.com/SSSD/sssd/issues/6331
%global sssd_version 2.8.0

%else
# Fedora
%global package_name freeipa
Expand Down Expand Up @@ -135,6 +138,15 @@
# Some packages don't provide new dist aliases.
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/
%{?python_disable_dependency_generator}

%if 0%{?fedora} < 37
# F35+, adds IdP integration
%global sssd_version 2.7.0
%else
# Fix for https://github.com/SSSD/sssd/issues/6331
%global sssd_version 2.8.0
%endif

# Fedora
%endif

Expand All @@ -161,8 +173,6 @@
# RHEL 8.2+, F32+ has 3.58
%global nss_version 3.44.0-4

# RHEL 8.7+, F35+, adds IdP integration
%global sssd_version 2.7.0

%define krb5_base_version %(LC_ALL=C /usr/bin/pkgconf --modversion krb5 | grep -Eo '^[^.]+\.[^.]+' || echo %krb5_version)
%global kdcproxy_version 0.4-3
Expand Down
11 changes: 0 additions & 11 deletions ipatests/test_integration/test_adtrust_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

import re
import os
import pytest
import textwrap

from ipaplatform.osinfo import osinfo
from ipaplatform.paths import paths
from ipapython.dn import DN
from ipatests.pytest_ipa.integration import tasks
Expand Down Expand Up @@ -52,9 +50,6 @@ def test_samba_config_file(self):
res = self.master.run_command(['testparm', '-s'])
assert 'ERROR' not in (res.stdout_text + res.stderr_text)

@pytest.mark.xfail(
osinfo.id == 'fedora' and osinfo.version_number >= (37,),
reason='freeipa ticket 9234', strict=True)
def test_add_agent_not_allowed(self):
"""Check that add-agents can be run only by Admins."""
user = "nonadmin"
Expand Down Expand Up @@ -256,9 +251,6 @@ def test_schema_compat_attribute(self):
'"member","ipaexternalmember")')
assert value in entry_list

@pytest.mark.xfail(
osinfo.id == 'fedora' and osinfo.version_number >= (37,),
reason='freeipa ticket 9234', strict=True)
def test_ipa_user_pac(self):
"""Test that a user can request a service ticket with PAC"""
user = 'testpacuser'
Expand Down Expand Up @@ -287,9 +279,6 @@ def test_ipa_user_pac(self):
tasks.kinit_admin(self.master)
self.master.run_command(['ipa', 'user-del', user])

@pytest.mark.xfail(
osinfo.id == 'fedora' and osinfo.version_number >= (37,),
reason='freeipa ticket 9234', strict=True)
def test_ipa_user_s4u2self_pac(self):
"""Test that a service can request S4U2Self ticket with PAC"""
user = 'tests4u2selfuser'
Expand Down
4 changes: 0 additions & 4 deletions ipatests/test_integration/test_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

from ipalib.constants import IPAAPI_USER

from ipaplatform.osinfo import osinfo
from ipaplatform.paths import paths

from ipapython.dn import DN
Expand Down Expand Up @@ -1607,9 +1606,6 @@ def test_basesearch_compat_tree(self):
tasks.ldapsearch_dm(self.master, base, ldap_args=[], scope='sub')
tasks.ldapsearch_dm(self.master, base, ldap_args=[], scope='base')

@pytest.mark.xfail(
osinfo.id == 'fedora' and osinfo.version_number >= (37,),
reason='freeipa ticket 9234', strict=True)
def test_sid_generation(self):
"""
Test SID generation
Expand Down