diff options
Diffstat (limited to 'filesystems')
19 files changed, 182 insertions, 202 deletions
diff --git a/filesystems/openafs/Makefile b/filesystems/openafs/Makefile index 01746fb7aa3..405df590b99 100644 --- a/filesystems/openafs/Makefile +++ b/filesystems/openafs/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2020/01/26 17:31:10 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2022/03/19 16:19:02 jakllsch Exp $ -DISTNAME= openafs-1.6.21-src +DISTNAME= openafs-1.8.8.1-src PKGNAME= ${DISTNAME:C/-src//} CATEGORIES= filesystems net sysutils -MASTER_SITES= http://www.openafs.org/dl/openafs/1.6.21/ +MASTER_SITES= http://www.openafs.org/dl/openafs/1.8.8.1/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= gendalia@NetBSD.org @@ -18,10 +18,14 @@ CONFLICTS+= heimdal-[0-9]* CONFLICTS+= lwp-[0-9]* CONFLICTS+= rx-[0-9]* +# No idea if this is still needed; +# might also depend on bmake vs. gmake whether this works, +# seems more likely to work with gmake, but we're using bmake. MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes -USE_TOOLS+= lex +USE_LIBTOOL= yes +USE_TOOLS+= lex autoconf automake RCD_SCRIPTS+= bosserver .include "options.mk" @@ -29,6 +33,12 @@ RCD_SCRIPTS+= bosserver CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +# Avoid _res in multithreaded on NetBSD +.include "../../mk/bsd.fast.prefs.mk" +.if ${OPSYS} == "NetBSD" +CONFIGURE_ENV+= ac_cv_res_retransretry=no +.endif + USE_GNU_CONFIGURE_HOST= no WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} @@ -46,15 +56,21 @@ BUILD_DEFS+= VARBASE # attempt to future-proof configuration pre-patch: - 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; \ + cd ${WRKSRC}/src/config && for i in 80 90; do \ + ${SED} -e 's|nbsd70|nbsd'$$i'|g' param.i386_nbsd70.h > param.i386_nbsd$$i.h; \ + ${SED} -e 's|nbsd70|nbsd'$$i'|g' param.amd64_nbsd70.h > param.amd64_nbsd$$i.h; \ + ${CP} param.nbsd70.h param.nbsd$$i.h; \ done post-patch: ${CP} ${WRKSRC}/src/config/param.armv6_nbsd80.h ${WRKSRC}/src/config/param.armv7_nbsd80.h +pre-configure: + cd ${WRKSRC} && ./regen.sh -q + MAKE_ENV+= LD_RUN_PATH=${PREFIX}/lib +# Can't do this yet. Somehow doesn't work with pkgsrc heimdal, +# but does with NetBSD base heimdal. +#.include "../../mk/krb5.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/filesystems/openafs/PLIST b/filesystems/openafs/PLIST index a84e81b7e86..cfbdd428861 100644 --- a/filesystems/openafs/PLIST +++ b/filesystems/openafs/PLIST @@ -1,18 +1,14 @@ -@comment $NetBSD: PLIST,v 1.5 2017/07/21 01:39:33 sevan Exp $ +@comment $NetBSD: PLIST,v 1.6 2022/03/19 16:19:02 jakllsch Exp $ bin/afs_compile_et bin/afsio bin/afsmonitor +bin/akeyconvert bin/aklog bin/asetkey bin/bos bin/cmdebug bin/fs -bin/klog -bin/klog.krb bin/klog.krb5 -bin/knfs -bin/kpasswd -bin/kpwvalid bin/livesys bin/pagsh bin/pagsh.krb @@ -32,7 +28,6 @@ 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 @@ -68,7 +63,6 @@ include/afs/error_table.h include/afs/errors.h include/afs/exporter.h include/afs/fileutil.h -include/afs/fs_stats.h include/afs/fsprobe.h include/afs/fssync.h include/afs/gtxX11win.h @@ -85,19 +79,15 @@ include/afs/gtxtextobj.h include/afs/gtxwindows.h include/afs/icl.h include/afs/ihandle.h -include/afs/kaport.h -include/afs/kauth.h -include/afs/kautils.h include/afs/keys.h include/afs/ktc.h include/afs/ktime.h include/afs/mit-sipb-cr.h include/afs/namei_ops.h -include/afs/netutils.h include/afs/nfs.h include/afs/nfsclient.h +include/afs/opr.h include/afs/osi_inode.h -include/afs/packages.h include/afs/pagcb.h include/afs/param.h include/afs/partition.h @@ -105,6 +95,7 @@ include/afs/prclient.h include/afs/prerror.h include/afs/print.h include/afs/procmgmt.h +include/afs/procmgmt_softsig.h include/afs/prs_fs.h include/afs/prserver.h include/afs/ptclient.h @@ -114,13 +105,14 @@ include/afs/pthread_nosigs.h include/afs/ptint.h 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 +include/afs/tabular_output.h include/afs/tcdata.h +include/afs/thread_pool.h +include/afs/thread_pool_types.h include/afs/unified_afs.h include/afs/usd.h include/afs/venus.h @@ -138,18 +130,16 @@ include/afs/volser.h include/afs/volume.h include/afs/volume_inline.h include/afs/vsutils_prototypes.h +include/afs/work_queue.h +include/afs/work_queue_types.h include/afs/xfsattrs.h include/afs/xstat_cm.h include/afs/xstat_fs.h -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/preempt.h +include/opr/lock.h +include/opr/queue.h include/rx/fcrypt.h include/rx/rx.h include/rx/rx_clock.h @@ -159,6 +149,7 @@ include/rx/rx_lwp.h include/rx/rx_misc.h include/rx/rx_multi.h include/rx/rx_null.h +include/rx/rx_opaque.h include/rx/rx_packet.h include/rx/rx_prototypes.h include/rx/rx_pthread.h @@ -188,8 +179,6 @@ lib/afs/libcmd.a lib/afs/libdir.a lib/afs/libfsprobe.a lib/afs/libgtx.a -lib/afs/libkauth.a -lib/afs/libkauth.krb.a lib/afs/libprocmgmt.a lib/afs/libprot.a lib/afs/libsys.a @@ -203,21 +192,30 @@ lib/afs/util.a lib/afs/vlib.a lib/libafsauthent.a lib/libafsauthent.so -lib/libafsauthent.so.1 -lib/libafsauthent.so.1.1 +lib/libafsauthent.so.2 +lib/libafsauthent.so.2.0.0 lib/libafsauthent_pic.a lib/libafscp.a +lib/libafshcrypto.a +lib/libafshcrypto.so +lib/libafshcrypto.so.2 +lib/libafshcrypto.so.2.0.0 +lib/libafsrfc3961.a lib/libafsrpc.a lib/libafsrpc.so -lib/libafsrpc.so.1 -lib/libafsrpc.so.1.5 +lib/libafsrpc.so.2 +lib/libafsrpc.so.2.0.0 lib/libafsrpc_pic.a -lib/libdes.a lib/libkopenafs.a lib/libkopenafs.so -lib/libkopenafs.so.1 -lib/libkopenafs.so.1.1 +lib/libkopenafs.so.2 +lib/libkopenafs.so.2.0.0 lib/liblwp.a +lib/libopr.a +lib/librokenafs.a +lib/librokenafs.so +lib/librokenafs.so.2 +lib/librokenafs.so.2.0.0 lib/librx.a lib/librxkad.a lib/librxstat.a @@ -227,7 +225,6 @@ libexec/openafs/dafileserver libexec/openafs/dasalvager libexec/openafs/davolserver libexec/openafs/fileserver -libexec/openafs/kaserver libexec/openafs/ptserver libexec/openafs/salvager libexec/openafs/salvageserver @@ -244,11 +241,6 @@ sbin/dafssync-debug sbin/fms sbin/fssync-debug sbin/fstrace -sbin/ka-forwarder -sbin/kadb_check -sbin/kas -sbin/kdb -sbin/kpwvalid sbin/prdb_check sbin/pt_util sbin/read_tape diff --git a/filesystems/openafs/PLIST.kauth b/filesystems/openafs/PLIST.kauth new file mode 100644 index 00000000000..019a88360c6 --- /dev/null +++ b/filesystems/openafs/PLIST.kauth @@ -0,0 +1,19 @@ +@comment $NetBSD: PLIST.kauth,v 1.1 2022/03/19 16:19:02 jakllsch Exp $ +bin/klog +bin/klog.krb +bin/knfs +bin/kpasswd +bin/kpwvalid +include/afs/kaport.h +include/afs/kauth.h +include/afs/kautils.h +lib/afs/libkauth.a +lib/afs/libkauth.krb.a +lib/pam_afs.krb.so +lib/pam_afs.so +libexec/openafs/kaserver +sbin/ka-forwarder +sbin/kadb_check +sbin/kas +sbin/kdb +sbin/kpwvalid diff --git a/filesystems/openafs/PLIST.pam b/filesystems/openafs/PLIST.pam deleted file mode 100644 index 0472102b2cc..00000000000 --- a/filesystems/openafs/PLIST.pam +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.pam,v 1.1 2012/08/30 17:37:55 jakllsch Exp $ -lib/pam_afs.krb.so.1 -lib/pam_afs.so.1 diff --git a/filesystems/openafs/distinfo b/filesystems/openafs/distinfo index c23151431f1..47b434678b6 100644 --- a/filesystems/openafs/distinfo +++ b/filesystems/openafs/distinfo @@ -1,17 +1,14 @@ -$NetBSD: distinfo,v 1.19 2021/10/26 10:25:29 nia Exp $ +$NetBSD: distinfo,v 1.20 2022/03/19 16:19:02 jakllsch Exp $ -BLAKE2s (openafs-1.6.21-src.tar.bz2) = ea3db99c8b04ad8594b5fd97b8189a104cfaa5b5044eef830e01814fcfba5a79 -SHA512 (openafs-1.6.21-src.tar.bz2) = 451c38ed5031b8a962da3276bf5d0f1b74c5956c2d10cdb8bbd22ea633880ebf35cf5fc71feb5d2eca4306762f6c2376a46f4522150291acfc469f8be2da757f -Size (openafs-1.6.21-src.tar.bz2) = 14682997 bytes -SHA1 (patch-acinclude.m4) = 1949234224ee12f6d70f2a7ac914342bdfe9b50d -SHA1 (patch-configure) = fc07ae1945b047dcdafbeade183fad3b2bd876e4 -SHA1 (patch-src_cf_osconf.m4) = 2ae23bc82dd3f19cfa3fecf50dcca514e09d7a4b -SHA1 (patch-src_comerr_Makefile.in) = dd5e996481d7ef908710868aa9dc1b65feb98717 -SHA1 (patch-src_config_afs__sysnames.h) = 26819b314797a149def42f5b63cbeb19ef6309e8 +BLAKE2s (openafs-1.8.8.1-src.tar.bz2) = cfa0eadf49551acae3e14a3b756ce618a30bece455915fde9a7a1311baa0f4c9 +SHA512 (openafs-1.8.8.1-src.tar.bz2) = fb181e0989e9bae714af26de916a96946eea20f98b47154f2de7b5e296cb4f42af5df037ef7b603073e97eafe52d7c401666f03130c1e0c9a6ae1a6c2707c384 +Size (openafs-1.8.8.1-src.tar.bz2) = 14866119 bytes +SHA1 (patch-src_cf_osconf.m4) = 6eae9ab0821c496f59ebd611c270b46d511a751f +SHA1 (patch-src_cf_sysname.m4) = 7f45f6387bf959d2026be369cbbfec1a96ff424b +SHA1 (patch-src_comerr_Makefile.in) = 0213dcd89dc2894b9724d89cec61a0738ddd6696 +SHA1 (patch-src_config_afs__sysnames.h) = 558854bf3b89b2d9679224b548e8b743adf7a752 SHA1 (patch-src_config_param.armv6_nbsd80.h) = eea7a8f8a141d285ba5a2bb4317950f0b860528f -SHA1 (patch-src_config_param.nbsd70.h) = 700216e464d801aee3ada0a597a5e2b3a4dab510 -SHA1 (patch-src_config_param.nbsd80.h) = cc9445a1b06ac977d93c9fe0b68cc67475beec08 -SHA1 (patch-src_config_param.nbsd90.h) = d70f8983635b42a04a1dfa312c130c1afb669cb3 -SHA1 (patch-src_des_andrew-conf.h) = 6ea03fcaf988d3d91bc1d3386e239496fc3069f0 -SHA1 (patch-src_des_conf-arm32-bsd.h) = ff1b2a3cc35ab272913c95adab28c3304234a891 -SHA1 (patch-src_lwp_lwp.c) = c4a92a29621ceaf54c56cd20772c18f76b0fe745 +SHA1 (patch-src_config_param.nbsd80.h) = 52335bea3c5ae9becab4d9e8248ecc3c2ac24749 +SHA1 (patch-src_config_param.nbsd90.h) = 0a958172a80e694f0b59c0e5e03c0956740b1ddb +SHA1 (patch-src_lwp_lwp.c) = be963332293d31137a46fb27d1dec25c7fbb120e +SHA1 (patch-src_lwp_process.amd64.s) = c0be87a82e201855d9004859e01c90d8016efc7f diff --git a/filesystems/openafs/options.mk b/filesystems/openafs/options.mk index c51b7bdee2b..5b57443ca17 100644 --- a/filesystems/openafs/options.mk +++ b/filesystems/openafs/options.mk @@ -1,13 +1,12 @@ -# $NetBSD: options.mk,v 1.4 2019/11/03 19:26:21 rillig Exp $ +# $NetBSD: options.mk,v 1.5 2022/03/19 16:19:02 jakllsch Exp $ .include "../../mk/bsd.prefs.mk" PKG_OPTIONS_VAR= PKG_OPTIONS.openafs PKG_SUPPORTED_OPTIONS+= server bitmap-later kernel-module supergroups namei -.if ${MACHINE_ARCH} != "x86_64" -PKG_SUPPORTED_OPTIONS+= pam -.endif +PKG_SUPPORTED_OPTIONS+= openafs-kauth PKG_SUGGESTED_OPTIONS= server -bitmap-later namei -kernel-module supergroups +PKG_SUGGESTED_OPTIONS+= -openafs-kauth .include "../../mk/bsd.options.mk" @@ -25,10 +24,10 @@ CONFIGURE_ARGS+= --disable-kernel-module .if !empty(PKG_OPTIONS:Mnamei) CONFIGURE_ARGS+= --enable-namei-fileserver .endif -.if !empty(PKG_OPTIONS:Mpam) -CONFIGURE_ARGS+= --enable-pam +.if !empty(PKG_OPTIONS:Mopenafs-kauth) +CONFIGURE_ARGS+= --enable-kauth .include "../../mk/pam.buildlink3.mk" -PLIST_SRC+= ${.CURDIR}/PLIST.pam +PLIST_SRC+= ${.CURDIR}/PLIST.kauth .else -CONFIGURE_ARGS+= --disable-pam +CONFIGURE_ARGS+= --disable-kauth .endif diff --git a/filesystems/openafs/patches/patch-acinclude.m4 b/filesystems/openafs/patches/patch-acinclude.m4 deleted file mode 100644 index e154131e461..00000000000 --- a/filesystems/openafs/patches/patch-acinclude.m4 +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-acinclude.m4,v 1.2 2017/10/08 02:41:39 sevan Exp $ - -- Add support for NetBSD 7 to 9 - ---- acinclude.m4.orig 2016-03-16 14:31:22.000000000 +0000 -+++ acinclude.m4 -@@ -777,6 +777,9 @@ case $AFS_SYSNAME in - *_nbsd40) AFS_PARAM_COMMON=param.nbsd40.h ;; - *_nbsd50) AFS_PARAM_COMMON=param.nbsd50.h ;; - *_nbsd60) AFS_PARAM_COMMON=param.nbsd60.h ;; -+ *_nbsd70) AFS_PARAM_COMMON=param.nbsd70.h ;; -+ *_nbsd80) AFS_PARAM_COMMON=param.nbsd80.h ;; -+ *_nbsd90) AFS_PARAM_COMMON=param.nbsd90.h ;; - *_obsd31) AFS_PARAM_COMMON=param.obsd31.h ;; - *_obsd32) AFS_PARAM_COMMON=param.obsd32.h ;; - *_obsd33) AFS_PARAM_COMMON=param.obsd33.h ;; diff --git a/filesystems/openafs/patches/patch-configure b/filesystems/openafs/patches/patch-configure deleted file mode 100644 index 51328649860..00000000000 --- a/filesystems/openafs/patches/patch-configure +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-configure,v 1.2 2017/10/08 02:41:39 sevan Exp $ - -- Add support for NetBSD 7 to 9 - ---- configure.orig 2016-03-16 14:32:21.000000000 +0000 -+++ configure -@@ -7559,6 +7559,9 @@ case $AFS_SYSNAME in - *_nbsd40) AFS_PARAM_COMMON=param.nbsd40.h ;; - *_nbsd50) AFS_PARAM_COMMON=param.nbsd50.h ;; - *_nbsd60) AFS_PARAM_COMMON=param.nbsd60.h ;; -+ *_nbsd70) AFS_PARAM_COMMON=param.nbsd70.h ;; -+ *_nbsd80) AFS_PARAM_COMMON=param.nbsd80.h ;; -+ *_nbsd90) AFS_PARAM_COMMON=param.nbsd90.h ;; - *_obsd31) AFS_PARAM_COMMON=param.obsd31.h ;; - *_obsd32) AFS_PARAM_COMMON=param.obsd32.h ;; - *_obsd33) AFS_PARAM_COMMON=param.obsd33.h ;; -@@ -23865,7 +23868,7 @@ case $AFS_SYSNAME in - XCFLAGS="-O2 -pipe -fPIC" - ;; - -- *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*) -+ *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*|*nbsd*0) - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-pthread" - PAM_OPTMZ=-O2 diff --git a/filesystems/openafs/patches/patch-src_cf_osconf.m4 b/filesystems/openafs/patches/patch-src_cf_osconf.m4 index b217a690e50..8d25e7998da 100644 --- a/filesystems/openafs/patches/patch-src_cf_osconf.m4 +++ b/filesystems/openafs/patches/patch-src_cf_osconf.m4 @@ -1,13 +1,15 @@ -$NetBSD: patch-src_cf_osconf.m4,v 1.1 2016/04/04 12:48:29 jakllsch Exp $ +$NetBSD: patch-src_cf_osconf.m4,v 1.2 2022/03/19 16:19:02 jakllsch Exp $ ---- src/cf/osconf.m4.orig 2016-03-16 14:31:22.000000000 +0000 +- support NetBSD newer than 7 + +--- src/cf/osconf.m4.orig 2021-12-09 17:07:41.000000000 +0000 +++ src/cf/osconf.m4 -@@ -205,7 +205,7 @@ case $AFS_SYSNAME in +@@ -189,7 +189,7 @@ case $AFS_SYSNAME in XCFLAGS="-O2 -pipe -fPIC" ;; -- *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*) -+ *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*|*nbsd*0) - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-pthread" +- *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*|*nbsd7*) ++ *nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*|*nbsd7*|*nbsd*0) + MT_CFLAGS='-pthread -D_REENTRANT' PAM_OPTMZ=-O2 + PAM_CFLAGS="-pipe -fPIC" diff --git a/filesystems/openafs/patches/patch-src_cf_sysname.m4 b/filesystems/openafs/patches/patch-src_cf_sysname.m4 new file mode 100644 index 00000000000..a5b1ff2331c --- /dev/null +++ b/filesystems/openafs/patches/patch-src_cf_sysname.m4 @@ -0,0 +1,17 @@ +$NetBSD: patch-src_cf_sysname.m4,v 1.1 2022/03/19 16:19:02 jakllsch Exp $ + +- add support for NetBSD 8 and 9; try to support -current/10 and 10.99/11 + +--- src/cf/sysname.m4.orig 2021-12-09 17:07:41.000000000 +0000 ++++ src/cf/sysname.m4 +@@ -342,6 +342,10 @@ case $AFS_SYSNAME in + *_nbsd50) AFS_PARAM_COMMON=param.nbsd50.h ;; + *_nbsd60) AFS_PARAM_COMMON=param.nbsd60.h ;; + *_nbsd70) AFS_PARAM_COMMON=param.nbsd70.h ;; ++ *_nbsd80) AFS_PARAM_COMMON=param.nbsd80.h ;; ++ *_nbsd90) AFS_PARAM_COMMON=param.nbsd90.h ;; ++ *_nbsd100) AFS_PARAM_COMMON=param.nbsd90.h ;; ++ *_nbsd110) AFS_PARAM_COMMON=param.nbsd90.h ;; + *_obsd31) AFS_PARAM_COMMON=param.obsd31.h ;; + *_obsd32) AFS_PARAM_COMMON=param.obsd32.h ;; + *_obsd33) AFS_PARAM_COMMON=param.obsd33.h ;; diff --git a/filesystems/openafs/patches/patch-src_comerr_Makefile.in b/filesystems/openafs/patches/patch-src_comerr_Makefile.in index 3a2651693f9..14c126b5e1d 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.2 2012/12/01 15:22:32 jakllsch Exp $ +$NetBSD: patch-src_comerr_Makefile.in,v 1.3 2022/03/19 16:19:02 jakllsch Exp $ ---- src/comerr/Makefile.in.orig 2012-03-26 23:03:34.000000000 +0000 +--- src/comerr/Makefile.in.orig 2021-12-09 17:07:41.000000000 +0000 +++ src/comerr/Makefile.in -@@ -29,7 +29,7 @@ ${TOP_LIBDIR}/libafscom_err.a: libafscom +@@ -33,7 +33,7 @@ ${TOP_LIBDIR}/libafscom_err.a: libafscom et_lex.lex.c: et_lex.lex.l $(RM) -f et_lex.lex.c @@ -10,4 +10,4 @@ $NetBSD: patch-src_comerr_Makefile.in,v 1.2 2012/12/01 15:22:32 jakllsch Exp $ + $(LEX) -l -t $(srcdir)/et_lex.lex.l > et_lex.lex.c compile_et: compile_et.o error_table.o - case $(SYS_NAME) in \ + $(Q)case $(SYS_NAME) in \ diff --git a/filesystems/openafs/patches/patch-src_config_afs__sysnames.h b/filesystems/openafs/patches/patch-src_config_afs__sysnames.h index 30aa46790ef..a8b3ee2a4cd 100644 --- a/filesystems/openafs/patches/patch-src_config_afs__sysnames.h +++ b/filesystems/openafs/patches/patch-src_config_afs__sysnames.h @@ -1,15 +1,13 @@ -$NetBSD: patch-src_config_afs__sysnames.h,v 1.4 2017/10/08 02:41:39 sevan Exp $ +$NetBSD: patch-src_config_afs__sysnames.h,v 1.5 2022/03/19 16:19:02 jakllsch Exp $ -- Add SYS_NAME_IDs for NetBSD 7 to 9 on arm/i386/amd64 +- Add SYS_NAME_IDs for NetBSD 8 to 9 on arm/i386/amd64 ---- src/config/afs_sysnames.h.orig 2017-07-04 09:38:22.000000000 +0000 +--- src/config/afs_sysnames.h.orig 2021-12-09 17:07:41.000000000 +0000 +++ src/config/afs_sysnames.h -@@ -275,6 +275,13 @@ - #define SYS_NAME_ID_macppc_nbsd50 2541 - #define SYS_NAME_ID_amd64_nbsd60 2542 +@@ -297,6 +297,11 @@ #define SYS_NAME_ID_i386_nbsd60 2543 -+#define SYS_NAME_ID_amd64_nbsd70 2544 -+#define SYS_NAME_ID_i386_nbsd70 2545 + #define SYS_NAME_ID_amd64_nbsd70 2544 + #define SYS_NAME_ID_i386_nbsd70 2545 +#define SYS_NAME_ID_amd64_nbsd80 2546 +#define SYS_NAME_ID_arm32_nbsd80 2547 +#define SYS_NAME_ID_i386_nbsd80 2548 diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd70.h b/filesystems/openafs/patches/patch-src_config_param.nbsd70.h deleted file mode 100644 index adf4559c795..00000000000 --- a/filesystems/openafs/patches/patch-src_config_param.nbsd70.h +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-src_config_param.nbsd70.h,v 1.2 2017/10/08 02:41:39 sevan Exp $ - -- Add support for NetBSD 7 - ---- src/config/param.nbsd70.h.orig 2016-04-03 18:39:15.000000000 +0000 -+++ src/config/param.nbsd70.h -@@ -41,6 +41,8 @@ - #define AFS_NBSD30_ENV 1 - #define AFS_NBSD40_ENV 1 - #define AFS_NBSD50_ENV 1 -+#define AFS_NBSD60_ENV 1 -+#define AFS_NBSD70_ENV 1 - #undef AFS_NONFSTRANS - #define AFS_NONFSTRANS 1 - -@@ -52,6 +54,8 @@ - #define AFS_HAVE_STATVFS 1 /* System supports statvfs */ - #endif - -+#define ROOTINO UFS_ROOTINO -+ - #ifndef UKERNEL - - #if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd80.h b/filesystems/openafs/patches/patch-src_config_param.nbsd80.h index 36e027358f4..ca72ee45af9 100644 --- a/filesystems/openafs/patches/patch-src_config_param.nbsd80.h +++ b/filesystems/openafs/patches/patch-src_config_param.nbsd80.h @@ -1,20 +1,18 @@ -$NetBSD: patch-src_config_param.nbsd80.h,v 1.1 2017/10/08 02:41:39 sevan Exp $ +$NetBSD: patch-src_config_param.nbsd80.h,v 1.2 2022/03/19 16:19:02 jakllsch Exp $ - Add support for NetBSD 8 ---- src/config/param.nbsd80.h.orig 2017-07-15 22:37:07.451884000 +0000 +--- src/config/param.nbsd80.h.orig 2022-03-18 17:06:12.813417775 +0000 +++ src/config/param.nbsd80.h -@@ -41,6 +41,9 @@ - #define AFS_NBSD30_ENV 1 - #define AFS_NBSD40_ENV 1 +@@ -26,6 +26,7 @@ #define AFS_NBSD50_ENV 1 -+#define AFS_NBSD60_ENV 1 -+#define AFS_NBSD70_ENV 1 + #define AFS_NBSD60_ENV 1 + #define AFS_NBSD70_ENV 1 +#define AFS_NBSD80_ENV 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 -@@ -52,6 +55,8 @@ +@@ -37,6 +38,8 @@ #define AFS_HAVE_STATVFS 1 /* System supports statvfs */ #endif diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd90.h b/filesystems/openafs/patches/patch-src_config_param.nbsd90.h index f5d033f5767..386becd27d5 100644 --- a/filesystems/openafs/patches/patch-src_config_param.nbsd90.h +++ b/filesystems/openafs/patches/patch-src_config_param.nbsd90.h @@ -1,21 +1,19 @@ -$NetBSD: patch-src_config_param.nbsd90.h,v 1.1 2020/09/20 22:15:00 jakllsch Exp $ +$NetBSD: patch-src_config_param.nbsd90.h,v 1.2 2022/03/19 16:19:02 jakllsch Exp $ - Add support for NetBSD 9 ---- src/config/param.nbsd90.h.orig 2020-09-20 22:11:06.272187304 +0000 +--- src/config/param.nbsd90.h.orig 2022-03-18 17:06:12.819973595 +0000 +++ src/config/param.nbsd90.h -@@ -41,6 +41,10 @@ - #define AFS_NBSD30_ENV 1 - #define AFS_NBSD40_ENV 1 +@@ -26,6 +26,8 @@ #define AFS_NBSD50_ENV 1 -+#define AFS_NBSD60_ENV 1 -+#define AFS_NBSD70_ENV 1 + #define AFS_NBSD60_ENV 1 + #define AFS_NBSD70_ENV 1 +#define AFS_NBSD80_ENV 1 +#define AFS_NBSD90_ENV 1 #undef AFS_NONFSTRANS #define AFS_NONFSTRANS 1 -@@ -52,6 +56,8 @@ +@@ -37,6 +39,8 @@ #define AFS_HAVE_STATVFS 1 /* System supports statvfs */ #endif diff --git a/filesystems/openafs/patches/patch-src_des_andrew-conf.h b/filesystems/openafs/patches/patch-src_des_andrew-conf.h deleted file mode 100644 index e00d31019b5..00000000000 --- a/filesystems/openafs/patches/patch-src_des_andrew-conf.h +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_des_andrew-conf.h,v 1.1 2017/10/08 02:41:39 sevan Exp $ - -- Include BSD config for 32-bit ARM config - ---- src/des/andrew-conf.h.orig 2017-07-15 20:59:16.278490000 +0000 -+++ src/des/andrew-conf.h -@@ -47,6 +47,8 @@ - #ifdef AFS_XBSD_ENV - #ifdef AFS_X86_XBSD_ENV - #include "conf-i386-obsd.h" -+#elif defined(AFS_ARM32_XBSD_ENV) -+#include "conf-arm32-bsd.h" - #elif defined(AFS_ALPHA_ENV) - #include "conf-alpha-bsd.h" - #else diff --git a/filesystems/openafs/patches/patch-src_des_conf-arm32-bsd.h b/filesystems/openafs/patches/patch-src_des_conf-arm32-bsd.h deleted file mode 100644 index 51e30bb6158..00000000000 --- a/filesystems/openafs/patches/patch-src_des_conf-arm32-bsd.h +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-src_des_conf-arm32-bsd.h,v 1.1 2017/10/08 02:41:39 sevan Exp $ - -- Add BSD on 32-BIT ARM support - ---- src/des/conf-arm32-bsd.h.orig 2017-07-15 21:01:01.505692000 +0000 -+++ src/des/conf-arm32-bsd.h -@@ -0,0 +1,5 @@ -+#define NOASM -+#define BITS32 -+#define BIG -+#define BSDUNIX -+#define LSBFIRST diff --git a/filesystems/openafs/patches/patch-src_lwp_lwp.c b/filesystems/openafs/patches/patch-src_lwp_lwp.c index 1dc5a128e59..da2e57027cd 100644 --- a/filesystems/openafs/patches/patch-src_lwp_lwp.c +++ b/filesystems/openafs/patches/patch-src_lwp_lwp.c @@ -1,10 +1,10 @@ -$NetBSD: patch-src_lwp_lwp.c,v 1.1 2017/10/08 02:41:39 sevan Exp $ +$NetBSD: patch-src_lwp_lwp.c,v 1.2 2022/03/19 16:19:02 jakllsch Exp $ - Like Linux & Darwin, exclude *BSD on 32-bit ARM from the bespoke LWP handling mechanism. ---- src/lwp/lwp.c.orig 2017-07-04 09:38:22.000000000 +0000 +--- src/lwp/lwp.c.orig 2021-12-09 17:07:41.000000000 +0000 +++ src/lwp/lwp.c -@@ -376,7 +376,7 @@ LWP_CreateProcess(void *(*ep) (void *), +@@ -365,7 +365,7 @@ LWP_CreateProcess(void *(*ep) (void *), Initialize_PCB(temp, priority, stackmemory, stacksize, ep, parm, name); insert(temp, &runnable[priority]); temp2 = lwp_cpptr; @@ -13,7 +13,7 @@ $NetBSD: patch-src_lwp_lwp.c,v 1.1 2017/10/08 02:41:39 sevan Exp $ if (PRE_Block != 0) Abort_LWP("PRE_Block not 0"); -@@ -472,7 +472,7 @@ LWP_CreateProcess2(void *(*ep) (void *), +@@ -461,7 +461,7 @@ LWP_CreateProcess2(void *(*ep) (void *), Initialize_PCB(temp, priority, stackptr, stacksize, ep, parm, name); insert(temp, &runnable[priority]); temp2 = lwp_cpptr; @@ -22,7 +22,7 @@ $NetBSD: patch-src_lwp_lwp.c,v 1.1 2017/10/08 02:41:39 sevan Exp $ if (PRE_Block != 0) Abort_LWP("PRE_Block not 0"); -@@ -973,7 +973,7 @@ Dispatcher(void) +@@ -961,7 +961,7 @@ Dispatcher(void) printf("Dispatch %d [PCB at 0x%x] \"%s\"\n", ++dispatch_count, runnable[i].head, runnable[i].head->name); #endif diff --git a/filesystems/openafs/patches/patch-src_lwp_process.amd64.s b/filesystems/openafs/patches/patch-src_lwp_process.amd64.s new file mode 100644 index 00000000000..01e26352e35 --- /dev/null +++ b/filesystems/openafs/patches/patch-src_lwp_process.amd64.s @@ -0,0 +1,39 @@ +$NetBSD: patch-src_lwp_process.amd64.s,v 1.1 2022/03/19 16:19:02 jakllsch Exp $ + +- make PIC for NetBSD/amd64 8.x; it somehow works otherwise on NetBSD 9.x + +--- src/lwp/process.amd64.s.orig 2021-12-09 17:07:41.000000000 +0000 ++++ src/lwp/process.amd64.s +@@ -41,7 +41,7 @@ + * just renaming the registers. + */ + +-#ifdef HAVE_MACHINE_ASM_H ++#if defined(__NetBSD__) || defined(HAVE_MACHINE_ASM_H) + #include <machine/asm.h> + #endif + +@@ -113,7 +113,11 @@ L1: + jmp *f(%rbp) /* jump to function pointer passed in arg */ + + /* Shouldnt be here....*/ ++#if defined(__NetBSD__) ++ call PIC_PLT(_C_LABEL(abort)) ++#else + call _C_LABEL(abort) ++#endif + + /* + * returnto(struct savearea *area2) +@@ -157,7 +161,11 @@ ENTRY(returnto) + + /* We never should get here, put in emergency brake as in i386 code */ + pushq $1234 ++#if defined(__NetBSD__) ++ call PIC_PLT(_C_LABEL(abort)) ++#else + call _C_LABEL(abort) ++#endif + + #if defined(__linux__) && defined(__ELF__) + .section .note.GNU-stack,"",%progbits |