upgrading package: amd 6.0.9 -> 6.0.10

21 years ago · 2973040593
2 changed files with 52 additions and 125 deletions
--- a/amd/amd.patch
+++ b/amd/amd.patch
@ -1,67 +1,20 @@
-Index: conf/nfs_prot/nfs_prot_freebsd3.h
--- conf/nfs_prot/nfs_prot_freebsd3.h.orig	2002-12-28 15:49:11.000000000 +0100
-+++ conf/nfs_prot/nfs_prot_freebsd3.h	2003-10-29 12:15:56.000000000 +0100
-@@ -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 */
-Index: include/am_defs.h
--- include/am_defs.h.orig	2002-12-28 15:49:23.000000000 +0100
-+++ include/am_defs.h	2003-10-29 12:15:56.000000000 +0100
-@@ -276,7 +276,7 @@
- /*
-  * Actions to take if <malloc.h> exists.
-  */
-#ifdef HAVE_MALLOC_H
-+#if defined(HAVE_MALLOC_H) && !(defined(__FreeBSD__) || defined(__NetBSD__))
- # include <malloc.h>
- #endif /* HAVE_MALLOC_H */
- 
-@@ -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 */
- 
-Index: hlfsd/stubs.c
--- hlfsd/stubs.c.orig	2002-12-28 15:49:22.000000000 +0100
-+++ hlfsd/stubs.c	2003-10-29 12:15:56.000000000 +0100
-@@ -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__) || defined(__NetBSD__))
-     /*
-      * 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 @@
-     }
+Index: conf/mount/mount_linux.c
+--- conf/mount/mount_linux.c.orig	2005-01-03 21:56:13 +0100
+++ conf/mount/mount_linux.c	2005-03-19 13:24:52 +0100
+@@ -50,7 +50,9 @@
+ #endif /* HAVE_CONFIG_H */
+ #include <am_defs.h>
+ #include <amu.h>
+-
+#ifndef NFS_MOUNT_VERSION
+#define NFS_MOUNT_VERSION 4
+#endif /* NFS_MOUNT_VERSION */
 
-     if (STREQ(argp->da_name, slinkname)) {
-#ifndef MNT2_NFS_OPT_SYMTTL
-+#if !defined(MNT2_NFS_OPT_SYMTTL) && !(defined(__FreeBSD__) || defined(__NetBSD__))
-       /*
-        * 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
+ struct opt_map {
+   const char *opt;		/* option name */
 Index: config.h.in
--- config.h.in.orig	2003-01-25 16:10:26.000000000 +0100
-+++ config.h.in	2003-10-29 12:15:56.000000000 +0100
+--- config.h.in.orig	2005-03-19 04:07:28 +0100
+++ config.h.in	2005-03-19 13:24:52 +0100
@@ -164,6 +164,9 @@
 /* Define to 1 if you have the <db1/ndbm.h> header file. */
 #undef HAVE_DB1_NDBM_H
@ -72,7 +25,7 @@ Index: config.h.in
 /* Define to 1 if you have the `dbm_open' function. */
 #undef HAVE_DBM_OPEN
 
-@@ -657,6 +660,9 @@
+@@ -663,6 +666,9 @@
 /* Define to 1 if you have the <nfs/nfs.h> header file. */
 #undef HAVE_NFS_NFS_H
 
@ -83,26 +36,18 @@ Index: config.h.in
 #undef HAVE_NFS_NFS_MOUNT_H
 
 Index: configure
--- configure.orig	2003-01-25 16:10:25.000000000 +0100
-+++ configure	2003-10-29 12:24:29.000000000 +0100
-@@ -9247,7 +9247,7 @@
+--- configure.orig	2005-03-19 04:07:26 +0100
+++ configure	2005-03-19 13:24:52 +0100
+@@ -20980,7 +20980,7 @@
 				;;
 		esac
 		;;
-	sunos[34]* | solaris1* | solaris2.[0-5]* | sunos5.[0-5]* )
-+	sunos[34]* | solaris1* | solaris2.[0-5] | solaris2.[0-5].* | sunos5.[0-5] | sunos5.[0-5].* )
+-	sunos[34]* | solaris1* | solaris2.[0-5] | sunos5.[0-5] | solaris2.5.* | sunos5.5.* )
+ 	sunos[34]* | solaris1* | solaris2.[0-5] | solaris2.[0-5].* | sunos5.[0-5] | sunos5.[0-5].* )
 		ac_cv_os_cflags="" ;;
- 	solaris* | sunos* )
+ 	solaris2* | sunos5* )
 		# turn on 64-bit file offset interface
