From c1b20fd45acb1974c1c125fbeb98a321aecb98b027eac6fbe024d68eda181dc7 Mon Sep 17 00:00:00 2001 From: Leonardo Chiquitto Date: Sun, 12 May 2013 10:30:39 +0000 Subject: [PATCH] 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 | 11 ++++ autofs.spec | 5 +- ...7-fix-submount-tree-not-all-expiring.patch | 57 ------------------- autofs-5.0.7-upstream-patches-20130311.bz2 | 3 - autofs-5.0.7-upstream-patches-20130428.bz2 | 3 + 5 files changed, 15 insertions(+), 64 deletions(-) delete mode 100644 autofs-5.0.7-fix-submount-tree-not-all-expiring.patch delete mode 100644 autofs-5.0.7-upstream-patches-20130311.bz2 create mode 100644 autofs-5.0.7-upstream-patches-20130428.bz2 diff --git a/autofs.changes b/autofs.changes index 1518c75..ee79a7e 100644 --- a/autofs.changes +++ b/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 diff --git a/autofs.spec b/autofs.spec index 8dc09b9..9ef3874 100644 --- a/autofs.spec +++ b/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 diff --git a/autofs-5.0.7-fix-submount-tree-not-all-expiring.patch b/autofs-5.0.7-fix-submount-tree-not-all-expiring.patch deleted file mode 100644 index 048aede..0000000 --- a/autofs-5.0.7-fix-submount-tree-not-all-expiring.patch +++ /dev/null @@ -1,57 +0,0 @@ -autofs-5.0.7 - fix submount tree not all expiring - -From: Ian Kent - -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); diff --git a/autofs-5.0.7-upstream-patches-20130311.bz2 b/autofs-5.0.7-upstream-patches-20130311.bz2 deleted file mode 100644 index 1e9fe26..0000000 --- a/autofs-5.0.7-upstream-patches-20130311.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf40a50acd2c560a399b5d6c686440fcd0be48fc0358a02fde8ec534c051912a -size 26499 diff --git a/autofs-5.0.7-upstream-patches-20130428.bz2 b/autofs-5.0.7-upstream-patches-20130428.bz2 new file mode 100644 index 0000000..6bad4f9 --- /dev/null +++ b/autofs-5.0.7-upstream-patches-20130428.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45b36c90689ac47e0de186d4a78f4b9de0afa210008fd150e8edf022ecc97825 +size 27772