[Lunar-commits] <moonbase> openafs, openafs-driver: Version bumped to 1.6.0

[Stefan Wold]

commit 5311f0256da4ac1301498a12f0f918e6fced9f55
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Sat Nov 5 18:33:15 2011 +0100

    openafs, openafs-driver: Version bumped to 1.6.0
    
    - Removed support for kernel 2.4
    - Prepared support for kernel 3.x
---
 filesys/openafs/BUILD         |   11 +----------
 filesys/openafs/DEPENDS       |    3 +--
 filesys/openafs/DETAILS       |   22 ++++++++--------------
 kernel/openafs-driver/BUILD   |   12 +-----------
 kernel/openafs-driver/DETAILS |   11 ++++-------
 5 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/filesys/openafs/BUILD b/filesys/openafs/BUILD
index eac1f5e..bc11c91 100644
--- a/filesys/openafs/BUILD
+++ b/filesys/openafs/BUILD
@@ -1,21 +1,13 @@
 (
   patch_it $SOURCE4 1   &&
   patch_it $SOURCE5 1   &&
-  patch_it $SOURCE6 1   &&
-  patch_it $SOURCE7 1   &&
-
-  # Autoconf fix
-  sedit 's;^AC_\(AIX\|MINIX\)$;;' acinclude.m4 &&
 
   ./regen.sh            &&
 
   case `uname -r` in
-    2.6.*)
+    2.6.*|3.*)
       kv="26"
       ;;
-    2.4.*)
-      kv="24"
-      ;;
     *)
       message "Unsupported kernel version!"
       exit -1
@@ -45,7 +37,6 @@
                 --localstatedir=/var/lib        \
                 --infodir=/usr/share/info       \
                 --mandir=/usr/share/man         \
-                --enable-largefile-fileserver   \
                 --enable-supergroups            \
                 --disable-kernel-module         \
                 $OPTS                           &&
diff --git a/filesys/openafs/DEPENDS b/filesys/openafs/DEPENDS
index 1a58dc4..6b229ed 100644
--- a/filesys/openafs/DEPENDS
+++ b/filesys/openafs/DEPENDS
@@ -1,5 +1,4 @@
 depends autoconf
 depends automake
 depends lsof
-optional_depends "heimdal" "--with-krb5-conf=/usr/bin/krb5-config" "" "for kerberos support"
-
+optional_depends "heimdal" "--with-krb5=/usr" "" "for kerberos support"
diff --git a/filesys/openafs/DETAILS b/filesys/openafs/DETAILS
index d0b74d8..eec0974 100644
--- a/filesys/openafs/DETAILS
+++ b/filesys/openafs/DETAILS
@@ -1,28 +1,22 @@
         MODULE=openafs
-       VERSION=1.4.14
+       VERSION=1.6.0
         SOURCE=openafs-$VERSION-src.tar.bz2
        SOURCE2=CellServDB
        SOURCE3=killafs-0.1
-       SOURCE4=openafs-1.4.7-rename_pagsh.patch
-       SOURCE5=openafs-1.4.7-rename_kpasswd.patch
-       SOURCE6=openafs-1.4.7-gcpags-workaround.patch
-       SOURCE7=openafs-kernel-2.6.38-fixes.patch
-    SOURCE_URL=http://www.openafs.org/dl/openafs/1.4.14
+       SOURCE4=openafs-1.6.0-rename_pagsh.patch
+       SOURCE5=openafs-1.6.0-rename_kpasswd.patch
+    SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION
    SOURCE2_URL=http://grand.central.org/dl/cellservdb
    SOURCE3_URL=$PATCH_URL
    SOURCE4_URL=$PATCH_URL
    SOURCE5_URL=$PATCH_URL
-   SOURCE6_URL=$PATCH_URL
-   SOURCE7_URL=$PATCH_URL
-    SOURCE_VFY=sha256:64ee97cfad067c24d0e5413d4bc650cfa82152e9a6acfdf9707d1320e09dd594
+    SOURCE_VFY=sha256:e722a3b817655fe9b4e0d6e2c31ab1eb3d74947f51267311c85c43302e0644e6
    SOURCE3_VFY=sha1:5532084c54a79f77807ee8ae3cb09018b3e74c12
-   SOURCE4_VFY=sha1:39f94d3cf2a14d4db2c0ba86caafa28a094bf564
-   SOURCE5_VFY=sha1:58fe18e2952b848b4ec3e398ec668e05f33dbe6b
-   SOURCE6_VFY=sha1:4f79505707bfffe482e2132fd1425f9a8d43f1f9
-   SOURCE7_VFY=sha256:b0ad9feac8d2d3b0f7dbb3212284b6822aff8ad84c9e2ae94da60fc7f4da94fc
+   SOURCE4_VFY=sha256:8481a9581b0b29e884993dc210006911203497eef1bc19acda06cb1215a32a1f
+   SOURCE5_VFY=sha256:1b17766cf82bd501a637ad3a8c904a5b62092bb90e74d5fe565c291e7b3fba4d
       WEB_SITE=http://www.openafs.org/
        ENTERED=20031216
-       UPDATED=20110127
+       UPDATED=20111105
     MAINTAINER="ratler at lunar-linux.org"
          SHORT="A distributed filesystem allowing cross-platform sharing"
 PSAFE=no
diff --git a/kernel/openafs-driver/BUILD b/kernel/openafs-driver/BUILD
index 5957a09..90e2c3c 100644
--- a/kernel/openafs-driver/BUILD
+++ b/kernel/openafs-driver/BUILD
@@ -3,20 +3,10 @@
   export EXTRA_CFLAGS="$CFLAGS"
   unset CFLAGS
 
-  patch_it $SOURCE2 1 &&
-
-  # Autoconf fix
-  sedit 's;^AC_\(AIX\|MINIX\)$;;' acinclude.m4 &&
-
-  ./regen.sh &&
-
   case `uname -r` in
-    2.6.*)
+    2.6.*|3.*)
       kv="26"
       ;;
-    2.4.*)
-      kv="24"
-      ;;
     *)
       message "Unsupported kernel version!"
       exit -1
diff --git a/kernel/openafs-driver/DETAILS b/kernel/openafs-driver/DETAILS
index 80067a1..999bce8 100644
--- a/kernel/openafs-driver/DETAILS
+++ b/kernel/openafs-driver/DETAILS
@@ -1,15 +1,12 @@
           MODULE=openafs-driver
-         VERSION=1.4.14
+         VERSION=1.6.0
           SOURCE=openafs-$VERSION-src.tar.bz2
-         SOURCE2=openafs-kernel-2.6.38-fixes.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/openafs-$VERSION
-      SOURCE_URL=http://www.openafs.org/dl/openafs/1.4.14
-     SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha256:64ee97cfad067c24d0e5413d4bc650cfa82152e9a6acfdf9707d1320e09dd594
-     SOURCE2_VFY=sha256:b0ad9feac8d2d3b0f7dbb3212284b6822aff8ad84c9e2ae94da60fc7f4da94fc
+      SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION
+      SOURCE_VFY=sha256:e722a3b817655fe9b4e0d6e2c31ab1eb3d74947f51267311c85c43302e0644e6
         WEB_SITE=http://www.openafs.org/
          ENTERED=20031216
-         UPDATED=20110127
+         UPDATED=20111105
       MAINTAINER="ratler at lunar-linux.org"
            SHORT="OpenAFS kernel module"
 PROFILE="yes"