- fix a couple of spec file problems and add upstream bug fix patch.

This commit is contained in:
Ian Kent 2022-09-13 10:30:09 +08:00
parent 8b4baa7fed
commit 097b8898fb
2 changed files with 46 additions and 3 deletions

View File

@ -0,0 +1,37 @@
autofs-5.1.8 - fix missing unlock in sasl_do_kinit_ext_cc()
From: James Dingwall <james-autofs@dingwall.me.uk>
There is a missing mutex unlock in function sasl_do_kinit_ext_cc(),
fix it.
Signed-off-by: James Dingwall <james-autofs@dingwall.me.uk>
Signed-off-by: Ian Kent <raven@themaw.net>
---
CHANGELOG | 1 +
modules/cyrus-sasl.c | 4 ++++
2 files changed, 5 insertions(+)
--- autofs-5.1.8.orig/CHANGELOG
+++ autofs-5.1.8/CHANGELOG
@@ -17,6 +17,7 @@
- remove nonstrict parameter from tree_mapent_umount_offsets().
- fix handling of incorrect return from umount_ent().
- dont use initgroups() at spawn.
+- fix missing unlock in sasl_do_kinit_ext_cc().
19/10/2021 autofs-5.1.8
- add xdr_exports().
--- autofs-5.1.8.orig/modules/cyrus-sasl.c
+++ autofs-5.1.8/modules/cyrus-sasl.c
@@ -721,6 +721,10 @@ sasl_do_kinit_ext_cc(unsigned logopt, st
debug(logopt, "Kerberos authentication was successful!");
+ status = pthread_mutex_unlock(&krb5cc_mutex);
+ if (status)
+ fatal(status);
+
return 0;
out_cleanup_def_princ:

View File

@ -12,7 +12,7 @@
Summary: A tool for automatically mounting and unmounting filesystems
Name: autofs
Version: 5.1.8
Release: 5%{?dist}
Release: 6%{?dist}
Epoch: 1
License: GPLv2+
Source: https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.gz
@ -35,6 +35,7 @@ Patch16: autofs-5.1.8-fix-sysconf-return-handling.patch
Patch17: autofs-5.1.8-remove-nonstrict-parameter-from-tree_mapent_umount_offsets.patch
Patch18: autofs-5.1.8-fix-handling-of-incorrect-return-from-umount_ent.patch
Patch19: autofs-5.1.8-dont-use-initgroups-at-spawn.patch
Patch20: autofs-5.1.8-fix-missing-unlock-in-sasl_do_kinit_ext_cc.patch
%if %{with_systemd}
BuildRequires: systemd-units
@ -118,6 +119,7 @@ echo %{version}-%{release} > .version
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%build
LDFLAGS=-Wl,-z,now
@ -219,13 +221,17 @@ fi
%{_sbindir}/mount.fedfs
%{_sbindir}/fedfs-map-nfs4
%endif
%dir %{_libdir}/autofs
%{_libdir}/libautofs.so
%{_libdir}/autofs/
%{_mandir}/*/*
%dir /etc/auto.master.d
%changelog
* Tue Sep 13 2022 Ian Kent <ikent@redhat.com> - 1:5.1.8-6
- fix changelog out of order entry.
- fix missing unlock in sasl_do_kinit_ext_cc().
- fix file listed twice in spec file.
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:5.1.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
@ -274,7 +280,7 @@ fi
- fix potential memory leak in "eliminate some more alloca usage" patch.
- remove unused parameter from add_path() in "eliminate some more alloca usage" patch.
* Sat Jun 19 2021 Ian Kent <ikent@redhat.com> - 1:5.1.7-19
* Thu Jul 22 2021 Ian Kent <ikent@redhat.com> - 1:5.1.7-19
- fix concat_options() error handling.
- eliminate some more alloca usage.
- use default stack size for threads.