Accepting request 175170 from home:leonardocf:branches:filesystems

- autofs-5.0.7-upstream-patches-20130428.bz2: update 5.0.7 upstream patches up to 2013-04-28.

OBS-URL: https://build.opensuse.org/request/show/175170
OBS-URL: https://build.opensuse.org/package/show/filesystems/autofs?expand=0&rev=122

autofs.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun May 12 10:02:05 UTC 2013 - lchiquitto@suse.com
+
+- autofs-5.0.7-upstream-patches-20130428.bz2: update 5.0.7 upstream
+  patches up to 2013-04-28, fixing some bugs:
+  * fix some automount(8) typos
+  * syncronize handle_mounts() shutdown
+  * fix submount tree not all expiring (bnc#801808)
+- remove patches that are now upstream:
+  * autofs-5.0.7-fix-submount-tree-not-all-expiring.patch
+
 -------------------------------------------------------------------
 Tue Apr  9 20:43:54 UTC 2013 - lchiquitto@suse.com
 

autofs.spec

@@ -75,14 +75,12 @@ Source8:        get-upstream-patches
 Source42:       org.freedesktop.AutoMount.conf
 Source100:      autofs-rpmlintrc
 # Upstream patches that will be in the next release
-%define patchdate 20130311
+%define patchdate 20130428
 Patch0:         autofs-%{version}-upstream-patches-%{patchdate}.bz2
 # PATCH-FIX-OPENSUSE autofs-5.0.7-revert-fix-libtirpc-name-clash.patch
 Patch1:         autofs-5.0.7-revert-fix-libtirpc-name-clash.patch
 # PATCH-FIX-UPSTREAM autofs-5.0.7-task-use-after-free.patch [bnc#727392]
 Patch82:        autofs-5.0.7-task-use-after-free.patch
-# PATCH-FIX-UPSTREAM autofs-5.0.7-fix-submount-tree-not-all-expiring.patch [bnc#801808]
-Patch83:        autofs-5.0.7-fix-submount-tree-not-all-expiring.patch
 # PATCH-FIX-OPENSUSE autofs-suse-auto_master_default.patch
 Patch100:       autofs-suse-auto_master_default.patch
 # PATCH-FIX-OPENSUSE autofs-suse-build.patch
@@ -114,7 +112,6 @@ cp %{SOURCE5} .
 %patch0 -p1
 %patch1 -p1
 %patch82 -p1
-%patch83 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p0 -b .udisks

autofs-5.0.7-fix-submount-tree-not-all-expiring.patch

@@ -1,57 +0,0 @@
-autofs-5.0.7 - fix submount tree not all expiring
-
-From: Ian Kent <ikent@redhat.com>
-
-Due to the change in the expire-specific-submount-only patch, sub-mounts
-within an indirect mount that follow a submount (in the check order) won't
-be expired if that submount is busy.
----
- lib/master.c |   24 +++++++++++++++---------
- 1 file changed, 15 insertions(+), 9 deletions(-)
-
-Index: autofs-5.0.7/lib/master.c
-===================================================================
---- autofs-5.0.7.orig/lib/master.c
-+++ autofs-5.0.7/lib/master.c
-@@ -905,15 +905,24 @@ int master_notify_submount(struct autofs
- 		this = list_entry(p, struct autofs_point, mounts);
- 		p = p->prev;
- 
--		if (!master_submount_list_empty(this)) {
--			mounts_mutex_unlock(ap);
--			return master_notify_submount(this, path, state);
--		}
--
- 		/* path not the same */
- 		if (strcmp(this->path, path))
- 			continue;
- 
-+		if (!master_submount_list_empty(this)) {
-+			char *this_path = strdup(this->path);
-+			if (this_path) {
-+				mounts_mutex_unlock(ap);
-+				master_notify_submount(this, path, state);
-+				mounts_mutex_lock(ap);
-+				if (!__master_find_submount(ap, this_path)) {
-+					free(this_path);
-+					continue;
-+				}
-+				free(this_path);
-+			}
-+		}
-+
- 		/* Now we have found the submount we want to expire */
- 
- 		st_mutex_lock();
-@@ -959,10 +968,7 @@ int master_notify_submount(struct autofs
- 			st_mutex_lock();
- 		}
- 		st_mutex_unlock();
--		mounts_mutex_unlock(ap);
--
--		return ret;
--
-+		break;
- 	}
- 
- 	mounts_mutex_unlock(ap);