- add changes for bug 1942371.

This commit is contained in:
Ian Kent 2021-04-19 08:11:05 +08:00
parent b00b719c2d
commit 9eaa5c690e
2 changed files with 45 additions and 3 deletions

View File

@ -0,0 +1,35 @@
autofs-5.1.7 - fix dandling symlink creation if nis support is not available
From: Ian Kent <raven@themaw.net>
If NIS support is not available a dangling symlink is created pointing
from lookup_nis.so to (a non-existent) lookup_yp.so.
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/Makefile | 2 ++
2 files changed, 3 insertions(+)
--- autofs-5.1.7.orig/CHANGELOG
+++ autofs-5.1.7/CHANGELOG
@@ -66,6 +66,7 @@
- refactor lookup_prune_one_cache() a bit.
- cater for empty mounts list in mnts_get_expire_list().
- add ext_mount_hash_mutex lock helpers.
+- fix dandling symlink creation if nis support is not available.
25/01/2021 autofs-5.1.7
- make bind mounts propagation slave by default.
--- autofs-5.1.7.orig/modules/Makefile
+++ autofs-5.1.7/modules/Makefile
@@ -77,7 +77,9 @@ install: all
install -c $(MODS) -m 755 $(INSTALLROOT)$(autofslibdir)
-rm -f $(INSTALLROOT)$(autofslibdir)/mount_smbfs.so
ln -fs lookup_file.so $(INSTALLROOT)$(autofslibdir)/lookup_files.so
+ifeq ($(YPCLNT), 1)
ln -fs lookup_yp.so $(INSTALLROOT)$(autofslibdir)/lookup_nis.so
+endif
ifeq ($(LDAP), 1)
ln -fs lookup_ldap.so $(INSTALLROOT)$(autofslibdir)/lookup_ldaps.so
endif

View File

@ -12,7 +12,7 @@
Summary: A tool for automatically mounting and unmounting filesystems Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs Name: autofs
Version: 5.1.7 Version: 5.1.7
Release: 12%{?dist} Release: 13%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Source: https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.gz Source: https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.gz
@ -92,7 +92,7 @@ BuildRequires: systemd-devel
BuildRequires: gcc BuildRequires: gcc
BuildRequires: autoconf, openldap-devel, bison, flex, libxml2-devel BuildRequires: autoconf, openldap-devel, bison, flex, libxml2-devel
BuildRequires: cyrus-sasl-devel, openssl-devel module-init-tools util-linux BuildRequires: cyrus-sasl-devel, openssl-devel module-init-tools util-linux
BuildRequires: e2fsprogs libtirpc-devel libsss_autofs libnsl2-devel BuildRequires: e2fsprogs libtirpc-devel libsss_autofs
BuildRequires: rpcgen pkgconfig krb5-devel BuildRequires: rpcgen pkgconfig krb5-devel
BuildRequires: make BuildRequires: make
Conflicts: cyrus-sasl-lib < 2.1.23-9 Conflicts: cyrus-sasl-lib < 2.1.23-9
@ -323,7 +323,14 @@ fi
%dir /etc/auto.master.d %dir /etc/auto.master.d
%changelog %changelog
* Tue Apr 13 2021 Ian Kent <ikent@redhat.com> - 1:5.1.7-11 * Mon Apr 19 2021 Ian Kent <ikent@redhat.com> - 1:5.1.7-13
- bz1942371 - Drop nis support from autofs
- fix dandling symlink creation if nis support is not available.
- remove BuildRequires libnsl2-devel.
- fix incorrect changelog revision.
- Resolves: rhbz#1942371
* Tue Apr 13 2021 Ian Kent <ikent@redhat.com> - 1:5.1.7-12
- bz1948956 - Using -hosts option does not resolve host from /etc/hosts - bz1948956 - Using -hosts option does not resolve host from /etc/hosts
and mount failes and mount failes
- Coverity fixes (arising from RHEL-8 bug 1912106) - Coverity fixes (arising from RHEL-8 bug 1912106)