The following commit has been merged in the master branch:
commit 2af30359f51eb325bf90799d6b46c8f22c22c66c
Author: Patrick Winnertz <win...@debian.org>
Date:   Tue Dec 7 17:01:43 2010 +0100

    Refresh all patches using quilt refresh
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/autogen.sh.patch b/debian/patches/autogen.sh.patch
old mode 100755
new mode 100644
index 47b1c80..e8c3502
--- a/debian/patches/autogen.sh.patch
+++ b/debian/patches/autogen.sh.patch
@@ -1,13 +1,15 @@
 ## DP: autogen.sh script from lustre upstream cvs for 1.6.4.2
-diff -urNad lustre-1.6.4.2~/autogen.sh lustre-1.6.4.2/autogen.sh
---- lustre-1.6.4.2~/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/autogen.sh  2008-02-13 12:31:39.631640478 +0100
+Index: lustre/autogen.sh
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ lustre/autogen.sh  2010-12-07 17:00:03.881545003 +0100
 @@ -0,0 +1,2 @@
 +#!/bin/sh
 +exec bash build/autogen.sh $@ 
-diff -urNad lustre-1.6.4.2~/build/autogen.sh lustre-1.6.4.2/build/autogen.sh
---- lustre-1.6.4.2~/build/autogen.sh   1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/build/autogen.sh    2008-02-13 12:31:39.631640478 +0100
+Index: lustre/build/autogen.sh
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ lustre/build/autogen.sh    2010-12-07 17:00:03.881545003 +0100
 @@ -0,0 +1,128 @@
 +#!/bin/bash
 +
@@ -137,15 +139,17 @@ diff -urNad lustre-1.6.4.2~/build/autogen.sh 
lustre-1.6.4.2/build/autogen.sh
 +        popd >/dev/null
 +    fi
 +done
-diff -urNad lustre-1.6.4.2~/ldiskfs/autogen.sh 
lustre-1.6.4.2/ldiskfs/autogen.sh
---- lustre-1.6.4.2~/ldiskfs/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/ldiskfs/autogen.sh  2008-02-13 12:31:39.631640478 +0100
+Index: lustre/ldiskfs/autogen.sh
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ lustre/ldiskfs/autogen.sh  2010-12-07 17:00:03.881545003 +0100
 @@ -0,0 +1,2 @@
 +#!/bin/bash
 +exec bash build/autogen.sh $@ 
-diff -urNad lustre-1.6.4.2~/ldiskfs/build/autogen.sh 
lustre-1.6.4.2/ldiskfs/build/autogen.sh
---- lustre-1.6.4.2~/ldiskfs/build/autogen.sh   1970-01-01 01:00:00.000000000 
+0100
-+++ lustre-1.6.4.2/ldiskfs/build/autogen.sh    2008-02-13 12:31:33.000000000 
+0100
+Index: lustre/ldiskfs/build/autogen.sh
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ lustre/ldiskfs/build/autogen.sh    2010-12-07 17:00:03.881545003 +0100
 @@ -0,0 +1,128 @@
 +#!/bin/bash
 +
@@ -275,9 +279,10 @@ diff -urNad lustre-1.6.4.2~/ldiskfs/build/autogen.sh 
lustre-1.6.4.2/ldiskfs/buil
 +        popd >/dev/null
 +    fi
 +done
-diff -urNad lustre-1.6.4.2~/libsysio/autogen.sh 
lustre-1.6.4.2/libsysio/autogen.sh
---- lustre-1.6.4.2~/libsysio/autogen.sh        1970-01-01 01:00:00.000000000 
+0100
-+++ lustre-1.6.4.2/libsysio/autogen.sh 2008-02-13 12:31:39.631640478 +0100
+Index: lustre/libsysio/autogen.sh
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ lustre/libsysio/autogen.sh 2010-12-07 17:00:03.885545003 +0100
 @@ -0,0 +1,5 @@
 +#!/bin/sh
 +
diff --git a/debian/patches/bash_completion.patch 
b/debian/patches/bash_completion.patch
old mode 100755
new mode 100644
index a6d3294..3c07cc9
--- a/debian/patches/bash_completion.patch
+++ b/debian/patches/bash_completion.patch
@@ -1,7 +1,8 @@
 ## DP: Support for Bash completion. Work in progress.
-diff -urNad lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lctl 
/tmp/dpep.59jPKV/lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lctl
---- lustre-1.6.0.1/lustre/contrib/bash_completion/lctl 1970-01-01 
01:00:00.000000000 +0100
-+++ lustre-1.6.0.1/lustre/contrib/bash_completion/lctl 2006-08-11 
17:10:01.000000000 +0100
+Index: lustre/lustre/contrib/bash_completion/lctl
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ lustre/lustre/contrib/bash_completion/lctl 2010-12-07 17:00:20.657545001 
+0100
 @@ -0,0 +1,13 @@
 +#-*- mode: shell-script;-*-
 +
@@ -16,9 +17,10 @@ diff -urNad 
lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lctl /tmp/dpep.
 +
 +complete -F _lctl lctl
 +
-diff -urNad lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lfs 
/tmp/dpep.59jPKV/lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lfs
---- lustre-1.6.0.1/lustre/contrib/bash_completion/lfs  1970-01-01 
01:00:00.000000000 +0100
-+++ lustre-1.6.0.1/lustre/contrib/bash_completion/lfs  2006-08-11 
16:40:23.000000000 +0100
+Index: lustre/lustre/contrib/bash_completion/lfs
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ lustre/lustre/contrib/bash_completion/lfs  2010-12-07 17:00:20.657545001 
+0100
 @@ -0,0 +1,13 @@
 +#-*- mode: shell-script;-*-
 +
diff --git a/debian/patches/bug12769-ql-fix.patch 
b/debian/patches/bug12769-ql-fix.patch
old mode 100755
new mode 100644
index 420b1de..ee28002
--- a/debian/patches/bug12769-ql-fix.patch
+++ b/debian/patches/bug12769-ql-fix.patch
@@ -1,17 +1,18 @@
 ## bug12769-ql-fix.dpatch by Goswin von Brederlow <goswin-...@web.de>
 ## DP: Ensure that dirty pages are flushed out with the right creds
 
