Update patches for 1.4.7pre3.

diff --git a/debian/patches/dfsg b/debian/patches/dfsg
index f969444e34c01fafa0a8af57376dab1ad5e07fbc..3450fc74fe5999737df5f367fba1a46f40f4f3f1 100644 (file)
--- a/debian/patches/dfsg
+++ b/debian/patches/dfsg
@@ -62,7 +62,7 @@ upstream for obvious reasons.
 +          afs_atomlist.c afs_lhash.c snprintf.c
 --- openafs.orig/configure.in
 +++ openafs/configure.in
-@@ -83,9 +83,6 @@
+@@ -85,9 +85,6 @@
  src/mpp/Makefile \
  src/null/Makefile \
  src/package/Makefile \

diff --git a/debian/patches/linux-restore-iget b/debian/patches/linux-restore-iget
deleted file mode 100644 (file)
index 0eb0875..0000000
--- a/debian/patches/linux-restore-iget
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixes an oops on startup for Linux 2.4.24 kernels.
-
-STABLE14-linux-restore-iget-cachemgr-20080326
-
---- openafs.orig/src/afs/LINUX/osi_file.c
-+++ openafs/src/afs/LINUX/osi_file.c
-@@ -64,6 +64,10 @@
-     memset(afile, 0, sizeof(struct osi_file));
- #if defined(HAVE_IGET)
-     tip = iget(afs_cacheSBp, (u_long) ainode);
-+    if (!tip)
-+      osi_Panic("Can't get inode %d\n", ainode);
-+
-+    dp = d_alloc_anon(tip);
- #else
-     fid.i32.ino = ainode;
-     fid.i32.gen = 0;

diff --git a/debian/patches/series b/debian/patches/series
index d81adf2c0899a59f7393aff0178452568d7ccc31..74c1d0969ac395cdb68e849a861dd8a235dfc0f3 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,3 @@ ucontext-everywhere
 find-core-files
 ktc-prototypes
 multiple-local-realms
-linux-restore-iget