Delete 'lib/sifp'

.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/' \

Makefile.am

@@ -326,9 +326,6 @@ non_interactive_cmocka_based_tests += test_resolv_fake
 endif   # HAVE_LIBRESOLV
 
 non_interactive_cmocka_based_tests += ifp_tests
-if BUILD_LIBSIFP
-non_interactive_cmocka_based_tests += sss_sifp-tests
-endif   # BUILD_LIBSIFP
 
 if HAVE_INOTIFY
 non_interactive_cmocka_based_tests += test_inotify
@@ -948,10 +945,6 @@ SSSD_DOCS = \
     idmap_doc \
     nss_idmap_doc
 
-if BUILD_LIBSIFP
-    SSSD_DOCS += sss_simpleifp_doc
-endif  # BUILD_LIBSIFP
-
 CLIENT_LIBS = $(LTLIBINTL)
 
 if WITH_JOURNALD
@@ -1424,35 +1417,6 @@ include_HEADERS = \
     src/lib/certmap/sss_certmap.h \
     $(NULL)
 
-if BUILD_LIBSIFP
-lib_LTLIBRARIES += libsss_simpleifp.la
-pkgconfig_DATA += src/lib/sifp/sss_simpleifp.pc
-
-libsss_simpleifp_la_SOURCES = \
-    src/lib/sifp/sss_sifp.c \
-    src/lib/sifp/sss_sifp_dbus.c \
-    src/lib/sifp/sss_sifp_attrs.c \
-    src/lib/sifp/sss_sifp_common.c \
-    src/lib/sifp/sss_sifp_parser.c \
-    src/lib/sifp/sss_sifp_utils.c
-libsss_simpleifp_la_CFLAGS = \
-    $(AM_CFLAGS) \
-    -I$(top_srcdir)/src/lib/sifp
-libsss_simpleifp_la_LIBADD = \
-    $(DBUS_LIBS) \
-    $(DHASH_LIBS)
-libsss_simpleifp_la_LDFLAGS = \
-    -Wl,--version-script,$(srcdir)/src/lib/sifp/sss_simpleifp.exports \
-    -version-info 1:1:1
-
-dist_noinst_HEADERS += src/lib/sifp/sss_sifp_private.h
-dist_noinst_DATA += src/lib/sifp/sss_simpleifp.exports
-
-include_HEADERS += \
-    src/lib/sifp/sss_sifp.h \
-    src/lib/sifp/sss_sifp_dbus.h
-endif  # BUILD_LIBSIFP
-
 #########################
 # Systemtap tracing     #
 #########################
@@ -3172,31 +3136,6 @@ ifp_tests_LDADD = \
     libsss_sbus.la \
     $(NULL)
 
-if BUILD_LIBSIFP
-sss_sifp_tests_SOURCES = \
-    src/tests/cmocka/test_sss_sifp.c \
-    src/lib/sifp/sss_sifp_attrs.c \
-    src/lib/sifp/sss_sifp_common.c \
-    src/lib/sifp/sss_sifp_parser.c \
-    src/lib/sifp/sss_sifp_utils.c \
-    src/lib/sifp/sss_sifp_dbus.c \
-    src/lib/sifp/sss_sifp.c
-sss_sifp_tests_CFLAGS = \
-    $(AM_CFLAGS) \
-    $(CMOCKA_CFLAGS) \
-    -I$(top_srcdir)/src/lib/sifp
-sss_sifp_tests_LDFLAGS = \
-    -Wl,-wrap,dbus_bus_get \
-    -Wl,-wrap,dbus_connection_send_with_reply_and_block
-sss_sifp_tests_LDADD = \
-    $(CMOCKA_LIBS) \
-    $(DBUS_LIBS) \
-    $(TALLOC_LIBS) \
-    $(DHASH_LIBS) \
-    $(POPT_LIBS) \
-    $(SSSD_INTERNAL_LTLIBS)
-endif # BUILD_LIBSIFP
-
 test_sysdb_views_SOURCES = \
     src/tests/cmocka/test_sysdb_views.c \
     src/providers/ipa/ipa_utils.c \
@@ -5449,9 +5388,6 @@ docs:
 	$(DOXYGEN) src/lib/idmap/sss_idmap.doxy
 	$(DOXYGEN) src/sss_client/idmap/sss_nss_idmap.doxy
 	$(DOXYGEN) src/lib/certmap/sss_certmap.doxy
-if BUILD_LIBSIFP
-	$(DOXYGEN) src/lib/sifp/sss_simpleifp.doxy
-endif  # BUILD_LIBSIFP
 else !HAVE_DOXYGEN
 docs:
 	@echo "Doxygen not installed, cannot generate documentation"

configure.ac

@@ -189,7 +189,6 @@ WITH_SUBID_LIB_PATH
 WITH_PASSKEY
 WITH_SSH
 WITH_SSH_KNOWN_HOSTS_PROXY
-WITH_LIBSIFP
 WITH_SYSLOG
 WITH_SAMBA
 WITH_NFS
@@ -575,8 +574,6 @@ AC_CONFIG_FILES([Makefile contrib/sssd.spec src/examples/rwtab src/doxy.config
                  src/lib/certmap/sss_certmap.pc src/lib/certmap/sss_certmap.doxy
                  src/sss_client/idmap/sss_nss_idmap.pc
                  src/sss_client/idmap/sss_nss_idmap.doxy
-                 src/lib/sifp/sss_simpleifp.pc
-                 src/lib/sifp/sss_simpleifp.doxy
                  src/config/setup.py
                  src/systemtap/sssd.stp
                  src/tools/analyzer/Makefile

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,34 +43,6 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
     )
 fi
 
-if [[ "$DISTRO_BRANCH" == -redhat-centos-9*- ||
-      "$DISTRO_BRANCH" == -redhat-redhatenterprise*-9.*- ]]; then
-    CONFIGURE_ARG_LIST+=(
-        "--with-libsifp"
-        "--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

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,8 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
         bc
         libunistring-dev
         libcap-dev
+        libsubid4
+        libsubid-dev
     )
 
     DEPS_INTGCHECK_SATISFIED=true

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():