summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--filesystems/openafs/Makefile16
-rw-r--r--filesystems/openafs/PLIST56
-rw-r--r--filesystems/openafs/distinfo19
-rw-r--r--filesystems/openafs/patches/patch-Makefile.in13
-rw-r--r--filesystems/openafs/patches/patch-aa69
-rw-r--r--filesystems/openafs/patches/patch-src_afsd_afsd.c17
-rw-r--r--filesystems/openafs/patches/patch-src_aklog_aklog.c26
-rw-r--r--filesystems/openafs/patches/patch-src_comerr_Makefile.in6
-rw-r--r--filesystems/openafs/patches/patch-src_config_afs__sysnames.h13
-rw-r--r--filesystems/openafs/patches/patch-src_config_param.nbsd30.h12
-rw-r--r--filesystems/openafs/patches/patch-src_config_param.nbsd40.h12
-rw-r--r--filesystems/openafs/patches/patch-src_config_param.nbsd60.h12
-rw-r--r--filesystems/openafs/patches/patch-src_util_softsig.c14
13 files changed, 128 insertions, 157 deletions
diff --git a/filesystems/openafs/Makefile b/filesystems/openafs/Makefile
index 515cd0faa3d..2e27f464cb1 100644
--- a/filesystems/openafs/Makefile
+++ b/filesystems/openafs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/10/03 16:08:33 asau Exp $
+# $NetBSD: Makefile,v 1.3 2012/12/01 15:22:32 jakllsch Exp $
-DISTNAME= openafs-1.4.14-src
+DISTNAME= openafs-1.6.1-src
PKGNAME= ${DISTNAME:C/-src//}
CATEGORIES= filesystems net sysutils
-MASTER_SITES= http://www.openafs.org/dl/openafs/1.4.14/
+MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.1/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= gendalia@NetBSD.org
@@ -46,10 +46,12 @@ BUILD_DEFS+= VARBASE
# attempt to future-proof configuration
pre-build:
- cd ${WRKSRC}/src/config && for i in 50 60 70 80 90; do \
- ${SED} -e 's|nbsd40|nbsd'$$i'|g' param.i386_nbsd40.h > param.i386_nbsd$$i.h; \
- ${SED} -e 's|nbsd40|nbsd'$$i'|g' param.amd64_nbsd40.h > param.amd64_nbsd$$i.h; \
- ${CP} param.nbsd40.h param.nbsd$$i.h; \
+ cd ${WRKSRC}/src/config && for i in 70 80 90; do \
+ ${SED} -e 's|nbsd60|nbsd'$$i'|g' param.i386_nbsd60.h > param.i386_nbsd$$i.h; \
+ ${SED} -e 's|nbsd60|nbsd'$$i'|g' param.amd64_nbsd60.h > param.amd64_nbsd$$i.h; \
+ ${CP} param.nbsd60.h param.nbsd$$i.h; \
done
+MAKE_ENV+= LD_RUN_PATH=${PREFIX}/lib
+
.include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/openafs/PLIST b/filesystems/openafs/PLIST
index a76a1719b2d..0b28db1de08 100644
--- a/filesystems/openafs/PLIST
+++ b/filesystems/openafs/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.1 2012/08/30 17:37:55 jakllsch Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/12/01 15:22:32 jakllsch Exp $
bin/afs_compile_et
+bin/afsio
bin/afsmonitor
+bin/aklog
+bin/asetkey
bin/bos
bin/cmdebug
-bin/dlog
-bin/dpass
bin/fs
bin/klog
bin/klog.krb
+bin/klog.krb5
bin/knfs
bin/kpasswd
bin/kpwvalid
@@ -15,6 +17,7 @@ bin/livesys
bin/pagsh
bin/pagsh.krb
bin/pts
+bin/restorevol
bin/rxgen
bin/scout
bin/sys
@@ -29,16 +32,18 @@ bin/xstat_fs_test
include/afs/acl.h
include/afs/afs.h
include/afs/afs_args.h
+include/afs/afs_assert.h
include/afs/afs_atomlist.h
+include/afs/afs_consts.h
include/afs/afs_lhash.h
include/afs/afs_stats.h
include/afs/afs_sysnames.h
include/afs/afscbint.h
+include/afs/afscp.h
include/afs/afsint.h
include/afs/afssyscalls.h
include/afs/afsutil.h
include/afs/afsutil_prototypes.h
-include/afs/assert.h
include/afs/audit.h
include/afs/auth.h
include/afs/bnode.h
@@ -55,7 +60,7 @@ include/afs/cellconfig.h
include/afs/cmd.h
include/afs/cnvldb.h
include/afs/com_err.h
-include/afs/debug.h
+include/afs/daemon_com.h
include/afs/dir.h
include/afs/dirpath.h
include/afs/error_table.h
@@ -92,6 +97,7 @@ include/afs/nfs.h
include/afs/nfsclient.h
include/afs/osi_inode.h
include/afs/packages.h
+include/afs/pagcb.h
include/afs/param.h
include/afs/partition.h
include/afs/prclient.h
@@ -109,6 +115,7 @@ include/afs/ptserver.h
include/afs/ptuser.h
include/afs/remote.h
include/afs/rxgen_consts.h
+include/afs/salvsync.h
include/afs/softsig.h
include/afs/stds.h
include/afs/sysctl.h
@@ -118,14 +125,18 @@ include/afs/usd.h
include/afs/venus.h
include/afs/vice.h
include/afs/viceinode.h
+include/afs/vioc.h
include/afs/vl_opcodes.h
include/afs/vldbint.h
include/afs/vlserver.h
include/afs/vnode.h
+include/afs/vnode_inline.h
include/afs/voldefs.h
include/afs/volint.h
include/afs/volser.h
include/afs/volume.h
+include/afs/volume_inline.h
+include/afs/vsutils_prototypes.h
include/afs/xfsattrs.h
include/afs/xstat_cm.h
include/afs/xstat_fs.h
@@ -133,10 +144,10 @@ include/des.h
include/des_conf.h
include/des_odd.h
include/des_prototypes.h
+include/kopenafs.h
include/lock.h
include/lwp.h
include/mit-cpyright.h
-include/potpourri.h
include/preempt.h
include/rx/fcrypt.h
include/rx/rx.h
@@ -161,6 +172,7 @@ include/timer.h
include/ubik.h
include/ubik_int.h
lib/afs/libacl.a
+lib/afs/libafscom_err.a
lib/afs/libafsint.a
lib/afs/libafsutil.a
lib/afs/libaudit.a
@@ -172,13 +184,11 @@ lib/afs/libbudb.a
lib/afs/libbutm.a
lib/afs/libbxdb.a
lib/afs/libcmd.a
-lib/afs/libcom_err.a
lib/afs/libdir.a
lib/afs/libfsprobe.a
lib/afs/libgtx.a
lib/afs/libkauth.a
lib/afs/libkauth.krb.a
-lib/afs/libnull.a
lib/afs/libprocmgmt.a
lib/afs/libprot.a
lib/afs/libsys.a
@@ -190,20 +200,35 @@ lib/afs/libxstat_cm.a
lib/afs/libxstat_fs.a
lib/afs/util.a
lib/afs/vlib.a
-lib/libafssetpag.so
-lib/libafssetpag.so.1
-lib/libafssetpag.so.1.0
+lib/libafsauthent.a
+lib/libafsauthent.so
+lib/libafsauthent.so.1
+lib/libafsauthent.so.1.1
+lib/libafsauthent_pic.a
+lib/libafscp.a
+lib/libafsrpc.a
+lib/libafsrpc.so
+lib/libafsrpc.so.1
+lib/libafsrpc.so.1.5
+lib/libafsrpc_pic.a
lib/libdes.a
+lib/libkopenafs.a
+lib/libkopenafs.so
+lib/libkopenafs.so.1
+lib/libkopenafs.so.1.1
lib/liblwp.a
lib/librx.a
lib/librxkad.a
lib/librxstat.a
lib/libubik.a
libexec/openafs/buserver
+libexec/openafs/dafileserver
+libexec/openafs/dasalvager
libexec/openafs/fileserver
libexec/openafs/kaserver
libexec/openafs/ptserver
libexec/openafs/salvager
+libexec/openafs/salvageserver
libexec/openafs/upclient
libexec/openafs/upserver
libexec/openafs/vlserver
@@ -213,20 +238,22 @@ sbin/backup
sbin/bos_util
sbin/bosserver
sbin/butc
+sbin/dafssync-debug
sbin/fms
+sbin/fssync-debug
sbin/fstrace
+sbin/ka-forwarder
sbin/kadb_check
sbin/kas
-sbin/ka-forwarder
sbin/kdb
-sbin/kdump
sbin/kpwvalid
sbin/prdb_check
sbin/pt_util
sbin/read_tape
-sbin/restorevol
sbin/rmtsysd
sbin/rxdebug
+sbin/salvsync-debug
+sbin/state_analyzer
sbin/uss
sbin/vldb_check
sbin/vldb_convert
@@ -235,4 +262,5 @@ sbin/volinfo
sbin/vos
sbin/vsys
share/examples/rc.d/bosserver
+share/openafs/C/afszcm.cat
@pkgdir lib/openafs
diff --git a/filesystems/openafs/distinfo b/filesystems/openafs/distinfo
index 5da02f2bba2..cfd70c82578 100644
--- a/filesystems/openafs/distinfo
+++ b/filesystems/openafs/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.2 2012/11/22 22:22:45 jakllsch Exp $
+$NetBSD: distinfo,v 1.3 2012/12/01 15:22:32 jakllsch Exp $
-SHA1 (openafs-1.4.14-src.tar.bz2) = 2b4e7c839bbf8f577fdd4831e7a3b3ebb9c41926
-RMD160 (openafs-1.4.14-src.tar.bz2) = ecc038d7f9068d420cf1c94f9c01db5ecd1accac
-Size (openafs-1.4.14-src.tar.bz2) = 11813993 bytes
-SHA1 (patch-aa) = f85439544b75de0fc1d5ed8726d05c519a106088
-SHA1 (patch-src_afsd_afsd.c) = ccc518675fc4b4fa594bb6b3a9f2c36e03df2ea6
-SHA1 (patch-src_comerr_Makefile.in) = f325c813dab0dc62592abead6d112ce15df086c9
-SHA1 (patch-src_config_afs__sysnames.h) = 30b385e25d3e45cea02b7df9508eba095765b4f0
-SHA1 (patch-src_config_param.nbsd30.h) = 64bbe81ef7208b6e3f70af4eddcb9d535e8a9c34
-SHA1 (patch-src_config_param.nbsd40.h) = ddfb69d2255629946e6df8416e6e2fcbfc0ffabb
+SHA1 (openafs-1.6.1-src.tar.bz2) = 85d25d20c406ee4e6a1cac4580ddfb42676b215d
+RMD160 (openafs-1.6.1-src.tar.bz2) = 027e58101300e29a307b451095e72754f0ae11d5
+Size (openafs-1.6.1-src.tar.bz2) = 14356434 bytes
+SHA1 (patch-Makefile.in) = 159d314975188f768e0046bf153711d1b5c6b89c
+SHA1 (patch-src_aklog_aklog.c) = 7a21b2bd338a3a1d00dc0cb99f1af206ab0c607c
+SHA1 (patch-src_comerr_Makefile.in) = dd5e996481d7ef908710868aa9dc1b65feb98717
+SHA1 (patch-src_config_param.nbsd60.h) = bb2288fd155f20df64fe2e8bc91f0fcf215d6c46
+SHA1 (patch-src_util_softsig.c) = 3f1b27b2ce0d72de6239ebefc199eba831c1acf0
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
+