upgrading package: amd 6.0.10 -> 6.1.2.1

amd/amd.patch

@@ -1,7 +1,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 @@
+--- conf/mount/mount_linux.c.orig	2005-09-12 03:55:40 +0200
++++ conf/mount/mount_linux.c	2005-09-28 16:29:51 +0200
+@@ -49,7 +49,9 @@
  #endif /* HAVE_CONFIG_H */
  #include <am_defs.h>
  #include <amu.h>
@@ -10,12 +10,12 @@ Index: conf/mount/mount_linux.c
 +#define NFS_MOUNT_VERSION 4
 +#endif /* NFS_MOUNT_VERSION */
  
- struct opt_map {
-   const char *opt;		/* option name */
+ #ifndef MOUNT_TYPE_UFS
+ /*
 Index: config.h.in
---- 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 @@
+--- config.h.in.orig	2005-09-19 05:05:08 +0200
++++ config.h.in	2005-09-28 16:29:51 +0200
+@@ -159,6 +159,9 @@
  /* Define to 1 if you have the <db1/ndbm.h> header file. */
  #undef HAVE_DB1_NDBM_H
  
@@ -25,7 +25,7 @@ Index: config.h.in
  /* Define to 1 if you have the `dbm_open' function. */
  #undef HAVE_DBM_OPEN
  
-@@ -663,6 +666,9 @@
+@@ -712,6 +715,9 @@
  /* Define to 1 if you have the <nfs/nfs.h> header file. */
  #undef HAVE_NFS_NFS_H
  
@@ -36,9 +36,9 @@ Index: config.h.in
  #undef HAVE_NFS_NFS_MOUNT_H
  
 Index: configure
---- configure.orig	2005-03-19 04:07:26 +0100
-+++ configure	2005-03-19 13:24:52 +0100
-@@ -20980,7 +20980,7 @@
+--- configure.orig	2005-09-19 05:05:07 +0200
++++ configure	2005-09-28 16:34:17 +0200
+@@ -20836,7 +20836,7 @@
  				;;
  		esac
  		;;
@@ -47,7 +47,7 @@ Index: configure
  		ac_cv_os_cflags="" ;;
  	solaris2* | sunos5* )
  		# turn on 64-bit file offset interface
-@@ -25025,6 +25025,7 @@
+@@ -24960,6 +24960,7 @@
  	nfs/export.h			\
  	nfs/mount.h			\
  	nfs/nfs.h			\
@@ -55,7 +55,7 @@ Index: configure
  	nfs/nfs_clnt.h			\
  	nfs/nfs_gfs.h			\
  	nfs/nfs_mount.h			\
-@@ -25918,7 +25919,7 @@
+@@ -26337,7 +26338,7 @@
  			ac_cv_nfs_prot_headers=sunos3 ;;
  	sunos4* | solaris1* )
  			ac_cv_nfs_prot_headers=sunos4 ;;
@@ -64,10 +64,67 @@ Index: configure
  			ac_cv_nfs_prot_headers=sunos5_3 ;;
  	sunos5.4* | solaris2.4* )
  			ac_cv_nfs_prot_headers=sunos5_4 ;;
