CI: remove C9S from platforms list.

SSSD · Jan 25, 2025 · 248d1e7 · 248d1e7
1 parent dfba5b7
commit 248d1e7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 120 deletions.
diff --git a/.github/workflows/copr_build.yml b/.github/workflows/copr_build.yml
@@ -70,7 +70,7 @@ jobs:
       with:
         coprcfg: ${{ steps.copr.outputs.coprcfg }}
         filter: "fedora-.+-x86_64|centos-stream-.*-x86_64"
-        exclude: "fedora-eln-.+|centos-stream-8-x86_64"
+        exclude: "fedora-eln-.+|centos-stream-8-x86_64|centos-stream-9-x86_64"
 
     - name: Create copr project
       uses: next-actions/copr/create-project@master
@@ -94,11 +94,6 @@ jobs:
       env:
         coprcfg: ${{ steps.copr.outputs.coprcfg }}
       run: |
-        # CentOS Stream 9
-        copr-cli --config "$coprcfg" edit-chroot                                                  \
-          --repos 'https://kojihub.stream.centos.org/kojifiles/repos/c9s-build/latest/$basearch/' \
-          $COPR_ACCOUNT/$COPR_PROJECT/centos-stream-9-x86_64
-
         # CentOS Stream 10
         copr-cli --config "$coprcfg" edit-chroot                                                  \
           --repos 'https://kojihub.stream.centos.org/kojifiles/repos/c10s-build/latest/$basearch/' \

diff --git a/contrib/ci/configure.sh b/contrib/ci/configure.sh
@@ -30,14 +30,11 @@ declare -a CONFIGURE_ARG_LIST=(
     "--with-initscript=sysv"
     "--with-syslog=syslog"
     "--enable-systemtap"
-)
-
-
-CONFIGURE_ARG_LIST+=(
+    "--with-subid"
+    "--with-passkey"
     "--without-python2-bindings"
 )
 
-
 # Different versions of Debian might need different versions here but this is
 # sufficient to make the CI work
 if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
@@ -46,33 +43,6 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
     )
 fi
 
-if [[ "$DISTRO_BRANCH" == -redhat-centos-9*- ||
-      "$DISTRO_BRANCH" == -redhat-redhatenterprise*-9.*- ]]; then
-    CONFIGURE_ARG_LIST+=(
-        "--with-conf-service-user-support"
-    )
-fi
-
-if [[ "$DISTRO_BRANCH" == -redhat-fedora-* ||
-      "$DISTRO_BRANCH" == -redhat-centos-9*- ||
-      "$DISTRO_BRANCH" == -redhat-centos-10*- ||
-      "$DISTRO_BRANCH" == -redhat-redhatenterprise*-9.*- ||
-      "$DISTRO_BRANCH" == -redhat-redhatenterprise*-10.*- ]]; then
-    CONFIGURE_ARG_LIST+=(
-        "--with-subid"
-    )
-fi
-
-if [[ "$DISTRO_BRANCH" == -redhat-fedora-* ||
-      "$DISTRO_BRANCH" == -redhat-centos-9*- ||
-      "$DISTRO_BRANCH" == -redhat-centos-10*- ||
-      "$DISTRO_BRANCH" == -redhat-redhatenterprise*-9.*- ||
-      "$DISTRO_BRANCH" == -redhat-redhatenterprise*-10.*- ]]; then
-    CONFIGURE_ARG_LIST+=(
-        "--with-passkey"
-    )
-fi
-
 declare -r -a CONFIGURE_ARG_LIST
 
 fi # _CONFIGURE_SH
diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh
@@ -46,47 +46,17 @@ if [[ "$DISTRO_BRANCH" == -redhat-* ]]; then
         krb5-workstation
         libunistring-devel
         libcap-devel
+        systemtap-sdt-dtrace
+        python3-dbus
+        python3-ldap
+        python3-ldb
+        python3-psutil
+        python3-pycodestyle
+        python3-pytest
+        python3-requests
+        libfido2-devel
     )
 
