Received: by mail.netbsd.org (Postfix, from userid 605) id 94A5E84E77; Thu, 16 Feb 2023 18:56:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C2F3A84E72 for ; Thu, 16 Feb 2023 18:56:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id UQUKuc9TD3pG for ; Thu, 16 Feb 2023 18:56:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id BFE5A84CDC for ; Thu, 16 Feb 2023 18:56:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B8981FA90; Thu, 16 Feb 2023 18:56:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1676573804248160" MIME-Version: 1.0 Date: Thu, 16 Feb 2023 18:56:44 +0000 From: "Havard Eidnes" Subject: CVS commit: pkgsrc/filesystems/openafs To: pkgsrc-changes@NetBSD.org Reply-To: he@netbsd.org X-Mailer: log_accum Message-Id: <20230216185644.B8981FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1676573804248160 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: he Date: Thu Feb 16 18:56:44 UTC 2023 Modified Files: pkgsrc/filesystems/openafs: distinfo pkgsrc/filesystems/openafs/patches: patch-src_config_afs__sysnames.h Added Files: pkgsrc/filesystems/openafs/patches: patch-src_config_param.nbsd100.h patch-src_config_param.ppc_nbsd100.h Log Message: openafs: bring the ability to build & install to NetBSD/macppc 10.0_BETA. I see fertile ground for similar fixes for other archs in this package. The 10.0-specific files were copied from the 9.0 files and minimally modified (actually, the ppc_nbsd100 file was from the ppc_nbsd20 file). New ID assigned for NetBSD/macppc 10.0. No functional testing done: "it builds; ship it!" :) To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/filesystems/openafs/distinfo cvs rdiff -u -r1.5 -r1.6 \ pkgsrc/filesystems/openafs/patches/patch-src_config_afs__sysnames.h cvs rdiff -u -r0 -r1.1 \ pkgsrc/filesystems/openafs/patches/patch-src_config_param.nbsd100.h \ pkgsrc/filesystems/openafs/patches/patch-src_config_param.ppc_nbsd100.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1676573804248160 Content-Disposition: inline Content-Length: 8629 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/filesystems/openafs/distinfo diff -u pkgsrc/filesystems/openafs/distinfo:1.20 pkgsrc/filesystems/openafs/distinfo:1.21 --- pkgsrc/filesystems/openafs/distinfo:1.20 Sat Mar 19 16:19:02 2022 +++ pkgsrc/filesystems/openafs/distinfo Thu Feb 16 18:56:44 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2022/03/19 16:19:02 jakllsch Exp $ +$NetBSD: distinfo,v 1.21 2023/02/16 18:56:44 he Exp $ BLAKE2s (openafs-1.8.8.1-src.tar.bz2) = cfa0eadf49551acae3e14a3b756ce618a30bece455915fde9a7a1311baa0f4c9 SHA512 (openafs-1.8.8.1-src.tar.bz2) = fb181e0989e9bae714af26de916a96946eea20f98b47154f2de7b5e296cb4f42af5df037ef7b603073e97eafe52d7c401666f03130c1e0c9a6ae1a6c2707c384 @@ -8,7 +8,9 @@ SHA1 (patch-src_cf_sysname.m4) = 7f45f63 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.nbsd100.h) = 5af5a945a68958dee515fb1eb98b002097c0fb40 SHA1 (patch-src_config_param.nbsd80.h) = 52335bea3c5ae9becab4d9e8248ecc3c2ac24749 SHA1 (patch-src_config_param.nbsd90.h) = 0a958172a80e694f0b59c0e5e03c0956740b1ddb +SHA1 (patch-src_config_param.ppc_nbsd100.h) = 21802201fffc94bba23119c7781189a2ddfe680f SHA1 (patch-src_lwp_lwp.c) = be963332293d31137a46fb27d1dec25c7fbb120e SHA1 (patch-src_lwp_process.amd64.s) = c0be87a82e201855d9004859e01c90d8016efc7f Index: pkgsrc/filesystems/openafs/patches/patch-src_config_afs__sysnames.h diff -u pkgsrc/filesystems/openafs/patches/patch-src_config_afs__sysnames.h:1.5 pkgsrc/filesystems/openafs/patches/patch-src_config_afs__sysnames.h:1.6 --- pkgsrc/filesystems/openafs/patches/patch-src_config_afs__sysnames.h:1.5 Sat Mar 19 16:19:02 2022 +++ pkgsrc/filesystems/openafs/patches/patch-src_config_afs__sysnames.h Thu Feb 16 18:56:44 2023 @@ -1,10 +1,10 @@ -$NetBSD: patch-src_config_afs__sysnames.h,v 1.5 2022/03/19 16:19:02 jakllsch Exp $ +$NetBSD: patch-src_config_afs__sysnames.h,v 1.6 2023/02/16 18:56:44 he Exp $ - Add SYS_NAME_IDs for NetBSD 8 to 9 on arm/i386/amd64 --- src/config/afs_sysnames.h.orig 2021-12-09 17:07:41.000000000 +0000 +++ src/config/afs_sysnames.h -@@ -297,6 +297,11 @@ +@@ -297,6 +297,12 @@ #define SYS_NAME_ID_i386_nbsd60 2543 #define SYS_NAME_ID_amd64_nbsd70 2544 #define SYS_NAME_ID_i386_nbsd70 2545 @@ -13,6 +13,7 @@ $NetBSD: patch-src_config_afs__sysnames. +#define SYS_NAME_ID_i386_nbsd80 2548 +#define SYS_NAME_ID_amd64_nbsd90 2549 +#define SYS_NAME_ID_i386_nbsd90 2550 ++#define SYS_NAME_ID_macppc_nbsd100 2551 #define SYS_NAME_ID_i386_obsd31 2600 #define SYS_NAME_ID_i386_obsd32 2601 Added files: Index: pkgsrc/filesystems/openafs/patches/patch-src_config_param.nbsd100.h diff -u /dev/null pkgsrc/filesystems/openafs/patches/patch-src_config_param.nbsd100.h:1.1 --- /dev/null Thu Feb 16 18:56:44 2023 +++ pkgsrc/filesystems/openafs/patches/patch-src_config_param.nbsd100.h Thu Feb 16 18:56:44 2023 @@ -0,0 +1,169 @@ +$NetBSD: patch-src_config_param.nbsd100.h,v 1.1 2023/02/16 18:56:44 he Exp $ + +--- src/config/param.nbsd100.h.orig 2023-02-16 19:16:24.549771760 +0100 ++++ src/config/param.nbsd100.h 2023-02-16 19:23:09.070744023 +0100 +@@ -0,0 +1,164 @@ ++/* NetBSD shared section */ ++ ++#ifndef AFS_PARAM_COMMON_H ++#define AFS_PARAM_COMMON_H 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 ++ ++#define AFS_MOUNT_AFS "afs" /* The name of the filesystem type. */ ++#define AFS_SYSCALL 210 ++ ++#define AFS_KALLOC(n) kmem_alloc(n, KM_SLEEP) ++#define AFS_KALLOC_NOSLEEP(n) kmem_alloc(n, KM_NOSLEEP) ++#define AFS_KFREE kmem_free ++#define VATTR_NULL vattr_null ++ ++#define AFS_XBSD_ENV 1 /* {Free,Open,Net}BSD */ ++ ++#define AFS_NBSD_ENV 1 ++#define AFS_NBSD15_ENV 1 ++#define AFS_NBSD16_ENV 1 ++#define AFS_NBSD20_ENV 1 ++#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 ++#define AFS_NBSD80_ENV 1 ++#define AFS_NBSD90_ENV 1 ++#define AFS_NBSD100_ENV 1 ++#undef AFS_NONFSTRANS ++#define AFS_NONFSTRANS 1 ++ ++#define AFS_VFSINCL_ENV 1 ++ ++#define AFS_HAVE_FFS 1 /* Use system's ffs. */ ++ ++#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) ++#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) ++#include ++#endif ++ ++#define FTRUNC O_TRUNC ++ ++#define IUPD 0x0010 ++#define IACC 0x0020 ++#define ICHG 0x0040 ++#define IMOD 0x0080 ++ ++#define RXK_LISTENER_ENV 1 ++ ++#include ++ ++#define AFS_VFS_ENV 1 ++#define AFS_GREEDY43_ENV 1 ++ ++#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ ++#define AFS_USE_GETTIMEOFDAY 1 /* use gettimeofday to implement rx clock */ ++#define AFS_GLOBAL_SUNLOCK 1 ++ ++/* Extra kernel definitions (from kdefs file) */ ++#ifdef _KERNEL_DEPRECATED ++#define AFS_VFS34 1 /* What is VFS34??? */ ++#define afsio_iov uio_iov ++#define afsio_iovcnt uio_iovcnt ++#define afsio_offset uio_offset ++#define afsio_seg uio_segflg ++#define afsio_resid uio_resid ++#define AFS_UIOSYS UIO_SYSSPACE ++#define AFS_UIOUSER UIO_USERSPACE ++#define AFS_CLBYTES CLBYTES ++#define osi_GetTime(x) microtime(x) ++#define AFS_KALLOC(x) kalloc(x) ++#define AFS_KFREE(x,y) kfree(x,y) ++#define v_count v_usecount ++#define v_vfsp v_mount ++#define vfs_bsize mnt_stat.f_bsize ++#define vfs_fsid mnt_stat.f_fsid ++#define va_nodeid va_fileid ++#define vfs_vnodecovered mnt_vnodecovered ++#define direct dirent ++ ++#ifndef MUTEX_DEFAULT ++#define MUTEX_DEFAULT 0 ++#endif /* MUTEX_DEFAULT */ ++ ++#ifndef SSYS ++#define SSYS 0x00002 ++#endif /* SSYS */ ++ ++#define p_rcred p_ucred ++ ++#define VN_RELE(vp) vrele(((struct vnode *)(vp))) ++#define VN_HOLD(vp) VREF(((struct vnode *)(vp))) ++ ++#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) ++enum vcexcl { NONEXCL, EXCL }; ++ ++#ifdef KERNEL ++#ifndef MIN ++#define MIN(A,B) ((A) < (B) ? (A) : (B)) ++#endif ++#ifndef MAX ++#define MAX(A,B) ((A) > (B) ? (A) : (B)) ++#endif ++#endif /* KERNEL */ ++ ++#endif /* ! ASSEMBLER & ! __LANGUAGE_ASSEMBLY__ && !defined(IGNORE_STDS_H) */ ++#endif /* _KERNEL_DEPRECATED */ ++ ++#else /* !defined(UKERNEL) */ ++ ++ ++/* This section for user space compiles only */ ++ ++#define UKERNEL 1 /* user space kernel */ ++ ++#include ++ ++#define AFS_USERSPACE_IP_ADDR 1 ++#define RXK_LISTENER_ENV 1 ++#define AFS_GCPAGS 0 /* if nonzero, garbage collect PAGs */ ++ ++#define afsio_iov uio_iov ++#define afsio_iovcnt uio_iovcnt ++#define afsio_offset uio_offset ++#define afsio_seg uio_segflg ++#define afsio_fmode uio_fmode ++#define afsio_resid uio_resid ++#define AFS_UIOSYS UIO_SYSSPACE ++#define AFS_UIOUSER UIO_USERSPACE ++#define AFS_CLBYTES MCLBYTES ++#define AFS_MINCHANGE 2 ++#define VATTR_NULL usr_vattr_null ++ ++#define AFS_DIRENT ++#ifndef CMSERVERPREF ++#define CMSERVERPREF ++#endif ++ ++#if !defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H) && !defined() ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#endif ++ ++#endif /* !defined(UKERNEL) */ ++ ++#define ROOTINO UFS_ROOTINO ++ ++#endif /* AFS_PARAM_COMMON_H */ Index: pkgsrc/filesystems/openafs/patches/patch-src_config_param.ppc_nbsd100.h diff -u /dev/null pkgsrc/filesystems/openafs/patches/patch-src_config_param.ppc_nbsd100.h:1.1 --- /dev/null Thu Feb 16 18:56:44 2023 +++ pkgsrc/filesystems/openafs/patches/patch-src_config_param.ppc_nbsd100.h Thu Feb 16 18:56:44 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_config_param.ppc_nbsd100.h,v 1.1 2023/02/16 18:56:44 he Exp $ + +--- src/config/param.ppc_nbsd100.h.orig 2023-02-16 19:16:24.549771760 +0100 ++++ src/config/param.ppc_nbsd100.h 2023-02-16 19:21:11.780631671 +0100 +@@ -0,0 +1,10 @@ ++#ifndef AFS_PPC_PARAM_H ++#define AFS_PPC_PARAM_H ++ ++#define SYS_NAME "macppc_nbsd100" ++#define SYS_NAME_ID SYS_NAME_ID_macppc_nbsd100 ++ ++#define AFS_PPC_ENV 1 ++#define AFSBIG_ENDIAN 1 ++ ++#endif /* AFS_PCC_PARAM_H */ --_----------=_1676573804248160--