-diff --git a/lustre/llite/file.c b/lustre/llite/file.c
---- a/lustre/llite/file.c
-+++ b/lustre/llite/file.c
-@@ -281,6 +281,10 @@ int ll_file_release(struct inode *inode,
-         if (lsm)
+Index: lustre/lustre/llite/file.c
+===================================================================
+--- lustre.orig/lustre/llite/file.c    2010-12-07 16:58:57.589545003 +0100
++++ lustre/lustre/llite/file.c 2010-12-07 17:00:14.833545003 +0100
+@@ -277,6 +277,10 @@
                  lov_test_and_clear_async_rc(lsm);
          lli->lli_async_rc = 0;
-+
+ 
 +        /* Ensure that dirty pages are flushed out with the right creds */
 +        if (file->f_mode & FMODE_WRITE)
 +                filemap_fdatawrite(file->f_mapping);
- 
++
          rc = ll_mdc_close(sbi->ll_mdc_exp, inode, file);
-         RETURN(rc);
+ 
+         if (OBD_FAIL_TIMEOUT_MS(OBD_FAIL_PTLRPC_DUMP_LOG, obd_fail_val))
diff --git a/debian/patches/bug13852-quota_includes.patch 
b/debian/patches/bug13852-quota_includes.patch
old mode 100755
new mode 100644
index 5296b6f..b284c23
--- a/debian/patches/bug13852-quota_includes.patch
+++ b/debian/patches/bug13852-quota_includes.patch
@@ -1,8 +1,10 @@
 ## DP: Missing include of sys/quota.h
 
---- ./lustre/include/liblustre.h       2007-08-13 19:31:56.000000000 +0200
-+++ ./lustre/include/liblustre.h       2007-10-10 11:38:20.071254030 +0200
-@@ -50,6 +50,7 @@
+Index: lustre/lustre/include/liblustre.h
+===================================================================
+--- lustre.orig/lustre/include/liblustre.h     2010-12-07 16:54:32.573545003 
+0100
++++ lustre/lustre/include/liblustre.h  2010-12-07 17:00:35.193545002 +0100
+@@ -67,6 +67,7 @@
  #ifndef _IOWR
  # include "ioctl.h"
  #endif
diff --git a/debian/patches/bug15587_security.capability_xattr.patch 
b/debian/patches/bug15587_security.capability_xattr.patch
old mode 100755
new mode 100644
index 7c2a1eb..c85823e
--- a/debian/patches/bug15587_security.capability_xattr.patch
+++ b/debian/patches/bug15587_security.capability_xattr.patch
@@ -1,12 +1,12 @@
 ## bug15587_security.capability_xattr.dpatch by Patrick Winnertz 
<win...@debian.org> 
 ## DP: ignore security.capability xattr for now 
 
-diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
-index 8fbc7bf..819e7bb 100644
---- a/lustre/llite/xattr.c
-+++ b/lustre/llite/xattr.c
-@@ -142,6 +142,11 @@ int ll_setxattr_common(struct inode *inode, const char 
*name,
-             (xattr_type == XATTR_LUSTRE_T && strcmp(name, "lustre.lov") == 0))
+Index: lustre/lustre/llite/xattr.c
+===================================================================
+--- lustre.orig/lustre/llite/xattr.c   2010-12-07 16:58:57.589545003 +0100
++++ lustre/lustre/llite/xattr.c        2010-12-07 17:00:17.853545002 +0100
+@@ -148,6 +148,11 @@
+             strcmp(name, "security.capability") == 0))
                  RETURN(0);
  
 +        /* b15587: ignore security.capability xattr for now */
@@ -17,15 +17,15 @@ index 8fbc7bf..819e7bb 100644
          ll_inode2fid(&fid, inode);
          rc = mdc_setxattr(sbi->ll_mdc_exp, &fid, valid,
                            name, value, size, 0, flags, &req);
-@@ -254,6 +259,11 @@ int ll_getxattr_common(struct inode *inode, const char 
*name,
-         if (rc)
-                 RETURN(rc);
+@@ -260,6 +265,11 @@
  
-+        /* b15587: ignore security.capability xattr for now */
-+        if ((xattr_type == XATTR_SECURITY_T &&
+         /* b15587: ignore security.capability xattr for now */
+         if ((xattr_type == XATTR_SECURITY_T &&
 +            strcmp(name, "security.capability") == 0))
 +                RETURN(-ENODATA);
 +
-         /* posix acl is under protection of LOOKUP lock. when calling to this,
-          * we just have path resolution to the target inode, so we have great
-          * chance that cached ACL is uptodate.
++        /* b15587: ignore security.capability xattr for now */
++        if ((xattr_type == XATTR_SECURITY_T &&
+             strcmp(name, "security.capability") == 0))
+                 RETURN(-ENODATA);
+ 
diff --git a/debian/patches/enable-quota.patch 
b/debian/patches/enable-quota.patch
old mode 100755
new mode 100644
index c3be2bf..71ceabe
--- a/debian/patches/enable-quota.patch
+++ b/debian/patches/enable-quota.patch
@@ -1,8 +1,9 @@
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: --enable-quota check was only run when building modules.
-diff -urNad lustre~/configure.ac lustre/configure.ac
---- lustre~/configure.ac       2009-03-12 10:32:27.000000000 +0100
-+++ lustre/configure.ac        2009-03-12 11:19:53.000000000 +0100
+Index: lustre/configure.ac
+===================================================================
+--- lustre.orig/configure.ac   2010-12-07 16:54:32.541545003 +0100
++++ lustre/configure.ac        2010-12-07 17:00:37.901545003 +0100
 @@ -8,6 +8,7 @@
  LB_CHECK_VERSION
  
@@ -11,10 +12,11 @@ diff -urNad lustre~/configure.ac lustre/configure.ac
  
  AC_CANONICAL_SYSTEM
  
-diff -urNad lustre~/lustre/autoconf/lustre-core.m4 
lustre/lustre/autoconf/lustre-core.m4
---- lustre~/lustre/autoconf/lustre-core.m4     2009-03-12 11:19:52.000000000 
+0100
-+++ lustre/lustre/autoconf/lustre-core.m4      2009-03-12 11:19:53.000000000 
+0100
-@@ -1813,6 +1813,7 @@
+Index: lustre/lustre/autoconf/lustre-core.m4
+===================================================================
+--- lustre.orig/lustre/autoconf/lustre-core.m4 2010-12-07 16:54:32.549545003 
+0100
++++ lustre/lustre/autoconf/lustre-core.m4      2010-12-07 17:00:37.901545003 
+0100
+@@ -2197,6 +2197,7 @@
  ])
  ])
  
diff --git a/debian/patches/fix-2.6.15-versioncheck.patch 
b/debian/patches/fix-2.6.15-versioncheck.patch
old mode 100755
new mode 100644
index eb8ba70..19066cf
--- a/debian/patches/fix-2.6.15-versioncheck.patch
+++ b/debian/patches/fix-2.6.15-versioncheck.patch
@@ -3,9 +3,11 @@
 ## DP: Upstream check assumes RedHat patched kernel.
 
 diff lustre-1.6.2/lustre/include/linux/lustre_compat25.h 
lustre-1.6.2/lustre/include/linux/lustre_compat25.h
---- lustre-1.6.2/lustre/include/linux/lustre_compat25.h        (revision 135)
-+++ lustre-1.6.2/lustre/include/linux/lustre_compat25.h        (working copy)
-@@ -75,7 +75,7 @@
+Index: lustre/lustre/include/linux/lustre_compat25.h
+===================================================================
+--- lustre.orig/lustre/include/linux/lustre_compat25.h 2010-12-07 
16:54:32.597545003 +0100
++++ lustre/lustre/include/linux/lustre_compat25.h      2010-12-07 
17:00:32.345545003 +0100
+@@ -106,7 +106,7 @@
  #define TRYLOCK_INODE_MUTEX(inode) (!down_trylock(&(inode)->i_sem))
  #endif /* HAVE_INODE_I_MUTEX */
  
diff --git a/debian/patches/fix-oot-builds.patch 
b/debian/patches/fix-oot-builds.patch
old mode 100755
new mode 100644
index e34bec6..e6e24a6
--- a/debian/patches/fix-oot-builds.patch
+++ b/debian/patches/fix-oot-builds.patch
@@ -2,10 +2,11 @@
 ## DP: forgot include dir in gcc flags and fix version_tag.pl to handle
 ## DP: out of tree builds.
 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/build/autoconf/lustre-build.m4 lustre/build/autoconf/lustre-build.m4
---- lustre~/build/autoconf/lustre-build.m4     2010-03-03 14:44:38.000000000 
+0100
-+++ lustre/build/autoconf/lustre-build.m4      2010-03-03 16:30:38.704635051 
+0100
-@@ -816,7 +816,7 @@
+Index: lustre/build/autoconf/lustre-build.m4
+===================================================================
+--- lustre.orig/build/autoconf/lustre-build.m4 2010-12-07 16:54:32.365545003 
+0100
++++ lustre/build/autoconf/lustre-build.m4      2010-12-07 17:00:45.137545002 
+0100
+@@ -737,7 +737,7 @@
        CC="$CC -m64"
  fi
  
