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

Stefan Wold ratler at lunar-linux.org
Sat May 11 18:09:48 CEST 2013


commit 39eca72a556e5e3911a99ab2437a06fc2f5bc285
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 11 May 2013 09:08:49 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/39eca72a556e5e3911a99ab2437a06fc2f5bc285

openafs, openafs-driver: Version bumped to 1.6.2

- Added patches for kernel 3.8 and kernel 3.9
---
  filesys/openafs-driver/BUILD   | +37/-42   
  filesys/openafs-driver/DETAILS | +11/-20   
  filesys/openafs/BUILD          | +101/-113 
  filesys/openafs/DETAILS        | +3/-24    
  4 files changed, 152 insertions(+), 199 deletions(-)

--- a/filesys/openafs-driver/BUILD
+++ b/filesys/openafs-driver/BUILD
@@ -1,47 +1,42 @@
-(
-  # This is needed or a test will fail
-  export EXTRA_CFLAGS="$CFLAGS"
-  unset CFLAGS
+OPTS+=" --with-linux-kernel-headers=/usr/src/linux"
 
-  case `uname -r` in
-    2.6.*|3.*)
-      kv="26"
-      ;;
-    *)
-      message "Unsupported kernel version!"
-      exit -1
-      ;;
-  esac &&
+# This is needed or a test will fail
+export EXTRA_CFLAGS="$CFLAGS"
+unset CFLAGS
 
-  case `arch` in
-    x86_64)
-      OPTS+=" --with-afs-sysname=amd64_linux${kv}"
-      ;;
-    i386|i486|i586|i686|athlon)
-      OPTS+=" --with-afs-sysname=i386_linux${kv}"
-      ;;
-    *)
-      OPTS+=" --with-afs-sysname=`arch`_linux${kv}"
-      ;;
-  esac &&
+patch_it $SOURCE2 1 &&
+patch_it $SOURCE3 1 &&
+patch_it $SOURCE4 1 &&
+patch_it $SOURCE5 1 &&
 
-  OPTS+=" --with-linux-kernel-headers=/usr/src/linux"
+case `uname -r` in
+  2.6.*|3.*)
+    kv="26"
+    ;;
+  *)
+    message "Unsupported kernel version!"
+    exit -1
+    ;;
+esac &&
 
-  patch_it $SOURCE2 1 &&
-  patch_it $SOURCE3 1 &&
-  patch_it $SOURCE4 1 &&
-  patch_it $SOURCE5 1 &&
-  patch_it $SOURCE6 1 &&
-  patch_it $SOURCE7 1 &&
-  patch_it $SOURCE8 1 &&
-  ./regen.sh -q &&
-  ./configure   --prefix=/usr                   \
-                --sysconfdir=/etc               \
-                --localstatedir=/var/lib        \
-                --infodir=/usr/share/info       \
-                --mandir=/usr/share/man         \
-                $OPTS                           &&
-  make only_libafs &&
-  prepare_install
+case `arch` in
+  x86_64)
+    OPTS+=" --with-afs-sysname=amd64_linux${kv}"
+    ;;
+  i386|i486|i586|i686|athlon)
+    OPTS+=" --with-afs-sysname=i386_linux${kv}"
+    ;;
+  *)
+    OPTS+=" --with-afs-sysname=`arch`_linux${kv}"
+    ;;
+esac &&
 
-) > $C_FIFO 2>&1
+./regen.sh -q &&
+./configure   --prefix=/usr                   \
+              --sysconfdir=/etc               \
+              --localstatedir=/var/lib        \
+              --infodir=/usr/share/info       \
+              --mandir=/usr/share/man         \
+              $OPTS                           &&
+make only_libafs &&
+prepare_install
--- a/filesys/openafs-driver/DETAILS
+++ b/filesys/openafs-driver/DETAILS
@@ -1,33 +1,24 @@
           MODULE=openafs-driver
