CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Wed Oct 3 05:49:53 UTC 2018
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
Log Message:
Identify some Cavium ThunderX CPUs
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/aarch64/aarch64/cpu.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/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.7 src/sys/arch/aarch64/aarch64/cpu.c:1.8
--- src/sys/arch/aarch64/aarch64/cpu.c:1.7 Mon Sep 10 11:05:12 2018
+++ src/sys/arch/aarch64/aarch64/cpu.c Wed Oct 3 05:49:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.7 2018/09/10 11:05:12 ryo Exp $ */
+/* $NetBSD: cpu.c,v 1.8 2018/10/03 05:49:53 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.7 2018/09/10 11:05:12 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.8 2018/10/03 05:49:53 skrll Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -176,7 +176,11 @@ const struct cpuidtab cpuids[] = {
{ CPU_ID_CORTEXA72R0 & CPU_PARTMASK, "Cortex-A72", "Cortex", "V8-A" },
{ CPU_ID_CORTEXA73R0 & CPU_PARTMASK, "Cortex-A73", "Cortex", "V8-A" },
{ CPU_ID_CORTEXA55R1 & CPU_PARTMASK, "Cortex-A55", "Cortex", "V8.2-A" },
- { CPU_ID_CORTEXA75R2 & CPU_PARTMASK, "Cortex-A75", "Cortex", "V8.2-A" }
+ { CPU_ID_CORTEXA75R2 & CPU_PARTMASK, "Cortex-A75", "Cortex", "V8.2-A" },
+ { CPU_ID_THUNDERXRX, "Cavium Thunder X", "Cavium", "V8-A" },
+ { CPU_ID_THUNDERX81XXRX, "Cavium Thunder X CN81XX", "Cavium", "V8-A" },
+ { CPU_ID_THUNDERX83XXRX, "Cavium Thunder X CN83XX", "Cavium", "V8-A" },
+ { CPU_ID_THUNDERX2RX, "Cavium Thunder X2", "Cavium", "V8-A" },
};
static void
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Wed Oct 3 05:45:50 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add commented out Cavium CN88XX ThunderX EARLYCONS and CONSADDR To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/GENERIC64 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/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.41 src/sys/arch/evbarm/conf/GENERIC64:1.42 --- src/sys/arch/evbarm/conf/GENERIC64:1.41 Sun Sep 30 16:06:02 2018 +++ src/sys/arch/evbarm/conf/GENERIC64 Wed Oct 3 05:45:49 2018 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.41 2018/09/30 16:06:02 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.42 2018/10/03 05:45:49 skrll Exp $ # # GENERIC ARM (aarch64) kernel # @@ -81,6 +81,7 @@ options VERBOSE_INIT_ARM # verbose boot #options EARLYCONS=rk3399, CONSADDR=0xff1a #options EARLYCONS=sunxi, CONSADDR=0x01c28000 #options EARLYCONS=tegra, CONSADDR=0x70006000 +#options EARLYCONS=thunderx, CONSADDR=0x87e02400 #options EARLYCONS=virt makeoptions DEBUG="-g" # compile full symbol table
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: skrll Date: Wed Oct 3 05:43:37 UTC 2018 Modified Files: src/sys/arch/arm/include: cputypes.h Log Message: Add some Cavium CPU_IDs (implementor and primary part number only aka CPU_PARTMASK) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/include/cputypes.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/arm/include/cputypes.h diff -u src/sys/arch/arm/include/cputypes.h:1.2 src/sys/arch/arm/include/cputypes.h:1.3 --- src/sys/arch/arm/include/cputypes.h:1.2 Tue May 1 10:10:31 2018 +++ src/sys/arch/arm/include/cputypes.h Wed Oct 3 05:43:37 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cputypes.h,v 1.2 2018/05/01 10:10:31 ryo Exp $ */ +/* $NetBSD: cputypes.h,v 1.3 2018/10/03 05:43:37 skrll Exp $ */ /* * Copyright (c) 1998, 2001 Ben Harris @@ -176,6 +176,11 @@ #define CPU_ID_CORTEX_A72_P(n) ((n & 0xff0ff0f0) == 0x410fd080) #define CPU_ID_CORTEX_A73_P(n) ((n & 0xff0ff0f0) == 0x410fd090) #define CPU_ID_CORTEX_A75_P(n) ((n & 0xff0ff0f0) == 0x410fd0a0) + +#define CPU_ID_THUNDERXRX 0x43000a10 +#define CPU_ID_THUNDERX81XXRX 0x43000a20 +#define CPU_ID_THUNDERX83XXRX 0x43000a30 +#define CPU_ID_THUNDERX2RX 0x43000af0 #define CPU_ID_SA110 0x4401a100 #define CPU_ID_SA1100 0x4401a110 #define CPU_ID_TI925T 0x54029250
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: sevan Date: Wed Oct 3 00:13:17 UTC 2018 Modified Files: src/games/fortune/datfiles: fortunes Log Message: Advice from Bob Morris https://www.ieee-security.org/Cipher/ConfReports/conf-rep-Crypto95.html To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.73 src/games/fortune/datfiles/fortunes:1.74 --- src/games/fortune/datfiles/fortunes:1.73 Wed Sep 12 22:10:07 2018 +++ src/games/fortune/datfiles/fortunes Wed Oct 3 00:13:16 2018 @@ -16237,3 +16237,6 @@ and I are going to spend the rest of our events such as these will affect you in the future. You are interested in the unknown, the mysterious, the unexplainable. That is why you are here. -- Criswell Predicts, "Plan 9 From Outer Space" +% +Rule 1 of cryptanalysis: check for plaintext. + -- Bob Morris, Crypto '95
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Tue Oct 2 22:44:07 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: log.c
Log Message:
Don't treat mostly connection closed events as filtering events.
There a a failed to negotiate instance too, but I don't want to generate
more diff.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/log.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/log.c
diff -u src/crypto/external/bsd/openssh/dist/log.c:1.18 src/crypto/external/bsd/openssh/dist/log.c:1.19
--- src/crypto/external/bsd/openssh/dist/log.c:1.18 Sun Aug 26 03:46:36 2018
+++ src/crypto/external/bsd/openssh/dist/log.c Tue Oct 2 18:44:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: log.c,v 1.18 2018/08/26 07:46:36 christos Exp $ */
+/* $NetBSD: log.c,v 1.19 2018/10/02 22:44:07 christos Exp $ */
/* $OpenBSD: log.c,v 1.51 2018/07/27 12:03:17 markus Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: log.c,v 1.18 2018/08/26 07:46:36 christos Exp $");
+__RCSID("$NetBSD: log.c,v 1.19 2018/10/02 22:44:07 christos Exp $");
#include
#include
@@ -183,7 +183,7 @@ logdie(const char *fmt,...)
va_start(args, fmt);
do_log(SYSLOG_LEVEL_INFO, fmt, args);
va_end(args);
- cleanup_exit(255);
+ cleanup_exit(254);
}
/* Log this message (information that usually should go to the log). */
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: christos
Date: Tue Oct 2 22:40:29 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: monitor_wrap.c packet.c
serverloop.c
Log Message:
Undo previous change. It made filtering a lot more aggressive.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 \
src/crypto/external/bsd/openssh/dist/monitor_wrap.c \
src/crypto/external/bsd/openssh/dist/serverloop.c
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/packet.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/monitor_wrap.c
diff -u src/crypto/external/bsd/openssh/dist/monitor_wrap.c:1.22 src/crypto/external/bsd/openssh/dist/monitor_wrap.c:1.23
--- src/crypto/external/bsd/openssh/dist/monitor_wrap.c:1.22 Sat Sep 29 11:10:44 2018
+++ src/crypto/external/bsd/openssh/dist/monitor_wrap.c Tue Oct 2 18:40:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: monitor_wrap.c,v 1.22 2018/09/29 15:10:44 christos Exp $ */
+/* $NetBSD: monitor_wrap.c,v 1.23 2018/10/02 22:40:28 christos Exp $ */
/* $OpenBSD: monitor_wrap.c,v 1.107 2018/07/20 03:46:34 djm Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: monitor_wrap.c,v 1.22 2018/09/29 15:10:44 christos Exp $");
+__RCSID("$NetBSD: monitor_wrap.c,v 1.23 2018/10/02 22:40:28 christos Exp $");
#include
#include
#include
@@ -151,7 +151,7 @@ mm_request_receive(int sock, struct sshb
if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) {
if (errno == EPIPE)
- cleanup_exit(255);
+ cleanup_exit(254);
fatal("%s: read: %s", __func__, strerror(errno));
}
msg_len = PEEK_U32(buf);
Index: src/crypto/external/bsd/openssh/dist/serverloop.c
diff -u src/crypto/external/bsd/openssh/dist/serverloop.c:1.22 src/crypto/external/bsd/openssh/dist/serverloop.c:1.23
--- src/crypto/external/bsd/openssh/dist/serverloop.c:1.22 Sat Sep 29 11:10:44 2018
+++ src/crypto/external/bsd/openssh/dist/serverloop.c Tue Oct 2 18:40:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: serverloop.c,v 1.22 2018/09/29 15:10:44 christos Exp $ */
+/* $NetBSD: serverloop.c,v 1.23 2018/10/02 22:40:28 christos Exp $ */
/* $OpenBSD: serverloop.c,v 1.209 2018/07/27 05:13:02 dtucker Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: serverloop.c,v 1.22 2018/09/29 15:10:44 christos Exp $");
+__RCSID("$NetBSD: serverloop.c,v 1.23 2018/10/02 22:40:28 christos Exp $");
#include /* MIN MAX */
#include
@@ -343,7 +343,7 @@ process_input(struct ssh *ssh, fd_set *r
"%.100s port %d: %.100s",
ssh_remote_ipaddr(ssh),
ssh_remote_port(ssh), strerror(errno));
-cleanup_exit(255);
+cleanup_exit(254);
}
} else {
/* Buffer any received data. */
@@ -440,7 +440,7 @@ server_loop2(struct ssh *ssh, Authctxt *
if (received_sigterm) {
logit("Exiting on signal %d", (int)received_sigterm);
/* Clean up sessions, utmp, etc. */
- cleanup_exit(255);
+ cleanup_exit(254);
}
collect_children(ssh);
Index: src/crypto/external/bsd/openssh/dist/packet.c
diff -u src/crypto/external/bsd/openssh/dist/packet.c:1.34 src/crypto/external/bsd/openssh/dist/packet.c:1.35
--- src/crypto/external/bsd/openssh/dist/packet.c:1.34 Sat Sep 29 11:10:44 2018
+++ src/crypto/external/bsd/openssh/dist/packet.c Tue Oct 2 18:40:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: packet.c,v 1.34 2018/09/29 15:10:44 christos Exp $ */
+/* $NetBSD: packet.c,v 1.35 2018/10/02 22:40:28 christos Exp $ */
/* $OpenBSD: packet.c,v 1.277 2018/07/16 03:09:13 djm Exp $ */
/*
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: packet.c,v 1.34 2018/09/29 15:10:44 christos Exp $");
+__RCSID("$NetBSD: packet.c,v 1.35 2018/10/02 22:40:28 christos Exp $");
#include /* MIN roundup */
#include
@@ -1883,7 +1883,7 @@ ssh_packet_disconnect(struct ssh *ssh, c
/* Close the connection. */
ssh_packet_close(ssh);
- cleanup_exit(255);
+ cleanup_exit(254);
}
/*
CVS commit: [pgoyette-compat] src/doc
Module Name:src Committed By: pgoyette Date: Tue Oct 2 22:00:47 UTC 2018 Modified Files: src/doc [pgoyette-compat]: TODO.compat-module Log Message: Update To generate a diff of this commit: cvs rdiff -u -r1.1.2.16 -r1.1.2.17 src/doc/TODO.compat-module Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.compat-module diff -u src/doc/TODO.compat-module:1.1.2.16 src/doc/TODO.compat-module:1.1.2.17 --- src/doc/TODO.compat-module:1.1.2.16 Sun Sep 30 01:48:27 2018 +++ src/doc/TODO.compat-module Tue Oct 2 22:00:47 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: TODO.compat-module,v 1.1.2.16 2018/09/30 01:48:27 pgoyette Exp $ */ +/* $NetBSD: TODO.compat-module,v 1.1.2.17 2018/10/02 22:00:47 pgoyette Exp $ */ DONE @@ -51,14 +51,12 @@ DONE 14. Cleaned up some previous vectored routines (related to if_43.c) to use the MP-safe mechanism. +15. Organized netbsd32 machine-dependent code to fit a common build +framework, and split version-specific code from baseline code as +needed. TODO - Required for branch merge -15. Need to finish cleaning up the netbsd32 machine-dependent code, since -the MI code assumes that there's MD file available. This is done, but -there's still an issue with the compat_netbsd32 for sparc64 - it wants -to reference emul_sunos but doesn't include sunos_exec.c in the build. - 16. The ieee_80211 compat code needs to be verified to make sure it is handling the if43_20 compat routine cvtcmd() correctly.
CVS commit: [pgoyette-compat] src/sys/arch/sparc64/sparc64
Module Name:src Committed By: pgoyette Date: Tue Oct 2 22:00:15 UTC 2018 Modified Files: src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep_13.c netbsd32_machdep_16.c Log Message: Remove conditional compilation based on COMPAT_SUNOS - just update the sf_scp field regardless. We've previously removed the comparison that checks if a lwp's emul is emul_sunos, so now we can also remove the include for "opt_sunos.h" To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \ src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c \ src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.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/sparc64/sparc64/netbsd32_machdep_13.c diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c:1.1.2.1 src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c:1.1.2.2 --- src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c:1.1.2.1 Sun Sep 30 00:17:55 2018 +++ src/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c Tue Oct 2 22:00:15 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep_13.c,v 1.1.2.1 2018/09/30 00:17:55 pgoyette Exp $ */ +/* $NetBSD: netbsd32_machdep_13.c,v 1.1.2.2 2018/10/02 22:00:15 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,11 +27,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_13.c,v 1.1.2.1 2018/09/30 00:17:55 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_13.c,v 1.1.2.2 2018/10/02 22:00:15 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" -#include "opt_compat_sunos.h" #include "opt_modular.h" #include "opt_execfmt.h" #include "firm_events.h" Index: src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c diff -u src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.1 src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.2 --- src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c:1.1.2.1 Sun Sep 30 00:17:55 2018 +++ src/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c Tue Oct 2 22:00:15 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.1 2018/09/30 00:17:55 pgoyette Exp $ */ +/* $NetBSD: netbsd32_machdep_16.c,v 1.1.2.2 2018/10/02 22:00:15 pgoyette Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,11 +27,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.1 2018/09/30 00:17:55 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.2 2018/10/02 22:00:15 pgoyette Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" -#include "opt_compat_sunos.h" #include "opt_modular.h" #include "opt_execfmt.h" #include "firm_events.h" @@ -153,9 +152,7 @@ netbsd32_sendsig_sigcontext(const ksigin */ sf.sf_signo = sig; sf.sf_code = (u_int)ksi->ksi_trap; -#if defined(COMPAT_SUNOS) || defined(MODULAR) sf.sf_scp = (u_long)>sf_sc; -#endif sf.sf_addr = 0; /* XXX */ /*
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: christos
Date: Tue Oct 2 18:49:24 UTC 2018
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: isakmp_frag.c
Log Message:
PR/53646: Thomas Reim: Incorrect detection of the packet complete code in
fragment list check.
While the fix in https://launchpad.net/~rdratlos/+archive/ubuntu/racoon
- if (i > last_frag) /* It is complete */
+ if (i >= last_frag) /* It is complete */
has the correct behavior, it violates the test for successful
completion of the invariant of the loop:
for (i = 1; i <= last_frag; i++) {
if (!check_fragment_index())
break;
}
if (i > last_frag)
return ok;
It is better to move the check for NULL in the loop earlier, so that
the final iteration is done and the test is kept the same. It makes
the code easier to understand and preserves the original intent.
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c:1.8 src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c:1.9
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c:1.8 Sat May 19 15:32:16 2018
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c Tue Oct 2 14:49:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_frag.c,v 1.8 2018/05/19 19:32:16 maxv Exp $ */
+/* $NetBSD: isakmp_frag.c,v 1.9 2018/10/02 18:49:24 christos Exp $ */
/* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */
@@ -289,11 +289,11 @@ isakmp_frag_extract(iph1, msg)
if (last_frag != 0) {
item = iph1->frag_chain;
for (i = 1; i <= last_frag; i++) {
+ if (item == NULL) /* Not found */
+break;
if (item->frag_num != i)
break;
item = item->frag_next;
- if (item == NULL) /* Not found */
-break;
}
if (i > last_frag) /* It is complete */
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: mrg Date: Tue Oct 2 18:37:32 UTC 2018 Modified Files: src/sys/arch/m68k/m68k: switch_subr.s Log Message: fix diagnostic build. XXX: pullup-7, pullup-8. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/m68k/m68k/switch_subr.s 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/m68k/switch_subr.s diff -u src/sys/arch/m68k/m68k/switch_subr.s:1.32 src/sys/arch/m68k/m68k/switch_subr.s:1.33 --- src/sys/arch/m68k/m68k/switch_subr.s:1.32 Mon Oct 14 12:20:05 2013 +++ src/sys/arch/m68k/m68k/switch_subr.s Tue Oct 2 18:37:31 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: switch_subr.s,v 1.32 2013/10/14 12:20:05 isaki Exp $ */ +/* $NetBSD: switch_subr.s,v 1.33 2018/10/02 18:37:31 mrg Exp $ */ /* * Copyright (c) 2001 The NetBSD Foundation. @@ -151,7 +151,7 @@ ENTRY(cpu_switchto) movl P_VMSPACE(%a2),%a2 | vm = p->p_vmspace #if defined(DIAGNOSTIC) && !defined(sun2) tstl %a2 | vm == VM_MAP_NULL? - jeq Lcpu_switch_badsw | panic + jeq .Lcpu_switch_badsw | panic #endif pea (%a0) | save newlwp #if !defined(_SUN3X_) || defined(PMAP_DEBUG)
CVS commit: src/lib/libcurses
Module Name:src
Committed By: roy
Date: Tue Oct 2 17:35:44 UTC 2018
Modified Files:
src/lib/libcurses: curses_private.h curses_screen.3 fileio.c initscr.c
newwin.c resize.c ripoffline.c screen.c setterm.c
Log Message:
curses: fix ripoffline
When creating stdscr, ensure it's placed and sized in accordance with
lines ripped off.
LINES is no longer adjusted for lines ripped off.
POSIX makes no mention that it should be adjusted.
Bottom lines are now placed correctly.
Lines ripped off are now displayed after calling initscr.
ok kamil@
Fixes PR #53635
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/lib/libcurses/curses_private.h
cvs rdiff -u -r1.24 -r1.25 src/lib/libcurses/curses_screen.3
cvs rdiff -u -r1.5 -r1.6 src/lib/libcurses/fileio.c
cvs rdiff -u -r1.32 -r1.33 src/lib/libcurses/initscr.c
cvs rdiff -u -r1.51 -r1.52 src/lib/libcurses/newwin.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libcurses/resize.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libcurses/ripoffline.c
cvs rdiff -u -r1.33 -r1.34 src/lib/libcurses/screen.c
cvs rdiff -u -r1.66 -r1.67 src/lib/libcurses/setterm.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/libcurses/curses_private.h
diff -u src/lib/libcurses/curses_private.h:1.63 src/lib/libcurses/curses_private.h:1.64
--- src/lib/libcurses/curses_private.h:1.63 Thu Sep 27 14:05:26 2018
+++ src/lib/libcurses/curses_private.h Tue Oct 2 17:35:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: curses_private.h,v 1.63 2018/09/27 14:05:26 roy Exp $ */
+/* $NetBSD: curses_private.h,v 1.64 2018/10/02 17:35:44 roy Exp $ */
/*-
* Copyright (c) 1998-2000 Brett Lymn
@@ -368,7 +368,7 @@ void __cursesi_chtype_to_cchar(chtype, c
int __fgetc_resize(FILE *);
int __unget(wint_t);
int __mvcur(int, int, int, int, int);
-WINDOW *__newwin(SCREEN *, int, int, int, int, int);
+WINDOW *__newwin(SCREEN *, int, int, int, int, int, int);
int __nodelay(void);
int __notimeout(void);
void __restartwin(void);
@@ -378,9 +378,10 @@ void __restore_meta_state(void);
void __restore_termios(void);
void __restore_stophandler(void);
void __restore_winchhandler(void);
-int __ripoffscreen(SCREEN *, int *);
+int __ripoffscreen(SCREEN *);
void __ripoffresize(SCREEN *);
-int __rippedlines(const SCREEN *);
+void __ripofftouch(SCREEN *);
+int __rippedlines(const SCREEN *, int);
void __save_termios(void);
void __set_color(WINDOW *win, attr_t attr);
void __set_stophandler(void);
Index: src/lib/libcurses/curses_screen.3
diff -u src/lib/libcurses/curses_screen.3:1.24 src/lib/libcurses/curses_screen.3:1.25
--- src/lib/libcurses/curses_screen.3:1.24 Fri Sep 28 08:11:34 2018
+++ src/lib/libcurses/curses_screen.3 Tue Oct 2 17:35:44 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: curses_screen.3,v 1.24 2018/09/28 08:11:34 kamil Exp $
+.\" $NetBSD: curses_screen.3,v 1.25 2018/10/02 17:35:44 roy Exp $
.\"
.\" Copyright (c) 2002
.\" Brett Lymn (bl...@netbsd.org, brett_l...@yahoo.com.au)
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\"
-.Dd September 28, 2018
+.Dd October 2, 2018
.Dt CURSES_SCREEN 3
.Os
.Sh NAME
@@ -239,8 +239,6 @@ or
.Xr doupdate 3 ,
but may call
.Xr wnoutrefresh 3 .
-.Dv LINES
-will be reduced by the total number of lines ripped off.
.Fn ripoffline
can be called up to five times.
.Pp
Index: src/lib/libcurses/fileio.c
diff -u src/lib/libcurses/fileio.c:1.5 src/lib/libcurses/fileio.c:1.6
--- src/lib/libcurses/fileio.c:1.5 Sat Oct 22 21:55:06 2016
+++ src/lib/libcurses/fileio.c Tue Oct 2 17:35:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fileio.c,v 1.5 2016/10/22 21:55:06 christos Exp $ */
+/* $NetBSD: fileio.c,v 1.6 2018/10/02 17:35:44 roy Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fileio.c,v 1.5 2016/10/22 21:55:06 christos Exp $");
+__RCSID("$NetBSD: fileio.c,v 1.6 2018/10/02 17:35:44 roy Exp $");
#endif/* not lint */
#include "curses.h"
@@ -195,7 +195,7 @@ getwin(FILE *fp)
if (fread(wtmp, sizeof(WINDOW), 1, fp) != 1)
goto error0;
win = __newwin(_cursesi_screen, wtmp->maxy, wtmp->maxx,
- wtmp->begy, wtmp->begx, FALSE);
+ wtmp->begy, wtmp->begx, FALSE, FALSE);
if (win == NULL)
goto error0;
win->cury = wtmp->cury;
Index: src/lib/libcurses/initscr.c
diff -u src/lib/libcurses/initscr.c:1.32 src/lib/libcurses/initscr.c:1.33
--- src/lib/libcurses/initscr.c:1.32 Wed Jan 11 17:15:27 2017
+++ src/lib/libcurses/initscr.c Tue Oct 2 17:35:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: initscr.c,v 1.32 2017/01/11 17:15:27 roy Exp $ */
+/* $NetBSD: initscr.c,v 1.33 2018/10/02 17:35:44 roy Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)initscr.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: initscr.c,v 1.32 2017/01/11 17:15:27 roy Exp $");
+__RCSID("$NetBSD: initscr.c,v 1.33 2018/10/02 17:35:44 roy Exp $");
#endif
CVS commit: src/crypto/external/bsd/openssl/dist/test
Module Name:src
Committed By: christos
Date: Tue Oct 2 13:53:51 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/dist/test: hmactest.c
Log Message:
Use hex string syntax to prevent overflow warnings for character constants
>= 128.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/test/hmactest.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/test/hmactest.c
diff -u src/crypto/external/bsd/openssl/dist/test/hmactest.c:1.3 src/crypto/external/bsd/openssl/dist/test/hmactest.c:1.4
--- src/crypto/external/bsd/openssl/dist/test/hmactest.c:1.3 Sun Sep 23 09:33:03 2018
+++ src/crypto/external/bsd/openssl/dist/test/hmactest.c Tue Oct 2 09:53:51 2018
@@ -38,10 +38,8 @@ static struct test_st {
"e9139d1e6ee064ef8cf514fc7dc83e86",
},
{
-{
-0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-}, 16, "Hi There", 8,
+"\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
+16, "Hi There", 8,
"9294727a3638bb1c13f48ef8158bfc9d",
},
{
@@ -49,10 +47,8 @@ static struct test_st {
"750c783e6ab0b503eaa86e310a5db738",
},
{
-{
-0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-}, 16, {
+"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa",
+16, {
0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
