Skip to content

Commit

Permalink
Delete 'lib/sifp'.
Browse files Browse the repository at this point in the history
:relnote:Previously deprecated `--with-libsifp` configure option and
'sss_simpleifp' library were removed.
  • Loading branch information
alexey-tikhonov committed Jan 24, 2025
1 parent afc643d commit a4e9b5e
Show file tree
Hide file tree
Showing 20 changed files with 1 addition and 6,890 deletions.
64 changes: 0 additions & 64 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 #
#########################
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion contrib/ci/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ fi
if [[ "$DISTRO_BRANCH" == -redhat-centos-9*- ||
"$DISTRO_BRANCH" == -redhat-redhatenterprise*-9.*- ]]; then
CONFIGURE_ARG_LIST+=(
"--with-libsifp"
"--with-conf-service-user-support"
)
fi
Expand Down
31 changes: 0 additions & 31 deletions contrib/sssd.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -486,24 +486,6 @@ Provides rules for polkit integration with SSSD. This is required
for smartcard support if SSSD service is running as user 'sssd'.
%endif

%package -n libsss_simpleifp
Summary: The SSSD D-Bus responder helper library
License: GPL-3.0-or-later
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: GPL-3.0-or-later
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.
%endif

%package winbind-idmap
Summary: SSSD's idmap_sss Backend for Winbind
License: GPL-3.0-or-later AND LGPL-3.0-or-later
Expand Down Expand Up @@ -609,7 +591,6 @@ autoreconf -ivf
--with-syslog=journald \
--with-test-dir=/dev/shm \
%if 0%{?rhel} == 9
--with-libsifp \
--with-conf-service-user-support \
--with-files-provider \
--with-extended-enumeration-support \
Expand Down Expand Up @@ -955,18 +936,6 @@ install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/sssd.conf
%{_datadir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.sssd.infopipe.service

%if 0%{?rhel} == 9
%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
%endif

%files client -f sssd_client.lang
%license src/sss_client/COPYING src/sss_client/COPYING.LESSER
%{_libdir}/libnss_sss.so.2
Expand Down
18 changes: 0 additions & 18 deletions src/conf_macros.m4
Original file line number Diff line number Diff line change
Expand Up @@ -751,24 +751,6 @@ AC_DEFUN([WITH_SSH_KNOWN_HOSTS_PROXY],
AM_CONDITIONAL([BUILD_SSH_KNOWN_HOSTS_PROXY], [test x"$with_ssh" = xyes -a x"$with_ssh_know_hosts_proxy" = 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],
Expand Down
Loading

0 comments on commit a4e9b5e

Please sign in to comment.