CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Wed Jan 3 20:24:16 UTC 2024
Modified Files:
src/usr.bin/make: parse.c
Log Message:
make: do not add newline to an empty buffer
When LoadFile reads from /dev/null the buffer will be empty,
appending "\n" just results in an unnecessary extra call
to ParseRawLine.
Reviewed by: rillig
To generate a diff of this commit:
cvs rdiff -u -r1.713 -r1.714 src/usr.bin/make/parse.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/parse.c
diff -u src/usr.bin/make/parse.c:1.713 src/usr.bin/make/parse.c:1.714
--- src/usr.bin/make/parse.c:1.713 Fri Dec 29 20:43:58 2023
+++ src/usr.bin/make/parse.c Wed Jan 3 20:24:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.713 2023/12/29 20:43:58 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.714 2024/01/03 20:24:16 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.713 2023/12/29 20:43:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.714 2024/01/03 20:24:16 sjg Exp $");
/* Detects a multiple-inclusion guard in a makefile. */
typedef enum {
@@ -383,7 +383,7 @@ LoadFile(const char *path, int fd)
}
assert(buf.len <= buf.cap);
- if (!Buf_EndsWith(, '\n'))
+ if (buf.len > 0 && !Buf_EndsWith(, '\n'))
Buf_AddByte(, '\n');
return buf; /* may not be null-terminated */
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Wed Jan 3 20:24:16 UTC 2024 Modified Files: src/usr.bin/make: parse.c Log Message: make: do not add newline to an empty buffer When LoadFile reads from /dev/null the buffer will be empty, appending "\n" just results in an unnecessary extra call to ParseRawLine. Reviewed by: rillig To generate a diff of this commit: cvs rdiff -u -r1.713 -r1.714 src/usr.bin/make/parse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Wed Jan 3 18:43:52 UTC 2024 Modified Files: src/sys/sys: endian.h Log Message: break the cycle: this does not need it only needs To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/sys/endian.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/endian.h diff -u src/sys/sys/endian.h:1.31 src/sys/sys/endian.h:1.32 --- src/sys/sys/endian.h:1.31 Mon Aug 8 14:55:18 2022 +++ src/sys/sys/endian.h Wed Jan 3 13:43:52 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: endian.h,v 1.31 2022/08/08 18:55:18 rillig Exp $ */ +/* $NetBSD: endian.h,v 1.32 2024/01/03 18:43:52 christos Exp $ */ /* * Copyright (c) 1987, 1991, 1993 @@ -52,7 +52,7 @@ #include #include -#include +#include #ifndef in_addr_t typedef __in_addr_t in_addr_t;
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Wed Jan 3 18:43:52 UTC 2024 Modified Files: src/sys/sys: endian.h Log Message: break the cycle: this does not need it only needs To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/sys/endian.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc
Module Name:src Committed By: christos Date: Wed Jan 3 18:41:53 UTC 2024 Modified Files: src/lib/libc/gen: siginterrupt.c signal.c src/lib/libc/include: extern.h src/lib/libc/yp: local.h yp_all.c yp_first.c yp_maplist.c yp_master.c yp_match.c yp_order.c Log Message: tidy up some extern declarations To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libc/gen/siginterrupt.c cvs rdiff -u -r1.15 -r1.16 src/lib/libc/gen/signal.c cvs rdiff -u -r1.27 -r1.28 src/lib/libc/include/extern.h cvs rdiff -u -r1.4 -r1.5 src/lib/libc/yp/local.h cvs rdiff -u -r1.13 -r1.14 src/lib/libc/yp/yp_all.c \ src/lib/libc/yp/yp_maplist.c cvs rdiff -u -r1.16 -r1.17 src/lib/libc/yp/yp_first.c cvs rdiff -u -r1.15 -r1.16 src/lib/libc/yp/yp_master.c cvs rdiff -u -r1.19 -r1.20 src/lib/libc/yp/yp_match.c cvs rdiff -u -r1.14 -r1.15 src/lib/libc/yp/yp_order.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc
Module Name:src
Committed By: christos
Date: Wed Jan 3 18:41:53 UTC 2024
Modified Files:
src/lib/libc/gen: siginterrupt.c signal.c
src/lib/libc/include: extern.h
src/lib/libc/yp: local.h yp_all.c yp_first.c yp_maplist.c yp_master.c
yp_match.c yp_order.c
Log Message:
tidy up some extern declarations
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/gen/siginterrupt.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/gen/signal.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/include/extern.h
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/yp/local.h
cvs rdiff -u -r1.13 -r1.14 src/lib/libc/yp/yp_all.c \
src/lib/libc/yp/yp_maplist.c
cvs rdiff -u -r1.16 -r1.17 src/lib/libc/yp/yp_first.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/yp/yp_master.c
cvs rdiff -u -r1.19 -r1.20 src/lib/libc/yp/yp_match.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/yp/yp_order.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/siginterrupt.c
diff -u src/lib/libc/gen/siginterrupt.c:1.13 src/lib/libc/gen/siginterrupt.c:1.14
--- src/lib/libc/gen/siginterrupt.c:1.13 Mon Jun 25 18:32:43 2012
+++ src/lib/libc/gen/siginterrupt.c Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: siginterrupt.c,v 1.13 2012/06/25 22:32:43 abs Exp $ */
+/* $NetBSD: siginterrupt.c,v 1.14 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -34,18 +34,18 @@
#if 0
static char sccsid[] = "@(#)siginterrupt.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: siginterrupt.c,v 1.13 2012/06/25 22:32:43 abs Exp $");
+__RCSID("$NetBSD: siginterrupt.c,v 1.14 2024/01/03 18:41:53 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
+#include "extern.h"
#include
#ifdef __weak_alias
__weak_alias(siginterrupt,_siginterrupt)
#endif
-extern sigset_t __sigintr;
/*
* Set signal state to prevent restart of system calls
* after an instance of the indicated signal.
Index: src/lib/libc/gen/signal.c
diff -u src/lib/libc/gen/signal.c:1.15 src/lib/libc/gen/signal.c:1.16
--- src/lib/libc/gen/signal.c:1.15 Tue Jan 2 14:27:26 2024
+++ src/lib/libc/gen/signal.c Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: signal.c,v 1.15 2024/01/02 19:27:26 christos Exp $ */
+/* $NetBSD: signal.c,v 1.16 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)signal.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: signal.c,v 1.15 2024/01/02 19:27:26 christos Exp $");
+__RCSID("$NetBSD: signal.c,v 1.16 2024/01/03 18:41:53 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -42,13 +42,13 @@ __RCSID("$NetBSD: signal.c,v 1.15 2024/0
* Almost backwards compatible signal.
*/
#include "namespace.h"
+#include "extern.h"
#include
#ifdef __weak_alias
__weak_alias(signal,_signal)
#endif
-extern sigset_t __sigintr;
sigset_t __sigintr; /* shared with siginterrupt */
sig_t
Index: src/lib/libc/include/extern.h
diff -u src/lib/libc/include/extern.h:1.27 src/lib/libc/include/extern.h:1.28
--- src/lib/libc/include/extern.h:1.27 Tue Apr 4 15:26:06 2023
+++ src/lib/libc/include/extern.h Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.27 2023/04/04 19:26:06 christos Exp $ */
+/* $NetBSD: extern.h,v 1.28 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -34,6 +34,7 @@ typedef struct _locale *locale_t;
__BEGIN_DECLS
extern char *__minbrk;
+extern sigset_t __sigintr;
int __getcwd(char *, size_t);
int __getlogin(char *, size_t);
int __setlogin(const char *);
Index: src/lib/libc/yp/local.h
diff -u src/lib/libc/yp/local.h:1.4 src/lib/libc/yp/local.h:1.5
--- src/lib/libc/yp/local.h:1.4 Tue Mar 20 12:30:26 2012
+++ src/lib/libc/yp/local.h Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: local.h,v 1.4 2012/03/20 16:30:26 matt Exp $ */
+/* $NetBSD: local.h,v 1.5 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -27,4 +27,10 @@
__BEGIN_DECLS
void __yp_unbind(struct dom_binding *);
int _yp_invalid_domain(const char *);
+
+extern struct timeval _yplib_timeout;
+extern int _yplib_nerrs;
+extern int _yplib_bindtries;
+extern char _yp_domain[];
+
__END_DECLS
Index: src/lib/libc/yp/yp_all.c
diff -u src/lib/libc/yp/yp_all.c:1.13 src/lib/libc/yp/yp_all.c:1.14
--- src/lib/libc/yp/yp_all.c:1.13 Mon Jun 25 18:32:46 2012
+++ src/lib/libc/yp/yp_all.c Wed Jan 3 13:41:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: yp_all.c,v 1.13 2012/06/25 22:32:46 abs Exp $ */
+/* $NetBSD: yp_all.c,v 1.14 2024/01/03 18:41:53 christos Exp $ */
/*
* Copyright (c) 1992, 1993 Theo de Raadt
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: yp_all.c,v 1.13 2012/06/25 22:32:46 abs Exp $");
+__RCSID("$NetBSD: yp_all.c,v 1.14
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: andvar Date: Wed Jan 3 18:13:19 UTC 2024 Modified Files: src/sys/arch/aarch64/include: armreg.h Log Message: ddress->address in comment. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/aarch64/include/armreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: andvar Date: Wed Jan 3 18:13:19 UTC 2024 Modified Files: src/sys/arch/aarch64/include: armreg.h Log Message: ddress->address in comment. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/aarch64/include/armreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/aarch64/include/armreg.h diff -u src/sys/arch/aarch64/include/armreg.h:1.65 src/sys/arch/aarch64/include/armreg.h:1.66 --- src/sys/arch/aarch64/include/armreg.h:1.65 Sun Sep 24 10:13:44 2023 +++ src/sys/arch/aarch64/include/armreg.h Wed Jan 3 18:13:19 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.65 2023/09/24 10:13:44 skrll Exp $ */ +/* $NetBSD: armreg.h,v 1.66 2024/01/03 18:13:19 andvar Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -1153,7 +1153,7 @@ AARCH64REG_WRITE_INLINE(tcr_el2) #define TCR_EL2_DS __BIT(32) // 52-bit output address (FEAT_LPA2) //__BIT(31) // Res1 #define TCR_EL2_TCMA __BIT(30) // Unchecked accesses control (FEAT_MTE2) -#define TCR_EL2_TBID __BIT(29) // Top Byte Instruction ddress matching (FEAT_PAuth) +#define TCR_EL2_TBID __BIT(29) // Top Byte Instruction address matching (FEAT_PAuth) #define TCR_EL2_HWU62 __BIT(28) // Hardware use bit 62 (FEAT_HPDS2) #define TCR_EL2_HWU61 __BIT(27) // Hardware use bit 61 (FEAT_HPDS2) #define TCR_EL2_HWU60 __BIT(26) // Hardware use bit 60 (FEAT_HPDS2)
CVS commit: src
Module Name:src
Committed By: andvar
Date: Wed Jan 3 18:10:42 UTC 2024
Modified Files:
src/sbin/ifconfig: ifconfig.c
src/sys/kern: uipc_socket2.c
Log Message:
s/addreseses/addresses/ in comments (and one missing whitespace).
To generate a diff of this commit:
cvs rdiff -u -r1.249 -r1.250 src/sbin/ifconfig/ifconfig.c
cvs rdiff -u -r1.142 -r1.143 src/sys/kern/uipc_socket2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/ifconfig.c
diff -u src/sbin/ifconfig/ifconfig.c:1.249 src/sbin/ifconfig/ifconfig.c:1.250
--- src/sbin/ifconfig/ifconfig.c:1.249 Fri Nov 25 08:41:05 2022
+++ src/sbin/ifconfig/ifconfig.c Wed Jan 3 18:10:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ifconfig.c,v 1.249 2022/11/25 08:41:05 knakahara Exp $ */
+/* $NetBSD: ifconfig.c,v 1.250 2024/01/03 18:10:42 andvar Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1983, 1993\
The Regents of the University of California. All rights reserved.");
-__RCSID("$NetBSD: ifconfig.c,v 1.249 2022/11/25 08:41:05 knakahara Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.250 2024/01/03 18:10:42 andvar Exp $");
#endif /* not lint */
#include
@@ -751,8 +751,8 @@ main(int argc, char **argv)
*
* -a means "print status of all interfaces".
*
- * -w means "spin until DAD completes for all addreseses", and is
- * mutually exclusivewith all other flags/commands.
+ * -w means "spin until DAD completes for all addresses", and is
+ * mutually exclusive with all other flags/commands.
*/
if ((lflag || Cflag || wflag) &&
(aflag || get_flag('m') || vflag || zflag))
Index: src/sys/kern/uipc_socket2.c
diff -u src/sys/kern/uipc_socket2.c:1.142 src/sys/kern/uipc_socket2.c:1.143
--- src/sys/kern/uipc_socket2.c:1.142 Wed Oct 26 23:38:09 2022
+++ src/sys/kern/uipc_socket2.c Wed Jan 3 18:10:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_socket2.c,v 1.142 2022/10/26 23:38:09 riastradh Exp $ */
+/* $NetBSD: uipc_socket2.c,v 1.143 2024/01/03 18:10:42 andvar Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.142 2022/10/26 23:38:09 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.143 2024/01/03 18:10:42 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1202,7 +1202,7 @@ sbappendaddrchain(struct sockbuf *sb, co
bad:
/*
- * On error, free the prepended addreseses. For consistency
+ * On error, free the prepended addresses. For consistency
* with sbappendaddr(), leave it to our caller to free
* the input record chain passed to us as m0.
*/
CVS commit: src
Module Name:src Committed By: andvar Date: Wed Jan 3 18:10:42 UTC 2024 Modified Files: src/sbin/ifconfig: ifconfig.c src/sys/kern: uipc_socket2.c Log Message: s/addreseses/addresses/ in comments (and one missing whitespace). To generate a diff of this commit: cvs rdiff -u -r1.249 -r1.250 src/sbin/ifconfig/ifconfig.c cvs rdiff -u -r1.142 -r1.143 src/sys/kern/uipc_socket2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/share/mk
I would also prefer current general "virt68k", rather than specific emulators like qemu68k etc. because: - it's unlikely that someone will design and implement new virtual Ethernet/storage I/O devices for ancient architectures - we should avoid dumb copies of MD locore.s, pmap_bootstrap.c, headers, and src/distrib files etc. - even if we will support different VM implementation, we can still have multiple kernel config files in a single port, as we've merged sun3 (020 + Sun's MMU) and sun3x (030 MMU) into a single sun3 port in the past (atari and evbarm also have multiple GENERIC like config files for different archtectures) Thanks, --- Izumi Tsutsui
Re: CVS commit: src/share/mk
> On Jan 3, 2024, at 9:16 AM, Jason Thorpe wrote: > > There’s really nothing Qemu specific about it, other than Qemu version number > extraction. Let me elaborate, actually, now that I am not constrained by thumbs-only typing. It uses the generic Linux m68k “bootinfo”, which specify the machine type and address of the various devices, and provisions for how reset/halt are handled are also dealt with generically. Every Linux m68k platform uses this mechanism and I would be shocked (SHOCKED) if some hypothetical future non-Qemu m68k VirtIO platform did not support Linux natively. The Qemu version extraction is actually done with one of those “bootinfo” records. There are really only two assumptions that are made: - RAM starts at PA $., the kernel starts with the MMU disabled, and is loaded at its link address. - I/O devices start at PA $FF00., and that they can be mapped VA==PA with a TT register. The latter would be pretty easy to deal with dynamically if the situation arose. And the former would be possible to adapt to if that assumption were to suddenly not be valid. Heck, the hp300 kernel is linked at VA=$. and knows how to deal with the start of RAM varying based on how much memory is installed (whereas the end of RAM is always at the same location, at the top of the physical address space. Weirdos.) -- thorpej
Re: CVS commit: src/share/mk
There’s really nothing Qemu specific about it, other than Qemu version number extraction. -- thorpej Sent from my iPhone. > On Jan 2, 2024, at 11:03 PM, Valery Ushakov wrote: > > On Wed, Jan 03, 2024 at 02:48:06 +, Jason R Thorpe wrote: > >> Add virt68k to MACHINES.m68k. > > "virt" is too generic a name, if this is specifically a qemu version, > may be it should have been called qemu68k... Guess it's too late now. > > -uwe
CVS commit: src/sys/arch/m68k/include
Module Name:src
Committed By: thorpej
Date: Wed Jan 3 12:46:12 UTC 2024
Modified Files:
src/sys/arch/m68k/include: cpu.h
Log Message:
G/C some bit defs that are redundant with mmu_{51,40}.h
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/m68k/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k/include
Module Name:src
Committed By: thorpej
Date: Wed Jan 3 12:46:12 UTC 2024
Modified Files:
src/sys/arch/m68k/include: cpu.h
Log Message:
G/C some bit defs that are redundant with mmu_{51,40}.h
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/m68k/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/m68k/include/cpu.h
diff -u src/sys/arch/m68k/include/cpu.h:1.18 src/sys/arch/m68k/include/cpu.h:1.19
--- src/sys/arch/m68k/include/cpu.h:1.18 Wed Dec 27 17:35:35 2023
+++ src/sys/arch/m68k/include/cpu.h Wed Jan 3 12:46:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.18 2023/12/27 17:35:35 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.19 2024/01/03 12:46:12 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -73,36 +73,6 @@
#include
-/* XXX - Move this stuff into maybe? */
-
-/*
- * 68851 and 68030 MMU
- */
-#define PMMU_LVLMASK 0x0007
-#define PMMU_INV 0x0400
-#define PMMU_WP 0x0800
-#define PMMU_ALV 0x1000
-#define PMMU_SO 0x2000
-#define PMMU_LV 0x4000
-#define PMMU_BE 0x8000
-#define PMMU_FAULT (PMMU_WP|PMMU_INV)
-
-/* XXX - Move this stuff into maybe? */
-
-/*
- * 68040 MMU
- */
-#define MMU40_RES 0x001
-#define MMU40_TTR 0x002
-#define MMU40_WP 0x004
-#define MMU40_MOD 0x010
-#define MMU40_CMMASK 0x060
-#define MMU40_SUP 0x080
-#define MMU40_U0 0x100
-#define MMU40_U1 0x200
-#define MMU40_GLB 0x400
-#define MMU40_BE 0x800
-
/* XXX - Move this stuff into maybe? */
/* fields in the 68020 cache control register */
CVS commit: src/sys/arch/mac68k/mac68k
Module Name:src
Committed By: thorpej
Date: Wed Jan 3 12:43:43 UTC 2024
Modified Files:
src/sys/arch/mac68k/mac68k: machdep.c
Log Message:
get_physical(): Use bit defs from
To generate a diff of this commit:
cvs rdiff -u -r1.365 -r1.366 src/sys/arch/mac68k/mac68k/machdep.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/arch/mac68k/mac68k/machdep.c
diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.365 src/sys/arch/mac68k/mac68k/machdep.c:1.366
--- src/sys/arch/mac68k/mac68k/machdep.c:1.365 Sat Sep 23 13:45:50 2023
+++ src/sys/arch/mac68k/mac68k/machdep.c Wed Jan 3 12:43:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.365 2023/09/23 13:45:50 andvar Exp $ */
+/* $NetBSD: machdep.c,v 1.366 2024/01/03 12:43:42 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.365 2023/09/23 13:45:50 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.366 2024/01/03 12:43:42 thorpej Exp $");
#include "opt_adb.h"
#include "opt_compat_netbsd.h"
@@ -122,6 +122,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include
#include
+#include
#include
#include
@@ -2257,15 +2258,15 @@ get_physical(u_int addr, u_long * phys)
if (mmutype == MMU_68040) {
ph = ptest040((void *)addr, FC_SUPERD);
- if ((ph & MMU40_RES) == 0) {
+ if ((ph & MMUSR40_R) == 0) {
ph = ptest040((void *)addr, FC_USERD);
- if ((ph & MMU40_RES) == 0)
+ if ((ph & MMUSR40_R) == 0)
return 0;
}
- if ((ph & MMU40_TTR) != 0)
+ if ((ph & MMUSR40_T) != 0)
ph = addr;
- mask = (macos_tc & 0x4000) ? 0x1fff : 0x0fff;
+ mask = (macos_tc & TCR40_P) ? 0x1fff : 0x0fff;
ph &= (~mask);
} else {
switch (get_pte(addr, pte, )) {
CVS commit: src/sys/arch/mac68k/mac68k
Module Name:src Committed By: thorpej Date: Wed Jan 3 12:43:43 UTC 2024 Modified Files: src/sys/arch/mac68k/mac68k: machdep.c Log Message: get_physical(): Use bit defs from To generate a diff of this commit: cvs rdiff -u -r1.365 -r1.366 src/sys/arch/mac68k/mac68k/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: riastradh Date: Wed Jan 3 11:40:38 UTC 2024 Modified Files: src/external/bsd/fetch/dist/libfetch: common.c Log Message: fetch(3): Backport SSL validation from pkgsrc libfetch 2.40. We should really sync with pkgsrc libfetch to avoid divergence, but this is a low-risk, high-priority change for NetBSD 10: https://mail-index.netbsd.org/pkgsrc-changes/2024/01/03/msg290052.html To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/fetch/dist/libfetch/common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: riastradh
Date: Wed Jan 3 11:40:38 UTC 2024
Modified Files:
src/external/bsd/fetch/dist/libfetch: common.c
Log Message:
fetch(3): Backport SSL validation from pkgsrc libfetch 2.40.
We should really sync with pkgsrc libfetch to avoid divergence, but
this is a low-risk, high-priority change for NetBSD 10:
https://mail-index.netbsd.org/pkgsrc-changes/2024/01/03/msg290052.html
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/fetch/dist/libfetch/common.c
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/fetch/dist/libfetch/common.c
diff -u src/external/bsd/fetch/dist/libfetch/common.c:1.5 src/external/bsd/fetch/dist/libfetch/common.c:1.6
--- src/external/bsd/fetch/dist/libfetch/common.c:1.5 Fri Dec 29 00:55:46 2023
+++ src/external/bsd/fetch/dist/libfetch/common.c Wed Jan 3 11:40:38 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.5 2023/12/29 00:55:46 christos Exp $ */
+/* $NetBSD: common.c,v 1.6 2024/01/03 11:40:38 riastradh Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2010 Joerg Sonnenberger
@@ -452,6 +452,10 @@ fetch_ssl(conn_t *conn, int verbose)
conn->ssl_meth = SSLv23_client_method();
conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth);
SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY);
+ if (getenv("SSL_NO_VERIFY_PEER") == NULL) {
+ SSL_CTX_set_default_verify_paths(conn->ssl_ctx);
+ SSL_CTX_set_verify(conn->ssl_ctx, SSL_VERIFY_PEER, NULL);
+ }
conn->ssl = SSL_new(conn->ssl_ctx);
if (conn->ssl == NULL){
