rpms/am-utils/devel am-utils-6.1.5-nolock-toplvl.patch, NONE, 1.1 am-utils.spec, 1.48, 1.49

Karel Zak kzak at fedoraproject.org
Tue Dec 2 13:09:18 UTC 2008


Author: kzak

Update of /cvs/pkgs/rpms/am-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11543

Modified Files:
	am-utils.spec 
Added Files:
	am-utils-6.1.5-nolock-toplvl.patch 
Log Message:
* Tue Dec  2 2008 Karel Zak <kzak at redhat.com> 5:6.1.5-12
- fix #450754 - Amd does not work with 2.6.25 (thanks to Philippe Troin)


am-utils-6.1.5-nolock-toplvl.patch:

--- NEW FILE am-utils-6.1.5-nolock-toplvl.patch ---

amd does not work with kernel 2.6.25

Just after start-up, one can find the following in /var/log/messages:

Jun 10 11:36:28 tantale amd[18589]: '/net': mount: No locks available
Jun 10 11:36:29 tantale kernel: Invalid hostname "pid18588 at tantale:/net" in NFS lock request

For more details see:
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=479884

From: Philippe Troin <phil at fifi.org>
Addresses-Red-Hat-Bug: #450754

diff -up am-utils-6.1.5/amd/amfs_toplvl.c.kzak am-utils-6.1.5/amd/amfs_toplvl.c
--- am-utils-6.1.5/amd/amfs_toplvl.c.kzak	2008-12-02 13:45:08.000000000 +0100
+++ am-utils-6.1.5/amd/amfs_toplvl.c	2008-12-02 13:37:21.000000000 +0100
@@ -226,7 +226,10 @@ amfs_toplvl_mount(am_node *mp, mntfs *mf
 		MNTTAB_OPT_RETRANS, gopt.amfs_auto_retrans[AMU_TYPE_TOPLVL]);
       xstrlcat(opts, toplvl_opts, sizeof(opts));
     }
-
+#ifdef MNTTAB_OPT_NOLOCK
+    xstrlcat(opts, ",", sizeof(opts));
+    xstrlcat(opts, MNTTAB_OPT_NOLOCK, sizeof(opts));
+#endif /* MNTTAB_OPT_NOLOCK */
 #ifdef MNTTAB_OPT_NOAC
     if (gopt.auto_attrcache == 0) {
       xstrlcat(opts, ",", sizeof(opts));


Index: am-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/am-utils/devel/am-utils.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- am-utils.spec	29 May 2008 12:11:36 -0000	1.48
+++ am-utils.spec	2 Dec 2008 13:08:47 -0000	1.49
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd
 Name: am-utils
 Version: 6.1.5
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -46,6 +46,8 @@
 Patch4: am-utils-6.1.5-buildsys.patch
 # 435420 - CVE-2008-1078 am-utils: insecure usage of temporary files
 Patch5: am-utils-6.1.5-expn-temp.patch
+# 450754 - Amd does not work with 2.6.25
+Patch6: am-utils-6.1.5-nolock-toplvl.patch
 
 # We need to filter out some perl requirements for now.
 %define _use_internal_dependency_generator 0
@@ -70,6 +72,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 find_requires=%{old_find_requires}
 echo "$find_requires | grep -v lostaltmail.conf" > find-requires
@@ -174,6 +177,9 @@
 %{_libdir}/libamu.so*
 
 %changelog
+* Tue Dec  2 2008 Karel Zak <kzak at redhat.com> 5:6.1.5-12
+- fix #450754 - Amd does not work with 2.6.25 (thanks to Philippe Troin)
+
 * Thu May 29 2008 Karel Zak <kzak at redhat.com> 5:6.1.5-11
 - review & cleanup init script
 




More information about the fedora-extras-commits mailing list