Deprecate 'sss_simpleifp' library.

:relnote:'sss_simpleifp' library is deprecated and might be removed in further releases. Those who are interested to keep using it awhile should configure its build explicitly using `--with-libsifp` ./configure option. Reviewed-by: Iker Pedrosa <[email protected]> Reviewed-by: Tomáš Halman <[email protected]>
SSSD · Mar 27, 2023 · 132fb40 · 132fb40
1 parent b3c681a
commit 132fb40
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -256,7 +256,6 @@ if HAVE_CMOCKA
         dp_opt_tests \
         responder-get-domains-tests \
         config_check-tests \
-        sss_sifp-tests \
         test_search_bases \
         test_ldap_auth \
         test_sdap_access \
@@ -304,6 +303,9 @@ endif   # HAVE_LIBRESOLV
 
 if BUILD_IFP
 non_interactive_cmocka_based_tests += ifp_tests
+if BUILD_LIBSIFP
+non_interactive_cmocka_based_tests += sss_sifp-tests
+endif   # BUILD_LIBSIFP
 endif   # BUILD_IFP
 
 if HAVE_INOTIFY
@@ -902,7 +904,6 @@ dist_noinst_HEADERS = \
     src/sss_client/sudo/sss_sudo.h \
     src/sss_client/nfs/nfsidmap_internal.h \
     src/lib/idmap/sss_idmap_private.h \
-    src/lib/sifp/sss_sifp_private.h \
     src/lib/winbind_idmap_sss/winbind_idmap_sss.h \
     src/tests/cmocka/test_utils.h \
     src/tools/common/sss_tools.h \
@@ -926,8 +927,10 @@ SSSD_DOCS = \
     nss_idmap_doc
 
 if BUILD_IFP
+if BUILD_LIBSIFP
     SSSD_DOCS += sss_simpleifp_doc
-endif
+endif  # BUILD_LIBSIFP
+endif  # BUILD_IFP
 
 CLIENT_LIBS = $(LTLIBINTL)
 
@@ -1419,6 +1422,7 @@ include_HEADERS = \
     $(NULL)
 
 if BUILD_IFP
+if BUILD_LIBSIFP
 lib_LTLIBRARIES += libsss_simpleifp.la
 pkgconfig_DATA += src/lib/sifp/sss_simpleifp.pc
 
@@ -1439,12 +1443,14 @@ 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
+endif  # BUILD_LIBSIFP
+endif  # BUILD_IFP
 
 #########################
 # Systemtap tracing     #
@@ -3159,6 +3165,7 @@ 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 \
@@ -3181,6 +3188,7 @@ sss_sifp_tests_LDADD = \
     $(DHASH_LIBS) \
     $(POPT_LIBS) \
     $(SSSD_INTERNAL_LTLIBS)
+endif # BUILD_LIBSIFP
 endif # BUILD_IFP
 
 test_sysdb_views_SOURCES = \
@@ -5354,8 +5362,10 @@ docs:
 	$(DOXYGEN) src/sss_client/idmap/sss_nss_idmap.doxy
 	$(DOXYGEN) src/lib/certmap/sss_certmap.doxy
 if BUILD_IFP
+if BUILD_LIBSIFP
 	$(DOXYGEN) src/lib/sifp/sss_simpleifp.doxy
-endif
+endif  # BUILD_LIBSIFP
+endif  # BUILD_IFP
 else !HAVE_DOXYGEN
 docs:
 	@echo "Doxygen not installed, cannot generate documentation"

diff --git a/configure.ac b/configure.ac
@@ -190,6 +190,7 @@ WITH_SUBID_LIB_PATH
 WITH_PASSKEY
 WITH_SSH
 WITH_IFP
+WITH_LIBSIFP
 WITH_SYSLOG
 WITH_SAMBA
 WITH_NFS

diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
@@ -445,23 +445,6 @@ Provides rules for polkit integration with SSSD. This is required
 for smartcard support.
 %endif
 
-%package -n libsss_simpleifp
-Summary: The SSSD D-Bus responder helper library
-License: GPLv3+
-Requires: sssd-dbus = %{version}-%{release}
-
-%description -n libsss_simpleifp
-Provides library that simplifies D-Bus API for the SSSD InfoPipe responder.
-
-%package -n libsss_simpleifp-devel
-Summary: The SSSD D-Bus responder helper library
-License: GPLv3+
-Requires: dbus-devel
-Requires: libsss_simpleifp = %{version}-%{release}
-
-%description -n libsss_simpleifp-devel
-Provides library that simplifies D-Bus API for the SSSD InfoPipe responder.
-
 %package winbind-idmap
 Summary: SSSD's idmap_sss Backend for Winbind
 License: GPLv3+ and LGPLv3+
@@ -869,16 +852,6 @@ done
 %{_datadir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
 
-%files -n libsss_simpleifp
-%{_libdir}/libsss_simpleifp.so.*
-
-%files -n libsss_simpleifp-devel
-%doc sss_simpleifp_doc/html
-%{_includedir}/sss_sifp.h
-%{_includedir}/sss_sifp_dbus.h
-%{_libdir}/libsss_simpleifp.so
-%{_libdir}/pkgconfig/sss_simpleifp.pc
-
 %files client -f sssd_client.lang
 %license src/sss_client/COPYING src/sss_client/COPYING.LESSER
 %{_libdir}/libnss_sss.so.2

diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
@@ -724,6 +724,24 @@ AC_DEFUN([WITH_IFP],
     AM_CONDITIONAL([BUILD_IFP], [test x"$with_infopipe" = xyes])
   ])
 
+AC_DEFUN([WITH_LIBSIFP],
+  [ AC_ARG_WITH([libsifp],
+                [AC_HELP_STRING([--with-libsifp],
+                                [Whether to build sss_simpleifp library [no].
+                                Please take a note that sss_simpleifp library is
+                                deprecated and might be removed in further releases.]
+                               )
+                ],
+                [with_libsifp=$withval],
+                with_libsifp=no
+               )
+
+    if test x"$with_libsifp" = xyes; then
+        AC_DEFINE(BUILD_LIBSIFP, 1, [whether to build sss_simpleifp library])
+    fi
+    AM_CONDITIONAL([BUILD_LIBSIFP], [test x"$with_libsifp" = xyes])
+  ])
+
 AC_DEFUN([WITH_SAMBA],
   [ AC_ARG_WITH([samba],
                 [AC_HELP_STRING([--with-samba],

diff --git a/src/tests/dlopen-tests.c b/src/tests/dlopen-tests.c
@@ -49,7 +49,9 @@ struct so {
     { "pam_sss.so", { LIBPFX"pam_sss.so", NULL } },
     { "pam_sss_gss.so", { LIBPFX"pam_sss_gss.so", NULL } },
 #ifdef BUILD_IFP
+#ifdef BUILD_LIBSIFP
     { "libsss_simpleifp.so", { LIBPFX"libsss_simpleifp.so", NULL } },
+#endif /* BUILD_LIBSIFP */
 #endif /* BUILD_IFP */
 #ifdef BUILD_SUDO
     { "libsss_sudo.so", { LIBPFX"libsss_sudo.so", NULL } },