[OpenAFS-port-freebsd] Patches for FreeBSD 4.x

Matthew Emmerton matt@gsicomp.on.ca
Mon, 3 Jun 2002 20:19:51 -0400


This is a multi-part message in MIME format.

------=_NextPart_000_0019_01C20B3C.04B48D40
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

Attached are 6 patches against OpenAFS-1.2.4 to add support for all FreeBSD
4.x releases, rather than just FreeBSD 4.2.

I've tested these on FreeBSD 4.2, 4.3 and 4.6-RC3.

After applying the patches, you must rename 3 files (cut 'n paste to save
typing):

mv src/config/param.i386_fbsd_42.h src/config/param.i386_fbsd_4.h
mv src/config/param.i386_fbsd_42_usr.h src/config/param.i386_fbsd_4_usr.h
mv src/config/Makefile.i386_fbsd_42.in src/config/Makefile.i386_fbsd_4.in

Please let me know if there are any problems with these patches (especially
on FreeBSD 4.0 or 4.1.)

--
Matt Emmerton

------=_NextPart_000_0019_01C20B3C.04B48D40
Content-Type: application/octet-stream;
	name="patch-be"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="patch-be"

--- src/config/param.i386_fbsd_42_usr.h.orig	Sat May 18 21:17:46 2002=0A=
+++ src/config/param.i386_fbsd_42_usr.h	Sat May 18 21:18:07 2002=0A=
@@ -5,8 +5,7 @@=0A=
 #define UKERNEL			1	/* user space kernel */=0A=
 #define AFS_ENV			1=0A=
 #define AFS_VFSINCL_ENV         1=0A=
-#define AFS_USR_FBSD40_ENV	1=0A=
-#define AFS_USR_FBSD42_ENV	1=0A=
+#define AFS_USR_FBSD4_ENV	1=0A=
 #define AFS_USR_FBSD_ENV	1=0A=
 #define AFS_NONFSTRANS 1=0A=
 #define AFS_KERBEROS_ENV=0A=
@@ -24,8 +23,8 @@=0A=
 #define AFS_GCPAGS	      0       /* if nonzero, garbage collect PAGs */=0A=
 =0A=
 /* Machine / Operating system information */=0A=
-#define SYS_NAME	"i386_fbsd_42"=0A=
-#define SYS_NAME_ID	SYS_NAME_ID_i386_fbsd_42=0A=
+#define SYS_NAME	"i386_fbsd_4"=0A=
+#define SYS_NAME_ID	SYS_NAME_ID_i386_fbsd_4=0A=
 #define AFSLITTLE_ENDIAN    1=0A=
 #define AFS_HAVE_FFS        1       /* Use system's ffs. */=0A=
 #define AFS_HAVE_STATVFS    0	/* System doesn't support statvfs */=0A=

------=_NextPart_000_0019_01C20B3C.04B48D40
Content-Type: application/octet-stream;
	name="patch-ba"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="patch-ba"

--- aclocal.m4.orig	Sat May 18 20:38:41 2002=0A=
+++ aclocal.m4	Sat May 18 20:39:09 2002=0A=
@@ -218,8 +218,8 @@=0A=
 else=0A=
 	AC_MSG_CHECKING(your AFS sysname)=0A=
 	case $host in=0A=
-		i?86-*-freebsd4.2*)=0A=
-			AFS_SYSNAME=3D"i386_fbsd_42"=0A=
+		i?86-*-freebsd4*)=0A=
+			AFS_SYSNAME=3D"i386_fbsd_4"=0A=
 			;;=0A=
 		hppa*-hp-hpux11*)=0A=
 			AFS_SYSNAME=3D"hp_ux110"=0A=

------=_NextPart_000_0019_01C20B3C.04B48D40
Content-Type: application/octet-stream;
	name="patch-bb"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="patch-bb"

--- acinclude.m4.orig	Sat May 18 20:38:48 2002=0A=
+++ acinclude.m4	Sat May 18 20:39:01 2002=0A=
@@ -206,8 +206,8 @@=0A=
 else=0A=
 	AC_MSG_CHECKING(your AFS sysname)=0A=
 	case $host in=0A=
