From: Russ Allbery <rra@debian.org>
Date: Fri, 11 Apr 2008 03:53:45 +0000 (+0000)
Subject: Update patches for 1.4.7pre3.
X-Git-Tag: debian/1.4.7.pre3.dfsg1-1
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c17e908234558b0ddbb73a647617ea3ff2de14dc;p=packages%2Fo%2Fopenafs.git

Update patches for 1.4.7pre3.
---

diff --git a/debian/patches/dfsg b/debian/patches/dfsg
index f969444e3..3450fc74f 100644
--- 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
index 0eb0875c8..000000000
--- 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 d81adf2c0..74c1d0969 100644
--- 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