-@@ -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			\
-@@ -13042,6 +13043,7 @@
+@@ -25025,6 +25025,7 @@
 	nfs/export.h			\
 	nfs/mount.h			\
 	nfs/nfs.h			\
@ -110,33 +55,40 @@ Index: configure
 	nfs/nfs_clnt.h			\
 	nfs/nfs_gfs.h			\
 	nfs/nfs_mount.h			\
-@@ -13553,7 +13555,7 @@
+@@ -25918,7 +25919,7 @@
 			ac_cv_nfs_prot_headers=sunos3 ;;
 	sunos4* | solaris1* )
 			ac_cv_nfs_prot_headers=sunos4 ;;
-	sunos5.[0-3]* | solaris2.[0-3]* )
-+	sunos5.[0-3]* | solaris2.[0-3] | solaris2.[0-3].* )
+-	sunos5.[0-3] | solaris2.[0-3] )
+ 	sunos5.[0-3]* | solaris2.[0-3] | solaris2.[0-3].* )
 			ac_cv_nfs_prot_headers=sunos5_3 ;;
 	sunos5.4* | solaris2.4* )
 			ac_cv_nfs_prot_headers=sunos5_4 ;;
-Index: conf/nfs_prot/nfs_prot_freebsd3.h
--- conf/nfs_prot/nfs_prot_freebsd3.h.orig	Tue Jan 13 15:49:30 2004
-+++ conf/nfs_prot/nfs_prot_freebsd3.h	Tue Jan 13 15:49:02 2004
-@@ -54,6 +54,10 @@
- #ifdef HAVE_NFS_NFS_H
- # include <nfs/nfs.h>
- #endif /* HAVE_NFS_NFS_H */
-+#ifndef NFSX_V4STATEID
-+/* specific to NFS Version 4 */
-+#define NFSX_V4STATEID 16
-+#endif
- #ifdef HAVE_NFSCLIENT_NFS_H
- # include <nfsclient/nfs.h>
- #endif /* HAVE_NFSCLIENT_NFS_H */
+Index: hlfsd/stubs.c
+--- hlfsd/stubs.c.orig	2005-01-03 21:56:14 +0100
+++ hlfsd/stubs.c	2005-03-19 13:24:52 +0100
+@@ -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__) || defined(__NetBSD__))
+     /*
+      * 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__) || defined(__NetBSD__))
+       /*
+        * 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
 Index: libamu/mount_fs.c
--- libamu/mount_fs.c.orig	2003-01-23 23:13:02.000000000 +0100
-+++ libamu/mount_fs.c	2004-02-02 16:15:59.986753646 +0100
-@@ -624,8 +624,10 @@
+--- libamu/mount_fs.c.orig	2005-03-19 04:06:28 +0100
+++ libamu/mount_fs.c	2005-03-19 13:24:52 +0100
+@@ -611,8 +611,10 @@
     nap->flags |= MNT2_NFS_OPT_BIODS;
 #endif /* MNT2_NFS_OPT_BIODS */
 
@ -147,28 +99,3 @@ Index: libamu/mount_fs.c
 
 #ifdef MNT2_NFS_OPT_SPONGY
   if (hasmntopt(mntp, MNTTAB_OPT_SPONGY) != NULL) {
-Index: conf/mount/mount_linux.c
--- conf/mount/mount_linux.c.orig	2002-12-28 15:49:09.000000000 +0100
-+++ conf/mount/mount_linux.c	2004-02-02 20:07:31.668824640 +0100
-@@ -50,7 +50,9 @@
- #endif /* HAVE_CONFIG_H */
- #include <am_defs.h>
- #include <amu.h>
-
-+#ifndef NFS_MOUNT_VERSION
-+#define NFS_MOUNT_VERSION 4
-+#endif /* NFS_MOUNT_VERSION */
- 
- struct opt_map {
-   const char *opt;		/* option name */
-Index: include/am_defs.h
--- include/am_defs.h.orig	2005-02-04 23:22:22 +0100
-+++ include/am_defs.h	2005-02-04 23:22:23 +0100
-@@ -908,6 +908,7 @@
-  * Actions to take if <rpcsvc/nis.h> exists.
-  */
- #ifdef HAVE_RPCSVC_NIS_H
-+#undef GROUP_OBJ
- # include <rpcsvc/nis.h>
- #endif /* HAVE_RPCSVC_NIS_H */
- 
--- a/amd/amd.spec
+++ b/amd/amd.spec
@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        System
 License:      BSD
-Version:      6.0.9
-Release:      20050204
+Version:      6.0.10
+Release:      20050319

 #   list of sources
 Source0:      ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz