Update license field to use GPL-3.0-or-later

Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>

.gitignore

@@ -70,3 +70,20 @@ slapi-nis-0.17.tar.gz
 /slapi-nis-0.56.tar.gz.sig
 /slapi-nis-0.56.0.tar.gz
 /slapi-nis-0.56.0.tar.gz.sig
+/slapi-nis-0.56.1.tar.gz
+/slapi-nis-0.56.1.tar.gz.sig
+/slapi-nis-0.56.2.tar.gz
+/slapi-nis-0.56.2.tar.gz.sig
+/slapi-nis-0.56.3.tar.gz
+/slapi-nis-0.56.3.tar.gz.sig
+/slapi-nis-0.56.4.tar.gz
+/slapi-nis-0.56.4.tar.gz.asc
+/slapi-nis-0.56.4.tar.gz.sig
+/slapi-nis-0.56.5.tar.gz
+/slapi-nis-0.56.5.tar.gz.asc
+/slapi-nis-0.56.6.tar.gz
+/slapi-nis-0.56.6.tar.gz.asc
+/slapi-nis-0.56.7.tar.gz
+/slapi-nis-0.56.7.tar.gz.asc
+/slapi-nis-0.60.0.tar.gz
+/slapi-nis-0.60.0.tar.gz.asc

0001-support-transition-from-libtirpc-to-libnsl-in-Fedora.patch

@@ -0,0 +1,28 @@
+From 062c157013c5af8714d9015582de898b42d1a981 Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <abokovoy@redhat.com>
+Date: Wed, 2 May 2018 08:56:15 +0300
+Subject: [PATCH] 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
+-- 
+2.14.3
+

slapi-nis-openldap-2.6.patch

@@ -0,0 +1,36 @@
+From 610cf4ce34ad850eda67d9fba1f98f8ab6001e6e Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <abokovoy@redhat.com>
+Date: Tue, 1 Feb 2022 08:28:18 +0200
+Subject: [PATCH] Update OpenLDAP detection code to deal with libldap_r removal
+ in 2.6
+
+Resolves: rhbz#2032691
+
+Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
+---
+ configure.ac | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7cd7d76..24fbe20 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -71,8 +71,13 @@ dirsrv)
+ 		;;
+ 	openldap)
+ 		runtime_modules="nss nspr"
+-		LDAP_CFLAGS=
+-		LDAP_LIBS="-lldap_r -llber"
++		SAVE_LIBS="$LIBS"
++		LIBS=
++		AC_SEARCH_LIBS([ldap_search], [ldap_r ldap], [], [AC_MSG_ERROR([libldap or libldap_r not found])])
++		AC_SEARCH_LIBS([ber_peek_tag], [lber], [], [AC_MSG_ERROR([liblber not found])])
++		LDAP_LIBS="$LIBS"
++		LDAP_CFLAGS=""
++		LIBS="$SAVE_LIBS"
+ 		;;
+ 	*)
+ 		runtime_modules="nss nspr"
+-- 
+2.34.1
+

slapi-nis.spec

@@ -10,34 +10,34 @@
 %endif
 
 Name:		slapi-nis
-Version:	0.56.0
-Release:	2%{?dist}
+Version:	0.60.0
+Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
-Group:		System Environment/Daemons
-License:	GPLv2
-URL:		http://slapi-nis.fedorahosted.org/
-Source0:	https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz
-Source1:	https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz.sig
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+License:	GPL-3.0-or-later
+URL:		http://pagure.io/slapi-nis/
+Source0:	https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz
+Source1:	https://releases.pagure.org/slapi-nis/slapi-nis-%{version}.tar.gz.asc
+
+BuildRequires: make
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  libtool
 BuildRequires:	389-ds-base-devel >= 1.3.5.6, %{ldap_impl}-devel
 BuildRequires:	nspr-devel, nss-devel, /usr/bin/rpcgen
 %if 0%{?fedora} > 18 || 0%{?rhel} > 6
-BuildRequires:	libsss_nss_idmap-devel
+BuildRequires:	libsss_nss_idmap-devel > 1.16.0-5
 %define sss_nss_opts --with-sss-nss-idmap --with-idviews
 %else
 %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}
+%if 0%{?fedora} > 27 || 0%{?rhel} >= 9
+ExcludeArch: %{ix86}
 %endif
 Requires: 389-ds-base >= 1.3.5.6
 
