CVS commit: src/dist/pf/sbin/pflogd
Module Name:src Committed By: rjs Date: Sat Aug 19 05:57:34 UTC 2023 Modified Files: src/dist/pf/sbin/pflogd: pflogd.c Log Message: pflogd: adapt to new libpcap API. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/dist/pf/sbin/pflogd/pflogd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/dist/pf/sbin/pflogd/pflogd.c diff -u src/dist/pf/sbin/pflogd/pflogd.c:1.10 src/dist/pf/sbin/pflogd/pflogd.c:1.11 --- src/dist/pf/sbin/pflogd/pflogd.c:1.10 Fri Aug 28 12:17:41 2015 +++ src/dist/pf/sbin/pflogd/pflogd.c Sat Aug 19 05:57:34 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: pflogd.c,v 1.10 2015/08/28 12:17:41 joerg Exp $ */ +/* $NetBSD: pflogd.c,v 1.11 2023/08/19 05:57:34 rjs Exp $ */ /* $OpenBSD: pflogd.c,v 1.45 2007/06/06 14:11:26 henning Exp $ */ /* @@ -349,7 +349,6 @@ try_reset_dump(int nomove) hdr.magic = TCPDUMP_MAGIC; hdr.version_major = PCAP_VERSION_MAJOR; hdr.version_minor = PCAP_VERSION_MINOR; - hdr.thiszone = hpcap->tzoff; hdr.snaplen = hpcap->snapshot; hdr.sigfigs = 0; hdr.linktype = hpcap->linktype;
CVS commit: src/dist/pf/sbin/pflogd
Module Name:src Committed By: rjs Date: Sat Aug 19 05:57:34 UTC 2023 Modified Files: src/dist/pf/sbin/pflogd: pflogd.c Log Message: pflogd: adapt to new libpcap API. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/dist/pf/sbin/pflogd/pflogd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: sjg Date: Sat Aug 19 01:34:21 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: varmod-mtime.exp varmod-mtime.mk Log Message: varmod-mtime.mk: use :localtime for %s Add a comment to explain why ${%s:L:localtime} should be used to get a value that matches time(3). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-mtime.exp \ src/usr.bin/make/unit-tests/varmod-mtime.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: sjg Date: Sat Aug 19 01:34:21 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: varmod-mtime.exp varmod-mtime.mk Log Message: varmod-mtime.mk: use :localtime for %s Add a comment to explain why ${%s:L:localtime} should be used to get a value that matches time(3). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/varmod-mtime.exp \ src/usr.bin/make/unit-tests/varmod-mtime.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/varmod-mtime.exp diff -u src/usr.bin/make/unit-tests/varmod-mtime.exp:1.3 src/usr.bin/make/unit-tests/varmod-mtime.exp:1.4 --- src/usr.bin/make/unit-tests/varmod-mtime.exp:1.3 Thu Aug 17 19:06:51 2023 +++ src/usr.bin/make/unit-tests/varmod-mtime.exp Sat Aug 19 01:34:21 2023 @@ -1,8 +1,8 @@ -make: "varmod-mtime.mk" line 58: Cannot determine mtime for 'no/such/file1': -make: "varmod-mtime.mk" line 58: Cannot determine mtime for 'no/such/file2': -make: "varmod-mtime.mk" line 58: Malformed conditional (${no/such/file1 no/such/file2:L:mtime=error}) -make: "varmod-mtime.mk" line 69: Invalid argument 'errorhandler-no' for modifier ':mtime' -make: "varmod-mtime.mk" line 69: Malformed conditional (${MAKEFILE:mtime=errorhandler-no} > 0) +make: "varmod-mtime.mk" line 60: Cannot determine mtime for 'no/such/file1': +make: "varmod-mtime.mk" line 60: Cannot determine mtime for 'no/such/file2': +make: "varmod-mtime.mk" line 60: Malformed conditional (${no/such/file1 no/such/file2:L:mtime=error}) +make: "varmod-mtime.mk" line 71: Invalid argument 'errorhandler-no' for modifier ':mtime' +make: "varmod-mtime.mk" line 71: Malformed conditional (${MAKEFILE:mtime=errorhandler-no} > 0) make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/varmod-mtime.mk diff -u src/usr.bin/make/unit-tests/varmod-mtime.mk:1.3 src/usr.bin/make/unit-tests/varmod-mtime.mk:1.4 --- src/usr.bin/make/unit-tests/varmod-mtime.mk:1.3 Thu Aug 17 19:06:51 2023 +++ src/usr.bin/make/unit-tests/varmod-mtime.mk Sat Aug 19 01:34:21 2023 @@ -1,9 +1,11 @@ -# $NetBSD: varmod-mtime.mk,v 1.3 2023/08/17 19:06:51 rillig Exp $ +# $NetBSD: varmod-mtime.mk,v 1.4 2023/08/19 01:34:21 sjg Exp $ # # Tests for the ':mtime' variable modifier, which maps each word of the # expression to that file's modification time. -start:= ${%s:L:gmtime} +# Note: strftime() uses mktime() for %s and mktime() assumes localtime +# so this should match time() +start:= ${%s:L:localtime} # Ensure that this makefile exists and has a modification time. If the file
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Sat Aug 19 00:09:17 UTC 2023 Modified Files: src/usr.bin/make: meta.c Log Message: meta_ignore: check metaIgnorePaths on raw path Some path prefixes can trigger automount, if we want to ignore them it might be best to check metaIgnorePaths before we call realpath. If the raw path does not match, check again after realpath. To generate a diff of this commit: cvs rdiff -u -r1.205 -r1.206 src/usr.bin/make/meta.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/meta.c diff -u src/usr.bin/make/meta.c:1.205 src/usr.bin/make/meta.c:1.206 --- src/usr.bin/make/meta.c:1.205 Tue Mar 28 14:39:31 2023 +++ src/usr.bin/make/meta.c Sat Aug 19 00:09:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: meta.c,v 1.205 2023/03/28 14:39:31 rillig Exp $ */ +/* $NetBSD: meta.c,v 1.206 2023/08/19 00:09:17 sjg Exp $ */ /* * Implement 'meta' mode. @@ -932,6 +932,13 @@ meta_ignore(GNode *gn, const char *p) return true; if (*p == '/') { + /* first try the raw path "as is" */ + if (has_any_prefix(p, )) { +#ifdef DEBUG_META_MODE + DEBUG1(META, "meta_oodate: ignoring path: %s\n", p); +#endif + return true; + } cached_realpath(p, fname); /* clean it up */ if (has_any_prefix(fname, )) { #ifdef DEBUG_META_MODE
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Sat Aug 19 00:09:17 UTC 2023 Modified Files: src/usr.bin/make: meta.c Log Message: meta_ignore: check metaIgnorePaths on raw path Some path prefixes can trigger automount, if we want to ignore them it might be best to check metaIgnorePaths before we call realpath. If the raw path does not match, check again after realpath. To generate a diff of this commit: cvs rdiff -u -r1.205 -r1.206 src/usr.bin/make/meta.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/msdosfs
Module Name:src Committed By: mrg Date: Fri Aug 18 21:05:44 UTC 2023 Modified Files: src/sys/fs/msdosfs: msdosfs_vnops.c Log Message: fix the previous to not fail to include the extension in lookups. copy deExtension into the final 3 bytes. previously, this was found by having them next to each other in the containing structure, but as separate strings. thanks to miod for pointing this out. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/fs/msdosfs/msdosfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/msdosfs/msdosfs_vnops.c diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.111 src/sys/fs/msdosfs/msdosfs_vnops.c:1.112 --- src/sys/fs/msdosfs/msdosfs_vnops.c:1.111 Mon Aug 14 05:41:09 2023 +++ src/sys/fs/msdosfs/msdosfs_vnops.c Fri Aug 18 21:05:44 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: msdosfs_vnops.c,v 1.111 2023/08/14 05:41:09 mrg Exp $ */ +/* $NetBSD: msdosfs_vnops.c,v 1.112 2023/08/18 21:05:44 mrg Exp $ */ /*- * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank. @@ -48,7 +48,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.111 2023/08/14 05:41:09 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.112 2023/08/18 21:05:44 mrg Exp $"); #include #include @@ -1168,7 +1168,10 @@ msdosfs_readdir(void *v) memcpy(deName, dentp->deName, sizeof dentp->deName); -memset([8], 0, 3); +memcpy(deName + 8, dentp->deExtension, + sizeof dentp->deExtension); +assert(sizeof(deName) == sizeof(dentp->deName) + + sizeof(dentp->deExtension)); dirbuf->d_namlen = msdosfs_dos2unixfn(deName, (u_char *)dirbuf->d_name,
CVS commit: src/sys/fs/msdosfs
Module Name:src Committed By: mrg Date: Fri Aug 18 21:05:44 UTC 2023 Modified Files: src/sys/fs/msdosfs: msdosfs_vnops.c Log Message: fix the previous to not fail to include the extension in lookups. copy deExtension into the final 3 bytes. previously, this was found by having them next to each other in the containing structure, but as separate strings. thanks to miod for pointing this out. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/sys/fs/msdosfs/msdosfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch
Module Name:src Committed By: christos Date: Fri Aug 18 19:42:06 UTC 2023 Modified Files: src/sys/compat/linux/arch/aarch64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/arch/aarch64/linux_syscall.h \ src/sys/compat/linux/arch/aarch64/linux_syscallargs.h \ src/sys/compat/linux/arch/aarch64/linux_syscalls.c \ src/sys/compat/linux/arch/aarch64/linux_sysent.c \ src/sys/compat/linux/arch/aarch64/linux_systrace_args.c cvs rdiff -u -r1.117 -r1.118 src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.116 -r1.117 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.118 -r1.119 src/sys/compat/linux/arch/alpha/linux_syscalls.c cvs rdiff -u -r1.79 -r1.80 src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.23 -r1.24 \ src/sys/compat/linux/arch/amd64/linux_systrace_args.c cvs rdiff -u -r1.90 -r1.91 src/sys/compat/linux/arch/arm/linux_syscall.h \ src/sys/compat/linux/arch/arm/linux_syscallargs.h \ src/sys/compat/linux/arch/arm/linux_syscalls.c \ src/sys/compat/linux/arch/arm/linux_sysent.c cvs rdiff -u -r1.23 -r1.24 \ src/sys/compat/linux/arch/arm/linux_systrace_args.c cvs rdiff -u -r1.124 -r1.125 src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.125 -r1.126 src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.19 -r1.20 \ src/sys/compat/linux/arch/i386/linux_systrace_args.c cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.87 -r1.88 src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c cvs rdiff -u -r1.94 -r1.95 src/sys/compat/linux/arch/powerpc/linux_syscall.h \ src/sys/compat/linux/arch/powerpc/linux_sysent.c cvs rdiff -u -r1.93 -r1.94 \ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \ src/sys/compat/linux/arch/powerpc/linux_syscalls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/arch/aarch64/linux_syscall.h diff -u src/sys/compat/linux/arch/aarch64/linux_syscall.h:1.8 src/sys/compat/linux/arch/aarch64/linux_syscall.h:1.9 --- src/sys/compat/linux/arch/aarch64/linux_syscall.h:1.8 Sat Jul 29 11:05:45 2023 +++ src/sys/compat/linux/arch/aarch64/linux_syscall.h Fri Aug 18 15:42:05 2023 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscall.h,v 1.8 2023/07/29 15:05:45 christos Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.9 2023/08/18 19:42:05 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.9 2023/07/29 15:04:28 christos Exp + * created from NetBSD: syscalls.master,v 1.10 2023/08/18 19:41:19 christos Exp */ #ifndef _LINUX_SYS_SYSCALL_H_ @@ -222,6 +222,9 @@ /* syscall: "exit_group" ret: "int" args: "int" */ #define LINUX_SYS_exit_group 94 +/* syscall: "waitid" ret: "int" args: "int" "id_t" "linux_siginfo_t *" "int" "struct rusage50 *" */ +#define LINUX_SYS_waitid 95 + /* syscall: "set_tid_address" ret: "int" args: "int *" */ #define LINUX_SYS_set_tid_address 96 Index: src/sys/compat/linux/arch/aarch64/linux_syscallargs.h diff -u src/sys/compat/linux/arch/aarch64/linux_syscallargs.h:1.8 src/sys/compat/linux/arch/aarch64/linux_syscallargs.h:1.9 --- src/sys/compat/linux/arch/aarch64/linux_syscallargs.h:1.8 Sat Jul 29 11:05:45 2023 +++ src/sys/compat/linux/arch/aarch64/linux_syscallargs.h Fri Aug 18 15:42:05 2023 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscallargs.h,v 1.8 2023/07/29 15:05:45 christos Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.9 2023/08/18 19:42:05
CVS commit: src/sys/compat/linux/arch
Module Name:src Committed By: christos Date: Fri Aug 18 19:42:06 UTC 2023 Modified Files: src/sys/compat/linux/arch/aarch64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/alpha: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/linux/arch/aarch64/linux_syscall.h \ src/sys/compat/linux/arch/aarch64/linux_syscallargs.h \ src/sys/compat/linux/arch/aarch64/linux_syscalls.c \ src/sys/compat/linux/arch/aarch64/linux_sysent.c \ src/sys/compat/linux/arch/aarch64/linux_systrace_args.c cvs rdiff -u -r1.117 -r1.118 src/sys/compat/linux/arch/alpha/linux_syscall.h \ src/sys/compat/linux/arch/alpha/linux_sysent.c cvs rdiff -u -r1.116 -r1.117 \ src/sys/compat/linux/arch/alpha/linux_syscallargs.h cvs rdiff -u -r1.118 -r1.119 src/sys/compat/linux/arch/alpha/linux_syscalls.c cvs rdiff -u -r1.79 -r1.80 src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.23 -r1.24 \ src/sys/compat/linux/arch/amd64/linux_systrace_args.c cvs rdiff -u -r1.90 -r1.91 src/sys/compat/linux/arch/arm/linux_syscall.h \ src/sys/compat/linux/arch/arm/linux_syscallargs.h \ src/sys/compat/linux/arch/arm/linux_syscalls.c \ src/sys/compat/linux/arch/arm/linux_sysent.c cvs rdiff -u -r1.23 -r1.24 \ src/sys/compat/linux/arch/arm/linux_systrace_args.c cvs rdiff -u -r1.124 -r1.125 src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.125 -r1.126 src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.19 -r1.20 \ src/sys/compat/linux/arch/i386/linux_systrace_args.c cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.87 -r1.88 src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c cvs rdiff -u -r1.94 -r1.95 src/sys/compat/linux/arch/powerpc/linux_syscall.h \ src/sys/compat/linux/arch/powerpc/linux_sysent.c cvs rdiff -u -r1.93 -r1.94 \ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \ src/sys/compat/linux/arch/powerpc/linux_syscalls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src Committed By: christos Date: Fri Aug 18 19:41:20 UTC 2023 Modified Files: src/sys/compat/common: compat_mod.h files.common src/sys/compat/linux/arch/aarch64: syscalls.master src/sys/compat/linux/arch/alpha: syscalls.master src/sys/compat/linux/arch/amd64: syscalls.master src/sys/compat/linux/arch/arm: syscalls.master src/sys/compat/linux/arch/i386: syscalls.master src/sys/compat/linux/arch/mips: syscalls.master src/sys/compat/linux/arch/powerpc: syscalls.master src/sys/compat/linux/common: linux_misc.c linux_misc.h linux_signal.c src/sys/compat/linux32/common: linux32_wait.c Log Message: Add linux waitid(2) from GSoC 2023 (Theodore Preduta) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/common/compat_mod.h cvs rdiff -u -r1.9 -r1.10 src/sys/compat/common/files.common cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux/arch/aarch64/syscalls.master cvs rdiff -u -r1.104 -r1.105 src/sys/compat/linux/arch/alpha/syscalls.master cvs rdiff -u -r1.70 -r1.71 src/sys/compat/linux/arch/amd64/syscalls.master cvs rdiff -u -r1.77 -r1.78 src/sys/compat/linux/arch/arm/syscalls.master cvs rdiff -u -r1.132 -r1.133 src/sys/compat/linux/arch/i386/syscalls.master cvs rdiff -u -r1.77 -r1.78 src/sys/compat/linux/arch/mips/syscalls.master cvs rdiff -u -r1.82 -r1.83 src/sys/compat/linux/arch/powerpc/syscalls.master cvs rdiff -u -r1.261 -r1.262 src/sys/compat/linux/common/linux_misc.c cvs rdiff -u -r1.28 -r1.29 src/sys/compat/linux/common/linux_misc.h cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/common/linux_signal.c cvs rdiff -u -r1.12 -r1.13 src/sys/compat/linux32/common/linux32_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat
Module Name:src Committed By: christos Date: Fri Aug 18 19:41:20 UTC 2023 Modified Files: src/sys/compat/common: compat_mod.h files.common src/sys/compat/linux/arch/aarch64: syscalls.master src/sys/compat/linux/arch/alpha: syscalls.master src/sys/compat/linux/arch/amd64: syscalls.master src/sys/compat/linux/arch/arm: syscalls.master src/sys/compat/linux/arch/i386: syscalls.master src/sys/compat/linux/arch/mips: syscalls.master src/sys/compat/linux/arch/powerpc: syscalls.master src/sys/compat/linux/common: linux_misc.c linux_misc.h linux_signal.c src/sys/compat/linux32/common: linux32_wait.c Log Message: Add linux waitid(2) from GSoC 2023 (Theodore Preduta) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/compat/common/compat_mod.h cvs rdiff -u -r1.9 -r1.10 src/sys/compat/common/files.common cvs rdiff -u -r1.9 -r1.10 src/sys/compat/linux/arch/aarch64/syscalls.master cvs rdiff -u -r1.104 -r1.105 src/sys/compat/linux/arch/alpha/syscalls.master cvs rdiff -u -r1.70 -r1.71 src/sys/compat/linux/arch/amd64/syscalls.master cvs rdiff -u -r1.77 -r1.78 src/sys/compat/linux/arch/arm/syscalls.master cvs rdiff -u -r1.132 -r1.133 src/sys/compat/linux/arch/i386/syscalls.master cvs rdiff -u -r1.77 -r1.78 src/sys/compat/linux/arch/mips/syscalls.master cvs rdiff -u -r1.82 -r1.83 src/sys/compat/linux/arch/powerpc/syscalls.master cvs rdiff -u -r1.261 -r1.262 src/sys/compat/linux/common/linux_misc.c cvs rdiff -u -r1.28 -r1.29 src/sys/compat/linux/common/linux_misc.h cvs rdiff -u -r1.88 -r1.89 src/sys/compat/linux/common/linux_signal.c cvs rdiff -u -r1.12 -r1.13 src/sys/compat/linux32/common/linux32_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/common/compat_mod.h diff -u src/sys/compat/common/compat_mod.h:1.8 src/sys/compat/common/compat_mod.h:1.9 --- src/sys/compat/common/compat_mod.h:1.8 Fri Jul 28 14:19:00 2023 +++ src/sys/compat/common/compat_mod.h Fri Aug 18 15:41:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_mod.h,v 1.8 2023/07/28 18:19:00 christos Exp $ */ +/* $NetBSD: compat_mod.h,v 1.9 2023/08/18 19:41:18 christos Exp $ */ /*- * Copyright (c) 2013, 2019 The NetBSD Foundation, Inc. @@ -37,6 +37,8 @@ int compat_100_init(void); int compat_100_fini(void); int kern_event_100_init(void); int kern_event_100_fini(void); +void usb_100_init(void); +void usb_100_fini(void); #endif #ifdef COMPAT_90 Index: src/sys/compat/common/files.common diff -u src/sys/compat/common/files.common:1.9 src/sys/compat/common/files.common:1.10 --- src/sys/compat/common/files.common:1.9 Fri Jul 28 14:19:00 2023 +++ src/sys/compat/common/files.common Fri Aug 18 15:41:18 2023 @@ -1,4 +1,4 @@ -# $NetBSD: files.common,v 1.9 2023/07/28 18:19:00 christos Exp $ +# $NetBSD: files.common,v 1.10 2023/08/18 19:41:18 christos Exp $ # # Generic utility files, used by various compat options. @@ -113,6 +113,7 @@ file compat/common/vfs_syscalls_90.c co # Compatibility code for NetBSD 10.0 file compat/common/compat_100_mod.c compat_100 file compat/common/kern_event_100.c compat_100 +#file compat/common/usb_subr_100.c compat_100 # # Sources for sysv ipc compatibility across the versions. Index: src/sys/compat/linux/arch/aarch64/syscalls.master diff -u src/sys/compat/linux/arch/aarch64/syscalls.master:1.9 src/sys/compat/linux/arch/aarch64/syscalls.master:1.10 --- src/sys/compat/linux/arch/aarch64/syscalls.master:1.9 Sat Jul 29 11:04:28 2023 +++ src/sys/compat/linux/arch/aarch64/syscalls.master Fri Aug 18 15:41:19 2023 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.9 2023/07/29 15:04:28 christos Exp $ + $NetBSD: syscalls.master,v 1.10 2023/08/18 19:41:19 christos Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -216,7 +216,9 @@ 92 STD { int|linux_sys||personality(unsigned long per); } 93 STD { int|linux_sys||exit(int rval); } 94 STD { int|linux_sys||exit_group(int error_code); } -95 UNIMPL waitid +95 STD { int|linux_sys||waitid(int idtype, id_t id, \ + linux_siginfo_t *infop, int options, \ + struct rusage50 *rusage); } 96 STD { int|linux_sys||set_tid_address(int *tid); } 97 UNIMPL unshare 98 STD { int|linux_sys||futex(int *uaddr, int op, int val, \ Index: src/sys/compat/linux/arch/alpha/syscalls.master diff -u src/sys/compat/linux/arch/alpha/syscalls.master:1.104 src/sys/compat/linux/arch/alpha/syscalls.master:1.105 --- src/sys/compat/linux/arch/alpha/syscalls.master:1.104 Sat Jul 29 11:04:28 2023 +++ src/sys/compat/linux/arch/alpha/syscalls.master Fri Aug 18 15:41:19 2023 @@ -1,4 +1,4 @@ - $NetBSD: syscalls.master,v 1.104 2023/07/29 15:04:28 christos Exp $ + $NetBSD: syscalls.master,v 1.105 2023/08/18 19:41:19 christos Exp $ ; ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 @@ -703,7 +703,9 @@ 435 UNIMPL mq_timedreceive 436 UNIMPL mq_notify 437 UNIMPL mq_getsetattr
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Aug 18 19:02:05 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: catch up with tcpdump, add file To generate a diff of this commit: cvs rdiff -u -r1.1945 -r1.1946 src/doc/3RDPARTY cvs rdiff -u -r1.2993 -r1.2994 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1945 src/doc/3RDPARTY:1.1946 --- src/doc/3RDPARTY:1.1945 Thu Aug 17 11:19:26 2023 +++ src/doc/3RDPARTY Fri Aug 18 15:02:04 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1945 2023/08/17 15:19:26 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1946 2023/08/18 19:02:04 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -422,12 +422,12 @@ Notes: Please use "expat" as the vendor tag for CVS imports. Package: file -Version: 5.43 -Current Vers: 5.43 +Version: 5.45 +Current Vers: 5.45 Maintainer: Christos Zoulas Archive Site: ftp://ftp.astron.com/pub/file/ Home Page: http://www.darwinsys.com/file/ -Date: 2022-09-24 +Date: 2023-08-18 Mailing List: f...@astron.com Responsible: christos, pooka License: BSD (2-clause) @@ -801,12 +801,12 @@ Use the src/external/bsd/libpcap/libpcap tree. sys/net/dlt.h is a copy of the dlt constants from pcap.h Package: tcpdump -Version: 4.9.3 -Current Vers: 4.9.3 +Version: 4.99.4 +Current Vers: 4.99.4 Maintainer: tcpdump-work...@lists.tcpdump.org Archive Site: http://www.tcpdump.org/release/ Home Page: http://www.tcpdump.org/ -Date: 2021-03-01 +Date: 2023-08-17 Mailing List: tcpdump-work...@lists.tcpdump.org Responsible: License: BSD (3-clause) Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2993 src/doc/CHANGES:1.2994 --- src/doc/CHANGES:1.2993 Thu Aug 17 11:19:26 2023 +++ src/doc/CHANGES Fri Aug 18 15:02:04 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2993 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2994 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -197,3 +197,6 @@ Changes from NetBSD 10.0 to NetBSD 11.0: gdb(1): Updated to 13.2. [christos 20230811] libfido2: Import 1.13.0 [christos 20230811] libpcap: Import 1.10.4. [christos 20230817] + tcpdump(8): Import 4.99.4. [christos 20230817] + file(1): Upgraded to 5.45. [christos 20230818] +
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Aug 18 19:02:05 UTC 2023 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: catch up with tcpdump, add file To generate a diff of this commit: cvs rdiff -u -r1.1945 -r1.1946 src/doc/3RDPARTY cvs rdiff -u -r1.2993 -r1.2994 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/file
Module Name:src Committed By: christos Date: Fri Aug 18 19:00:11 UTC 2023 Modified Files: src/external/bsd/file/dist: ChangeLog Makefile.in aclocal.m4 config.guess config.sub configure configure.ac src/external/bsd/file/dist/doc: Makefile.in file.1 libmagic.3 magic.5 src/external/bsd/file/dist/magic: Makefile.am Makefile.in src/external/bsd/file/dist/magic/magdir: apple archive cad coff commands elf filesystems games geo jpeg linux mail.news msdos xenix src/external/bsd/file/dist/python: Makefile.in src/external/bsd/file/dist/src: Makefile.in apprentice.c cdf.c cdf_time.c compress.c der.c encoding.c file.c file.h fsmagic.c funcs.c is_csv.c is_json.c magic.c print.c readcdf.c readelf.c softmagic.c src/external/bsd/file/dist/tests: Makefile.in src/external/bsd/file/include: config.h src/external/bsd/file/lib: Makefile Removed Files: src/external/bsd/file/dist: .travis.yml src/external/bsd/file/dist/fuzz: Dockerfile build.sh magic_fuzzer.c project.yaml src/external/bsd/file/dist/magic/magdir: dsf etf src/external/bsd/file/dist/python: HOWTO magic.pyi pyproject.toml threads.py src/external/bsd/file/dist/tests: pgp-binary-key-v4-ecc-rev.result pgp-binary-key-v4-rsa-no-userid-rev.result Log Message: merge conflicts between file-5.43 and file-5.45 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/.travis.yml cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/ChangeLog cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/Makefile.in \ src/external/bsd/file/dist/configure.ac cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/aclocal.m4 cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/config.guess cvs rdiff -u -r1.14 -r1.15 src/external/bsd/file/dist/config.sub cvs rdiff -u -r1.27 -r1.28 src/external/bsd/file/dist/configure cvs rdiff -u -r1.15 -r1.16 src/external/bsd/file/dist/doc/Makefile.in cvs rdiff -u -r1.27 -r1.28 src/external/bsd/file/dist/doc/file.1 cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/doc/libmagic.3 cvs rdiff -u -r1.24 -r1.25 src/external/bsd/file/dist/doc/magic.5 cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/fuzz/Dockerfile \ src/external/bsd/file/dist/fuzz/build.sh \ src/external/bsd/file/dist/fuzz/magic_fuzzer.c \ src/external/bsd/file/dist/fuzz/project.yaml cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/magic/Makefile.am cvs rdiff -u -r1.25 -r1.26 src/external/bsd/file/dist/magic/Makefile.in cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/magic/magdir/apple cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/magic/magdir/archive cvs rdiff -u -r1.3 -r1.4 src/external/bsd/file/dist/magic/magdir/cad \ src/external/bsd/file/dist/magic/magdir/coff \ src/external/bsd/file/dist/magic/magdir/commands \ src/external/bsd/file/dist/magic/magdir/games \ src/external/bsd/file/dist/magic/magdir/linux \ src/external/bsd/file/dist/magic/magdir/mail.news \ src/external/bsd/file/dist/magic/magdir/msdos \ src/external/bsd/file/dist/magic/magdir/xenix cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/magic/magdir/dsf \ src/external/bsd/file/dist/magic/magdir/etf cvs rdiff -u -r1.21 -r1.22 src/external/bsd/file/dist/magic/magdir/elf \ src/external/bsd/file/dist/magic/magdir/filesystems cvs rdiff -u -r1.7 -r1.8 src/external/bsd/file/dist/magic/magdir/geo \ src/external/bsd/file/dist/magic/magdir/jpeg cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/file/dist/python/HOWTO \ src/external/bsd/file/dist/python/magic.pyi \ src/external/bsd/file/dist/python/pyproject.toml \ src/external/bsd/file/dist/python/threads.py cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/python/Makefile.in cvs rdiff -u -r1.18 -r1.19 src/external/bsd/file/dist/src/Makefile.in cvs rdiff -u -r1.27 -r1.28 src/external/bsd/file/dist/src/apprentice.c \ src/external/bsd/file/dist/src/file.h cvs rdiff -u -r1.20 -r1.21 src/external/bsd/file/dist/src/cdf.c \ src/external/bsd/file/dist/src/funcs.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/file/dist/src/cdf_time.c \ src/external/bsd/file/dist/src/encoding.c cvs rdiff -u -r1.22 -r1.23 src/external/bsd/file/dist/src/compress.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/file/dist/src/der.c cvs rdiff -u -r1.17 -r1.18 src/external/bsd/file/dist/src/file.c \ src/external/bsd/file/dist/src/fsmagic.c \ src/external/bsd/file/dist/src/magic.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/file/dist/src/is_csv.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/file/dist/src/is_json.c cvs rdiff -u -r1.16 -r1.17 src/external/bsd/file/dist/src/print.c cvs rdiff -u -r1.19 -r1.20 src/external/bsd/file/dist/src/readcdf.c cvs rdiff -u -r1.26 -r1.27 src/external/bsd/file/dist/src/readelf.c cvs rdiff -u -r1.25 -r1.26
CVS import: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Fri Aug 18 18:36:54 UTC 2023 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5214 Log Message: Update to file-5.45 (Last was file-5.44) 2023-07-27 15:45 Christos Zoulas * release 5.45 2023-07-17 11:53 Christos Zoulas * PR/465: psrok1: Avoid muslc asctime_r crash 2023-05-21 13:05 Christos Zoulas * add SIMH tape format support 2023-02-09 12:50 Christos Zoulas * bump the max size of the elf section notes to be read to 128K and make it configurable 2023-01-08 1:08 Christos Zoulas * PR/415: Fix decompression with program returning empty 2022-12-26 1:47 Christos Zoulas * PR/408: fix -p with seccomp * PR/412: fix MinGW compilation Status: Vendor Tag: CHRISTOS Release Tags: FILE5_45 U src/external/bsd/file/dist/Makefile.am C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/acinclude.m4 C src/external/bsd/file/dist/configure.ac C src/external/bsd/file/dist/aclocal.m4 C src/external/bsd/file/dist/Makefile.in C src/external/bsd/file/dist/config.h.in U src/external/bsd/file/dist/libmagic.pc.in U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING C src/external/bsd/file/dist/ChangeLog U src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/README.md U src/external/bsd/file/dist/TODO C src/external/bsd/file/dist/compile C src/external/bsd/file/dist/config.guess C src/external/bsd/file/dist/config.sub U src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh C src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT U src/external/bsd/file/dist/RELEASE-PROCEDURE U src/external/bsd/file/dist/README.DEVELOPER C src/external/bsd/file/dist/depcomp U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/visibility.m4 U src/external/bsd/file/dist/src/Makefile.am C src/external/bsd/file/dist/src/Makefile.in U src/external/bsd/file/dist/src/asctime_r.c U src/external/bsd/file/dist/src/asprintf.c U src/external/bsd/file/dist/src/ctime_r.c U src/external/bsd/file/dist/src/dprintf.c U src/external/bsd/file/dist/src/fmtcheck.c U src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/getopt_long.c U src/external/bsd/file/dist/src/gmtime_r.c U src/external/bsd/file/dist/src/localtime_r.c U src/external/bsd/file/dist/src/pread.c U src/external/bsd/file/dist/src/strcasestr.c U src/external/bsd/file/dist/src/strlcat.c U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c U src/external/bsd/file/dist/src/buffer.c C src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c C src/external/bsd/file/dist/src/encoding.c C src/external/bsd/file/dist/src/compress.c C src/external/bsd/file/dist/src/is_csv.c C src/external/bsd/file/dist/src/is_json.c N src/external/bsd/file/dist/src/is_simh.c U src/external/bsd/file/dist/src/is_tar.c C src/external/bsd/file/dist/src/readelf.c C src/external/bsd/file/dist/src/print.c C src/external/bsd/file/dist/src/fsmagic.c C src/external/bsd/file/dist/src/funcs.c C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/readelf.h U src/external/bsd/file/dist/src/tar.h U src/external/bsd/file/dist/src/apptype.c C src/external/bsd/file/dist/src/der.c U src/external/bsd/file/dist/src/der.h U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h U src/external/bsd/file/dist/src/mygetopt.h C src/external/bsd/file/dist/src/cdf.c C src/external/bsd/file/dist/src/cdf_time.c C src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h C src/external/bsd/file/dist/src/file.c U src/external/bsd/file/dist/src/seccomp.c U src/external/bsd/file/dist/src/magic.h.in U src/external/bsd/file/dist/src/cdf.mk U src/external/bsd/file/dist/src/BNF U src/external/bsd/file/dist/src/memtest.c U src/external/bsd/file/dist/doc/Makefile.am C src/external/bsd/file/dist/doc/Makefile.in C src/external/bsd/file/dist/doc/libmagic.3 C src/external/bsd/file/dist/doc/magic.5 C src/external/bsd/file/dist/doc/file.1 C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/scripts/create_filemagic_flac U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/aes U
CVS import: src/external/bsd/file/dist
Module Name:src Committed By: christos Date: Fri Aug 18 18:36:54 UTC 2023 Update of /cvsroot/src/external/bsd/file/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5214 Log Message: Update to file-5.45 (Last was file-5.44) 2023-07-27 15:45 Christos Zoulas * release 5.45 2023-07-17 11:53 Christos Zoulas * PR/465: psrok1: Avoid muslc asctime_r crash 2023-05-21 13:05 Christos Zoulas * add SIMH tape format support 2023-02-09 12:50 Christos Zoulas * bump the max size of the elf section notes to be read to 128K and make it configurable 2023-01-08 1:08 Christos Zoulas * PR/415: Fix decompression with program returning empty 2022-12-26 1:47 Christos Zoulas * PR/408: fix -p with seccomp * PR/412: fix MinGW compilation Status: Vendor Tag: CHRISTOS Release Tags: FILE5_45 U src/external/bsd/file/dist/Makefile.am C src/external/bsd/file/dist/configure U src/external/bsd/file/dist/acinclude.m4 C src/external/bsd/file/dist/configure.ac C src/external/bsd/file/dist/aclocal.m4 C src/external/bsd/file/dist/Makefile.in C src/external/bsd/file/dist/config.h.in U src/external/bsd/file/dist/libmagic.pc.in U src/external/bsd/file/dist/AUTHORS U src/external/bsd/file/dist/COPYING C src/external/bsd/file/dist/ChangeLog U src/external/bsd/file/dist/INSTALL U src/external/bsd/file/dist/NEWS U src/external/bsd/file/dist/README.md U src/external/bsd/file/dist/TODO C src/external/bsd/file/dist/compile C src/external/bsd/file/dist/config.guess C src/external/bsd/file/dist/config.sub U src/external/bsd/file/dist/install-sh U src/external/bsd/file/dist/ltmain.sh C src/external/bsd/file/dist/missing U src/external/bsd/file/dist/MAINT U src/external/bsd/file/dist/RELEASE-PROCEDURE U src/external/bsd/file/dist/README.DEVELOPER C src/external/bsd/file/dist/depcomp U src/external/bsd/file/dist/m4/libtool.m4 U src/external/bsd/file/dist/m4/ltoptions.m4 U src/external/bsd/file/dist/m4/ltsugar.m4 U src/external/bsd/file/dist/m4/ltversion.m4 U src/external/bsd/file/dist/m4/lt~obsolete.m4 U src/external/bsd/file/dist/m4/visibility.m4 U src/external/bsd/file/dist/src/Makefile.am C src/external/bsd/file/dist/src/Makefile.in U src/external/bsd/file/dist/src/asctime_r.c U src/external/bsd/file/dist/src/asprintf.c U src/external/bsd/file/dist/src/ctime_r.c U src/external/bsd/file/dist/src/dprintf.c U src/external/bsd/file/dist/src/fmtcheck.c U src/external/bsd/file/dist/src/getline.c U src/external/bsd/file/dist/src/getopt_long.c U src/external/bsd/file/dist/src/gmtime_r.c U src/external/bsd/file/dist/src/localtime_r.c U src/external/bsd/file/dist/src/pread.c U src/external/bsd/file/dist/src/strcasestr.c U src/external/bsd/file/dist/src/strlcat.c U src/external/bsd/file/dist/src/strlcpy.c U src/external/bsd/file/dist/src/vasprintf.c U src/external/bsd/file/dist/src/buffer.c C src/external/bsd/file/dist/src/magic.c C src/external/bsd/file/dist/src/apprentice.c C src/external/bsd/file/dist/src/softmagic.c U src/external/bsd/file/dist/src/ascmagic.c C src/external/bsd/file/dist/src/encoding.c C src/external/bsd/file/dist/src/compress.c C src/external/bsd/file/dist/src/is_csv.c C src/external/bsd/file/dist/src/is_json.c N src/external/bsd/file/dist/src/is_simh.c U src/external/bsd/file/dist/src/is_tar.c C src/external/bsd/file/dist/src/readelf.c C src/external/bsd/file/dist/src/print.c C src/external/bsd/file/dist/src/fsmagic.c C src/external/bsd/file/dist/src/funcs.c C src/external/bsd/file/dist/src/file.h U src/external/bsd/file/dist/src/readelf.h U src/external/bsd/file/dist/src/tar.h U src/external/bsd/file/dist/src/apptype.c C src/external/bsd/file/dist/src/der.c U src/external/bsd/file/dist/src/der.h U src/external/bsd/file/dist/src/file_opts.h U src/external/bsd/file/dist/src/elfclass.h U src/external/bsd/file/dist/src/mygetopt.h C src/external/bsd/file/dist/src/cdf.c C src/external/bsd/file/dist/src/cdf_time.c C src/external/bsd/file/dist/src/readcdf.c U src/external/bsd/file/dist/src/cdf.h C src/external/bsd/file/dist/src/file.c U src/external/bsd/file/dist/src/seccomp.c U src/external/bsd/file/dist/src/magic.h.in U src/external/bsd/file/dist/src/cdf.mk U src/external/bsd/file/dist/src/BNF U src/external/bsd/file/dist/src/memtest.c U src/external/bsd/file/dist/doc/Makefile.am C src/external/bsd/file/dist/doc/Makefile.in C src/external/bsd/file/dist/doc/libmagic.3 C src/external/bsd/file/dist/doc/magic.5 C src/external/bsd/file/dist/doc/file.1 C src/external/bsd/file/dist/magic/Makefile.am C src/external/bsd/file/dist/magic/Makefile.in U src/external/bsd/file/dist/magic/Header U src/external/bsd/file/dist/magic/Localstuff U src/external/bsd/file/dist/magic/scripts/create_filemagic_flac U src/external/bsd/file/dist/magic/magdir/acorn U src/external/bsd/file/dist/magic/magdir/adi U src/external/bsd/file/dist/magic/magdir/adventure U src/external/bsd/file/dist/magic/magdir/aes U
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: tnn Date: Fri Aug 18 14:26:50 UTC 2023 Modified Files: src/usr.sbin/npf/npfctl: npf_build.c Log Message: npfctl: adapt to new libpcap API To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/npf/npfctl/npf_build.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: tnn Date: Fri Aug 18 14:26:50 UTC 2023 Modified Files: src/usr.sbin/npf/npfctl: npf_build.c Log Message: npfctl: adapt to new libpcap API To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/npf/npfctl/npf_build.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/npf/npfctl/npf_build.c diff -u src/usr.sbin/npf/npfctl/npf_build.c:1.55 src/usr.sbin/npf/npfctl/npf_build.c:1.56 --- src/usr.sbin/npf/npfctl/npf_build.c:1.55 Sat May 30 14:16:56 2020 +++ src/usr.sbin/npf/npfctl/npf_build.c Fri Aug 18 14:26:50 2023 @@ -32,7 +32,7 @@ */ #include -__RCSID("$NetBSD: npf_build.c,v 1.55 2020/05/30 14:16:56 rmind Exp $"); +__RCSID("$NetBSD: npf_build.c,v 1.56 2023/08/18 14:26:50 tnn Exp $"); #include #define __FAVOR_BSD @@ -530,8 +530,14 @@ npfctl_build_pcap(nl_rule_t *rl, const c const size_t maxsnaplen = 64 * 1024; struct bpf_program bf; size_t len; + pcap_t *pd; - if (pcap_compile_nopcap(maxsnaplen, DLT_RAW, , + pd = pcap_open_dead(DLT_RAW, maxsnaplen); + if (pd == NULL) { + err(EXIT_FAILURE, "pcap_open_dead"); + } + + if (pcap_compile(pd, , filter, 1, PCAP_NETMASK_UNKNOWN) == -1) { yyerror("invalid pcap-filter(7) syntax"); } @@ -542,6 +548,7 @@ npfctl_build_pcap(nl_rule_t *rl, const c } npfctl_dump_bpf(); pcap_freecode(); + pcap_close(pd); } static void
CVS commit: src/usr.bin/netstat
Module Name:src Committed By: martin Date: Fri Aug 18 13:18:17 UTC 2023 Modified Files: src/usr.bin/netstat: bpf.c main.c netstat.h Log Message: Rename local bpf_* functions to nsbpf_* to avoid conflicts with new libpcap bpf_* functions To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/netstat/bpf.c cvs rdiff -u -r1.104 -r1.105 src/usr.bin/netstat/main.c cvs rdiff -u -r1.53 -r1.54 src/usr.bin/netstat/netstat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/netstat/bpf.c diff -u src/usr.bin/netstat/bpf.c:1.17 src/usr.bin/netstat/bpf.c:1.18 --- src/usr.bin/netstat/bpf.c:1.17 Sat Nov 19 08:56:20 2022 +++ src/usr.bin/netstat/bpf.c Fri Aug 18 13:18:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: bpf.c,v 1.17 2022/11/19 08:56:20 yamt Exp $ */ +/* $NetBSD: bpf.c,v 1.18 2023/08/18 13:18:17 martin Exp $ */ /* * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -47,7 +47,7 @@ #include "prog_ops.h" void -bpf_stats(void) +nsbpf_stats(void) { struct bpf_stat bpf_s; size_t len = sizeof(bpf_s); @@ -69,7 +69,7 @@ bpf_stats(void) } void -bpf_dump(const char *bpfif) +nsbpf_dump(const char *bpfif) { struct bpf_d_ext *dpe; Index: src/usr.bin/netstat/main.c diff -u src/usr.bin/netstat/main.c:1.104 src/usr.bin/netstat/main.c:1.105 --- src/usr.bin/netstat/main.c:1.104 Mon Oct 24 08:11:25 2022 +++ src/usr.bin/netstat/main.c Fri Aug 18 13:18:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.104 2022/10/24 08:11:25 msaitoh Exp $ */ +/* $NetBSD: main.c,v 1.105 2023/08/18 13:18:17 martin Exp $ */ /* * Copyright (c) 1983, 1988, 1993 @@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19 #if 0 static char sccsid[] = "from: @(#)main.c 8.4 (Berkeley) 3/1/94"; #else -__RCSID("$NetBSD: main.c,v 1.104 2022/10/24 08:11:25 msaitoh Exp $"); +__RCSID("$NetBSD: main.c,v 1.105 2023/08/18 13:18:17 martin Exp $"); #endif #endif /* not lint */ @@ -560,9 +560,9 @@ main(int argc, char *argv[]) #ifndef SMALL if (Bflag) { if (sflag) - bpf_stats(); + nsbpf_stats(); else - bpf_dump(interface); + nsbpf_dump(interface); exit(0); } #endif Index: src/usr.bin/netstat/netstat.h diff -u src/usr.bin/netstat/netstat.h:1.53 src/usr.bin/netstat/netstat.h:1.54 --- src/usr.bin/netstat/netstat.h:1.53 Thu Sep 1 10:10:20 2022 +++ src/usr.bin/netstat/netstat.h Fri Aug 18 13:18:17 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: netstat.h,v 1.53 2022/09/01 10:10:20 msaitoh Exp $ */ +/* $NetBSD: netstat.h,v 1.54 2023/08/18 13:18:17 martin Exp $ */ /* * Copyright (c) 1992, 1993 @@ -137,8 +137,8 @@ void routepr(u_long); void mroutepr(u_long, u_long, u_long, u_long); void mrt_stats(u_long, u_long); -void bpf_stats(void); -void bpf_dump(const char *); +void nsbpf_stats(void); +void nsbpf_dump(const char *); kvm_t *get_kvmd(void);
CVS commit: src/usr.bin/netstat
Module Name:src Committed By: martin Date: Fri Aug 18 13:18:17 UTC 2023 Modified Files: src/usr.bin/netstat: bpf.c main.c netstat.h Log Message: Rename local bpf_* functions to nsbpf_* to avoid conflicts with new libpcap bpf_* functions To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/netstat/bpf.c cvs rdiff -u -r1.104 -r1.105 src/usr.bin/netstat/main.c cvs rdiff -u -r1.53 -r1.54 src/usr.bin/netstat/netstat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/ndp
Module Name:src Committed By: tnn Date: Fri Aug 18 13:07:38 UTC 2023 Modified Files: src/usr.sbin/ndp: Makefile ndp.c Log Message: ndp: add gmt2local() from external/bsd/tcpdump instead of reachover It is no longer shipped with the tcpdump distribution. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/ndp/Makefile cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/ndp/ndp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/ndp
Module Name:src Committed By: tnn Date: Fri Aug 18 13:07:38 UTC 2023 Modified Files: src/usr.sbin/ndp: Makefile ndp.c Log Message: ndp: add gmt2local() from external/bsd/tcpdump instead of reachover It is no longer shipped with the tcpdump distribution. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/ndp/Makefile cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/ndp/ndp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/ndp/Makefile diff -u src/usr.sbin/ndp/Makefile:1.13 src/usr.sbin/ndp/Makefile:1.14 --- src/usr.sbin/ndp/Makefile:1.13 Tue Oct 10 19:30:41 2017 +++ src/usr.sbin/ndp/Makefile Fri Aug 18 13:07:38 2023 @@ -1,18 +1,15 @@ -# $NetBSD: Makefile,v 1.13 2017/10/10 19:30:41 christos Exp $ +# $NetBSD: Makefile,v 1.14 2023/08/18 13:07:38 tnn Exp $ .include USE_FORT?= yes # network client -TCPDUMP= ${NETBSDSRCDIR}/external/bsd/tcpdump/dist -.PATH: ${TCPDUMP} - RUMPPRG= ndp -SRCS= ndp.c gmt2local.c +SRCS= ndp.c MAN= ndp.8 CPPFLAGS+= -DINET6 -CPPFLAGS+= -I. -I${TCPDUMP} +CPPFLAGS+= -I. .if (${MKRUMP} != "no") CPPFLAGS+= -DRUMP_ACTION Index: src/usr.sbin/ndp/ndp.c diff -u src/usr.sbin/ndp/ndp.c:1.59 src/usr.sbin/ndp/ndp.c:1.60 --- src/usr.sbin/ndp/ndp.c:1.59 Sat Nov 27 22:30:25 2021 +++ src/usr.sbin/ndp/ndp.c Fri Aug 18 13:07:38 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ndp.c,v 1.59 2021/11/27 22:30:25 rillig Exp $ */ +/* $NetBSD: ndp.c,v 1.60 2023/08/18 13:07:38 tnn Exp $ */ /* $KAME: ndp.c,v 1.121 2005/07/13 11:30:13 keiichi Exp $ */ /* @@ -62,6 +62,27 @@ */ /* + * Copyright (c) 1997 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that: (1) source code distributions + * retain the above copyright notice and this paragraph in its entirety, (2) + * distributions including binary code include the above copyright notice and + * this paragraph in its entirety in the documentation or other materials + * provided with the distribution, and (3) all advertising materials mentioning + * features or use of this software display the following acknowledgement: + * ``This product includes software developed by the University of California, + * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of + * the University nor the names of its contributors may be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + */ + +/* * Based on: * "@(#) Copyright (c) 1984, 1993\n\ * The Regents of the University of California. All rights reserved.\n"; @@ -105,7 +126,6 @@ #include #include -#include "gmt2local.h" #include "prog_ops.h" static pid_t pid; @@ -134,6 +154,7 @@ static void ifinfo(char *, int, char **) static const char *sec2str(time_t); static char *ether_str(struct sockaddr_dl *); static void ts_print(const struct timeval *); +static int32_t gmt2local(time_t t); #define NDP_F_CLEAR 1 #define NDP_F_DELETE 2 @@ -953,3 +974,35 @@ ts_print(const struct timeval *tvp) (void)printf("%02d:%02d:%02d.%06u ", s / 3600, (s % 3600) / 60, s % 60, (u_int32_t)tvp->tv_usec); } + +/* + * Returns the difference between gmt and local time in seconds. + * Use gmtime() and localtime() to keep things simple. + */ +static int32_t +gmt2local(time_t t) +{ + int dt, dir; + struct tm *gmt, *loc; + struct tm sgmt; + + if (t == 0) + t = time(NULL); + gmt = + *gmt = *gmtime(); + loc = localtime(); + dt = (loc->tm_hour - gmt->tm_hour) * 60 * 60 + + (loc->tm_min - gmt->tm_min) * 60; + + /* + * If the year or julian day is different, we span 00:00 GMT + * and must add or subtract a day. Check the year first to + * avoid problems when the julian day wraps. + */ + dir = loc->tm_year - gmt->tm_year; + if (dir == 0) + dir = loc->tm_yday - gmt->tm_yday; + dt += dir * 24 * 60 * 60; + + return (dt); +}
CVS commit: src/external/bsd/tcpdump/bin
Module Name:src Committed By: tnn Date: Fri Aug 18 12:55:50 UTC 2023 Modified Files: src/external/bsd/tcpdump/bin: Makefile Log Message: tcpdump: print-medsa.c is gone To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/external/bsd/tcpdump/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/tcpdump/bin/Makefile diff -u src/external/bsd/tcpdump/bin/Makefile:1.26 src/external/bsd/tcpdump/bin/Makefile:1.27 --- src/external/bsd/tcpdump/bin/Makefile:1.26 Thu Aug 17 20:19:39 2023 +++ src/external/bsd/tcpdump/bin/Makefile Fri Aug 18 12:55:50 2023 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2023/08/17 20:19:39 christos Exp $ +# $NetBSD: Makefile,v 1.27 2023/08/18 12:55:50 tnn Exp $ WARNS?= 1 # XXX: need to cleanup later @@ -101,7 +101,6 @@ print-lwapp.c \ print-lwres.c \ print-m3ua.c \ print-macsec.c \ -print-medsa.c \ print-mobile.c \ print-mobility.c \ print-mpcp.c \
CVS commit: src/external/bsd/tcpdump/bin
Module Name:src Committed By: tnn Date: Fri Aug 18 12:55:50 UTC 2023 Modified Files: src/external/bsd/tcpdump/bin: Makefile Log Message: tcpdump: print-medsa.c is gone To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/external/bsd/tcpdump/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tcpdump/dist
Module Name:src Committed By: tnn Date: Fri Aug 18 12:53:04 UTC 2023 Added Files: src/external/bsd/tcpdump/dist: ntp.h Log Message: tcpdump: fix mismerge (revive ntp.h) To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 src/external/bsd/tcpdump/dist/ntp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tcpdump/dist
Module Name:src Committed By: tnn Date: Fri Aug 18 12:53:04 UTC 2023 Added Files: src/external/bsd/tcpdump/dist: ntp.h Log Message: tcpdump: fix mismerge (revive ntp.h) To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 src/external/bsd/tcpdump/dist/ntp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/external/bsd/tcpdump/dist/ntp.h diff -u /dev/null src/external/bsd/tcpdump/dist/ntp.h:1.3 --- /dev/null Fri Aug 18 12:53:04 2023 +++ src/external/bsd/tcpdump/dist/ntp.h Fri Aug 18 12:53:03 2023 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that: (1) source code distributions + * retain the above copyright notice and this paragraph in its entirety, (2) + * distributions including binary code include the above copyright notice and + * this paragraph in its entirety in the documentation or other materials + * provided with the distribution, and (3) all advertising materials mentioning + * features or use of this software display the following acknowledgement: + * ``This product includes software developed by the University of California, + * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of + * the University nor the names of its contributors may be used to endorse + * or promote products derived from this software without specific prior + * written permission. + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * + */ + +#include "netdissect-stdinc.h" + +#include "netdissect.h" + +/* + * Structure definitions for NTP fixed point values + * + *0 1 2 3 + *0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Integer Part | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Fraction Part | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + *0 1 2 3 + *0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | Integer Part | Fraction Part | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +*/ +struct l_fixedpt { + nd_uint32_t int_part; + nd_uint32_t fraction; +}; + +struct s_fixedpt { + nd_uint16_t int_part; + nd_uint16_t fraction; +}; + +void p_ntp_time(netdissect_options *, const struct l_fixedpt *);
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Fri Aug 18 12:52:31 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Restore original changes entry for ticket #328, the no-change files don't even have an RCS ID marker and somehow forced commits on the branch did not work. To generate a diff of this commit: cvs rdiff -u -r1.1.2.109 -r1.1.2.110 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.109 src/doc/CHANGES-10.0:1.1.2.110 --- src/doc/CHANGES-10.0:1.1.2.109 Thu Aug 17 10:03:37 2023 +++ src/doc/CHANGES-10.0 Fri Aug 18 12:52:31 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.109 2023/08/17 10:03:37 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.110 2023/08/18 12:52:31 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -11174,8 +11174,6 @@ sys/uvm/uvm_fault.c1.234 [chs, ticket #327] external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile 1.18 -external/apache2/mDNSResponder/dist/mDNSCore/DNSCommon.c 1.10 -external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c 1.18 mdnsd(8): switch to use arc4random(3) for randomness [gutteridge, ticket #328]
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Fri Aug 18 12:52:31 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Restore original changes entry for ticket #328, the no-change files don't even have an RCS ID marker and somehow forced commits on the branch did not work. To generate a diff of this commit: cvs rdiff -u -r1.1.2.109 -r1.1.2.110 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.