From 062c157013c5af8714d9015582de898b42d1a981 Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: May 02 2018 06:34:18 +0000 Subject: support transition from libtirpc to libnsl in Fedora 28 libnsl2-devel in Fedora 28 depends on libtirpc-devel internally so we can also reduce the dependency in spec --- diff --git a/configure.ac b/configure.ac index 184a9af..80f2ca2 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,12 @@ AC_ARG_WITH(tirpc, ]) if test $use_tirpc = yes ; then PKG_CHECK_MODULES(TIRPC,libtirpc) +fi + +PKG_CHECK_MODULES(NSL,libnsl,[use_libnsl=yes],[use_libnsl=no]) +if test "$use_libnsl" = yes ; then + RPC_CFLAGS="$NSL_CFLAGS" + RPC_LIBS="$NSL_LIBS" else RPC_CFLAGS= RPC_LIBS=-lnsl diff --git a/slapi-nis.spec b/slapi-nis.spec index dee48ee..247a73d 100644 --- a/slapi-nis.spec +++ b/slapi-nis.spec @@ -28,13 +28,10 @@ BuildRequires: libsss_nss_idmap-devel > 1.16.0-5 %define sss_nss_opts %{nil} %endif BuildRequires: pam-devel -%if 0%{?fedora} > 6 || 0%{?rhel} > 5 -BuildRequires: tcp_wrappers-devel -%else -BuildRequires: tcp_wrappers -%endif -%if 0%{?fedora} > 14 || 0%{?rhel} > 6 +%if (0%{?fedora} > 14 && 0%{?fedora} < 28) || (0%{?rhel} > 6 && 0%{?rhel} < 8) BuildRequires: libtirpc-devel +%else +BuildRequires: libnsl2-devel %endif %if 0%{?rhel} > 0 && 0%{?rhel} < 7 ExclusiveArch: x86_64 %{ix86} @@ -58,7 +55,7 @@ for attributes from multiple entries in the tree. %setup -q %build -%configure --disable-static --with-tcp-wrappers --with-ldap=%{ldap_impl} \ +%configure --disable-static --with-ldap=%{ldap_impl} \ --with-nsswitch --with-pam --with-pam-service=system-auth \ %{sss_nss_opts} %{betxn_opts} sed -i -e 's,%{_libdir}/dirsrv/plugins/,,g' -e 's,.so$,,g' doc/examples/*.ldif @@ -86,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT %{_sbindir}/nisserver-plugin-defs %changelog +* Wed May 02 2018 Alexander Bokovoy - 0.56.2-2 +- Remove tcpwrappers support from a default build +- Use libnsl2 for Fedora 28 or later + * Fri Jan 19 2018 Alexander Bokovoy - 0.56.2-1 - New upstream release - Use extended SSSD API to signal that an entry should not be cached anymore