-    if [[ "$DISTRO_BRANCH" == -redhat-fedora-4[1-9]* ||
-          "$DISTRO_BRANCH" == -redhat-redhatenterprise*-10.*- ||
-          "$DISTRO_BRANCH" == -redhat-centos*-10*- ]]; then
-        DEPS_LIST+=(systemtap-sdt-dtrace)
-    fi
-
-    if [[ "$DISTRO_BRANCH" == -redhat-fedora-4[0-9]* ||
-          "$DISTRO_BRANCH" == -redhat-fedora-3[7-9]* ||
-          "$DISTRO_BRANCH" == -redhat-redhatenterprise*-9.*- ||
-          "$DISTRO_BRANCH" == -redhat-redhatenterprise*-10.*- ||
-          "$DISTRO_BRANCH" == -redhat-centos*-9*- ||
-          "$DISTRO_BRANCH" == -redhat-centos*-10*- ]]; then
-        DEPS_LIST+=(
-            python3-dbus
-            python3-ldap
-            python3-ldb
-            python3-psutil
-            python3-pycodestyle
-            python3-pytest
-            python3-requests
-        )
-    else
-        DEPS_LIST+=(
-            dbus-python
-            pyldb
-            pytest
-            python-ldap
-            python-pep8
-            python-psutil
-            python-requests
-        )
-    fi
-
-    if [[ "$DISTRO_BRANCH" == -redhat-fedora-* ]]; then
-        DEPS_LIST+=(
-            libfido2-devel
-        )
-    fi
-
     _DEPS_LIST_SPEC=`
         sed -e 's/@PACKAGE_VERSION@/0/g' \
             -e 's/@PACKAGE_NAME@/package-name/g' \
@@ -176,6 +146,7 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
         bc
         libunistring-dev
         libcap-dev
+        libsubid4
     )
 
     DEPS_INTGCHECK_SATISFIED=true

diff --git a/contrib/ci/get-matrix.py b/contrib/ci/get-matrix.py
@@ -38,7 +38,7 @@ def get_fedora_matrix():
 
 
 def get_centos_matrix():
-    return ['centos-9', 'centos-10']
+    return ['centos-10']
 
 
 def get_other_matrix():

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
@@ -23,11 +23,7 @@
 %global use_sysusers 0
 %endif
 
-%if 0%{?fedora} >= 35 || 0%{?rhel} >= 9
 %global build_subid 1
-%else
-%global build_subid 0
-%endif
 
 %if 0%{?fedora} >= 34
 %global build_kcm_renewals 1
@@ -39,11 +35,7 @@
 %global build_kcm_renewals 0
 %endif
 
-%if 0%{?fedora} >= 39 || 0%{?rhel} >= 9
 %global build_passkey 1
-%else
-%global build_passkey 0
-%endif
 
 %if 0%{?fedora} >= 41 || 0%{?rhel} >= 10
 %global build_ssh_known_hosts_proxy 0
@@ -202,16 +194,12 @@ the existing back ends.
 %package common
 Summary: Common files for the SSSD
 License: GPL-3.0-or-later
-%if 0%{?rhel} != 9
 # libsss_simpleifp is removed starting 2.9.0
 Obsoletes: libsss_simpleifp < 2.9.0
 Obsoletes: libsss_simpleifp-debuginfo < 2.9.0
-%endif
-%if 0%{?rhel} != 9
 %if %{use_sssd_user}
 Obsoletes: sssd-polkit-rules < 2.10.0
 %endif
-%endif
 # Requires
 # due to ABI changes in 1.1.30/1.2.0
 Requires: libldb >= %{ldb_version}
@@ -472,20 +460,6 @@ Requires: sssd-common = %{version}-%{release}
 Provides the D-Bus responder of the SSSD, called the InfoPipe, that allows
 the information from the SSSD to be transmitted over the system bus.
 
-%if 0%{?rhel} == 9
-%if %{use_sssd_user}
-%package polkit-rules
-Summary: Rules for polkit integration for SSSD
-Group: Applications/System
-License: GPL-3.0-or-later
-Requires: polkit >= 0.106
-Requires: sssd-common = %{version}-%{release}
-
-%description polkit-rules
-Provides rules for polkit integration with SSSD. This is required
-for smartcard support if SSSD service is running as user 'sssd'.
-%endif
-
 %package winbind-idmap
 Summary: SSSD's idmap_sss Backend for Winbind
 License: GPL-3.0-or-later AND LGPL-3.0-or-later
@@ -590,13 +564,6 @@ autoreconf -ivf
     --with-sssd-user=%{sssd_user} \
     --with-syslog=journald \
     --with-test-dir=/dev/shm \
-%if 0%{?rhel} == 9
-    --with-conf-service-user-support \
-    --with-files-provider \
-    --with-extended-enumeration-support \
-    --with-ssh-known-hosts-proxy \
-    --with-allow-remote-domain-local-groups \
-%endif
 %if %{build_subid}
     --with-subid \
 %endif
@@ -797,9 +764,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
 %{_libexecdir}/%{servicename}/sssd_check_socket_activated_responders
 
 %dir %{_libdir}/%{name}
-%if 0%{?rhel} == 9
-%{_libdir}/%{name}/libsss_files.so
-%endif
 %{_libdir}/%{name}/libsss_simple.so
 
 #Internal shared libraries
@@ -856,9 +820,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
 %{_mandir}/man1/sss_ssh_knownhostsproxy.1*
 %endif
 %{_mandir}/man5/sssd.conf.5*
-%if 0%{?rhel} == 9
-%{_mandir}/man5/sssd-files.5*
-%endif
 %{_mandir}/man5/sssd-simple.5*
 %{_mandir}/man5/sssd-sudo.5*
 %{_mandir}/man5/sssd-session-recording.5*
@@ -878,9 +839,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
 %{_sysusersdir}/sssd.conf
 %endif
 %if %{use_sssd_user}
-%if 0%{?rhel} == 9
-%files polkit-rules
-%endif
 %{_datadir}/polkit-1/rules.d/*
 %endif