@@ -14,9 +15,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
  AC_SUBST(LLCPPFLAGS)
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/autoMakefile.am lustre/lustre/autoMakefile.am
---- lustre~/lustre/autoMakefile.am     2010-01-23 03:07:58.000000000 +0100
-+++ lustre/lustre/autoMakefile.am      2010-03-03 16:30:38.704635051 +0100
+Index: lustre/lustre/autoMakefile.am
+===================================================================
+--- lustre.orig/lustre/autoMakefile.am 2010-12-07 16:54:32.369545003 +0100
++++ lustre/lustre/autoMakefile.am      2010-12-07 17:00:45.137545002 +0100
 @@ -85,7 +85,7 @@
  BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
  
@@ -26,19 +28,17 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
        echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
        cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null &&          \
                  $(RM) tmpver tmpdiff ||                                       
\
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl
---- lustre~/lustre/scripts/version_tag.pl      2010-03-03 14:44:38.000000000 
+0100
-+++ lustre/lustre/scripts/version_tag.pl       2010-03-03 16:33:54.136665590 
+0100
+Index: lustre/lustre/scripts/version_tag.pl
+===================================================================
+--- lustre.orig/lustre/scripts/version_tag.pl  2010-12-07 16:54:32.385545003 
+0100
++++ lustre/lustre/scripts/version_tag.pl       2010-12-07 17:00:45.137545002 
+0100
 @@ -166,17 +166,19 @@
          !$ver->open("$objdir/include/linux/version.h") &&
          !$ver->open("$dir/include/linux/utsrelease.h") &&
          !$ver->open("$dir/include/linux/version.h")) {
 -            die "Run make dep on '$dir'\n";
 -        }
