Nie możesz wybrać więcej, niż 25 tematów Tematy muszą się zaczynać od litery lub cyfry, mogą zawierać myślniki ('-') i mogą mieć do 35 znaków.
 
 
 
 
 
 

119 wiersze
4.2 KiB

diff -Naur am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h
--- am-utils-6.0.9.orig/conf/nfs_prot/nfs_prot_freebsd3.h Sat Dec 28 15:49:11 2002
+++ am-utils-6.0.9/conf/nfs_prot/nfs_prot_freebsd3.h Mon Jan 27 19:26:55 2003
@@ -54,6 +54,9 @@
#ifdef HAVE_NFS_NFS_H
# include <nfs/nfs.h>
#endif /* HAVE_NFS_NFS_H */
+#ifdef HAVE_NFSCLIENT_NFS_H
+# include <nfsclient/nfs.h>
+#endif /* HAVE_NFSCLIENT_NFS_H */
#ifdef HAVE_UFS_UFS_UFSMOUNT_H
# include <ufs/ufs/ufsmount.h>
#endif /* HAVE_UFS_UFS_UFSMOUNT_H */
diff -Naur am-utils-6.0.9.orig/config.h.in am-utils-6.0.9/config.h.in
--- am-utils-6.0.9.orig/config.h.in Sat Jan 25 16:10:26 2003
+++ am-utils-6.0.9/config.h.in Mon Jan 27 19:25:36 2003
@@ -657,6 +657,9 @@
/* Define to 1 if you have the <nfs/nfs.h> header file. */
#undef HAVE_NFS_NFS_H
+/* Define if you have the <nfsclient/nfs.h> header file. */
+#undef HAVE_NFSCLIENT_NFS_H
+
/* Define to 1 if you have the <nfs/nfs_mount.h> header file. */
#undef HAVE_NFS_NFS_MOUNT_H
diff -Naur am-utils-6.0.9.orig/configure am-utils-6.0.9/configure
--- am-utils-6.0.9.orig/configure Sat Jan 25 16:10:25 2003
+++ am-utils-6.0.9/configure Mon Jan 27 19:23:46 2003
@@ -13042,6 +13042,7 @@
nfs/export.h \
nfs/mount.h \
nfs/nfs.h \
+ nfsclient/nfs.h \
nfs/nfs_clnt.h \
nfs/nfs_gfs.h \
nfs/nfs_mount.h \
diff -Naur am-utils-6.0.9.orig/hlfsd/stubs.c am-utils-6.0.9/hlfsd/stubs.c
--- am-utils-6.0.9.orig/hlfsd/stubs.c Sat Dec 28 15:49:22 2002
+++ am-utils-6.0.9/hlfsd/stubs.c Mon Jan 27 19:35:01 2003
@@ -133,7 +133,7 @@
res.ns_u.ns_attr_u = rootfattr;
} else if (eq_fh(argp, &slink)) {
-#ifndef MNT2_NFS_OPT_SYMTTL
+#if !defined(MNT2_NFS_OPT_SYMTTL) && !defined(__FreeBSD__) /* FIXME */
/*
* This code is needed to defeat Solaris 2.4's (and newer) symlink
* values cache. It forces the last-modified time of the symlink to be
@@ -232,7 +232,7 @@
}
if (STREQ(argp->da_name, slinkname)) {
-#ifndef MNT2_NFS_OPT_SYMTTL
+#if !defined(MNT2_NFS_OPT_SYMTTL) && !defined(__FreeBSD__) /* FIXME */
/*
* This code is needed to defeat Solaris 2.4's (and newer) symlink
* values cache. It forces the last-modified time of the symlink to be
diff -Naur am-utils-6.0.9.orig/include/am_defs.h am-utils-6.0.9/include/am_defs.h
--- am-utils-6.0.9.orig/include/am_defs.h Sat Dec 28 15:49:23 2002
+++ am-utils-6.0.9/include/am_defs.h Mon Jan 27 09:57:05 2003
@@ -276,7 +276,7 @@
/*
* Actions to take if <malloc.h> exists.
*/
-#ifdef HAVE_MALLOC_H
+#if defined(HAVE_MALLOC_H) && !defined(__FreeBSD__)
# include <malloc.h>
#endif /* HAVE_MALLOC_H */
--- am-utils-6.0.9/configure.orig Fri Jan 31 12:21:41 2003
+++ am-utils-6.0.9/configure Fri Jan 31 12:23:07 2003
@@ -13020,6 +13020,7 @@
cdfs/cdfsmount.h \
cdfs/cdfs_mount.h \
db1/ndbm.h \
+ gdbm/ndbm.h \
hsfs/hsfs.h \
isofs/cd9660/cd9660_mount.h \
linux/auto_fs.h \
--- am-utils-6.0.9/configure.in.orig Fri Jan 31 12:21:56 2003
+++ am-utils-6.0.9/configure.in Fri Jan 31 12:23:29 2003
@@ -409,6 +409,7 @@
cdfs/cdfsmount.h \
cdfs/cdfs_mount.h \
db1/ndbm.h \
+ gdbm/ndbm.h \
hsfs/hsfs.h \
isofs/cd9660/cd9660_mount.h \
linux/auto_fs.h \
--- am-utils-6.0.9/config.h.in.orig Fri Jan 31 12:22:12 2003
+++ am-utils-6.0.9/config.h.in Fri Jan 31 12:25:59 2003
@@ -164,6 +164,9 @@
/* Define to 1 if you have the <db1/ndbm.h> header file. */
#undef HAVE_DB1_NDBM_H
+/* Define to 1 if you have the <gdbm/ndbm.h> header file. */
+#undef HAVE_GDBM_NDBM_H
+
/* Define to 1 if you have the `dbm_open' function. */
#undef HAVE_DBM_OPEN
--- am-utils-6.0.9/include/am_defs.h.orig Fri Jan 31 12:22:29 2003
+++ am-utils-6.0.9/include/am_defs.h Fri Jan 31 12:24:45 2003
@@ -338,6 +338,14 @@
/* ensure that struct datum is not included again from <rpcsvc/yp_prot.h> */
# define DATUM
# endif /* not DATUM */
+# else /* not HAVE_DB1_NDBM_H */
+# ifdef HAVE_GDBM_NDBM_H
+# include <gdbm/ndbm.h>
+# ifndef DATUM
+/* ensure that struct datum is not included again from <rpcsvc/yp_prot.h> */
+# define DATUM
+# endif /* not DATUM */
+# endif /* HAVE_GDBM_NDBM_H */
# endif /* HAVE_DB1_NDBM_H */
#endif /* HAVE_NDBM_H */