-         VERSION=1.6.1
+         VERSION=1.6.2
           SOURCE=openafs-$VERSION-src.tar.bz2
-         SOURCE2=openafs-1.6.1-kernel-3.5-end_writeback-fix.patch
-         SOURCE3=openafs-1.6.1-kernel-3.5-encode_fh_API-fix.patch
-         SOURCE4=openafs-1.6.1-glibc-2.16.patch
-         SOURCE5=openafs-1.6.1-kernel-3.6-fixes.patch
-         SOURCE6=openafs-1.6.1-kernel-3.7-fixes.patch
-         SOURCE7=openafs-1.6.1-do_not_skip_flusing_empty_files.patch
-         SOURCE8=openafs-1.6.1-kernel-3.7-fixes-2.patch
+         SOURCE2=001-openafs-1.6.2-linux-3.8-session-keyring-changes.patch
+         SOURCE3=002-openafs-1.6.2-linux-3.8-vmtruncate-removal.patch
+         SOURCE4=003-openafs-1.6.2-linux-setpag-may-replace-credentials.patch
+         SOURCE5=004-openafs-1.6.2-linux-3.9-hlist-iterator-change.patch
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/openafs-$VERSION
       SOURCE_URL=http://www.openafs.org/dl/openafs/$VERSION
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
      SOURCE4_URL=$PATCH_URL
      SOURCE5_URL=$PATCH_URL
-     SOURCE6_URL=$PATCH_URL
-     SOURCE7_URL=$PATCH_URL
-     SOURCE8_URL=$PATCH_URL
-      SOURCE_VFY=sha256:d05ef7f8e89b6939726d93bb46d4353e20a459890b9c3ca3065d50de408bf5b0
-     SOURCE2_VFY=sha256:a3da603af30a0b106fd0cfece80533c59c2047923c02159cb57b306520738c89
-     SOURCE3_VFY=sha256:a7a31d48e50124213c831b3e20de3daeef0e1923edc21b37c516ed9e318c96f3
-     SOURCE4_VFY=sha256:fb5e795604dec96dac2764293f630a92946a7fcae6c0d8939d2a19fecf7d877b
-     SOURCE5_VFY=sha256:cbb73be8dd8d0554157dd9826a75f71ce09c1e5026f6e57d3c130d7f9f7678b2
-     SOURCE6_VFY=sha256:87a695c6c8d1b46c682787377ea032442ceb221d708258cdf5f586034c2a9b16
-     SOURCE7_VFY=sha256:c63d18ea2527f0eeffe07f61bb4534ae124082b4a009ce69206c46498c94bcfe
-     SOURCE8_VFY=sha256:602edb8bbf03f14172d5aef27a477505865bdf879c1041d85f85c26854d9fa11
+      SOURCE_VFY=sha256:0db0877cd42131a744472ad0abfa26a4402a5bad94adb4d1eada75c8b6895bc9
+     SOURCE2_VFY=sha256:ff551a528c73746380c8f74064a7b604ca870e94fd0d1e4bcfe0d4b4bb5fd5ec
+     SOURCE3_VFY=sha256:69c1edb99e4eb3116e54fd48ae60ac8373e8548b509d25842bab2086319e8d04
+     SOURCE4_VFY=sha256:61828aff1c3d5da6171cde34c4a58c33f1fdce732cdcabd5b4928c89f0125ad3
+     SOURCE5_VFY=sha256:220efafd7a971c0d2c95ef02720b6043a3916b78b245e53a91454d8e378fd492
         WEB_SITE=http://www.openafs.org/
          ENTERED=20031216
-         UPDATED=20130101
+         UPDATED=20130511
       MAINTAINER="ratler at lunar-linux.org"
            SHORT="OpenAFS kernel module"
 PROFILE="yes"