-+            #die "Run make dep on '$dir'\n";
-+          $kernver = "UNKOWN-KERNEL";
-+        } else {
- 
+-
 -    while(defined($line = <$ver>)) {
 -        $line =~ /\#define UTS_RELEASE "(.*)"/;
 -        if ($1) {
@@ -47,6 +47,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
 -        }
 -    }
 -    $ver->close();
++            #die "Run make dep on '$dir'\n";
++          $kernver = "UNKOWN-KERNEL";
++        } else {
++
 +          while(defined($line = <$ver>)) {
 +              $line =~ /\#define UTS_RELEASE "(.*)"/;
 +              if ($1) {
diff --git a/debian/patches/fix-symlink-attack.patch 
b/debian/patches/fix-symlink-attack.patch
old mode 100755
new mode 100644
index 03406d5..5880109
--- a/debian/patches/fix-symlink-attack.patch
+++ b/debian/patches/fix-symlink-attack.patch
@@ -1,9 +1,10 @@
 ## fix-symlink-attack.dpatch by Patrick Winnertz <win...@debian.org>
 ## DP: Fix symlink attack on runiozone
 
-diff -urNad lustre-1.6.5.1~/lustre/tests/runiozone 
lustre-1.6.5.1/lustre/tests/runiozone
---- lustre-1.6.5.1~/lustre/tests/runiozone     2007-02-10 07:33:10.000000000 
+0100
-+++ lustre-1.6.5.1/lustre/tests/runiozone      2008-08-27 16:58:36.000000000 
+0200
+Index: lustre/lustre/tests/runiozone
+===================================================================
+--- lustre.orig/lustre/tests/runiozone 2010-12-07 16:54:32.473545003 +0100
++++ lustre/lustre/tests/runiozone      2010-12-07 17:00:40.373545001 +0100
 @@ -9,9 +9,11 @@
  LOOP=0
  rm -f endiozone
diff --git a/debian/patches/fix_bashisms_for_dash.patch 
b/debian/patches/fix_bashisms_for_dash.patch
old mode 100755
new mode 100644
index 8cdbe78..51a195f
--- a/debian/patches/fix_bashisms_for_dash.patch
+++ b/debian/patches/fix_bashisms_for_dash.patch
@@ -1,10 +1,11 @@
 ## remove-set_tunables.dpatch by Patrick Winnertz <win...@debian.org>
 ## DP: fix some bashisms by switching the interpreter from sh to bash
 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/ldiskfs/configure.ac lustre/ldiskfs/configure.ac
---- lustre~/ldiskfs/configure.ac       2010-07-28 14:28:02.884964948 +0200
-+++ lustre/ldiskfs/configure.ac        2010-07-28 14:28:03.136965577 +0200
-@@ -91,7 +91,7 @@
+Index: lustre/ldiskfs/configure.ac
+===================================================================
+--- lustre.orig/ldiskfs/configure.ac   2010-12-07 16:59:06.421545002 +0100
++++ lustre/ldiskfs/configure.ac        2010-12-07 17:00:50.253545002 +0100
+@@ -93,7 +93,7 @@
  fi
  
  AC_SUBST(BACKFS)
@@ -13,36 +14,40 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  AC_SUBST(BACKFSU) # We need a Upper string
  
  AM_CONDITIONAL(USE_EXT4, test x$enable_ext4 = xyes)
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/tests/llog-test.sh lustre/lustre/tests/llog-test.sh
---- lustre~/lustre/tests/llog-test.sh  2010-01-11 04:29:50.000000000 +0100
-+++ lustre/lustre/tests/llog-test.sh   2010-07-28 14:28:03.136965577 +0200
+Index: lustre/lustre/tests/llog-test.sh
+===================================================================
+--- lustre.orig/lustre/tests/llog-test.sh      2010-12-07 16:54:32.297545003 
+0100
++++ lustre/lustre/tests/llog-test.sh   2010-12-07 17:00:50.253545002 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
  set -e
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/tests/lnet-selftest.sh lustre/lustre/tests/lnet-selftest.sh
---- lustre~/lustre/tests/lnet-selftest.sh      2010-04-10 02:28:57.000000000 
+0200
-+++ lustre/lustre/tests/lnet-selftest.sh       2010-07-28 14:28:24.855977956 
+0200
+Index: lustre/lustre/tests/lnet-selftest.sh
+===================================================================
+--- lustre.orig/lustre/tests/lnet-selftest.sh  2010-12-07 16:54:32.281545003 
+0100
++++ lustre/lustre/tests/lnet-selftest.sh       2010-12-07 17:00:50.281545002 
+0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
  LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
  . $LUSTRE/tests/test-framework.sh
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/tests/mdsrate-stat-large.sh 
lustre/lustre/tests/mdsrate-stat-large.sh
---- lustre~/lustre/tests/mdsrate-stat-large.sh 2010-04-10 02:28:57.000000000 
+0200
-+++ lustre/lustre/tests/mdsrate-stat-large.sh  2010-07-28 14:28:03.136965577 
+0200
+Index: lustre/lustre/tests/mdsrate-stat-large.sh
+===================================================================
+--- lustre.orig/lustre/tests/mdsrate-stat-large.sh     2010-12-07 
16:54:32.285545003 +0100
++++ lustre/lustre/tests/mdsrate-stat-large.sh  2010-12-07 17:00:50.281545002 
+0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  #
  # This test was used in a set of CMD3 tests (cmd3-8 test).
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/tests/rundbench lustre/lustre/tests/rundbench
---- lustre~/lustre/tests/rundbench     2010-01-11 04:29:50.000000000 +0100
-+++ lustre/lustre/tests/rundbench      2010-07-28 14:28:03.136965577 +0200
+Index: lustre/lustre/tests/rundbench
+===================================================================
+--- lustre.orig/lustre/tests/rundbench 2010-12-07 16:54:32.277545003 +0100
++++ lustre/lustre/tests/rundbench      2010-12-07 17:00:50.281545002 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
diff --git a/debian/patches/fix_dentry_conf_test.patch 
b/debian/patches/fix_dentry_conf_test.patch
old mode 100755
new mode 100644
index 02feaa1..5400c12
--- a/debian/patches/fix_dentry_conf_test.patch
+++ b/debian/patches/fix_dentry_conf_test.patch
@@ -1,11 +1,11 @@
 ## no_default_debugging.patch by Patrick Winnertz <win...@debian.org>
 ## DP: HAVE_LINUX_EXPORTFS_H not defined in configure target :S
 
-diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
-index d01d8e0..ac8eb0e 100644
---- a/lustre/autoconf/lustre-core.m4
-+++ b/lustre/autoconf/lustre-core.m4
-@@ -1243,11 +1243,8 @@ LB_LINUX_TRY_COMPILE([
+Index: lustre/lustre/autoconf/lustre-core.m4
+===================================================================
+--- lustre.orig/lustre/autoconf/lustre-core.m4 2010-12-07 17:00:47.757545002 
+0100
++++ lustre/lustre/autoconf/lustre-core.m4      2010-12-07 17:00:52.705545002 
+0100
+@@ -1258,11 +1258,8 @@
  AC_DEFUN([LC_FH_TO_DENTRY],
  [AC_MSG_CHECKING([if kernel has .fh_to_dentry member in export_operations 
struct])
  LB_LINUX_TRY_COMPILE([
diff --git a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch 
b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
old mode 100755
new mode 100644
index 8b7974c..af2ff69
--- a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
+++ b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
@@ -1,10 +1,11 @@
 ## ldiskfs-detect-2.6.20-2.6.22.dpatch by Goswin von Brederlow 
<goswin-...@web.de>
 ## DP: Patch from Q-Leap Networks modified by Patrick winnertz 
<patrick.winne...@credativ.de>
 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/ldiskfs/configure.ac lustre/ldiskfs/configure.ac
---- lustre~/ldiskfs/configure.ac       2010-03-03 17:25:38.000000000 +0100
-+++ lustre/ldiskfs/configure.ac        2010-03-04 14:53:13.608332585 +0100
-@@ -112,11 +112,16 @@
+Index: lustre/ldiskfs/configure.ac
+===================================================================
+--- lustre.orig/ldiskfs/configure.ac   2010-12-07 16:54:33.185545003 +0100
++++ lustre/ldiskfs/configure.ac        2010-12-07 16:59:06.421545002 +0100
+@@ -114,11 +114,16 @@
                  else
                        LDISKFS_SERIES="2.6-rhel5.series"
                  fi
@@ -20,5 +21,5 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch'
  2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
 +2.6.26*) LDISKFS_SERIES="2.6.26-vanilla.series";;
  2.6.27*) LDISKFS_SERIES="2.6-sles11.series";;
+ 2.6.32.*) LDISKFS_SERIES="2.6-sles11.series";;
  *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix 
ldiskfs/configure.ac])
- esac
diff --git a/debian/patches/libsysio.patch b/debian/patches/libsysio.patch
old mode 100755
new mode 100644
index af47e5b..5941705
--- a/debian/patches/libsysio.patch
+++ b/debian/patches/libsysio.patch
@@ -1,8 +1,10 @@
 ## libsysio.dpatch by Goswin von Brederlow <goswin-...@web.de>
 ## DP: Use path relative to $srcdir instead of PWD to allow using a builddir
 
---- lustre-1.6.0.1/lustre/liblustre/Makefile.am~       2004-12-20 
00:06:24.000000000 +0100
-+++ lustre-1.6.0.1/lustre/liblustre/Makefile.am        2007-07-20 
12:33:52.000000000 +0200
+Index: lustre/lustre/liblustre/Makefile.am
+===================================================================
+--- lustre.orig/lustre/liblustre/Makefile.am   2010-12-07 16:54:32.881545003 
+0100
++++ lustre/lustre/liblustre/Makefile.am        2010-12-07 17:00:11.837545002 
+0100
 @@ -1,7 +1,7 @@
  ## Liblustre excecutables & libraries Makefile
  SUBDIRS = . tests
diff --git a/debian/patches/lustre_config.patch 
b/debian/patches/lustre_config.patch
old mode 100755
new mode 100644
index 7074710..e635193
--- a/debian/patches/lustre_config.patch
+++ b/debian/patches/lustre_config.patch
@@ -1,9 +1,10 @@
 ## lustre_config.dpatch by Patrick Winnertz <win...@debian.org>
 ## DP: Hard coded path to lc_common... not the best solution, but a solution
 
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_cluman.in 
lustre-1.6.4.1/lustre/scripts/lc_cluman.in
---- lustre-1.6.4.1~/lustre/scripts/lc_cluman.in        2007-03-23 
03:31:10.000000000 +0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_cluman.in 2007-12-21 12:04:45.000000000 
+0100
+Index: lustre/lustre/scripts/lc_cluman.in
+===================================================================
+--- lustre.orig/lustre/scripts/lc_cluman.in    2010-12-07 16:54:32.657545003 
+0100
++++ lustre/lustre/scripts/lc_cluman.in 2010-12-07 17:00:29.205545002 +0100
 @@ -38,7 +38,7 @@
  }
  
@@ -13,10 +14,11 @@ diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_cluman.in 
lustre-1.6.4.1/lustre/sc
  
  #****************************** Global variables 
******************************#
  TMP_DIR=${CLUMGR_TMP_DIR}             # Temporary directory
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_hb.in 
lustre-1.6.4.1/lustre/scripts/lc_hb.in
---- lustre-1.6.4.1~/lustre/scripts/lc_hb.in    2007-03-23 03:31:10.000000000 
+0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_hb.in     2007-12-21 12:04:58.000000000 
+0100
-@@ -31,7 +31,7 @@
+Index: lustre/lustre/scripts/lc_hb.in
+===================================================================
+--- lustre.orig/lustre/scripts/lc_hb.in        2010-12-07 16:54:32.649545003 
+0100
++++ lustre/lustre/scripts/lc_hb.in     2010-12-07 17:00:29.205545002 +0100
+@@ -34,7 +34,7 @@
  }
  
  # Get the library of functions
@@ -25,9 +27,10 @@ diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_hb.in 
lustre-1.6.4.1/lustre/script
  
  #****************************** Global variables 
******************************#
  # Heartbeat tools
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_lvm.in 
lustre-1.6.4.1/lustre/scripts/lc_lvm.in
---- lustre-1.6.4.1~/lustre/scripts/lc_lvm.in   2007-03-23 03:31:10.000000000 
+0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_lvm.in    2007-12-21 12:05:15.000000000 
+0100
+Index: lustre/lustre/scripts/lc_lvm.in
+===================================================================
+--- lustre.orig/lustre/scripts/lc_lvm.in       2010-12-07 16:54:32.673545003 
+0100
++++ lustre/lustre/scripts/lc_lvm.in    2010-12-07 17:00:29.205545002 +0100
 @@ -118,7 +118,7 @@
  }
  
@@ -37,9 +40,10 @@ diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_lvm.in 
lustre-1.6.4.1/lustre/scrip
  
  #***************************** Global variables *****************************#
  # All the LVM device items in the csv file
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_md.in 
lustre-1.6.4.1/lustre/scripts/lc_md.in
---- lustre-1.6.4.1~/lustre/scripts/lc_md.in    2007-06-09 09:09:09.000000000 
+0200
-+++ lustre-1.6.4.1/lustre/scripts/lc_md.in     2007-12-21 12:05:31.000000000 
+0100
+Index: lustre/lustre/scripts/lc_md.in
+===================================================================
+--- lustre.orig/lustre/scripts/lc_md.in        2010-12-07 16:54:32.685545003 
+0100
++++ lustre/lustre/scripts/lc_md.in     2010-12-07 17:00:29.205545002 +0100
 @@ -70,7 +70,7 @@
  }
  