+@@ -50442,9 +50443,9 @@
+ if test -n "ufs"
+ then
+   ac_fs_name=ufs
+-  ac_fs_as_name=" (from: ext2 ffs ufs 42 efs xfs jfs ultrix)"
++  ac_fs_as_name=" (from: ext3 ext2 ffs ufs 42 efs xfs jfs ultrix)"
+ else
+-  ac_fs_name=ext2 ffs ufs 42 efs xfs jfs ultrix
++  ac_fs_name=ext3 ext2 ffs ufs 42 efs xfs jfs ultrix
+   ac_fs_as_name=""
+ fi
+ # store variable name of filesystem
+@@ -50461,7 +50462,7 @@
+ 
+ # assume not found
+ eval "ac_cv_fs_$ac_fs_name=no"
+-for ac_fs_tmp in ext2 ffs ufs 42 efs xfs jfs ultrix
++for ac_fs_tmp in ext3 ext2 ffs ufs 42 efs xfs jfs ultrix
+ do
+   ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+ 
+@@ -54306,7 +54307,7 @@
+ then
+   ac_fs_name=ufs
+ else
+-  ac_fs_name=4.2 4.3 4.4 ext2 ufs efs xfs ffs jfs ultrix
++  ac_fs_name=4.2 4.3 4.4 ext3 ext2 ufs efs xfs ffs jfs ultrix
+ fi
+ # prepare upper-case name of filesystem
+ ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+@@ -54323,7 +54324,7 @@
+ # undefine by default
+ eval "ac_cv_mount_type_$ac_fs_name=notfound"
+ # and look to see if it was found
+-for ac_fs_tmp in 4.2 4.3 4.4 ext2 ufs efs xfs ffs jfs ultrix
++for ac_fs_tmp in 4.2 4.3 4.4 ext3 ext2 ufs efs xfs ffs jfs ultrix
+ do
+ 
+   ac_upcase_fs_symbol=`echo $ac_fs_tmp | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' | tr -d '.'`
+@@ -59804,7 +59805,7 @@
+ then
+   ac_fs_name=ufs
+ else
+-  ac_fs_name=ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
++  ac_fs_name=ext3 ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
+ fi
+ # store variable name of fs
+ ac_upcase_fs_name=`echo $ac_fs_name | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+@@ -59821,7 +59822,7 @@
+ # undefine by default
+ eval "ac_cv_mnttab_type_$ac_fs_name=notfound"
+ # and look to see if it was found
+-for ac_fs_tmp in ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
++for ac_fs_tmp in ext3 ext2 ufs jfs 4.2 4.3 4.4 efs xfs ffs
+ do
+   if test "$ac_fs_tmp" = "nfs3" -a "$ac_cv_fs_nfs3" = "yes" -a "$ac_cv_header_linux_nfs_h" = "yes"
+   then
 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 @@
+--- hlfsd/stubs.c.orig	2005-08-03 02:35:36 +0200
++++ hlfsd/stubs.c	2005-09-28 16:29:51 +0200
+@@ -142,7 +142,7 @@
      res.ns_u.ns_attr_u = rootfattr;
    } else if (eq_fh(argp, &slink)) {
  
@@ -76,7 +133,7 @@ Index: hlfsd/stubs.c
      /*
       * 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 @@
+@@ -249,7 +249,7 @@
      }
  
      if (STREQ(argp->da_name, slinkname)) {
@@ -85,31 +142,3 @@ Index: hlfsd/stubs.c
        /*
         * 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	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 */
- 
-+#ifdef MNT2_NFS_OPT_SOFT
-   if (hasmntopt(mntp, MNTTAB_OPT_SOFT) != NULL)
-     nap->flags |= MNT2_NFS_OPT_SOFT;
-+#endif /* MNT2_NFS_OPT_SOFT */
- 
- #ifdef MNT2_NFS_OPT_SPONGY
-   if (hasmntopt(mntp, MNTTAB_OPT_SPONGY) != NULL) {
-
-taken from FedoraCore4 am-utils-6.0.9-12.src.rpm/am-utils-6.0.9.gcc4.patch
---- hlfsd/hlfsd.h.orig	2002-12-28 15:49:22.000000000 +0100
-+++ hlfsd/hlfsd.h	2005-03-25 17:15:55.753207705 +0100
-@@ -142,7 +142,7 @@
- extern char *mailbox(int, char *);
- extern char *passwdfile;
- extern char *slinkname;
--extern char mboxfile[];
-+/* extern char mboxfile[]; */
- extern gid_t hlfs_gid;
- extern int cache_interval;
- extern int noverify;
-

amd/amd.spec

@@ -32,8 +32,8 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        System
 License:      BSD
-Version:      6.0.10
-Release:      20050922
+Version:      6.1.2.1
+Release:      20050928
 
 #   list of sources
 Source0:      ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
@@ -70,14 +70,13 @@ AutoReqProv:  no
     prog amd = {
         version   = %{version}
         url       = ftp://ftp.am-utils.org/pub/am-utils/
-        regex     = am-utils-(6\.0\.\d+)\.tar\.gz
+        regex     = am-utils-(__VER__)\.tar\.gz
     }
 
 %prep
     %setup -q -n am-utils-%{version}
     %patch -p0
     %{l_shtool} subst \
-        -e 's;ext2;ext3 ext2;' \
         -e '/LINENO: error: C[+]* preprocessor/{N;N;N;N;s/.*/:/;}' \
         configure
     %{l_shtool} subst \