amd.patch 4.7 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145
  1. Index: conf/mount/mount_linux.c
  2. --- conf/mount/mount_linux.c.orig 2005-09-12 03:55:40 +0200
  3. +++ conf/mount/mount_linux.c 2005-09-28 16:29:51 +0200
  4. @@ -49,7 +49,9 @@
  5. #endif /* HAVE_CONFIG_H */
  6. #include <am_defs.h>
  7. #include <amu.h>
  8. -
  9. +#ifndef NFS_MOUNT_VERSION
  10. +#define NFS_MOUNT_VERSION 4
  11. +#endif /* NFS_MOUNT_VERSION */
  12. #ifndef MOUNT_TYPE_UFS
  13. /*
  14. Index: config.h.in
  15. --- config.h.in.orig 2005-09-19 05:05:08 +0200
  16. +++ config.h.in 2005-09-28 16:29:51 +0200
  17. @@ -159,6 +159,9 @@
  18. /* Define to 1 if you have the <db1/ndbm.h> header file. */
  19. #undef HAVE_DB1_NDBM_H
  20. +/* Define to 1 if you have the <gdbm/ndbm.h> header file. */
  21. +#undef HAVE_GDBM_NDBM_H
  22. +
  23. /* Define to 1 if you have the `dbm_open' function. */
  24. #undef HAVE_DBM_OPEN
  25. @@ -712,6 +715,9 @@
  26. /* Define to 1 if you have the <nfs/nfs.h> header file. */
  27. #undef HAVE_NFS_NFS_H
  28. +/* Define if you have the <nfsclient/nfs.h> header file. */
  29. +#undef HAVE_NFSCLIENT_NFS_H
  30. +
  31. /* Define to 1 if you have the <nfs/nfs_mount.h> header file. */
  32. #undef HAVE_NFS_NFS_MOUNT_H
  33. Index: configure
  34. --- configure.orig 2005-09-19 05:05:07 +0200
  35. +++ configure 2005-09-28 16:34:17 +0200
  36. @@ -20836,7 +20836,7 @@
  37. ;;
  38. esac
  39. ;;
  40. - sunos[34]* | solaris1* | solaris2.[0-5] | sunos5.[0-5] | solaris2.5.* | sunos5.5.* )
  41. + sunos[34]* | solaris1* | solaris2.[0-5] | solaris2.[0-5].* | sunos5.[0-5] | sunos5.[0-5].* )
  42. ac_cv_os_cflags="" ;;
  43. solaris2* | sunos5* )
  44. # turn on 64-bit file offset interface
  45. @@ -24960,6 +24960,7 @@
  46. nfs/export.h \
  47. nfs/mount.h \
  48. nfs/nfs.h \
  49. + nfsclient/nfs.h \
  50. nfs/nfs_clnt.h \
  51. nfs/nfs_gfs.h \
  52. nfs/nfs_mount.h \
  53. @@ -26337,7 +26338,7 @@
  54. ac_cv_nfs_prot_headers=sunos3 ;;
  55. sunos4* | solaris1* )
  56. ac_cv_nfs_prot_headers=sunos4 ;;
  57. - sunos5.[0-3] | solaris2.[0-3] )
  58. + sunos5.[0-3]* | solaris2.[0-3] | solaris2.[0-3].* )
  59. ac_cv_nfs_prot_headers=sunos5_3 ;;
  60. sunos5.4* | solaris2.4* )
  61. ac_cv_nfs_prot_headers=sunos5_4 ;;
  62. @@ -50442,9 +50443,9 @@
  63. if test -n "ufs"
  64. then
  65. ac_fs_name=ufs
  66. - ac_fs_as_name=" (from: ext2 ffs ufs 42 efs xfs jfs ultrix)"
  67. + ac_fs_as_name=" (from: ext3 ext2 ffs ufs 42 efs xfs jfs ultrix)"
  68. else
  69. - ac_fs_name=ext2 ffs ufs 42 efs xfs jfs ultrix
  70. + ac_fs_name=ext3 ext2 ffs ufs 42 efs xfs jfs ultrix
  71. ac_fs_as_name=""
  72. fi
  73. # store variable name of filesystem
  74. @@ -50461,7 +50462,7 @@
  75. # assume not found
  76. eval "ac_cv_fs_$ac_fs_name=no"
  77. -for ac_fs_tmp in ext2 ffs ufs 42 efs xfs jfs ultrix
  78. +for ac_fs_tmp in ext3 ext2 ffs ufs 42 efs xfs jfs ultrix
  79. do
  80. ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
  81. @@ -54306,7 +54307,7 @@
  82. then
  83. ac_fs_name=ufs
  84. else
  85. - ac_fs_name=4.2 4.3 4.4 ext2 ufs efs xfs ffs jfs ultrix
  86. + ac_fs_name=4.2 4.3 4.4 ext3 ext2 ufs efs xfs ffs jfs ultrix
  87. fi
  88. # prepare upper-case name of filesystem
  89. ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
  90. @@ -54323,7 +54324,7 @@
  91. # undefine by default
  92. eval "ac_cv_mount_type_$ac_fs_name=notfound"
  93. # and look to see if it was found
  94. -for ac_fs_tmp in 4.2 4.3 4.4 ext2 ufs efs xfs ffs jfs ultrix
  95. +for ac_fs_tmp in 4.2 4.3 4.4 ext3 ext2 ufs efs xfs ffs jfs ultrix
  96. do
  97. ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | tr -d '.'`
  98. @@ -59804,7 +59805,7 @@
  99. then
  100. ac_fs_name=ufs
  101. else
  102. - ac_fs_name=ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
  103. + ac_fs_name=ext3 ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
  104. fi
  105. # store variable name of fs
  106. ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
  107. @@ -59821,7 +59822,7 @@
  108. # undefine by default
  109. eval "ac_cv_mnttab_type_$ac_fs_name=notfound"
  110. # and look to see if it was found
  111. -for ac_fs_tmp in ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
  112. +for ac_fs_tmp in ext3 ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
  113. do
  114. if test "$ac_fs_tmp" = "nfs3" -a "$ac_cv_fs_nfs3" = "yes" -a "$ac_cv_header_linux_nfs_h" = "yes"
  115. then
  116. Index: hlfsd/stubs.c
  117. --- hlfsd/stubs.c.orig 2005-08-03 02:35:36 +0200
  118. +++ hlfsd/stubs.c 2005-09-28 16:29:51 +0200
  119. @@ -142,7 +142,7 @@
  120. res.ns_u.ns_attr_u = rootfattr;
  121. } else if (eq_fh(argp, &slink)) {
  122. -#ifndef MNT2_NFS_OPT_SYMTTL
  123. +#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__))
  124. /*
  125. * This code is needed to defeat Solaris 2.4's (and newer) symlink
  126. * values cache. It forces the last-modified time of the symlink to be
  127. @@ -249,7 +249,7 @@
  128. }
  129. if (STREQ(argp->da_name, slinkname)) {
  130. -#ifndef MNT2_NFS_OPT_SYMTTL
  131. +#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__))
  132. /*
  133. * This code is needed to defeat Solaris 2.4's (and newer) symlink
  134. * values cache. It forces the last-modified time of the symlink to be