@@ -49,9 +53,10 @@ diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_md.in 
lustre-1.6.4.1/lustre/script
  
  #***************************** Global variables *****************************#
  # All the MD device items in the csv file
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_modprobe.in 
lustre-1.6.4.1/lustre/scripts/lc_modprobe.in
---- lustre-1.6.4.1~/lustre/scripts/lc_modprobe.in      2007-03-23 
03:31:10.000000000 +0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_modprobe.in       2007-12-21 
12:05:50.000000000 +0100
+Index: lustre/lustre/scripts/lc_modprobe.in
+===================================================================
+--- lustre.orig/lustre/scripts/lc_modprobe.in  2010-12-07 16:54:32.629545003 
+0100
++++ lustre/lustre/scripts/lc_modprobe.in       2010-12-07 17:00:29.205545002 
+0100
 @@ -6,7 +6,7 @@
  
#################################################################################
  
@@ -61,10 +66,11 @@ diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_modprobe.in 
lustre-1.6.4.1/lustre/
  
  # Check the kernel version
  KERNEL_VERSION=`uname -r`
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_net.in 
lustre-1.6.4.1/lustre/scripts/lc_net.in
---- lustre-1.6.4.1~/lustre/scripts/lc_net.in   2007-03-23 03:31:10.000000000 
+0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_net.in    2007-12-21 12:06:06.000000000 
+0100
-@@ -27,7 +27,7 @@
+Index: lustre/lustre/scripts/lc_net.in
+===================================================================
+--- lustre.orig/lustre/scripts/lc_net.in       2010-12-07 16:54:32.665545003 
+0100
++++ lustre/lustre/scripts/lc_net.in    2010-12-07 17:00:29.209545002 +0100
+@@ -30,7 +30,7 @@
  }
  
  # Get the library of functions
@@ -73,10 +79,11 @@ diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_net.in 
lustre-1.6.4.1/lustre/scrip
  
  VERBOSE_OUTPUT=false
  # Get and check the positional parameters
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lustre_config.in 
lustre-1.6.4.1/lustre/scripts/lustre_config.in
---- lustre-1.6.4.1~/lustre/scripts/lustre_config.in    2007-10-14 
06:33:14.000000000 +0200
-+++ lustre-1.6.4.1/lustre/scripts/lustre_config.in     2007-12-21 
12:04:25.000000000 +0100
-@@ -230,7 +230,7 @@
+Index: lustre/lustre/scripts/lustre_config.in
+===================================================================
+--- lustre.orig/lustre/scripts/lustre_config.in        2010-12-07 
16:54:32.621545003 +0100
++++ lustre/lustre/scripts/lustre_config.in     2010-12-07 17:00:29.209545002 
+0100
+@@ -233,7 +233,7 @@
  }
  
  # Get the library of functions
@@ -84,11 +91,12 @@ diff -urNad lustre-1.6.4.1~/lustre/scripts/lustre_config.in 
lustre-1.6.4.1/lustr
 +. /usr/share/lustre/lc_common
  
  #***************************** Global variables *****************************#
- declare -a MGS_NODENAME             # node names of the MGS servers
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lustre_createcsv.in 
lustre-1.6.4.1/lustre/scripts/lustre_createcsv.in
---- lustre-1.6.4.1~/lustre/scripts/lustre_createcsv.in 2007-10-14 
06:33:14.000000000 +0200
-+++ lustre-1.6.4.1/lustre/scripts/lustre_createcsv.in  2007-12-21 
12:06:43.000000000 +0100
-@@ -37,7 +37,7 @@
+ declare -a NODE_NAMES               # node names in the failover group
+Index: lustre/lustre/scripts/lustre_createcsv.in
+===================================================================
+--- lustre.orig/lustre/scripts/lustre_createcsv.in     2010-12-07 
16:54:32.637545003 +0100
++++ lustre/lustre/scripts/lustre_createcsv.in  2010-12-07 17:00:29.209545002 
+0100
+@@ -39,7 +39,7 @@
  }
  
  # Get the library of functions
diff --git a/debian/patches/lustre_manpage.patch 
b/debian/patches/lustre_manpage.patch
old mode 100755
new mode 100644
index 1be2e19..db51779
--- a/debian/patches/lustre_manpage.patch
+++ b/debian/patches/lustre_manpage.patch
@@ -1,8 +1,10 @@
 ## lustre_manpatch.dpatch by Patrick Winnert <win...@debian.org>
 ## DP: registred symbol not allowed.
 
---- lustre-1.6.0.1/lustre/doc/lustre.7 2007-07-20 14:27:09.000000000 +0200
-+++ lustre-1.6.0.1/lustre/doc/lustre.7 2007-07-20 14:29:35.000000000 +0200
+Index: lustre/lustre/doc/lustre.7
+===================================================================
+--- lustre.orig/lustre/doc/lustre.7    2010-12-07 16:54:32.757545003 +0100
++++ lustre/lustre/doc/lustre.7 2010-12-07 17:00:23.361545002 +0100
 @@ -8,7 +8,7 @@
  .SH SYNOPSIS
  A high-performance file system designed for clusters.
@@ -11,4 +13,4 @@
 +.B Lustre\[rg]
  is a high-performance, massively-scalable, POSIX-compliant network file system
  designed for the world's largest high-performance compute clusters. Lustre
