[am-utils/f13/master] 6.1.5-16.1: fix NFS lock problem (602938, 640383)

[kzak]

commit 5fc8b94a619eb4bb0247250255a7b94ddd9548aa
Author: Karel Zak <kzak at redhat.com>
Date:   Wed Oct 6 11:59:33 2010 +0200

    6.1.5-16.1: fix NFS lock problem (602938, 640383)
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

 .gitignore                         |    3 ++
 am-utils-6.1.5-nolock-toplvl.patch |   49 ++++++++++++++++++++++++++++++-----
 am-utils.spec                      |    8 +++++-
 3 files changed, 52 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 417fec6..278b5d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 am-utils-6.1.5.tar.gz
+*~
+*.log
+*.rpm
diff --git a/am-utils-6.1.5-nolock-toplvl.patch b/am-utils-6.1.5-nolock-toplvl.patch
index 704cade..1606efd 100644
--- a/am-utils-6.1.5-nolock-toplvl.patch
+++ b/am-utils-6.1.5-nolock-toplvl.patch
@@ -6,15 +6,20 @@ 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
+Addresses: https://bugzilla.am-utils.org/show_bug.cgi?id=612
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=450754
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=640383
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=602938
+
+---
+ amd/amfs_toplvl.c |    5 ++++-
+ amd/autil.c       |    8 ++++++--
+ configure.in      |    3 +++
+ 3 files changed, 13 insertions(+), 3 deletions(-)
 
-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
+--- am-utils-6.1.5.orig/amd/amfs_toplvl.c
++++ am-utils-6.1.5/amd/amfs_toplvl.c
 @@ -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));
@@ -27,3 +32,33 @@ diff -up am-utils-6.1.5/amd/amfs_toplvl.c.kzak am-utils-6.1.5/amd/amfs_toplvl.c
  #ifdef MNTTAB_OPT_NOAC
      if (gopt.auto_attrcache == 0) {
        xstrlcat(opts, ",", sizeof(opts));
+--- am-utils-6.1.5.orig/amd/autil.c
++++ am-utils-6.1.5/amd/autil.c
+@@ -491,9 +491,13 @@ amfs_mount(am_node *mp, mntfs *mf, char
+
+   /*
+    * Make a ``hostname'' string for the kernel
++   *
++   * Linux kernel since v2.6.19-rc1 (commit 8dead0dbd478f35fd943f3719591e5af1ac0950d)
++   * does not accept '/' in hostname in NFS lock requests.
++   * -- kzak at redhat.com, 06-Oct-2010
+    */
+-  xsnprintf(fs_hostname, sizeof(fs_hostname), "pid%ld@%s:%s",
+-	    get_server_pid(), am_get_hostname(), dir);
++  xsnprintf(fs_hostname, sizeof(fs_hostname), "%s", am_get_hostname());
++
+   /*
+    * Most kernels have a name length restriction (64 bytes)...
+    */
+--- am-utils-6.1.5.orig/configure.in
++++ am-utils-6.1.5/configure.in
+@@ -621,6 +621,9 @@ AC_CHECK_HEADERS([			\
+ # ifndef __KERNEL__
+ #  define __KERNEL__
+ # endif /* __KERNEL__ */
++#ifdef HAVE_SYS_SOCKET_H
++# include <sys/socket.h>
++#endif /* HAVE_SYS_SOCKET_H */
+ #ifdef HAVE_LINUX_SOCKET_H
+ # include <linux/socket.h>
+ #endif /* HAVE_LINUX_SOCKET_H */
diff --git a/am-utils.spec b/am-utils.spec
index 92deca8..0d0ffa9 100644
--- a/am-utils.spec
+++ b/am-utils.spec
@@ -1,7 +1,7 @@
 Summary: Automount utilities including an updated version of Amd
 Name: am-utils
 Version: 6.1.5
-Release: 16%{?dist}
+Release: 16.1%{?dist}
 License: BSD
 Epoch: 5
 Group: System Environment/Daemons
@@ -47,6 +47,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
+# 602938 - am-utils fails on f13 with amfs_toplvl_mount
+# 640383 - am-utils doesn't work in Fedora 13
 Patch6: am-utils-6.1.5-nolock-toplvl.patch
 # 566711 - am-utils: incorrect use of tcp_wrapper
 Patch7: am-utils-6.1.5-libwarp.patch
@@ -180,6 +182,10 @@ fi
 %{_libdir}/libamu.so*
 
 %changelog
+* Wed Oct  6 2010 Karel Zak <kzak at redhat.com> 5:6.1.5-16.1
+- fix #602938 - am-utils fails on f13 with amfs_toplvl_mount
+- fix #640383 - am-utils doesn't work in Fedora 13
+
 * Mon Mar  1 2010 Karel Zak <kzak at redhat.com> 5:6.1.5-16
 - fix #566711 - am-utils: incorrect use of tcp_wrapper