--- a/filesys/openafs/BUILD
+++ b/filesys/openafs/BUILD
@@ -1,113 +1,101 @@
-(
-
-  patch_it $SOURCE4 1  &&
-  patch_it $SOURCE5 1  &&
-  patch_it $SOURCE6 1  &&
-  patch_it $SOURCE7 1  &&
-  patch_it $SOURCE8 1  &&
-  patch_it $SOURCE9 1  &&
-  patch_it $SOURCE10 1 &&
-  patch_it $SOURCE11 1 &&
-  patch_it $SOURCE12 1 &&
-
-  # Heimdal no longer have krb5_524_conv_principal - fugly workaround
-  sedit 's;krb524_convert_creds_kdc;krb5_524_conv_principal;g' configure.ac &&
-  ./regen.sh -q &&
-
-  case `uname -r` in
-    2.6.*|3.*)
-      kv="26"
-      ;;
-    *)
-      message "Unsupported kernel version!"
-      exit -1
-      ;;
-  esac  &&
-
-  case `arch` in
-    x86_64)
-      OPTS+=" --with-afs-sysname=amd64_linux${kv}"
-      ;;
-    i386|i486|i586|i686|athlon)
-      OPTS+=" --with-afs-sysname=i386_linux${kv}"
-      ;;
-    *)
-      OPTS+=" --with-afs-sysname=`arch`_linux${kv}"
-      ;;
-  esac  &&
-
-  if module_installed Linux-PAM; then
-      OPTS+=" --enable-pam"
-  else
-      OPTS+=" --disable-pam"
-  fi  &&
-
-  ./configure   --prefix=/usr              \
-                --sysconfdir=/etc          \
-                --localstatedir=/var/lib   \
-                --infodir=/usr/share/info  \
-                --mandir=/usr/share/man    \
-                --enable-supergroups       \
-                --disable-kernel-module    \
-                $OPTS                     &&
-  make all_nolibafs                       &&
-  prepare_install                         &&
-
-  if [ ! -d /etc/openafs ]; then
-      mkdir -p /etc/openafs/server
-  fi  &&
-
-  make install_nolibafs  &&
-
-  # Creating needed dirs if not existing
-   if [ ! -d /var/cache/openafs ]; then
-        mkdir -p /var/cache/openafs &&
-        chmod 0700 /var/cache/openafs
-  fi &&
-
-  # Server dirs
-  if [ ! -d /var/lib/openafs ]; then
-        mkdir -p /var/lib/openafs/{logs,db}
-        chmod 700 /var/lib/openafs/db
-        chmod 755 /var/lib/openafs/logs
-  fi  &&
-
-  if [ ! -d /afs ]; then
-        mkdir /afs &&
-        chmod 755 /afs
-  fi  &&
-
-  # Installing some db files
-  if [ ! -f /etc/openafs/CellServDB ]; then
-        install -p -m 644 $SOURCE_CACHE/CellServDB /etc/openafs/CellServDB
-  fi  &&
-  install -p -m 755 $SOURCE_CACHE/$SOURCE3 /usr/sbin/killafs  &&
-  touch /etc/openafs/SuidCells  &&
-
-  # Default to openafs.org unless custom cell has been chosen 
-  if [ ! -f /etc/openafs/ThisCell ]; then
-      echo "${AFSCELL:-openafs.org}" > /etc/openafs/ThisCell &&
-      touch /etc/openafs/ThisCell
-  fi  &&
-
-  # Create cacheinfo file, 200Mb size
-  if [ ! -f /etc/openafs/cacheinfo ]; then
-      # Convert to bytes from Mb
-      AFSCACHESIZE=${AFSCACHESIZE:-200}
-      AFSCACHESIZE=$((AFSCACHESIZE * 1000))
-      echo "/afs:/var/cache/openafs:$AFSCACHESIZE" > /etc/openafs/cacheinfo &&
-      touch /etc/openafs/cacheinfo
-  fi &&
-
-  # Copy conf and rc files (only needed by sysvinit systems)
-  if module_installed sysvinit; then
-    sedit "s;^OPTIONS=.*;OPTIONS=\"-nosettime -fakestat\";" $SOURCE_DIRECTORY/src/afsd/afs.conf.linux  &&
-    if [ ! -f /etc/config.d/afs ]; then
-      install -p -m 644 $SOURCE_DIRECTORY/src/afsd/afs.conf.linux /etc/config.d/afs
-    fi
-  fi &&
-
-  # Ugly but we need a new cellservdb everytime we run lin
-  rm -f $SOURCE_CACHE/$SOURCE2
-
-) > $C_FIFO 2>&1
+patch_it $SOURCE4 1  &&
+patch_it $SOURCE5 1  &&
+
+./regen.sh -q &&
+
+case `uname -r` in
+  2.6.*|3.*)
+    kv="26"
+    ;;
+  *)
+    message "Unsupported kernel version!"
+    exit -1
+    ;;
+esac  &&
+
+case `arch` in
+  x86_64)
+    OPTS+=" --with-afs-sysname=amd64_linux${kv}"
+    ;;
+  i386|i486|i586|i686|athlon)
+    OPTS+=" --with-afs-sysname=i386_linux${kv}"
+    ;;
+  *)
+    OPTS+=" --with-afs-sysname=`arch`_linux${kv}"
+    ;;
+esac  &&
+
+if module_installed Linux-PAM; then
+  OPTS+=" --enable-pam"
+else
+  OPTS+=" --disable-pam"
+fi  &&
+
+./configure  --prefix=/usr              \
+             --sysconfdir=/etc          \
+             --localstatedir=/var/lib   \
+             --infodir=/usr/share/info  \
+             --mandir=/usr/share/man    \
+             --enable-supergroups       \
+             --disable-kernel-module    \
+             --disable-fuse-client      \
+             $OPTS                     &&
+make all_nolibafs                      &&
+prepare_install                        &&
+
+if [ ! -d /etc/openafs ]; then
+  mkdir -p /etc/openafs/server
+fi  &&
+
+make install_nolibafs  &&
+
+# Creating needed dirs if not existing
+if [ ! -d /var/cache/openafs ]; then
+  mkdir -p /var/cache/openafs &&
+  chmod 0700 /var/cache/openafs
+fi &&
+
+# Server dirs
+if [ ! -d /var/lib/openafs ]; then
+  mkdir -p /var/lib/openafs/{logs,db}
+  chmod 700 /var/lib/openafs/db
+  chmod 755 /var/lib/openafs/logs
+fi  &&
+
+if [ ! -d /afs ]; then
+  mkdir /afs &&
+  chmod 755 /afs
+fi  &&
+
+# Installing some db files
+if [ ! -f /etc/openafs/CellServDB ]; then
+  install -p -m 644 $SOURCE_CACHE/CellServDB /etc/openafs/CellServDB
+fi  &&
+install -p -m 755 $SOURCE_CACHE/$SOURCE3 /usr/sbin/killafs  &&
+touch /etc/openafs/SuidCells  &&
+
+# Default to openafs.org unless custom cell has been chosen 
+if [ ! -f /etc/openafs/ThisCell ]; then
+  echo "${AFSCELL:-openafs.org}" > /etc/openafs/ThisCell &&
+  touch /etc/openafs/ThisCell
+fi  &&
+
+# Create cacheinfo file, 200Mb size
+if [ ! -f /etc/openafs/cacheinfo ]; then
+  # Convert to bytes from Mb
+  AFSCACHESIZE=${AFSCACHESIZE:-200}
+  AFSCACHESIZE=$((AFSCACHESIZE * 1000))
+  echo "/afs:/var/cache/openafs:$AFSCACHESIZE" > /etc/openafs/cacheinfo &&
+  touch /etc/openafs/cacheinfo
+fi &&
+
+# Copy conf and rc files (only needed by sysvinit systems)
+if module_installed sysvinit; then
+  sedit "s;^OPTIONS=.*;OPTIONS=\"-nosettime -fakestat\";" $SOURCE_DIRECTORY/src/afsd/afs.conf.linux  &&
+  if [ ! -f /etc/config.d/afs ]; then
+    install -p -m 644 $SOURCE_DIRECTORY/src/afsd/afs.conf.linux /etc/config.d/afs
+  fi
+fi &&
+
+# Ugly but we need a new cellservdb everytime we run lin
+rm -f $SOURCE_CACHE/$SOURCE2
--- a/filesys/openafs/DETAILS
+++ b/filesys/openafs/DETAILS
@@ -1,43 +1,22 @@
         MODULE=openafs