- is under active development from Cluster FileSystems (http://clusterfs.com).
+ is under active development from Sun Microsystems (http://www.lustre.org).
diff --git a/debian/patches/no-darwin.patch b/debian/patches/no-darwin.patch
old mode 100755
new mode 100644
index 92d1a55..861ddf4
--- a/debian/patches/no-darwin.patch
+++ b/debian/patches/no-darwin.patch
@@ -2,9 +2,10 @@
 ## DP: Remove faulty 'if DARWIN' blocks from autoMakefile.am files
 ## DP: Remove darwin subdirs from autoMakefile.am files
 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/include/libcfs/Makefile.am lustre/lnet/include/libcfs/Makefile.am
---- lustre~/lnet/include/libcfs/Makefile.am    2010-05-05 11:24:03.000000000 
+0200
-+++ lustre/lnet/include/libcfs/Makefile.am     2010-05-05 11:40:59.198032073 
+0200
+Index: lustre/lnet/include/libcfs/Makefile.am
+===================================================================
+--- lustre.orig/lnet/include/libcfs/Makefile.am        2010-12-07 
16:54:32.917545003 +0100
++++ lustre/lnet/include/libcfs/Makefile.am     2010-12-07 17:00:08.541545001 
+0100
 @@ -1,8 +1,8 @@
  SUBDIRS := linux
 -if DARWIN
@@ -18,9 +19,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
        portals_utils.h types.h user-lock.h user-prim.h user-time.h \
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/include/libcfs/Makefile.am.~1~ 
lustre/lnet/include/libcfs/Makefile.am.~1~
---- lustre~/lnet/include/libcfs/Makefile.am.~1~        1970-01-01 
01:00:00.000000000 +0100
-+++ lustre/lnet/include/libcfs/Makefile.am.~1~ 2010-05-05 11:24:03.000000000 
+0200
+Index: lustre/lnet/include/libcfs/Makefile.am.~1~
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ lustre/lnet/include/libcfs/Makefile.am.~1~ 2010-12-07 17:00:08.541545001 
+0100
 @@ -0,0 +1,9 @@
 +SUBDIRS := linux
 +if DARWIN
@@ -31,9 +33,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
 +EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
 +      portals_utils.h types.h user-lock.h user-prim.h user-time.h \
 +      user-tcpip.h user-bitops.h bitmap.h
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/include/lnet/Makefile.am lustre/lnet/include/lnet/Makefile.am
---- lustre~/lnet/include/lnet/Makefile.am      2010-05-05 11:24:03.000000000 
+0200
-+++ lustre/lnet/include/lnet/Makefile.am       2010-05-05 11:39:32.333472438 
+0200
+Index: lustre/lnet/include/lnet/Makefile.am
+===================================================================
+--- lustre.orig/lnet/include/lnet/Makefile.am  2010-12-07 16:54:32.933545003 
+0100
++++ lustre/lnet/include/lnet/Makefile.am       2010-12-07 17:00:08.541545001 
+0100
 @@ -1,10 +1,10 @@
  lnetdir=$(includedir)/lnet
  
@@ -49,9 +52,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  EXTRA_DIST = api.h api-support.h \
        lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/include/lnet/Makefile.am.~1~ 
lustre/lnet/include/lnet/Makefile.am.~1~
---- lustre~/lnet/include/lnet/Makefile.am.~1~  1970-01-01 01:00:00.000000000 
+0100
-+++ lustre/lnet/include/lnet/Makefile.am.~1~   2010-05-05 11:24:03.000000000 
+0200
+Index: lustre/lnet/include/lnet/Makefile.am.~1~
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ lustre/lnet/include/lnet/Makefile.am.~1~   2010-12-07 17:00:08.541545001 
+0100
 @@ -0,0 +1,11 @@
 +lnetdir=$(includedir)/lnet
 +
@@ -64,25 +68,15 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
 +EXTRA_DIST = api.h api-support.h \
 +      lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
 +        socklnd.h ptllnd.h ptllnd_wire.h lnetst.h lnet-sysctl.h
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/klnds/socklnd/autoMakefile.am 
lustre/lnet/klnds/socklnd/autoMakefile.am
---- lustre~/lnet/klnds/socklnd/autoMakefile.am 2010-04-10 02:28:56.000000000 
+0200
-+++ lustre/lnet/klnds/socklnd/autoMakefile.am  2010-05-05 11:35:37.533473974 
+0200
+Index: lustre/lnet/klnds/socklnd/autoMakefile.am
+===================================================================
+--- lustre.orig/lnet/klnds/socklnd/autoMakefile.am     2010-12-07 
16:54:32.969545003 +0100
++++ lustre/lnet/klnds/socklnd/autoMakefile.am  2010-12-07 17:00:08.545545001 
+0100
 @@ -6,21 +6,21 @@
  endif # LINUX
  endif # MODULES
  
 -if DARWIN
--
--  macos_PROGRAMS := ksocklnd
--
--  nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c 
socklnd_modparams.c socklnd_lib-darwin.c
--
--  ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
--  ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
--  ksocklnd_LDADD := $(EXTRA_KLIBS)
--
--  plist_DATA := Info.plist
--  install_data_hook := fix-kext-ownership
 +#if DARWIN
 +#
 +#  macos_PROGRAMS := ksocklnd
@@ -96,6 +90,17 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
 +#  plist_DATA := Info.plist
 +#  install_data_hook := fix-kext-ownership
  
+-  macos_PROGRAMS := ksocklnd
+-
+-  nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c 
socklnd_modparams.c socklnd_lib-darwin.c
+-
+-  ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
+-  ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
+-  ksocklnd_LDADD := $(EXTRA_KLIBS)
+-
+-  plist_DATA := Info.plist
+-  install_data_hook := fix-kext-ownership
+-
 -  EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
 -endif # DARWIN
 +#  EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
@@ -103,9 +108,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  install-data-hook: $(install_data_hook)
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/libcfs/autoMakefile.am lustre/lnet/libcfs/autoMakefile.am
---- lustre~/lnet/libcfs/autoMakefile.am        2010-05-05 11:24:03.000000000 
+0200
-+++ lustre/lnet/libcfs/autoMakefile.am 2010-05-05 11:41:39.355057967 +0200
+Index: lustre/lnet/libcfs/autoMakefile.am
+===================================================================
+--- lustre.orig/lnet/libcfs/autoMakefile.am    2010-12-07 16:54:32.945545003 
+0100
++++ lustre/lnet/libcfs/autoMakefile.am 2010-12-07 17:00:08.545545001 +0100
 @@ -35,10 +35,10 @@
  #
  
@@ -166,9 +172,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  endif
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lnet/lnet/autoMakefile.am lustre/lnet/lnet/autoMakefile.am
---- lustre~/lnet/lnet/autoMakefile.am  2010-04-10 02:28:56.000000000 +0200
-+++ lustre/lnet/lnet/autoMakefile.am   2010-05-05 11:35:37.533473974 +0200
+Index: lustre/lnet/lnet/autoMakefile.am
+===================================================================
+--- lustre.orig/lnet/lnet/autoMakefile.am      2010-12-07 16:54:32.953545003 
+0100
++++ lustre/lnet/lnet/autoMakefile.am   2010-12-07 17:00:08.545545001 +0100
 @@ -18,23 +18,23 @@
  modulenet_DATA = lnet$(KMODEXT)
  endif # LINUX
@@ -210,9 +217,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  endif # MODULES
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/lov/autoMakefile.am lustre/lustre/lov/autoMakefile.am
---- lustre~/lustre/lov/autoMakefile.am 2010-04-10 02:28:57.000000000 +0200
-+++ lustre/lustre/lov/autoMakefile.am  2010-05-05 11:35:37.533473974 +0200
+Index: lustre/lustre/lov/autoMakefile.am
+===================================================================
+--- lustre.orig/lustre/lov/autoMakefile.am     2010-12-07 16:54:32.981545003 
+0100
++++ lustre/lustre/lov/autoMakefile.am  2010-12-07 17:00:08.545545001 +0100
 @@ -46,29 +46,29 @@
  modulefs_DATA = lov$(KMODEXT)
  endif
@@ -232,6 +240,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
 -        lov_qos.c       \
 -        lov_offset.c    \
 -        lov_internal.h
+-
+-lov_CFLAGS := $(EXTRA_KCFLAGS)
+-lov_LDFLAGS := $(EXTRA_KLDFLAGS)
+-lov_LDADD := $(EXTRA_KLIBS)
 +#lov_SOURCES :=          \
 +#        lov_log.c       \
 +#     lov_pool.c      \
@@ -242,10 +254,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
 +#        lov_qos.c       \
 +#        lov_offset.c    \
 +#        lov_internal.h
- 
--lov_CFLAGS := $(EXTRA_KCFLAGS)
--lov_LDFLAGS := $(EXTRA_KLDFLAGS)
--lov_LDADD := $(EXTRA_KLIBS)
++
 +#lov_CFLAGS := $(EXTRA_KCFLAGS)
 +#lov_LDFLAGS := $(EXTRA_KLDFLAGS)
 +#lov_LDADD := $(EXTRA_KLIBS)
@@ -261,9 +270,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  endif # MODULES
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/lvfs/autoMakefile.am lustre/lustre/lvfs/autoMakefile.am
---- lustre~/lustre/lvfs/autoMakefile.am        2010-04-10 02:28:57.000000000 
+0200
-+++ lustre/lustre/lvfs/autoMakefile.am 2010-05-05 11:35:37.533473974 +0200
+Index: lustre/lustre/lvfs/autoMakefile.am
+===================================================================
+--- lustre.orig/lustre/lvfs/autoMakefile.am    2010-12-07 16:54:32.989545003 
+0100
++++ lustre/lustre/lvfs/autoMakefile.am 2010-12-07 17:00:08.545545001 +0100
 @@ -85,21 +85,21 @@
  
  endif # LINUX
@@ -301,9 +311,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  else # MODULES
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/obdclass/autoMakefile.am lustre/lustre/obdclass/autoMakefile.am
---- lustre~/lustre/obdclass/autoMakefile.am    2010-05-05 11:24:04.000000000 
+0200
-+++ lustre/lustre/obdclass/autoMakefile.am     2010-05-05 11:42:14.697472299 
+0200
+Index: lustre/lustre/obdclass/autoMakefile.am
+===================================================================
+--- lustre.orig/lustre/obdclass/autoMakefile.am        2010-12-07 
16:54:33.033545003 +0100
++++ lustre/lustre/obdclass/autoMakefile.am     2010-12-07 17:00:08.545545001 
+0100
 @@ -1,8 +1,8 @@
  SUBDIRS := linux
 -if DARWIN
@@ -362,9 +373,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  endif # MODULES
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/obdecho/autoMakefile.am lustre/lustre/obdecho/autoMakefile.am
---- lustre~/lustre/obdecho/autoMakefile.am     2010-01-11 04:29:50.000000000 
+0100
-+++ lustre/lustre/obdecho/autoMakefile.am      2010-05-05 11:35:37.533473974 
+0200
+Index: lustre/lustre/obdecho/autoMakefile.am
+===================================================================
+--- lustre.orig/lustre/obdecho/autoMakefile.am 2010-12-07 16:54:33.001545003 
+0100
++++ lustre/lustre/obdecho/autoMakefile.am      2010-12-07 17:00:08.545545001 
+0100
 @@ -46,22 +46,22 @@
  modulefs_DATA = obdecho$(KMODEXT)
  endif
@@ -404,9 +416,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  endif # MODULES
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/osc/autoMakefile.am lustre/lustre/osc/autoMakefile.am
---- lustre~/lustre/osc/autoMakefile.am 2010-04-10 02:28:57.000000000 +0200
-+++ lustre/lustre/osc/autoMakefile.am  2010-05-05 11:35:37.533473974 +0200
+Index: lustre/lustre/osc/autoMakefile.am
+===================================================================
+--- lustre.orig/lustre/osc/autoMakefile.am     2010-12-07 16:54:33.021545003 
+0100
++++ lustre/lustre/osc/autoMakefile.am  2010-12-07 17:00:08.549545001 +0100
 @@ -47,22 +47,22 @@
  modulefs_DATA = osc$(KMODEXT)
  endif
@@ -446,9 +459,10 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' 
'--exclude=.git' '--exclude=.arch'
  
  endif
  
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/ptlrpc/autoMakefile.am lustre/lustre/ptlrpc/autoMakefile.am
---- lustre~/lustre/ptlrpc/autoMakefile.am      2010-04-10 02:28:57.000000000 
+0200
-+++ lustre/lustre/ptlrpc/autoMakefile.am       2010-05-05 11:35:37.533473974 
+0200
+Index: lustre/lustre/ptlrpc/autoMakefile.am
+===================================================================
+--- lustre.orig/lustre/ptlrpc/autoMakefile.am  2010-12-07 16:54:33.009545003 
+0100
++++ lustre/lustre/ptlrpc/autoMakefile.am       2010-12-07 17:00:08.549545001 
+0100
 @@ -68,39 +68,39 @@
  modulefs_DATA = ptlrpc$(KMODEXT)
  endif #LINUX
diff --git a/debian/patches/no-strict-aliasing.patch 
b/debian/patches/no-strict-aliasing.patch
old mode 100755
new mode 100644
index 450d334..427e96d
--- a/debian/patches/no-strict-aliasing.patch
+++ b/debian/patches/no-strict-aliasing.patch
@@ -1,10 +1,11 @@
 ## no_default_debugging.patch by Patrick Winnertz <win...@debian.org>
 ## DP: Build lustre wit -fno-strict-aliasing as it otherwise fails to compile 
with gcc-4.4
 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
---- lustre~/lustre/autoconf/lustre-core.m4     2010-08-04 12:56:24.000000000 
+0200
-+++ lustre/lustre/autoconf/lustre-core.m4      2010-08-04 12:57:31.810494143 
+0200
-@@ -2269,9 +2269,9 @@
+Index: lustre/lustre/autoconf/lustre-core.m4
+===================================================================
+--- lustre.orig/lustre/autoconf/lustre-core.m4 2010-12-07 17:00:37.901545003 
+0100
++++ lustre/lustre/autoconf/lustre-core.m4      2010-12-07 17:00:47.757545002 
+0100
+@@ -2344,9 +2344,9 @@
  AC_DEFUN([LC_CONFIGURE],
  [LC_CONFIG_OBD_BUFFER_SIZE
  
diff --git a/debian/patches/no_default_debugging.patch 
b/debian/patches/no_default_debugging.patch
old mode 100755
new mode 100644
index bc2015a..23bb126
--- a/debian/patches/no_default_debugging.patch
+++ b/debian/patches/no_default_debugging.patch
@@ -1,10 +1,11 @@
 ## no_default_debugging.patch by Goswin von Brederlow <goswin-...@web.de>
 ## DP: Patch from Q-Leap Networks
 
-diff -urNad lustre-1.6.5-rc2~/lnet/libcfs/debug.c 
lustre-1.6.5-rc2/lnet/libcfs/debug.c
---- lustre-1.6.5-rc2~/lnet/libcfs/debug.c      2008-05-09 13:44:34.000000000 
+0200
-+++ lustre-1.6.5-rc2/lnet/libcfs/debug.c       2008-05-09 13:46:09.000000000 
+0200
-@@ -34,13 +34,13 @@
+Index: lustre/lnet/libcfs/debug.c
+===================================================================
+--- lustre.orig/lnet/libcfs/debug.c    2010-12-07 16:54:33.125545003 +0100
++++ lustre/lnet/libcfs/debug.c 2010-12-07 16:59:14.421545003 +0100
+@@ -52,13 +52,13 @@
  static char debug_file_name[1024];
  
  #ifdef __KERNEL__
diff --git a/debian/patches/page-size-undef-fixes.patch 
b/debian/patches/page-size-undef-fixes.patch
old mode 100755
new mode 100644
index 63e185d..f77f48f
--- a/debian/patches/page-size-undef-fixes.patch
+++ b/debian/patches/page-size-undef-fixes.patch
@@ -1,11 +1,13 @@
 ## page-size-undef-fixes.dpatch by  <dmlb2...@gmail.com>
 ## DP: set PAGE_SHIFT if this macro is undefined
 
---- lustre-1.6.0.1/lnet/include/libcfs/user-prim.h     2007-05-24 
07:23:17.000000000 -0700
-+++ lustre-1.6.0.1/lnet/include/libcfs/user-prim.h     2007-05-24 
07:24:04.000000000 -0700
-@@ -105,6 +105,12 @@
+Index: lustre/lnet/include/libcfs/user-prim.h
+===================================================================
+--- lustre.orig/lnet/include/libcfs/user-prim.h        2010-12-07 
16:57:17.801545003 +0100
++++ lustre/lnet/include/libcfs/user-prim.h     2010-12-07 16:58:38.857545002 
+0100
+@@ -140,6 +140,12 @@
  
- typedef struct page cfs_page_t;
+ #else
  
 +#ifndef PAGE_SHIFT
 +#define PAGE_SHIFT 12 /* 4KB page size if not defined */
diff --git a/debian/patches/posix_acl.patch b/debian/patches/posix_acl.patch
old mode 100755
new mode 100644
index b1a18a3..1cbaeeb
--- a/debian/patches/posix_acl.patch
+++ b/debian/patches/posix_acl.patch
@@ -1,9 +1,10 @@
 ## posix_acl.patch by Goswin von Brederlow <goswin-...@web.de>
 ## DP: Patch from Q-Leap Networks
 
-diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
---- lustre~/lustre/llite/file.c        2009-03-12 10:33:45.000000000 +0100
-+++ lustre/lustre/llite/file.c 2009-03-12 10:41:51.000000000 +0100
+Index: lustre/lustre/llite/file.c
+===================================================================
+--- lustre.orig/lustre/llite/file.c    2010-12-07 16:54:33.281545003 +0100
++++ lustre/lustre/llite/file.c 2010-12-07 16:58:57.589545003 +0100
 @@ -45,6 +45,7 @@
  #include <lustre_lite.h>
  #include <linux/pagemap.h>
@@ -12,9 +13,10 @@ diff -urNad lustre~/lustre/llite/file.c 
lustre/lustre/llite/file.c
  #include "llite_internal.h"
  #include <lustre/ll_fiemap.h>
  
-diff -urNad lustre~/lustre/llite/xattr.c lustre/lustre/llite/xattr.c
---- lustre~/lustre/llite/xattr.c       2009-03-12 10:27:57.000000000 +0100
-+++ lustre/lustre/llite/xattr.c        2009-03-12 10:40:31.000000000 +0100
+Index: lustre/lustre/llite/xattr.c
+===================================================================
+--- lustre.orig/lustre/llite/xattr.c   2010-12-07 16:54:33.273545003 +0100
++++ lustre/lustre/llite/xattr.c        2010-12-07 16:58:57.589545003 +0100
 @@ -38,6 +38,7 @@
  #include <linux/sched.h>
  #include <linux/mm.h>
@@ -23,9 +25,10 @@ diff -urNad lustre~/lustre/llite/xattr.c 
lustre/lustre/llite/xattr.c
  
  #define DEBUG_SUBSYSTEM S_LLITE
  
-diff -urNad lustre~/lustre/mdc/mdc_locks.c lustre/lustre/mdc/mdc_locks.c
---- lustre~/lustre/mdc/mdc_locks.c     2009-03-12 10:27:57.000000000 +0100
-+++ lustre/lustre/mdc/mdc_locks.c      2009-03-12 10:40:31.000000000 +0100
+Index: lustre/lustre/mdc/mdc_locks.c
+===================================================================
+--- lustre.orig/lustre/mdc/mdc_locks.c 2010-12-07 16:54:33.249545003 +0100
++++ lustre/lustre/mdc/mdc_locks.c      2010-12-07 16:58:57.589545003 +0100
 @@ -44,6 +44,7 @@
  # include <linux/pagemap.h>
  # include <linux/miscdevice.h>
@@ -34,9 +37,10 @@ diff -urNad lustre~/lustre/mdc/mdc_locks.c 
lustre/lustre/mdc/mdc_locks.c
  #else
  # include <liblustre.h>
  #endif
-diff -urNad lustre~/lustre/mdc/mdc_request.c lustre/lustre/mdc/mdc_request.c
---- lustre~/lustre/mdc/mdc_request.c   2009-03-12 10:27:57.000000000 +0100
-+++ lustre/lustre/mdc/mdc_request.c    2009-03-12 10:40:31.000000000 +0100
+Index: lustre/lustre/mdc/mdc_request.c
+===================================================================
+--- lustre.orig/lustre/mdc/mdc_request.c       2010-12-07 16:54:33.253545003 
+0100
++++ lustre/lustre/mdc/mdc_request.c    2010-12-07 16:58:57.593545003 +0100
 @@ -44,6 +44,7 @@
  # include <linux/pagemap.h>
  # include <linux/miscdevice.h>
@@ -45,9 +49,10 @@ diff -urNad lustre~/lustre/mdc/mdc_request.c 
lustre/lustre/mdc/mdc_request.c
  #else
  # include <liblustre.h>
  #endif
-diff -urNad lustre~/lustre/mds/handler.c lustre/lustre/mds/handler.c
---- lustre~/lustre/mds/handler.c       2009-03-12 10:40:31.000000000 +0100
-+++ lustre/lustre/mds/handler.c        2009-03-12 10:42:18.000000000 +0100
+Index: lustre/lustre/mds/handler.c
+===================================================================
+--- lustre.orig/lustre/mds/handler.c   2010-12-07 16:54:33.265545003 +0100
++++ lustre/lustre/mds/handler.c        2010-12-07 16:58:57.593545003 +0100
 @@ -52,6 +52,7 @@
  #include <linux/random.h>
  #include <linux/fs.h>
diff --git a/debian/patches/tex2pdf.patch b/debian/patches/tex2pdf.patch
old mode 100755
new mode 100644
index bb2c7a6..d340088
--- a/debian/patches/tex2pdf.patch
+++ b/debian/patches/tex2pdf.patch
@@ -1,8 +1,9 @@
 ## DP: prevend tex2pdf from writing to a location outside the build dir
 
-diff -urNad lustre-1.6.2.obsolete.0.125913187702285~/lustre/doc/tex2pdf 
lustre-1.6.2.obsolete.0.125913187702285/lustre/doc/tex2pdf
---- lustre-1.6.2~/lustre/doc/tex2pdf   2002-09-17 22:11:35.000000000 +0200
-+++ lustre-1.6.2/lustre/doc/tex2pdf    2007-09-18 11:30:03.000000000 +0200
+Index: lustre/lustre/doc/tex2pdf
+===================================================================
+--- lustre.orig/lustre/doc/tex2pdf     2010-12-07 16:54:32.721545003 +0100
++++ lustre/lustre/doc/tex2pdf  2010-12-07 17:00:26.357545002 +0100
 @@ -61,9 +61,8 @@
  my $MYHOSTNAME=hostname;
  my $MYNAME=basename $0;
diff --git a/debian/patches/use_bash_instead_of_sh.patch 
b/debian/patches/use_bash_instead_of_sh.patch
old mode 100755
new mode 100644
index 8cafa64..97c03a2
--- a/debian/patches/use_bash_instead_of_sh.patch
+++ b/debian/patches/use_bash_instead_of_sh.patch
@@ -2,18 +2,20 @@
 ## DP: This script uses functions not available on plain sh shell, therefore
 ## DP: using /bin/bash instead
 
-diff -urNad lustre~/lustre/tests/acl/make-tree 
lustre/lustre/tests/acl/make-tree
---- lustre~/lustre/tests/acl/make-tree 2005-06-21 00:18:48.000000000 +0200
-+++ lustre/lustre/tests/acl/make-tree  2008-10-10 09:32:09.000000000 +0200
+Index: lustre/lustre/tests/acl/make-tree
+===================================================================
+--- lustre.orig/lustre/tests/acl/make-tree     2010-12-07 16:54:32.421545003 
+0100
++++ lustre/lustre/tests/acl/make-tree  2010-12-07 17:00:42.689545003 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
  
  # reduce LEVELS from 3 => 2 by CFS
  LEVELS=2 ;            [ -z "$1" ] || LEVELS=$1
-diff -urNad lustre~/lustre/tests/insanity.sh lustre/lustre/tests/insanity.sh
---- lustre~/lustre/tests/insanity.sh   2008-01-11 13:30:26.000000000 +0100
-+++ lustre/lustre/tests/insanity.sh    2008-10-10 09:32:19.000000000 +0200
+Index: lustre/lustre/tests/insanity.sh
+===================================================================
+--- lustre.orig/lustre/tests/insanity.sh       2010-12-07 16:54:32.433545003 
+0100
++++ lustre/lustre/tests/insanity.sh    2010-12-07 17:00:42.689545003 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to