-		i?86-*-freebsd4.2*)=0A=
-			AFS_SYSNAME=3D"i386_fbsd_42"=0A=
+		i?86-*-freebsd4*)=0A=
+			AFS_SYSNAME=3D"i386_fbsd_4"=0A=
 			;;=0A=
 		hppa*-hp-hpux11*)=0A=
 			AFS_SYSNAME=3D"hp_ux110"=0A=

------=_NextPart_000_0019_01C20B3C.04B48D40
Content-Type: application/octet-stream;
	name="patch-bc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="patch-bc"

--- src/config/afs_sysnames.h.orig	Sun Jan 20 03:49:33 2002=0A=
+++ src/config/afs_sysnames.h	Sat May 18 20:50:27 2002=0A=
@@ -140,7 +140,7 @@=0A=
 #define SYS_NAME_ID_alpha_linux_22      2001=0A=
 #define SYS_NAME_ID_alpha_linux_24      2002=0A=
 =0A=
-#define SYS_NAME_ID_i386_fbsd_42        2100=0A=
+#define SYS_NAME_ID_i386_fbsd_4         2100=0A=
 =0A=
 #define SYS_NAME_ID_ia64_linux2		2200=0A=
 #define SYS_NAME_ID_ia64_linux22	2201=0A=

------=_NextPart_000_0019_01C20B3C.04B48D40
Content-Type: application/octet-stream;
	name="patch-bd"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="patch-bd"

--- src/config/param.i386_fbsd_42.h.orig	Sat May 18 21:17:37 2002=0A=
+++ src/config/param.i386_fbsd_42.h	Sat May 18 21:17:29 2002=0A=
@@ -9,11 +9,9 @@=0A=
 #define AFS_NAMEI_ENV     1   /* User space interface to file system */=0A=
 #define AFS_64BIT_IOPS_ENV 1  /* Needed for NAMEI */=0A=
 #define AFS_FBSD_ENV 1=0A=
-#define AFS_FBSD40_ENV 1=0A=
-#define AFS_FBSD42_ENV 1=0A=
+#define AFS_FBSD4_ENV 1=0A=
 #define AFS_X86_FBSD_ENV 1=0A=
-#define AFS_X86_FBSD40_ENV 1=0A=
-#define AFS_X86_FBSD42_ENV 1=0A=
+#define AFS_X86_FBSD4_ENV 1=0A=
 #define AFS_X86_ENV 1=0A=
 #define AFS_NONFSTRANS 1=0A=
 #define AFS_KERBEROS_ENV 1=0A=
@@ -48,8 +46,8 @@=0A=
 #ifndef	MOUNT_AFS=0A=
 #define	MOUNT_AFS AFS_MOUNT_AFS=0A=
 #endif=0A=
-#define SYS_NAME	"i386_fbsd_42"=0A=
-#define SYS_NAME_ID	SYS_NAME_ID_i386_fbsd_42=0A=
+#define SYS_NAME	"i386_fbsd_4"=0A=
+#define SYS_NAME_ID	SYS_NAME_ID_i386_fbsd_4=0A=
 =0A=
 #define AFS_HAVE_FFS            1       /* Use system's ffs. */=0A=
 #define AFS_HAVE_STATVFS	0	/* System doesn't supports statvfs */=0A=

------=_NextPart_000_0019_01C20B3C.04B48D40
Content-Type: application/octet-stream;
	name="patch-aa"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="patch-aa"

--- src/afsmonitor/afsmonitor.c.orig	Sat May 18 21:33:35 2002=0A=
+++ src/afsmonitor/afsmonitor.c	Sat May 18 21:38:33 2002=0A=
@@ -273,7 +273,7 @@=0A=
 extern char *cm_categories[]; /* cache manager data category names */=0A=
 =0A=
 =0A=
-=0A=
+#ifndef AFS_FBSD4_ENV=0A=
 /*	=0A=
         strcasestr(): Return first occurence of pattern s2 in s1, case =0A=
 	insensitive. =0A=
@@ -305,7 +305,7 @@=0A=
         }=0A=
         return ((char *)NULL);=0A=
 }=0A=
-=0A=
+#endif /* AFS_FBSD4_ENV */=0A=
 =0A=
 struct hostent *GetHostByName(name)=0A=
 char *name;=0A=

------=_NextPart_000_0019_01C20B3C.04B48D40--