From: Russ Allbery <rra@debian.org>
Date: Fri, 14 Apr 2006 21:26:16 +0000 (+0000)
Subject: Remove obsolete patches that have been incorporated upstream.
X-Git-Tag: debian/1.4.1-1~2
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b60f5006ba3702508bf40bd6de877102743322d4;p=packages%2Fo%2Fopenafs.git

Remove obsolete patches that have been incorporated upstream.
---

diff --git a/debian/patches/afslog b/debian/patches/afslog
deleted file mode 100644
index ec5ea5af5..000000000
--- a/debian/patches/afslog
+++ /dev/null
@@ -1,84 +0,0 @@
-Submitted upstream as #18662, but deferred until after the 1.4 release
-for upstream.  Fixes Debian bug #120097.
-
---- openafs-1.3.87.orig/src/afsd/afsd.c
-+++ openafs-1.3.87/src/afsd/afsd.c
-@@ -47,7 +47,8 @@
-   *                system problems, which can only be ameliorated by changing
-   *                NINODE (or equivalent) and rebuilding the kernel.
-   *		   This option is now disabled.
--  *	-logfile   Place where to put the logfile (default in <cache>/etc/AFSLog.
-+  *	-logfile   [OBSOLETE] Place where to put the logfile (default in
-+  *                <cache>/etc/AFSLog.
-   *	-waitclose make close calls always synchronous (slows em down, tho)
-   *	-files_per_subdir [n]	number of files per cache subdir. (def=2048)
-   *	-shutdown  Shutdown afs daemons
-@@ -184,7 +185,6 @@
- 
- 
- #define CACHEINFOFILE   "cacheinfo"
--#define	AFSLOGFILE	"AFSLog"
- #define	DCACHEFILE	"CacheItems"
- #define	VOLINFOFILE	"VolumeItems"
- #define CELLINFOFILE	"CellItems"
-@@ -236,7 +236,6 @@
- char fullpn_DCacheFile[1024];	/*Full pathname of DCACHEFILE */
- char fullpn_VolInfoFile[1024];	/*Full pathname of VOLINFOFILE */
- char fullpn_CellInfoFile[1024];	/*Full pathanem of CELLINFOFILE */
--char fullpn_AFSLogFile[1024];	/*Full pathname of AFSLOGFILE */
- char fullpn_CacheInfo[1024];	/*Full pathname of CACHEINFO */
- char fullpn_VFile[1024];	/*Full pathname of data cache files */
- char *vFilePtr;			/*Ptr to the number part of above pathname */
-@@ -1441,10 +1440,9 @@
- 	strcpy(confDir, as->parms[17].items->data);
-     }
-     sprintf(fullpn_CacheInfo, "%s/%s", confDir, CACHEINFOFILE);
--    sprintf(fullpn_AFSLogFile, "%s/%s", confDir, AFSLOGFILE);
-     if (as->parms[18].items) {
- 	/* -logfile */
--	strcpy(fullpn_AFSLogFile, as->parms[18].items->data);
-+        printf("afsd: Ignoring obsolete -logfile flag\n");
-     }
-     if (as->parms[19].items) {
- 	/* -waitclose */
-@@ -1561,18 +1559,6 @@
- 	exit(1);
-     }
- 
--    if ((logfd = fopen(fullpn_AFSLogFile, "r+")) == 0) {
--	if (afsd_verbose)
--	    printf("%s: Creating '%s'\n", rn, fullpn_AFSLogFile);
--	if (CreateCacheFile(fullpn_AFSLogFile, NULL)) {
--	    printf
--		("%s: Can't create '%s' (You may want to use the -logfile option)\n",
--		 rn, fullpn_AFSLogFile);
--	    exit(1);
--	}
--    } else
--	fclose(logfd);
--
-     /* do some random computations in memcache case to get things to work
-      * reasonably no matter which parameters you set.
-      */
-@@ -1978,21 +1964,6 @@
- 	call_syscall(AFSOP_VOLUMEINFO, fullpn_VolInfoFile);
- 
-     /*
--     * Pass the kernel the name of the afs logging file holding the volume
--     * information.
--     */
--    if (afsd_debug)
--	printf("%s: Calling AFSOP_AFSLOG: volume info file is '%s'\n", rn,
--	       fullpn_AFSLogFile);
--#if defined(AFS_SGI_ENV)
--    /* permit explicit -logfile argument to enable logging on memcache systems */
--    if (!(cacheFlags & AFSCALL_INIT_MEMCACHE) || as->parms[18].items)
--#else
--    if (!(cacheFlags & AFSCALL_INIT_MEMCACHE))	/* ... nor this ... */
--#endif
--	call_syscall(AFSOP_AFSLOG, fullpn_AFSLogFile);
--
--    /*
-      * Give the kernel the names of the AFS files cached on the workstation's
-      * disk.
-      */
diff --git a/debian/patches/cache-checks b/debian/patches/cache-checks
deleted file mode 100644
index 6360217f2..000000000
--- a/debian/patches/cache-checks
+++ /dev/null
@@ -1,32 +0,0 @@
-Die rather than just warn if the AFS cache fails any of its sanity checks,
-diagnose use of tmpfs, and reject any file system type other than ext2 or
-ext3.  Submitted upstream as #20947.
-
---- openafs/src/afsd/afsd.c	(revision 1849)
-+++ openafs/src/afsd/afsd.c	(local)
-@@ -1069,7 +1069,11 @@
- 	    return "cannot use reiserfs as cache partition";
- 	} else if  (statfsbuf.f_type == 0x58465342) { /* XFS_SUPER_MAGIC */
- 	    return "cannot use xfs as cache partition";
--	}
-+	} else if (statfsbuf.f_type == 0x01021994) {    /* TMPFS_SUPER_MAGIC */
-+            return "cannot use tmpfs as cache partition";
-+        } else if (statfsbuf.f_type != 0xEF53) {
-+            return "must use ext2 or ext3 for cache partition";
-+        }
-     }
- #endif
- 
-@@ -1665,8 +1669,10 @@
-     sprintf(fullpn_VFile, "%s/", cacheBaseDir);
-     vFilePtr = fullpn_VFile + strlen(fullpn_VFile);
- 
--    if  (!(cacheFlags & AFSCALL_INIT_MEMCACHE) && (fsTypeMsg = CheckCacheBaseDir(cacheBaseDir))) {
--	printf("%s: WARNING: Cache dir check failed (%s)\n", rn, fsTypeMsg);
-+    if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)
-+        && (fsTypeMsg = CheckCacheBaseDir(cacheBaseDir))) {
-+	printf("%s: ERROR: Cache dir check failed (%s)\n", rn, fsTypeMsg);
-+        exit(1);
-     }
- #if 0
-     fputs(AFS_GOVERNMENT_MESSAGE, stdout);