-       VERSION=1.6.1
+       VERSION=1.6.2
         SOURCE=openafs-$VERSION-src.tar.bz2
        SOURCE2=CellServDB
        SOURCE3=killafs-0.1
        SOURCE4=openafs-1.6.0-rename_pagsh.patch
        SOURCE5=openafs-1.6.0-rename_kpasswd.patch
-       SOURCE6=openafs-1.6.1-kernel-3.5-end_writeback-fix.patch
-       SOURCE7=openafs-1.6.1-kernel-3.5-encode_fh_API-fix.patch
-       SOURCE8=openafs-1.6.1-glibc-2.16.patch
-       SOURCE9=openafs-1.6.1-kernel-3.6-fixes.patch
-      SOURCE10=openafs-1.6.1-kernel-3.7-fixes.patch
-      SOURCE11=openafs-1.6.1-do_not_skip_flusing_empty_files.patch
-      SOURCE12=openafs-1.6.1-kernel-3.7-fixes-2.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
-   SOURCE8_URL=$PATCH_URL
-   SOURCE9_URL=$PATCH_URL
-  SOURCE10_URL=$PATCH_URL
-  SOURCE11_URL=$PATCH_URL
-  SOURCE12_URL=$PATCH_URL
-    SOURCE_VFY=sha256:d05ef7f8e89b6939726d93bb46d4353e20a459890b9c3ca3065d50de408bf5b0
+    SOURCE_VFY=sha256:0db0877cd42131a744472ad0abfa26a4402a5bad94adb4d1eada75c8b6895bc9
    SOURCE3_VFY=sha1:5532084c54a79f77807ee8ae3cb09018b3e74c12
    SOURCE4_VFY=sha256:8481a9581b0b29e884993dc210006911203497eef1bc19acda06cb1215a32a1f
    SOURCE5_VFY=sha256:1b17766cf82bd501a637ad3a8c904a5b62092bb90e74d5fe565c291e7b3fba4d
