From 4c91ced44db0b1bfe937561644c6953dfee35a81 Mon Sep 17 00:00:00 2001
From: Ian Kent <ikent@redhat.com>
Date: Tue, 3 Jul 2012 11:53:11 +0800
Subject: [PATCH] - and add the spec file update for the upstream sync up
 patches.

---
 autofs.spec | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/autofs.spec b/autofs.spec
index 147e60f..845476c 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -8,7 +8,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.0.6
-Release: 19%{?dist}
+Release: 21%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -59,6 +59,28 @@ Patch43: autofs-5.0.6-fix-dlopen-error-handling-in-sss-module.patch
 Patch44: autofs-5.0.6-fix-configure-string-length-tests.patch
 Patch45: autofs-5.0.6-fix-initialization-in-rpc-create_client.patch
 Patch46: autofs-5.0.6-fix-libtirpc-name-clash.patch
+Patch47: autofs-5.0.6-fix-fix-LDAP-result-leaks-on-error-paths.patch
+Patch48: autofs-5.0.6-report-map-not-read-when-debug-logging.patch
+Patch49: autofs-5.0.6-duplicate-parent-options-for-included-maps.patch
+Patch50: autofs-5.0.6-update-timeout-function-to-not-return-timeout.patch
+Patch51: autofs-5.0.6-move-timeout-to-map_source.patch
+Patch52: autofs-5.0.6-fix-kernel-verion-check-of-version-components.patch
+Patch53: autofs-5.0.6-dont-retry-ldap-connect-if-not-required.patch
+Patch54: autofs-5.0.6-check-if-mtab-is-a-link-to-proc-self-mounts.patch
+Patch55: autofs-5.0.6-fix-nfs4-contacts-portmap.patch
+Patch56: autofs-5.0.6-make-autofs-wait-longer-for-shutdown.patch
+Patch57: autofs-5.0.6-fix-sss-map-age.patch
+Patch58: autofs-5.0.6-fix-remount-deadlock.patch
+Patch59: autofs-5.0.6-fix-umount-recovery-of-busy-direct-mount.patch
+Patch60: autofs-5.0.6-fix-offset-mount-point-directory-removal.patch
+Patch61: autofs-5.0.6-remove-move-mount-code-and-configure-option.patch
+Patch62: autofs-5.0.6-fix-remount-of-multi-mount.patch
+Patch63: autofs-5.0.6-fix-device-ioctl-alloc-path-check.patch
+Patch64: autofs-5.0.6-refactor-lookup-hosts-module.patch
+Patch65: autofs-5.0.6-remove-cache-update-from-parse_mount.patch
+Patch66: autofs-5.0.6-add-function-to-delete-offset-cache-entry.patch
+Patch67: autofs-5.0.6-allow-update-of-multi-mount-offset-entries.patch
+Patch68: autofs-5.0.6-add-hup-signal-handling-to-hosts-map.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_systemd}
 BuildRequires: systemd-units
@@ -161,6 +183,28 @@ echo %{version}-%{release} > .version
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
+%patch53 -p1
+%patch54 -p1
+%patch55 -p1
+%patch56 -p1
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
+%patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
+%patch66 -p1
+%patch67 -p1
+%patch68 -p1
 
 %build
 #CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=/usr --libdir=%{_libdir}
@@ -263,6 +307,30 @@ fi
 %dir /etc/auto.master.d
 
 %changelog
+* Tue Jul 30 2012 Ian Kent <ikent@redhat.com> - 1:5.0.6-21
+- fix fix LDAP result leaks on error paths.
+- report map not read when debug logging.
+- duplicate parent options for included maps.
+- update ->timeout() function to not return timeout.
+- move timeout to map_source.
+- fix kernel verion check of version components.
+- dont retry ldap connect if not required.
+- check if /etc/mtab is a link to /proc/self/mounts.
+- fix nfs4 contacts portmap.
+- make autofs wait longer for shutdown.
+- fix sss map age not updated.
+- fix remount deadlock.
+- fix umount recovery of busy direct mount.
+- fix offset mount point directory removal.
+- remove move mount code and configure option.
+- fix remount of multi mount.
+- fix devce ioctl alloc path check.
+- refactor hosts lookup module.
+- remove cache update from parse_mount().
+- add function to delete offset cache entry.
+- allow update of multi mount offset entries.
+- add hup signal handling to hosts map.
+
 * Tue May 22 2012 Ian Kent <ikent@redhat.com> - 1:5.0.6-19
 - fix libtirpc name clash (bz821847).