OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   11-Oct-2005 08:39:35
  Branch: HEAD                             Handle: 2005101107393400

  Modified files:
    openpkg-src/amd         amd.patch amd.spec

  Log:
    upgrading package: amd 6.1.2.1 -> 6.1.3

  Summary:
    Revision    Changes     Path
    1.16        +14 -71     openpkg-src/amd/amd.patch
    1.68        +3  -3      openpkg-src/amd/amd.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/amd/amd.patch
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 amd.patch
  --- openpkg-src/amd/amd.patch 28 Sep 2005 14:37:50 -0000      1.15
  +++ openpkg-src/amd/amd.patch 11 Oct 2005 06:39:34 -0000      1.16
  @@ -1,6 +1,6 @@
   Index: conf/mount/mount_linux.c
  ---- 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
  +--- conf/mount/mount_linux.c.orig    2005-10-06 20:37:49 +0200
  ++++ conf/mount/mount_linux.c 2005-10-11 08:34:46 +0200
   @@ -49,7 +49,9 @@
    #endif /* HAVE_CONFIG_H */
    #include <am_defs.h>
  @@ -13,9 +13,9 @@
    #ifndef MOUNT_TYPE_UFS
    /*
   Index: config.h.in
  ---- 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 @@
  +--- config.h.in.orig 2005-10-10 19:06:16 +0200
  ++++ config.h.in      2005-10-11 08:34:46 +0200
  +@@ -162,6 +162,9 @@
    /* Define to 1 if you have the <db1/ndbm.h> header file. */
    #undef HAVE_DB1_NDBM_H
    
  @@ -25,7 +25,7 @@
    /* Define to 1 if you have the `dbm_open' function. */
    #undef HAVE_DBM_OPEN
    
  -@@ -712,6 +715,9 @@
  +@@ -730,6 +733,9 @@
    /* Define to 1 if you have the <nfs/nfs.h> header file. */
    #undef HAVE_NFS_NFS_H
    
  @@ -36,9 +36,9 @@
    #undef HAVE_NFS_NFS_MOUNT_H
    
   Index: configure
  ---- configure.orig   2005-09-19 05:05:07 +0200
  -+++ configure        2005-09-28 16:34:17 +0200
  -@@ -20836,7 +20836,7 @@
  +--- configure.orig   2005-10-10 19:06:13 +0200
  ++++ configure        2005-10-11 08:36:26 +0200
  +@@ -20871,7 +20871,7 @@
                                ;;
                esac
                ;;
  @@ -47,15 +47,15 @@
                ac_cv_os_cflags="" ;;
        solaris2* | sunos5* )
                # turn on 64-bit file offset interface
  -@@ -24960,6 +24960,7 @@
  +@@ -25004,6 +25004,7 @@
        nfs/export.h                    \
        nfs/mount.h                     \
        nfs/nfs.h                       \
  -+    nfsclient/nfs.h                 \
  ++    nfsclient/nfs.h                 \
        nfs/nfs_clnt.h                  \
        nfs/nfs_gfs.h                   \
        nfs/nfs_mount.h                 \
  -@@ -26337,7 +26338,7 @@
  +@@ -26383,7 +26384,7 @@
                        ac_cv_nfs_prot_headers=sunos3 ;;
        sunos4* | solaris1* )
                        ac_cv_nfs_prot_headers=sunos4 ;;
  @@ -64,66 +64,9 @@
                        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-08-03 02:35:36 +0200
  -+++ hlfsd/stubs.c    2005-09-28 16:29:51 +0200
  +--- hlfsd/stubs.c.orig       2005-09-30 04:48:42 +0200
  ++++ hlfsd/stubs.c    2005-10-11 08:34:46 +0200
   @@ -142,7 +142,7 @@
        res.ns_u.ns_attr_u = rootfattr;
      } else if (eq_fh(argp, &slink)) {
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/amd/amd.spec
  ============================================================================
  $ cvs diff -u -r1.67 -r1.68 amd.spec
  --- openpkg-src/amd/amd.spec  28 Sep 2005 14:37:50 -0000      1.67
  +++ openpkg-src/amd/amd.spec  11 Oct 2005 06:39:34 -0000      1.68
  @@ -32,8 +32,8 @@
   Class:        BASE
   Group:        System
   License:      BSD
  -Version:      6.1.2.1
  -Release:      20050928
  +Version:      6.1.3
  +Release:      20051011
   
   #   list of sources
   Source0:      ftp://ftp.am-utils.org/pub/am-utils/am-utils-%{version}.tar.gz
  @@ -70,7 +70,7 @@
       prog amd = {
           version   = %{version}
           url       = ftp://ftp.am-utils.org/pub/am-utils/
  -        regex     = am-utils-(__VER__)\.tar\.gz
  +        regex     = am-utils-(\d+\.\d+(\.\d+)*)\.tar\.gz
       }
   
   %prep
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to