-   SOURCE6_VFY=sha256:a3da603af30a0b106fd0cfece80533c59c2047923c02159cb57b306520738c89
-   SOURCE7_VFY=sha256:a7a31d48e50124213c831b3e20de3daeef0e1923edc21b37c516ed9e318c96f3
-   SOURCE8_VFY=sha256:fb5e795604dec96dac2764293f630a92946a7fcae6c0d8939d2a19fecf7d877b
-   SOURCE9_VFY=sha256:cbb73be8dd8d0554157dd9826a75f71ce09c1e5026f6e57d3c130d7f9f7678b2
-  SOURCE10_VFY=sha256:87a695c6c8d1b46c682787377ea032442ceb221d708258cdf5f586034c2a9b16
-  SOURCE11_VFY=sha256:c63d18ea2527f0eeffe07f61bb4534ae124082b4a009ce69206c46498c94bcfe
-  SOURCE12_VFY=sha256:602edb8bbf03f14172d5aef27a477505865bdf879c1041d85f85c26854d9fa11
       WEB_SITE=http://www.openafs.org/
        ENTERED=20031216
-       UPDATED=20130101
+       UPDATED=20130511
     MAINTAINER="ratler at lunar-linux.org"
          SHORT="A distributed filesystem allowing cross-platform sharing"
 PSAFE=no




More information about the Lunar-commits mailing list