From 3cef39aea0abd0c2967182d427da6b178c29a62a Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Sun, 30 Dec 2007 22:47:33 +0000
Subject: [PATCH] * Apply additional upstream patches to the 2.6.24 support to
 fix   builds with older kernels.  Thanks to Felix Koop for the testing.  
 (Closes: #458331)

---
 debian/changelog            |  8 ++++++++
 debian/patches/linux-2.6.24 | 36 +++++++++++++++++++++++++++++++-----
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e31c573d..6441166b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openafs (1.4.6.dfsg1-2) unstable; urgency=low
+
+  * Apply additional upstream patches to the 2.6.24 support to fix
+    builds with older kernels.  Thanks to Felix Koop for the testing.
+    (Closes: #458331)
+
+ -- Russ Allbery <rra@debian.org>  Sun, 30 Dec 2007 14:42:56 -0800
+
 openafs (1.4.6.dfsg1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/linux-2.6.24 b/debian/patches/linux-2.6.24
index fa0aaee3b..930e29996 100644
--- a/debian/patches/linux-2.6.24
+++ b/debian/patches/linux-2.6.24
@@ -4,8 +4,10 @@ STABLE14-linux-afs-unlinked-file-dentry-flagging-20071031
 STABLE14-linux-nsec-timestamp-zero-20071106
 STABLE14-linux-splice-support-20071106
 STABLE14-linux-2624-20071123
+STABLE14-linux-try-kbuild-deal-with-old-modpost-20071127
+STABLE14-linux24-kernel-configure-test-20071208
 
-Debian Bug#456258
+Debian Bug#456258, Bug#458331
 
 --- openafs.orig/acinclude.m4
 +++ openafs/acinclude.m4
@@ -314,7 +316,32 @@ Debian Bug#456258
  
  obj-m += conftest.o
  _ACEOF
-@@ -65,3 +68,16 @@
+@@ -24,8 +27,9 @@
+ 
+ MODULE_LICENSE("http://www.openafs.org/dl/license10.html");
+ _ACEOF
+-    echo make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD
+-    make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err
++    echo make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD &&
++    make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err &&
++    ! grep "^WARNING: .* undefined!$" conftest.err >/dev/null 2>&1
+     then [$3]
+     else
+       sed '/^ *+/d' conftest.err >&AS_MESSAGE_LOG_FD
+@@ -42,8 +46,10 @@
+ #
+ AC_DEFUN([AC_TRY_KBUILD24], [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ $CPPFLAGS"
+-  AC_TRY_COMPILE([$1], [$2], [$3], [$4])
++  CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ -Werror-implicit-function-declaration $CPPFLAGS"
++  AC_TRY_COMPILE([
++#include <linux/kernel.h>
++$1], [$2], [$3], [$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+ 
+ 
+@@ -65,3 +71,16 @@
      [],:,AC_MSG_RESULT(no)
      AC_MSG_FAILURE([Fix problem or use --disable-kernel-module...]))
    AC_MSG_RESULT(yes)])
@@ -333,7 +360,7 @@ Debian Bug#456258
 +    AC_MSG_RESULT($ac_linux_kbuild_requires_extra_cflags)])
 --- openafs.orig/src/cf/linux-test4.m4
 +++ openafs/src/cf/linux-test4.m4
-@@ -894,3 +894,59 @@
+@@ -894,3 +894,58 @@
        ac_cv_linux_fs_struct_fop_has_sendfile=no)])
    AC_MSG_RESULT($ac_cv_linux_fs_struct_fop_has_sendfile)])
  
@@ -387,8 +414,7 @@ Debian Bug#456258
 +  AC_CACHE_VAL([ac_cv_linux_sysctl_table_checking], [
 +    AC_TRY_KBUILD(
 +[#include <linux/sysctl.h>],
-+[extern int sysctl_check_table(struct ctl_table *t);
-+sysctl_check_table(NULL);],
++[ sysctl_check_table(NULL);],
 +      ac_cv_linux_sysctl_table_checking=yes,
 +      ac_cv_linux_sysctl_table_checking=no)])
 +  AC_MSG_RESULT($ac_cv_linux_sysctl_table_checking)])
-- 
2.39.5