@@ -58,7 +58,8 @@ for attributes from multiple entries in the tree.
 %setup -q
 
 %build
-%configure --disable-static --with-tcp-wrappers --with-ldap=%{ldap_impl} \
+autoconf --force
+%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
@@ -75,17 +76,116 @@ rm $RPM_BUILD_ROOT/%{_libdir}/dirsrv/plugins/*.la
 make check
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc COPYING NEWS README STATUS doc/*.txt doc/examples/*.ldif doc/ipa
 %{_mandir}/man1/*
 %{_libdir}/dirsrv/plugins/*.so
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Sat Aug 20 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.60.0-1
+- new upstream release
+- Change license from GPLv2 to GPLv3+ to follow 389-ds licensing
+- Fix ID views integration
+- Fix base scope lookups
+- Bump NIS max dgram size to 8KB by default instead of 1KB
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.7-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Feb 01 2022 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.7-5
+- Resolves: rhbz#2032691
+- Rebuild against newer OpenLDAP version
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Nov 12 2021 Björn Esser <besser82@fedoraproject.org> - 0.56.7-3
+- Rebuild(libnsl2)
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue May 18 2021 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.7-1
+- CVE-2021-3480: invalid bind DN crash
+- New upstream release
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Dec 04 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.6-1
+- New upstream release
+- Ignore searches which don't match any configured map
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed May 06 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.5-2
+- Initialize map locks in NIS plugin to prevent crash
+
+* Mon May 04 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.5-1
+- New upstream release
+- Resolves: rhbz#1751295: (2) When sync-repl is enabled, slapi-nis can deadlock during retrochanglog trimming
+- Resolves: rhbz#1768156: ERR - schemacompat - map rdlock: old way MAP_MONITOR_DISABLED
+
+* Fri Feb 07 2020 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.4-1
+- New upstream release
+- Fix build with newer gcc versions
+- Resolves rhbz#1800097
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 06 2019 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.3-1
+- New upstream release
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed May 02 2018 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.2-6
+- Force rebuild of configure
+
+* Wed May 02 2018 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.2-5
+- Link with libnsl explicitly in Fedora 28 or later
+- Require libnsl2-devel for build
+- Resolves rhbz#1573636
+
+* Thu Mar 15 2018 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.2-4
+- Remove tcpwrappers support as they aren't available in Fedora anymore
+
+* Thu Mar 15 2018 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.2-3
+- Do not build on i686 in Fedora 28 or later as 389-ds-base is not available there anymore
+- Resolves rhbz#1556448
+- Remove outdated ExclusiveArch for RHEL6
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 19 2018 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.2-1
+- New upstream release
+- Update links to the upstream project page and releases
+- Use extended SSSD API to signal that an entry should not be cached anymore
+- Add support for timeout-based NSS queries with libsss_nss_idmap
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.56.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Aug 08 2016 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.1-1
+- Support querying external users by UPN alias
+- Don't clobber target of the pblock for ID views
+
 * Mon Jun 20 2016 Alexander Bokovoy <abokovoy@redhat.com> - 0.56.0-2
 - Updated upstream tarball
 

sources

@@ -1,4 +1,2 @@
-058d7778c1fcdcfcd7c9f2b6ff880856  slapi-nis-0.55.tar.gz
-1469ef73d8293177d2ae67c52e21b672  slapi-nis-0.55.tar.gz.sig
-6fc3555631af3f656fe562bb0cea2336  slapi-nis-0.56.0.tar.gz
-f76067cf0e991b0d388d9c43f771e563  slapi-nis-0.56.0.tar.gz.sig
+SHA512 (slapi-nis-0.60.0.tar.gz) = 15fe7f821c6b7eea5f93edb46adcc8ba8ac8369e47b607bd56db23bbaf3e0a3e35da412bcc3665aa35bfd01d3863222d926d661adb70491f3ecce1204bc4b6e7
+SHA512 (slapi-nis-0.60.0.tar.gz.asc) = 117c1da76320ec065970752cfb5de379dbe7899e08dbcb7f2699daa26cb8cb429e1436092e4d5b39c162fc3b3f58b3c48a24c6884c2bd909767bccdd27cf7786