diff options
Diffstat (limited to 'filesystems/openafs/patches')
10 files changed, 68 insertions, 126 deletions
diff --git a/filesystems/openafs/patches/patch-Makefile.in b/filesystems/openafs/patches/patch-Makefile.in new file mode 100644 index 00000000000..ccc89b0f034 --- /dev/null +++ b/filesystems/openafs/patches/patch-Makefile.in @@ -0,0 +1,13 @@ +$NetBSD: patch-Makefile.in,v 1.1 2012/12/01 15:22:32 jakllsch Exp $ + +--- Makefile.in.orig 2012-03-26 23:03:34.000000000 +0000 ++++ Makefile.in +@@ -270,7 +270,7 @@ vol: cmd comerr dir afs sgiefs + + tsalvaged: vol libafsrpc libafsauthent cmd util + +case ${SYS_NAME} in \ +- alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd2*|*_darwin_*) \ ++ alpha_dux*|sgi_*|sun*_5*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*|*fbsd*|*nbsd*|*_darwin_*) \ + ${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \ + *_darwin_*) \ + ${COMPILE_PART1} tsalvaged ${COMPILE_PART2} ;; \ diff --git a/filesystems/openafs/patches/patch-aa b/filesystems/openafs/patches/patch-aa deleted file mode 100644 index b12ce7a4ee1..00000000000 --- a/filesystems/openafs/patches/patch-aa +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2012/11/22 22:22:45 jakllsch Exp $ - ---- configure.orig 2010-12-17 16:06:16.000000000 +0000 -+++ configure -@@ -5999,6 +5999,30 @@ echo $ECHO_N "checking your AFS sysname. - AFS_PARAM_COMMON=param.nbsd40.h - AFS_SYSNAME="i386_nbsd40" - ;; -+ i?86-*-netbsd*5.[0-8]*) -+ AFS_PARAM_COMMON=param.nbsd50.h -+ AFS_SYSNAME="i386_nbsd50" -+ ;; -+ x86_64-*-netbsd*5.[0-8]*) -+ AFS_PARAM_COMMON=param.nbsd50.h -+ AFS_SYSNAME="amd64_nbsd50" -+ ;; -+ i?86-*-netbsd*5.99*) -+ AFS_PARAM_COMMON=param.nbsd60.h -+ AFS_SYSNAME="i386_nbsd60" -+ ;; -+ x86_64-*-netbsd*5.99*) -+ AFS_PARAM_COMMON=param.nbsd60.h -+ AFS_SYSNAME="amd64_nbsd60" -+ ;; -+ i?86-*-netbsd*6.[0-8]*) -+ AFS_PARAM_COMMON=param.nbsd60.h -+ AFS_SYSNAME="i386_nbsd60" -+ ;; -+ x86_64-*-netbsd*6.[0-8]*) -+ AFS_PARAM_COMMON=param.nbsd60.h -+ AFS_SYSNAME="amd64_nbsd60" -+ ;; - hppa*-hp-hpux11.0*) - AFS_SYSNAME="hp_ux110" - ;; -@@ -24555,7 +24579,7 @@ case $AFS_SYSNAME in - YACC="byacc" - ;; - -- *nbsd2*|*nbsd3*|*nbsd4*) -+ *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*) - LEX="flex -l" - MT_CFLAGS='${XCFLAGS} -DAFS_PTHREAD_ENV -D_REENTRANT ' - MT_LIBS="-lpthread" # XXX -pthread soon -@@ -24563,7 +24587,14 @@ case $AFS_SYSNAME in - SHLIB_LDFLAGS="-shared -Xlinker -x" - SHLIB_LINKER="${MT_CC} -shared" - TXLIBS="/usr/lib/libcurses.so" -- XCFLAGS="-O2 -pipe" -+ case $AFS_SYSNAME in -+ amd64_nbsd*) -+ XCFLAGS="-O2 -pipe -fPIC" -+ ;; -+ *_nbsd*) -+ XCFLAGS="-O2 -pipe" -+ ;; -+ esac - YACC="yacc" - ;; - -@@ -25490,6 +25521,8 @@ if test "x$enable_optimize_lwp" = "xno"; - LWP_OPTMZ= - fi - -+XCFLAGS="${XCFLAGS} ${CFLAGS}" -+ - if test "x$enable_strip_binaries" != "xno"; then - if test "x$enable_strip_binaries" = "xmaybe" -a "x$enable_debug" = "xyes"; then - NO_STRIP_BIN=-ns diff --git a/filesystems/openafs/patches/patch-src_afsd_afsd.c b/filesystems/openafs/patches/patch-src_afsd_afsd.c deleted file mode 100644 index 13ae39e9e12..00000000000 --- a/filesystems/openafs/patches/patch-src_afsd_afsd.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_afsd_afsd.c,v 1.1 2012/08/30 17:37:55 jakllsch Exp $ - ---- src/afsd/afsd.c.orig 2010-12-17 15:58:42.000000000 +0000 -+++ src/afsd/afsd.c -@@ -2382,8 +2382,12 @@ mainproc(struct cmd_syndesc *as, void *a - if ((mount("AFS", cacheMountDir, MOUNT_AFS, 0, NULL)) < 0) { - #else - /* This is the standard mount used by the suns and rts */ -+#if defined(__NetBSD__) && __NetBSD_Prereq__(4,99,24) -+ if (1) { -+#else - if ((mount(MOUNT_AFS, cacheMountDir, mountFlags, (caddr_t) 0)) < 0) { - #endif -+#endif - printf("%s: Can't mount AFS on %s(%d)\n", rn, cacheMountDir, - errno); - exit(1); diff --git a/filesystems/openafs/patches/patch-src_aklog_aklog.c b/filesystems/openafs/patches/patch-src_aklog_aklog.c new file mode 100644 index 00000000000..0d0dbad35a1 --- /dev/null +++ b/filesystems/openafs/patches/patch-src_aklog_aklog.c @@ -0,0 +1,26 @@ +$NetBSD: patch-src_aklog_aklog.c,v 1.1 2012/12/01 15:22:32 jakllsch Exp $ + +--- src/aklog/aklog.c.orig 2012-03-26 23:03:34.000000000 +0000 ++++ src/aklog/aklog.c +@@ -67,9 +67,11 @@ + #if defined(HAVE_ET_COM_ERR_H) + #include <et/com_err.h> + #else +-#include <com_err.h> ++//#include <com_err.h> ++#include <krb5/com_err.h> + #endif + ++ + #ifndef HAVE_KERBEROSV_HEIM_ERR_H + #include <afs/com_err.h> + #endif +@@ -95,6 +97,8 @@ + #include "aklog.h" + #include "linked_list.h" + ++#define HAVE_NO_KRB5_524 ++ + #ifdef HAVE_KRB5_CREDS_KEYBLOCK + #define USING_MIT 1 + #endif diff --git a/filesystems/openafs/patches/patch-src_comerr_Makefile.in b/filesystems/openafs/patches/patch-src_comerr_Makefile.in index beb5a5783fa..3a2651693f9 100644 --- a/filesystems/openafs/patches/patch-src_comerr_Makefile.in +++ b/filesystems/openafs/patches/patch-src_comerr_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-src_comerr_Makefile.in,v 1.1 2012/08/30 17:37:55 jakllsch Exp $ +$NetBSD: patch-src_comerr_Makefile.in,v 1.2 2012/12/01 15:22:32 jakllsch Exp $ ---- src/comerr/Makefile.in.orig 2010-12-17 15:58:42.000000000 +0000 +--- src/comerr/Makefile.in.orig 2012-03-26 23:03:34.000000000 +0000 +++ src/comerr/Makefile.in -@@ -11,7 +11,7 @@ all: compile_et ${TOP_INCDIR}/afs/com_er +@@ -29,7 +29,7 @@ ${TOP_LIBDIR}/libafscom_err.a: libafscom et_lex.lex.c: et_lex.lex.l $(RM) -f et_lex.lex.c diff --git a/filesystems/openafs/patches/patch-src_config_afs__sysnames.h b/filesystems/openafs/patches/patch-src_config_afs__sysnames.h deleted file mode 100644 index c7e26cb8964..00000000000 --- a/filesystems/openafs/patches/patch-src_config_afs__sysnames.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_config_afs__sysnames.h,v 1.1 2012/11/22 22:22:45 jakllsch Exp $ - ---- src/config/afs_sysnames.h.orig 2010-12-17 15:58:42.000000000 +0000 -+++ src/config/afs_sysnames.h -@@ -238,6 +238,8 @@ - #define SYS_NAME_ID_macppc_nbsd30 2539 - #define SYS_NAME_ID_macppc_nbsd40 2540 - #define SYS_NAME_ID_macppc_nbsd50 2541 -+#define SYS_NAME_ID_amd64_nbsd60 2542 -+#define SYS_NAME_ID_i386_nbsd60 2543 - - #define SYS_NAME_ID_i386_obsd31 2600 - #define SYS_NAME_ID_i386_obsd32 2601 diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd30.h b/filesystems/openafs/patches/patch-src_config_param.nbsd30.h deleted file mode 100644 index 3d0b79169a3..00000000000 --- a/filesystems/openafs/patches/patch-src_config_param.nbsd30.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_config_param.nbsd30.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $ - ---- src/config/param.nbsd30.h.orig 2010-12-17 15:58:42.000000000 +0000 -+++ src/config/param.nbsd30.h -@@ -23,7 +23,6 @@ - #define AFS_NBSD20_ENV 1 - #define AFS_NBSD30_ENV 1 - #define AFS_NONFSTRANS 1 --#define AFS_KERBEROS_ENV 1 - - #define AFS_VFSINCL_ENV 1 - diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd40.h b/filesystems/openafs/patches/patch-src_config_param.nbsd40.h deleted file mode 100644 index 84649616e10..00000000000 --- a/filesystems/openafs/patches/patch-src_config_param.nbsd40.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_config_param.nbsd40.h,v 1.1 2012/08/30 17:37:55 jakllsch Exp $ - ---- src/config/param.nbsd40.h.orig 2010-12-17 15:58:42.000000000 +0000 -+++ src/config/param.nbsd40.h -@@ -24,7 +24,6 @@ - #define AFS_NBSD30_ENV 1 - #define AFS_NBSD40_ENV 1 - #define AFS_NONFSTRANS 1 --#define AFS_KERBEROS_ENV 1 - - #define AFS_VFSINCL_ENV 1 - diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd60.h b/filesystems/openafs/patches/patch-src_config_param.nbsd60.h new file mode 100644 index 00000000000..df70a23e23b --- /dev/null +++ b/filesystems/openafs/patches/patch-src_config_param.nbsd60.h @@ -0,0 +1,12 @@ +$NetBSD: patch-src_config_param.nbsd60.h,v 1.1 2012/12/01 15:22:32 jakllsch Exp $ + +--- src/config/param.nbsd60.h.orig 2012-03-26 23:03:34.000000000 +0000 ++++ src/config/param.nbsd60.h +@@ -3,6 +3,7 @@ + #ifndef AFS_PARAM_COMMON_H + #define AFS_PARAM_COMMON_H 1 + ++#define AFS_64BIT_ENV 1 + #define AFS_NAMEI_ENV 1 /* User space interface to file system */ + #define AFS_64BIT_IOPS_ENV 1 /* Needed for NAMEI */ + #define AFS_64BIT_CLIENT 1 diff --git a/filesystems/openafs/patches/patch-src_util_softsig.c b/filesystems/openafs/patches/patch-src_util_softsig.c new file mode 100644 index 00000000000..113fc27bd0e --- /dev/null +++ b/filesystems/openafs/patches/patch-src_util_softsig.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src_util_softsig.c,v 1.1 2012/12/01 15:22:32 jakllsch Exp $ + +--- src/util/softsig.c.orig 2012-03-26 23:03:34.000000000 +0000 ++++ src/util/softsig.c +@@ -72,7 +72,8 @@ softsig_thread(void *arg) + + while (1) { + void (*h) (int); +-#if !defined(AFS_DARWIN_ENV) && !defined(AFS_NBSD_ENV) ++#if defined(AFS_DARWIN_ENV) || (defined(AFS_NBSD_ENV) && !defined(AFS_NBSD50_ENV)) ++#else + int sigw; + #endif + |