CVS commit: src/share/man/man5
Module Name:src Committed By: kim Date: Sun Oct 11 22:46:25 UTC 2020 Modified Files: src/share/man/man5: ifconfig.if.5 Log Message: Bump date To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man5/ifconfig.if.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/ifconfig.if.5 diff -u src/share/man/man5/ifconfig.if.5:1.21 src/share/man/man5/ifconfig.if.5:1.22 --- src/share/man/man5/ifconfig.if.5:1.21 Sun Oct 11 22:38:48 2020 +++ src/share/man/man5/ifconfig.if.5 Sun Oct 11 22:46:24 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: ifconfig.if.5,v 1.21 2020/10/11 22:38:48 kim Exp $ +.\" $NetBSD: ifconfig.if.5,v 1.22 2020/10/11 22:46:24 kim Exp $ .\" .\" Copyright (c) 1996 Matthew R. Green .\" All rights reserved. @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 15, 2020 +.Dd October 12, 2020 .Dt IFCONFIG.IF 5 .Os .Sh NAME
CVS commit: src
Module Name:src
Committed By: kim
Date: Sun Oct 11 22:38:48 UTC 2020
Modified Files:
src/etc/rc.d: network
src/share/man/man5: ifconfig.if.5
Log Message:
Make "rtsol" functional again.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/etc/rc.d/network
cvs rdiff -u -r1.20 -r1.21 src/share/man/man5/ifconfig.if.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/network
diff -u src/etc/rc.d/network:1.82 src/etc/rc.d/network:1.83
--- src/etc/rc.d/network:1.82 Tue Sep 8 12:52:18 2020
+++ src/etc/rc.d/network Sun Oct 11 22:38:48 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.82 2020/09/08 12:52:18 martin Exp $
+# $NetBSD: network,v 1.83 2020/10/11 22:38:48 kim Exp $
#
# PROVIDE: network
@@ -325,7 +325,10 @@ network_start_interfaces()
;;
rtsol)
if ! checkyesno dhcpcd; then
- /sbin/dhcpcd -n --ipv6rs \
+ /sbin/dhcpcd -n -f /dev/null \
+ --background --persistent \
+ --noipv4 --nodhcp6 \
+ --ipv6ra_noautoconf \
${dhcpcd_flags} $int
fi
;;
Index: src/share/man/man5/ifconfig.if.5
diff -u src/share/man/man5/ifconfig.if.5:1.20 src/share/man/man5/ifconfig.if.5:1.21
--- src/share/man/man5/ifconfig.if.5:1.20 Fri Apr 17 13:36:48 2020
+++ src/share/man/man5/ifconfig.if.5 Sun Oct 11 22:38:48 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: ifconfig.if.5,v 1.20 2020/04/17 13:36:48 kim Exp $
+.\" $NetBSD: ifconfig.if.5,v 1.21 2020/10/11 22:38:48 kim Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -96,20 +96,21 @@ and any per interface configuration or r
.Pp
If the line is equal to
.Dq rtsol ,
-kernel processing of router advertisements will be enabled and an IPv6
-router solicitation message will be sent out on the interface.
+a dedicated
+.Xr dhcpcd 8
+process will be started for processing received router advertisements
+and sending out IPv6 router solicitation messages on the interface.
This is useful on networks where default routes can best be learned
from router advertisements.
However, if
.Sy dhcpcd
has been set to true in
.Xr rc.conf 5 ,
-it is assumed that
+it is assumed that that
.Xr dhcpcd 8
-will take care of sending any necessary router solicitation messages and
-processing received router advertisements through its configuration in
-.Xr dhcpcd.conf 5
-instead.
+process will take care of sending any necessary router solicitation
+messages and processing received router advertisements on all
+interfaces, and therefore no per-interface process is started.
.Pp
If a line is empty, or starts with
.Sq # ,
CVS commit: src/etc
Module Name:src
Committed By: jnemeth
Date: Sun Oct 11 22:14:55 UTC 2020
Modified Files:
src/etc: named.conf
Log Message:
Also edns-udp-size.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/etc/named.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/named.conf
diff -u src/etc/named.conf:1.9 src/etc/named.conf:1.10
--- src/etc/named.conf:1.9 Sun Oct 11 22:11:36 2020
+++ src/etc/named.conf Sun Oct 11 22:14:55 2020
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.9 2020/10/11 22:11:36 jnemeth Exp $
+# $NetBSD: named.conf,v 1.10 2020/10/11 22:14:55 jnemeth Exp $
# boot file for secondary name server
# Note that there should be one primary entry for each SOA record.
@@ -16,6 +16,7 @@ options {
bindkeys-file "bind.keys";
allow-recursion { localhost; localnets; };
max-udp-size 1220;
+ edns-udp-size 1220;
#
# This forces all queries to come from port 53; might be
CVS commit: src/etc
Module Name:src
Committed By: jnemeth
Date: Sun Oct 11 22:11:37 UTC 2020
Modified Files:
src/etc: named.conf
Log Message:
Set max-udp-size as per DNS flag day 2020, see
https://www.isc.org/blogs/dns-flag-day-2020-2/ .
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/etc/named.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/named.conf
diff -u src/etc/named.conf:1.8 src/etc/named.conf:1.9
--- src/etc/named.conf:1.8 Sat Mar 21 20:20:59 2020
+++ src/etc/named.conf Sun Oct 11 22:11:36 2020
@@ -1,4 +1,4 @@
-# $NetBSD: named.conf,v 1.8 2020/03/21 20:20:59 christos Exp $
+# $NetBSD: named.conf,v 1.9 2020/10/11 22:11:36 jnemeth Exp $
# boot file for secondary name server
# Note that there should be one primary entry for each SOA record.
@@ -15,6 +15,7 @@ options {
managed-keys-directory "keys";
bindkeys-file "bind.keys";
allow-recursion { localhost; localnets; };
+ max-udp-size 1220;
#
# This forces all queries to come from port 53; might be
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jdc
Date: Sun Oct 11 21:41:57 UTC 2020
Modified Files:
src/sys/dev/pci: radeonfb.c
Log Message:
Handle EDID:N entries, where N is the port number, so that we can set up
the display on port1 when port0 has no EDID information.
Try harder not to return NULL from radeonfb_modelookup() because we use
the result without checking later.
While here, adjust RADEONFB_DEBUG output:
don't print RADEON_PIXCLKS_CNTL (fixes a crash on sparc64 because it's
not aligned)
don't ignore the bottom 200 lines of the display (for no apparent reason))
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/dev/pci/radeonfb.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/dev/pci/radeonfb.c
diff -u src/sys/dev/pci/radeonfb.c:1.110 src/sys/dev/pci/radeonfb.c:1.111
--- src/sys/dev/pci/radeonfb.c:1.110 Mon Sep 28 05:43:58 2020
+++ src/sys/dev/pci/radeonfb.c Sun Oct 11 21:41:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: radeonfb.c,v 1.110 2020/09/28 05:43:58 macallan Exp $ */
+/* $NetBSD: radeonfb.c,v 1.111 2020/10/11 21:41:57 jdc Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.110 2020/09/28 05:43:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeonfb.c,v 1.111 2020/10/11 21:41:57 jdc Exp $");
#include
#include
@@ -590,7 +590,10 @@ radeonfb_attach(device_t parent, device_
PRINTREG(RADEON_LVDS_GEN_CNTL);
PRINTREG(RADEON_DISP_HW_DEBUG);
if (!IS_AVIVO(sc)) {
+ /*
+ XXX: We can't print this, as it's not correctly aligned
PRINTREG(RADEON_PIXCLKS_CNTL);
+ */
PRINTREG(RADEON_CRTC_H_SYNC_STRT_WID);
PRINTREG(RADEON_FP_H_SYNC_STRT_WID);
PRINTREG(RADEON_CRTC2_H_SYNC_STRT_WID);
@@ -927,10 +930,6 @@ radeonfb_attach(device_t parent, device_
dp->rd_vd.init_screen = radeonfb_init_screen;
-#ifdef RADEONFB_DEBUG
- dp->rd_virty -= 200;
-#endif
-
dp->rd_console = 0;
prop_dictionary_get_bool(device_properties(sc->sc_dev),
"is_console", &dp->rd_console);
@@ -1068,7 +1067,10 @@ radeonfb_attach(device_t parent, device_
PRINTREG(RADEON_TMDS_CNTL);
PRINTREG(RADEON_TMDS_TRANSMITTER_CNTL);
PRINTREG(RADEON_TMDS_PLL_CNTL);
+ /*
+ XXX: We can't print this, as it's not correctly aligned
PRINTREG(RADEON_PIXCLKS_CNTL);
+ */
}
return;
@@ -1968,7 +1970,7 @@ nobios:
}
for (i = 0; i < 2; i++) {
- char edid[128];
+ char edid[128], edid_port_str[7] = "EDID:";
uint8_t ddc;
struct edid_info *eip = &sc->sc_ports[i].rp_edid;
prop_data_t edid_data;
@@ -1981,10 +1983,17 @@ nobios:
DPRINTF((" crtc = %d\n", sc->sc_ports[i].rp_number));
sc->sc_ports[i].rp_edid_valid = 0;
- /* first look for static EDID data */
- if ((edid_data = prop_dictionary_get(device_properties(
- sc->sc_dev), "EDID")) != NULL) {
-
+ /*
+ * First look for static EDID data
+ * Try "EDID:port" then "EDID"
+ */
+ snprintf(&edid_port_str[5], 2, "%d", i);
+ edid_data = prop_dictionary_get(device_properties(
+ sc->sc_dev), edid_port_str);
+ if (edid_data == NULL)
+ edid_data = prop_dictionary_get(device_properties(
+ sc->sc_dev), "EDID");
+ if (edid_data != NULL) {
aprint_debug_dev(sc->sc_dev, "using static EDID\n");
memcpy(edid, prop_data_value(edid_data), 128);
if (edid_parse(edid, eip) == 0) {
@@ -2078,12 +2087,17 @@ const struct videomode *
radeonfb_modelookup(const char *name)
{
int i;
+ /* Use a default mode in case we don't find a matching mode */
+ const char *vm = "1024x768x60";
+ const struct videomode *vmp = NULL;
for (i = 0; i < videomode_count; i++) {
if (!strcmp(name, videomode_list[i].name))
return &videomode_list[i];
+ if (!strcmp(vm, videomode_list[i].name))
+ vmp = &videomode_list[i];
}
- return NULL;
+ return vmp;
}
void
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: roy
Date: Sun Oct 11 21:32:37 UTC 2020
Modified Files:
src/sbin/ifconfig: util.c
Log Message:
ifconfig: if SIOCGLIFADDR fails, continue to the next address
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sbin/ifconfig/util.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/util.c
diff -u src/sbin/ifconfig/util.c:1.19 src/sbin/ifconfig/util.c:1.20
--- src/sbin/ifconfig/util.c:1.19 Tue Oct 1 10:52:53 2019
+++ src/sbin/ifconfig/util.c Sun Oct 11 21:32:37 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.19 2019/10/01 10:52:53 kardel Exp $ */
+/* $NetBSD: util.c,v 1.20 2020/10/11 21:32:37 roy Exp $ */
/*-
* Copyright (c) 2008 David Young. All rights reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: util.c,v 1.19 2019/10/01 10:52:53 kardel Exp $");
+__RCSID("$NetBSD: util.c,v 1.20 2020/10/11 21:32:37 roy Exp $");
#endif /* not lint */
#include
@@ -275,8 +275,10 @@ print_link_addresses(prop_dictionary_t e
iflr.flags = IFLR_PREFIX;
iflr.prefixlen = sdl->sdl_alen * NBBY;
- if (prog_ioctl(s, SIOCGLIFADDR, &iflr) == -1)
+ if (prog_ioctl(s, SIOCGLIFADDR, &iflr) == -1) {
warn("%s: ioctl SIOCGLIFADDR", __func__);
+ continue;
+ }
if (((iflr.flags & IFLR_ACTIVE) != 0) != print_active_only)
continue;
CVS commit: src/sys/arch/sparc64
Module Name:src
Committed By: jdc
Date: Sun Oct 11 19:39:23 UTC 2020
Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
src/sys/arch/sparc64/sparc64: autoconf.c
Added Files:
src/sys/arch/sparc64/sparc64: static_edid.c static_edid.h
Log Message:
Add a static EDID entry for the Mesostation-999.
Use the same logic as macppc for adding the entry.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r1.222 -r1.223 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/sparc64/static_edid.c \
src/sys/arch/sparc64/sparc64/static_edid.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/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.159 src/sys/arch/sparc64/conf/files.sparc64:1.160
--- src/sys/arch/sparc64/conf/files.sparc64:1.159 Mon May 11 15:56:15 2020
+++ src/sys/arch/sparc64/conf/files.sparc64 Sun Oct 11 19:39:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc64,v 1.159 2020/05/11 15:56:15 jdc Exp $
+# $NetBSD: files.sparc64,v 1.160 2020/10/11 19:39:22 jdc Exp $
# @(#)files.sparc64 8.1 (Berkeley) 7/19/93
# sparc64-specific configuration info
@@ -257,6 +257,7 @@ file arch/sparc64/sparc64/kobj_machdep.c
file arch/sparc64/sparc64/machdep.c
file arch/sparc64/sparc64/process_machdep.c
file arch/sparc64/sparc64/procfs_machdep.c procfs
+file arch/sparc64/sparc64/static_edid.c
file arch/sparc/sparc/openprom.c
file arch/sparc/sparc/openfirm.c
file arch/sparc64/sparc64/ofw_machdep.c
Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.222 src/sys/arch/sparc64/sparc64/autoconf.c:1.223
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.222 Thu Jul 23 16:08:02 2020
+++ src/sys/arch/sparc64/sparc64/autoconf.c Sun Oct 11 19:39:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.222 2020/07/23 16:08:02 jdc Exp $ */
+/* $NetBSD: autoconf.c,v 1.223 2020/10/11 19:39:22 jdc Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.222 2020/07/23 16:08:02 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.223 2020/10/11 19:39:22 jdc Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -92,6 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include
#include
#include
+#include
#include
#include
@@ -1205,6 +1206,21 @@ set_hw_props(device_t dev)
}
}
+/* Static EDID definitions */
+static void
+set_static_edid(prop_dictionary_t dict)
+{
+ if (!strcmp(machine_model, "NATE,Meso-999")) {
+ prop_data_t edid;
+
+ DPRINTF(ACDB_PROBE, ("\nAdding EDID for Meso-999 "));
+ edid = prop_data_create_copy(edid_meso999,
+ sizeof(edid_meso999));
+ prop_dictionary_set(dict, "EDID:1", edid);
+ prop_object_release(edid);
+ }
+}
+
/*
* Called back during autoconfiguration for each device found
*/
@@ -1508,7 +1524,10 @@ noether:
if (OF_getprop(node, "width", &width, sizeof(width))
!= 4) {
instance = OF_open(name);
+ }
+ }
#endif
+ set_static_edid(dict);
}
set_hw_props(dev);
Added files:
Index: src/sys/arch/sparc64/sparc64/static_edid.c
diff -u /dev/null src/sys/arch/sparc64/sparc64/static_edid.c:1.1
--- /dev/null Sun Oct 11 19:39:23 2020
+++ src/sys/arch/sparc64/sparc64/static_edid.c Sun Oct 11 19:39:22 2020
@@ -0,0 +1,58 @@
+/* $NetBSD: static_edid.c,v 1.1 2020/10/11 19:39:22 jdc Exp $ */
+
+/*-
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Julian Coleman.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE
CVS commit: src/games/factor
Module Name:src Committed By: christos Date: Sun Oct 11 18:48:20 UTC 2020 Modified Files: src/games/factor: factor.6 Log Message: mention hex numbers To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/games/factor/factor.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/factor/factor.6 diff -u src/games/factor/factor.6:1.16 src/games/factor/factor.6:1.17 --- src/games/factor/factor.6:1.16 Sun Oct 4 10:22:52 2020 +++ src/games/factor/factor.6 Sun Oct 11 14:48:20 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: factor.6,v 1.16 2020/10/04 14:22:52 kre Exp $ +.\" $NetBSD: factor.6,v 1.17 2020/10/11 18:48:20 christos Exp $ .\" .\" Copyright (c) 1989, 1993 .\" The Regents of the University of California. All rights reserved. @@ -35,7 +35,7 @@ .\" .\" By Landon Curt Noll, http://www.isthe.com/chongo/index.html /\oo/\ .\" -.Dd October 3, 2020 +.Dd October 11, 2020 .Dt FACTOR 6 .Os .Sh NAME @@ -73,6 +73,9 @@ arguments, reads numbers, one per line, from standard input, until end of file or error. Leading white-space and empty lines are ignored. Numbers may be preceded by a single +. +Numbers that start with +.Dv 0x +are interpreted as hexadecimal. Integer less than 2 are rejected. Numbers are terminated by a non-digit character (such as a newline). After a number is read, it is factored.
CVS commit: src/games/factor
Module Name:src
Committed By: christos
Date: Sun Oct 11 18:46:21 UTC 2020
Modified Files:
src/games/factor: factor.c
Log Message:
Remove is_hex_str() (trying to guess if a number was hex or not). It is not
documented and can lead to unexpected behavior.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/games/factor/factor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/factor/factor.c
diff -u src/games/factor/factor.c:1.36 src/games/factor/factor.c:1.37
--- src/games/factor/factor.c:1.36 Sun Oct 11 13:18:34 2020
+++ src/games/factor/factor.c Sun Oct 11 14:46:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: factor.c,v 1.36 2020/10/11 17:18:34 christos Exp $ */
+/* $NetBSD: factor.c,v 1.37 2020/10/11 18:46:21 christos Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
__SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: factor.c,v 1.36 2020/10/11 17:18:34 christos Exp $");
+__RCSID("$NetBSD: factor.c,v 1.37 2020/10/11 18:46:21 christos Exp $");
#endif
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/factor/factor.c 35 2020-01-12 20:25:11Z gad $");
@@ -120,7 +120,6 @@ static void BN_print_fp(FILE *, const BI
static void BN_print_dec_fp(FILE *, const BIGNUM *);
static void convert_str2bn(BIGNUM **, char *);
-static bool is_hex_str(char *);
static void pr_fact(BIGNUM *, int, int); /* print factors of a value */
static void pr_print(BIGNUM *, int, int); /* print a prime */
static void usage(void) __dead;
@@ -451,29 +450,6 @@ BN_dup(const BIGNUM *a)
#endif
-/*
- * Scan the string from left-to-right to see if the longest substring
- * is a valid hexadecimal number.
- */
-static bool
-is_hex_str(char *str)
-{
- char c, *p;
- bool saw_hex = false;
-
- for (p = str; *p; p++) {
- if (isdigit((unsigned char)*p))
- continue;
- c = tolower((unsigned char)*p);
- if (c >= 'a' && c <= 'f') {
- saw_hex = true;
- continue;
- }
- break; /* Not a hexadecimal digit. */
- }
- return saw_hex;
-}
-
/* Convert string pointed to by *str to a bignum. */
static void
convert_str2bn(BIGNUM **val, char *p)
@@ -486,7 +462,7 @@ convert_str2bn(BIGNUM **val, char *p)
if (*p == '0' && (p[1] == 'x' || p[1] == 'X')) {
n = BN_hex2bn(val, p + 2);
} else {
- n = is_hex_str(p) ? BN_hex2bn(val, p) : BN_dec2bn(val, p);
+ n = BN_dec2bn(val, p);
}
if (n == 0)
errx(1, "%s: illegal numeric format.", p);
CVS commit: src/tests/games
Module Name:src
Committed By: christos
Date: Sun Oct 11 18:43:51 UTC 2020
Modified Files:
src/tests/games: t_factor.sh
Log Message:
simplify: use two arguments again, suggested by kre@
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/games/t_factor.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/games/t_factor.sh
diff -u src/tests/games/t_factor.sh:1.10 src/tests/games/t_factor.sh:1.11
--- src/tests/games/t_factor.sh:1.10 Sun Oct 11 13:17:39 2020
+++ src/tests/games/t_factor.sh Sun Oct 11 14:43:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_factor.sh,v 1.10 2020/10/11 17:17:39 christos Exp $
+# $NetBSD: t_factor.sh,v 1.11 2020/10/11 18:43:50 christos Exp $
#
# Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,12 +26,12 @@
#
expect() {
- echo "${3}" >expout
+ echo "${2}" >expout
ncrypt=$( ldd /usr/games/factor | grep -c -- -lcrypt )
- if [ "X$3" != "X" -a $ncrypt -eq 0 ] ; then
+ if [ -n "$3" ] && [ $ncrypt -eq 0 ] ; then
atf_skip "crypto needed for huge non-prime factors - PR bin/23663"
fi
- atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1} ${2}
+ atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
}
atf_test_case overflow1
@@ -40,7 +40,7 @@ overflow1_head() {
atf_set "require.progs" "/usr/games/factor"
}
overflow1_body() {
- expect "" '8675309' '8675309: 8675309'
+ expect '8675309' '8675309: 8675309'
}
atf_test_case overflow2
@@ -49,7 +49,7 @@ overflow2_head() {
atf_set "require.progs" "/usr/games/factor"
}
overflow2_body() {
- expect "" '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
+ expect '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
}
atf_test_case loop1
@@ -59,7 +59,7 @@ loop1_head() {
atf_set "require.progs" "/usr/games/factor"
}
loop1_body() {
- expect "" '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
+ expect '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
}
atf_test_case loop2
@@ -69,7 +69,7 @@ loop2_head() {
atf_set "require.progs" "/usr/games/factor"
}
loop2_body() {
- expect "" '91' '91: 7 13 769231 1428571' Need_Crypto
+ expect '91' '91: 7 13 769231 1428571' Need_Crypto
}
@@ -79,7 +79,7 @@ h_overflow1_head() {
atf_set "require.progs" "/usr/games/factor"
}
h_overflow1_body() {
- expect -h '8675309' '8675309: 8675309'
+ expect '-h 8675309' '8675309: 8675309'
}
atf_test_case h_overflow2
@@ -88,7 +88,7 @@ h_overflow2_head() {
atf_set "require.progs" "/usr/games/factor"
}
h_overflow2_body() {
- expect -h '6172538568' '6172538568: 2^3 3 7 17 2161253'
+ expect '-h 6172538568' '6172538568: 2^3 3 7 17 2161253'
}
atf_test_case h_loop1
@@ -98,7 +98,7 @@ h_loop1_head() {
atf_set "require.progs" "/usr/games/factor"
}
h_loop1_body() {
- expect -h '2147483647111311' '2147483647111311: 3^3 131 607148331103'
+ expect '-h 2147483647111311' '2147483647111311: 3^3 131 607148331103'
}
atf_test_case h_loop2
@@ -108,7 +108,7 @@ h_loop2_head() {
atf_set "require.progs" "/usr/games/factor"
}
h_loop2_body() {
- expect -h '91' '91: 7 13 769231 1428571' Need_Crypto
+ expect '-h 91' '91: 7 13 769231 1428571' Need_Crypto
}
@@ -118,7 +118,7 @@ hx_overflow1_head() {
atf_set "require.progs" "/usr/games/factor"
}
hx_overflow1_body() {
- expect -hx '8675309' '0x845FED: 0x845FED'
+ expect '-hx 8675309' '0x845FED: 0x845FED'
}
atf_test_case hx_overflow2
@@ -127,7 +127,7 @@ hx_overflow2_head() {
atf_set "require.progs" "/usr/games/factor"
}
hx_overflow2_body() {
- expect -hx '6172538568' '0x16FE976C8: 0x2^3 0x3 0x7 0x11 0x20FA65'
+ expect '-hx 6172538568' '0x16FE976C8: 0x2^3 0x3 0x7 0x11 0x20FA65'
}
atf_test_case hx_loop1
@@ -137,7 +137,7 @@ hx_loop1_head() {
atf_set "require.progs" "/usr/games/factor"
}
hx_loop1_body() {
- expect -hx '2147483647111311' '0x7A112708F: 0x3^3 0x83 0x8D5CDC505F'
+ expect '-hx 2147483647111311' '0x7A112708F: 0x3^3 0x83 0x8D5CDC505F'
}
atf_test_case hx_loop2
@@ -147,7 +147,7 @@ hx_loop2_head() {
atf_set "require.progs" "/usr/games/factor"
}
hx_loop2_body() {
- expect -hx '91' '0x5AF3107A3FF7: 0x7 0xd 0xBBCCF 0x15CC5B' Need_Crypto
+ expect '-hx 91' '0x5AF3107A3FF7: 0x7 0xd 0xBBCCF 0x15CC5B' Need_Crypto
}
atf_init_test_cases()
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: thorpej Date: Sun Oct 11 18:39:48 UTC 2020 Modified Files: src/sys/arch/alpha/alpha: qemu.c Log Message: initclocks() now fixes up tick and tickadj if hz changes, so we no longer need to do it. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/alpha/qemu.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/alpha/alpha/qemu.c diff -u src/sys/arch/alpha/alpha/qemu.c:1.4 src/sys/arch/alpha/alpha/qemu.c:1.5 --- src/sys/arch/alpha/alpha/qemu.c:1.4 Wed Oct 7 14:07:42 2020 +++ src/sys/arch/alpha/alpha/qemu.c Sun Oct 11 18:39:48 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: qemu.c,v 1.4 2020/10/07 14:07:42 thorpej Exp $ */ +/* $NetBSD: qemu.c,v 1.5 2020/10/11 18:39:48 thorpej Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -147,13 +147,9 @@ qemu_clock_init(void * const v __unused) /* * hz=1024 is a little bananas for an emulated - * virtual machine. Reset to something more - * reasonable, and recalculate everything based - * on it. + * virtual machine. Let MI code drive schedhz. */ hz = 50; - tick = 100 / hz; - tickadj = (24 / (60 * hz)) ? (24 / (60 * hz)) : 1; schedhz = 0; qemu_nsec_per_tick = 10UL / hz;
CVS commit: src/sys/kern
Module Name:src
Committed By: thorpej
Date: Sun Oct 11 18:39:09 UTC 2020
Modified Files:
src/sys/kern: kern_clock.c
Log Message:
Call cpu_initclocks() before registering the default timecounter,
in case it updates hz. If hz changes, recalculate tick and tickadj.
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/kern/kern_clock.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/kern/kern_clock.c
diff -u src/sys/kern/kern_clock.c:1.141 src/sys/kern/kern_clock.c:1.142
--- src/sys/kern/kern_clock.c:1.141 Fri May 8 22:10:09 2020
+++ src/sys/kern/kern_clock.c Sun Oct 11 18:39:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_clock.c,v 1.141 2020/05/08 22:10:09 ad Exp $ */
+/* $NetBSD: kern_clock.c,v 1.142 2020/10/11 18:39:09 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.141 2020/05/08 22:10:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.142 2020/10/11 18:39:09 thorpej Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
@@ -178,13 +178,24 @@ initclocks(void)
* code do its bit.
*/
psdiv = 1;
+
+ /*
+ * Call cpu_initclocks() before registering the default
+ * timecounter, in case it needs to adjust hz.
+ */
+ const int old_hz = hz;
+ cpu_initclocks();
+ if (old_hz != hz) {
+ tick = 100 / hz;
+ tickadj = (24 / (60 * hz)) ? (24 / (60 * hz)) : 1;
+ }
+
/*
* provide minimum default time counter
* will only run at interrupt resolution
*/
intr_timecounter.tc_frequency = hz;
tc_init(&intr_timecounter);
- cpu_initclocks();
/*
* Compute profhz and stathz, fix profhz if needed.
CVS commit: src
Module Name:src
Committed By: nia
Date: Sun Oct 11 17:49:08 UTC 2020
Modified Files:
src/distrib/sets/lists/xfont: mi
src/external/mit/xorg/share/fonts/misc/font-spleen-misc: Makefile
Log Message:
Generate oldschool Latin-1 variants of Spleen fonts.
Needed so ctwm can load them. ctwm uses XCreateFontSet which for some
reason seems adverse to returning UTF-8 fonts...
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xfont/mi
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xfont/mi
diff -u src/distrib/sets/lists/xfont/mi:1.43 src/distrib/sets/lists/xfont/mi:1.44
--- src/distrib/sets/lists/xfont/mi:1.43 Sat Oct 10 08:33:29 2020
+++ src/distrib/sets/lists/xfont/mi Sun Oct 11 17:49:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.43 2020/10/10 08:33:29 nia Exp $
+# $NetBSD: mi,v 1.44 2020/10/11 17:49:07 nia Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -4321,11 +4321,17 @@
./usr/X11R7/lib/X11/fonts/misc/k14.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/misc/nil2.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/misc/spleen-12x24.pcf.gz xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-12x24-ISO8859-1.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/misc/spleen-16x32.pcf.gz xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-16x32-ISO8859-1.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/misc/spleen-32x64.pcf.gz xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-32x64-ISO8859-1.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/misc/spleen-5x8.pcf.gz xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-5x8-ISO8859-1.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/misc/spleen-6x12.pcf.gz xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-6x12-ISO8859-1.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/misc/spleen-8x16.pcf.gz xfont share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/spleen-8x16-ISO8859-1.pcf.gz xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/util/map-ISO8859-1 xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/util/map-ISO8859-10 xfont share,xorg,x11fonts
./usr/X11R7/lib/X11/fonts/util/map-ISO8859-11 xfont share,xorg,x11fonts
Index: src/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile
diff -u src/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile:1.1 src/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile:1.2
--- src/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile:1.1 Sat Oct 10 07:28:04 2020
+++ src/external/mit/xorg/share/fonts/misc/font-spleen-misc/Makefile Sun Oct 11 17:49:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/10/10 07:28:04 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/10/11 17:49:08 nia Exp $
.include
@@ -8,12 +8,10 @@ FONTSRCPKG= font-spleen-misc
X11SRCDIR.font-spleen-misc= \
${X11SRCDIR}/external/bsd/${FONTSRCPKG}
-BDFFILES+= spleen-12x24.bdf
-BDFFILES+= spleen-16x32.bdf
-BDFFILES+= spleen-32x64.bdf
-BDFFILES+= spleen-5x8.bdf
-BDFFILES+= spleen-6x12.bdf
-BDFFILES+= spleen-8x16.bdf
+.for size in 32x64 16x32 12x24 8x16 6x12 5x8
+BDFFILES+= spleen-${size}.bdf
+UCSFILES+= spleen-${size} ISO8859-1
+.endfor
.include "../../Makefile.bdf"
CVS commit: src/games/factor
Module Name:src
Committed By: christos
Date: Sun Oct 11 17:18:34 UTC 2020
Modified Files:
src/games/factor: factor.c
Log Message:
>From gson@
- don't assume -h is always on for large factors
- fix saved large factors printing when -h
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/games/factor/factor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/factor/factor.c
diff -u src/games/factor/factor.c:1.35 src/games/factor/factor.c:1.36
--- src/games/factor/factor.c:1.35 Wed Oct 7 15:48:29 2020
+++ src/games/factor/factor.c Sun Oct 11 13:18:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: factor.c,v 1.35 2020/10/07 19:48:29 christos Exp $ */
+/* $NetBSD: factor.c,v 1.36 2020/10/11 17:18:34 christos Exp $ */
/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
__SCCSID("@(#)factor.c 8.4 (Berkeley) 5/4/95");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: factor.c,v 1.35 2020/10/07 19:48:29 christos Exp $");
+__RCSID("$NetBSD: factor.c,v 1.36 2020/10/11 17:18:34 christos Exp $");
#endif
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/factor/factor.c 35 2020-01-12 20:25:11Z gad $");
@@ -91,7 +91,8 @@ __FBSDID("$FreeBSD: head/usr.bin/factor/
#define PRIME_CHECKS 5
-static void pollard_pminus1(BIGNUM *, int); /* print factors for big numbers */
+/* print factors for big numbers */
+static void pollard_pminus1(BIGNUM *, int, int);
#else
@@ -121,7 +122,7 @@ static void BN_print_dec_fp(FILE *, cons
static void convert_str2bn(BIGNUM **, char *);
static bool is_hex_str(char *);
static void pr_fact(BIGNUM *, int, int); /* print factors of a value */
-static void pr_print(BIGNUM *, int); /* print a prime */
+static void pr_print(BIGNUM *, int, int); /* print a prime */
static void usage(void) __dead;
static BN_CTX *ctx; /* just use a global context */
@@ -243,13 +244,13 @@ pr_fact(BIGNUM *val, int hflag, int xfla
errx(1, "error in BN_sqr()");
if (BN_cmp(bnfact, val) > 0 ||
BN_is_prime_ex(val, PRIME_CHECKS, NULL, NULL) == 1)
-pr_print(val, xflag);
+pr_print(val, hflag, xflag);
else
-pollard_pminus1(val, xflag);
+pollard_pminus1(val, hflag, xflag);
#else
- pr_print(val, xflag);
+ pr_print(val, hflag, xflag);
#endif
- pr_print(NULL, xflag);
+ pr_print(NULL, hflag, xflag);
break;
}
@@ -275,39 +276,49 @@ pr_fact(BIGNUM *val, int hflag, int xfla
}
static void
-pr_print(BIGNUM *val, int xflag)
+pr_print(BIGNUM *val, int hflag, int xflag)
{
static BIGNUM *sval;
static int ex = 1;
- if (sval == NULL) {
- sval = BN_dup(val);
- return;
- }
+ BIGNUM *pval;
+
+ if (hflag) {
+ if (sval == NULL) {
+ sval = BN_dup(val);
+ return;
+ }
- if (val != NULL && BN_cmp(val, sval) == 0) {
- ex++;
+ if (val != NULL && BN_cmp(val, sval) == 0) {
+ ex++;
+ return;
+ }
+ pval = sval;
+ } else if (val == NULL) {
return;
+ } else {
+ pval = val;
}
- if (val == NULL)
- val = sval;
if (xflag) {
fputs(" 0x", stdout);
- BN_print_fp(stdout, val);
+ BN_print_fp(stdout, pval);
} else {
putchar(' ');
- BN_print_dec_fp(stdout, val);
+ BN_print_dec_fp(stdout, pval);
}
- if (ex > 1)
- pr_exp(ex, xflag);
- if (val != NULL) {
- BN_copy(sval, val);
- } else {
- BN_free(sval);
- sval = NULL;
+ if (hflag) {
+ if (ex > 1)
+ pr_exp(ex, xflag);
+
+ if (val != NULL) {
+ BN_copy(sval, val);
+ } else {
+ BN_free(sval);
+ sval = NULL;
+ }
+ ex = 1;
}
- ex = 1;
}
static void
@@ -321,7 +332,7 @@ usage(void)
/* pollard p-1, algorithm from Jim Gillogly, May 2000 */
static void
-pollard_pminus1(BIGNUM *val, int xflag)
+pollard_pminus1(BIGNUM *val, int hflag, int xflag)
{
BIGNUM *base, *rbase, *num, *i, *x;
@@ -350,9 +361,9 @@ newbase:
if (!BN_is_one(x)) {
if (BN_is_prime_ex(x, PRIME_CHECKS, NULL, NULL) == 1)
-pr_print(x, xflag);
+pr_print(x, hflag, xflag);
else
-pollard_pminus1(x, xflag);
+pollard_pminus1(x, hflag, xflag);
fflush(stdout);
BN_div(num, NULL, val, x, ctx);
@@ -360,7 +371,7 @@ newbase:
return;
if (BN_is_prime_ex(num, PRIME_CHECKS, NULL,
NULL) == 1) {
-pr_print(num, xflag);
+pr_print(num, hflag, xflag);
fflush(stdout);
return;
}
CVS commit: src/tests/games
Module Name:src
Committed By: christos
Date: Sun Oct 11 17:17:39 UTC 2020
Modified Files:
src/tests/games: t_factor.sh
Log Message:
Add tests for h and x flags
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/games/t_factor.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/games/t_factor.sh
diff -u src/tests/games/t_factor.sh:1.9 src/tests/games/t_factor.sh:1.10
--- src/tests/games/t_factor.sh:1.9 Mon Jun 27 01:29:32 2016
+++ src/tests/games/t_factor.sh Sun Oct 11 13:17:39 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_factor.sh,v 1.9 2016/06/27 05:29:32 pgoyette Exp $
+# $NetBSD: t_factor.sh,v 1.10 2020/10/11 17:17:39 christos Exp $
#
# Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -26,12 +26,12 @@
#
expect() {
- echo "${2}" >expout
+ echo "${3}" >expout
ncrypt=$( ldd /usr/games/factor | grep -c -- -lcrypt )
if [ "X$3" != "X" -a $ncrypt -eq 0 ] ; then
atf_skip "crypto needed for huge non-prime factors - PR bin/23663"
fi
- atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1}
+ atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1} ${2}
}
atf_test_case overflow1
@@ -40,7 +40,7 @@ overflow1_head() {
atf_set "require.progs" "/usr/games/factor"
}
overflow1_body() {
- expect '8675309' '8675309: 8675309'
+ expect "" '8675309' '8675309: 8675309'
}
atf_test_case overflow2
@@ -49,7 +49,7 @@ overflow2_head() {
atf_set "require.progs" "/usr/games/factor"
}
overflow2_body() {
- expect '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
+ expect "" '6172538568' '6172538568: 2 2 2 3 7 17 2161253'
}
atf_test_case loop1
@@ -59,7 +59,7 @@ loop1_head() {
atf_set "require.progs" "/usr/games/factor"
}
loop1_body() {
- expect '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
+ expect "" '2147483647111311' '2147483647111311: 3 3 3 131 607148331103'
}
atf_test_case loop2
@@ -69,7 +69,85 @@ loop2_head() {
atf_set "require.progs" "/usr/games/factor"
}
loop2_body() {
- expect '91' '91: 7 13 769231 1428571' Need_Crypto
+ expect "" '91' '91: 7 13 769231 1428571' Need_Crypto
+}
+
+
+atf_test_case h_overflow1
+h_overflow1_head() {
+ atf_set "descr" "Tests for h_overflow conditions"
+ atf_set "require.progs" "/usr/games/factor"
+}
+h_overflow1_body() {
+ expect -h '8675309' '8675309: 8675309'
+}
+
+atf_test_case h_overflow2
+h_overflow2_head() {
+ atf_set "descr" "Tests for h_overflow conditions"
+ atf_set "require.progs" "/usr/games/factor"
+}
+h_overflow2_body() {
+ expect -h '6172538568' '6172538568: 2^3 3 7 17 2161253'
+}
+
+atf_test_case h_loop1
+h_loop1_head() {
+ atf_set "descr" "Tests some cases that once locked the program" \
+ "in an infinite h_loop"
+ atf_set "require.progs" "/usr/games/factor"
+}
+h_loop1_body() {
+ expect -h '2147483647111311' '2147483647111311: 3^3 131 607148331103'
+}
+
+atf_test_case h_loop2
+h_loop2_head() {
+ atf_set "descr" "Tests some cases that once locked the program" \
+ "in an infinite h_loop"
+ atf_set "require.progs" "/usr/games/factor"
+}
+h_loop2_body() {
+ expect -h '91' '91: 7 13 769231 1428571' Need_Crypto
+}
+
+
+atf_test_case hx_overflow1
+hx_overflow1_head() {
+ atf_set "descr" "Tests for hx_overflow conditions"
+ atf_set "require.progs" "/usr/games/factor"
+}
+hx_overflow1_body() {
+ expect -hx '8675309' '0x845FED: 0x845FED'
+}
+
+atf_test_case hx_overflow2
+hx_overflow2_head() {
+ atf_set "descr" "Tests for hx_overflow conditions"
+ atf_set "require.progs" "/usr/games/factor"
+}
+hx_overflow2_body() {
+ expect -hx '6172538568' '0x16FE976C8: 0x2^3 0x3 0x7 0x11 0x20FA65'
+}
+
+atf_test_case hx_loop1
+hx_loop1_head() {
+ atf_set "descr" "Tests some cases that once locked the program" \
+ "in an infinite hx_loop"
+ atf_set "require.progs" "/usr/games/factor"
+}
+hx_loop1_body() {
+ expect -hx '2147483647111311' '0x7A112708F: 0x3^3 0x83 0x8D5CDC505F'
+}
+
+atf_test_case hx_loop2
+hx_loop2_head() {
+ atf_set "descr" "Tests some cases that once locked the program" \
+ "in an infinite hx_loop"
+ atf_set "require.progs" "/usr/games/factor"
+}
+hx_loop2_body() {
+ expect -hx '91' '0x5AF3107A3FF7: 0x7 0xd 0xBBCCF 0x15CC5B' Need_Crypto
}
atf_init_test_cases()
@@ -78,4 +156,14 @@ atf_init_test_cases()
atf_add_test_case overflow2
atf_add_test_case loop1
atf_add_test_case loop2
+
+ atf_add_test_case h_overflow1
+ atf_add_test_case h_overflow2
+ atf_add_test_case h_loop1
+ atf_add_test_case h_loop2
+
+ atf_add_test_case hx_overflow1
+ atf_add_test_case hx_overflow2
+ atf_add_test_case hx_loop1
+ atf_add_test_case hx_loop2
}
CVS commit: src
Module Name:src
Committed By: skrll
Date: Sun Oct 11 16:22:03 UTC 2020
Modified Files:
src/common/lib/libc/arch/arm: features.c
src/sys/arch/arm/include: cdefs.h
Log Message:
Define _ARM_ARCH_8 when __ARM_ARCH_8A (no trailing double underscore) as
it is defined by gcc.
__ARM_ARCH_8A__ (with trailing double underscore) seems to be a typo (or
maybe historical)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/features.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/include/cdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/features.c
diff -u src/common/lib/libc/arch/arm/features.c:1.2 src/common/lib/libc/arch/arm/features.c:1.3
--- src/common/lib/libc/arch/arm/features.c:1.2 Fri Aug 2 12:07:24 2019
+++ src/common/lib/libc/arch/arm/features.c Sun Oct 11 16:22:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: features.c,v 1.2 2019/08/02 12:07:24 joerg Exp $ */
+/* $NetBSD: features.c,v 1.3 2020/10/11 16:22:02 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,8 @@
* FEAT_THUMB2!=if ${COMPILE.c} -fsyntax-only -DTHUMB2_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
*/
-#if defined (__ARM_ARCH_8A__) || defined (__ARM_ARCH_7__) || \
+#if defined(__ARM_ARCH_8A) || defined (__ARM_ARCH_8A__) || \
+defined (__ARM_ARCH_7__) || \
defined (__ARM_ARCH_7A__) || defined (__ARM_ARCH_7R__) || \
defined (__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__) || \
defined (__ARM_ARCH_6T2__)
Index: src/sys/arch/arm/include/cdefs.h
diff -u src/sys/arch/arm/include/cdefs.h:1.16 src/sys/arch/arm/include/cdefs.h:1.17
--- src/sys/arch/arm/include/cdefs.h:1.16 Fri Aug 2 12:07:25 2019
+++ src/sys/arch/arm/include/cdefs.h Sun Oct 11 16:22:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.16 2019/08/02 12:07:25 joerg Exp $ */
+/* $NetBSD: cdefs.h,v 1.17 2020/10/11 16:22:02 skrll Exp $ */
#ifndef _ARM_CDEFS_H_
#define _ARM_CDEFS_H_
@@ -9,8 +9,10 @@
#endif
#endif
-#if defined (__ARM_ARCH_8A__)
-#define _ARM_ARCH_8 /* ARMv8 64-bit in AARCH32 */
+
+#if defined (__ARM_ARCH_8A__) || defined (__ARM_ARCH_8A)
+ /* __ARM_ARCH_8A__ is a typo */
+#define _ARM_ARCH_8
#endif
#if defined (_ARM_ARCH_8) || defined (__ARM_ARCH_7__) || \
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: tnn
Date: Sun Oct 11 15:33:18 UTC 2020
Modified Files:
src/sys/arch/arm/rockchip: rk3399_pcie.c
Log Message:
rk3399_pci: support for PCI express switches / bridges / multiple buses
There were two isses that prevented this from working:
1. We must use type 1 configuration cycles when accessing bus 2 and
beyond, but type 0 configuration cycles for bus 0 and 1.
2. The hardware address decoder cannot be used to decode the bus portion
of the ECAM address. Due to the physical SoC address of the remote device
region not having sufficient alignment the wrong bus address would go out
on the wire. Also the mapped region is too small to address busses
beyond bus31.
Fix: Reduce the number of ECAM translated bits to dev+func only.
For each configuration space access, acquire an exclusive lock
and reprogram the translator with the correct bus number and access type.
Config space is accessed sufficiently infrequent for this to not cause
any performance problems.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/rockchip/rk3399_pcie.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/arm/rockchip/rk3399_pcie.c
diff -u src/sys/arch/arm/rockchip/rk3399_pcie.c:1.11 src/sys/arch/arm/rockchip/rk3399_pcie.c:1.12
--- src/sys/arch/arm/rockchip/rk3399_pcie.c:1.11 Thu Oct 8 22:14:00 2020
+++ src/sys/arch/arm/rockchip/rk3399_pcie.c Sun Oct 11 15:33:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_pcie.c,v 1.11 2020/10/08 22:14:00 tnn Exp $ */
+/* $NetBSD: rk3399_pcie.c,v 1.12 2020/10/11 15:33:18 tnn Exp $ */
/*
* Copyright (c) 2018 Mark Kettenis
*
@@ -17,7 +17,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.11 2020/10/08 22:14:00 tnn Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.12 2020/10/11 15:33:18 tnn Exp $");
#include
#include
@@ -134,6 +134,7 @@ struct rkpcie_softc {
bus_addr_t sc_apb_addr;
bus_size_t sc_axi_size;
bus_size_t sc_apb_size;
+ kmutex_t sc_conf_lock;
};
static int rkpcie_match(device_t, cfdata_t, void *);
@@ -405,6 +406,8 @@ again:
sc->sc_phsc.sc_pc.pc_conf_read = rkpcie_conf_read;
sc->sc_phsc.sc_pc.pc_conf_write = rkpcie_conf_write;
sc->sc_phsc.sc_pc.pc_conf_hook = rkpcie_conf_hook;
+
+ mutex_init(&sc->sc_conf_lock, MUTEX_DEFAULT, IPL_HIGH);
pcihost_init2(&sc->sc_phsc);
}
@@ -419,7 +422,7 @@ rkpcie_atr_init(struct rkpcie_softc *sc)
int region, i, ranges_len;
/* Use region 0 to map PCI configuration space */
- HWRITE4(sc, PCIE_ATR_OB_ADDR0(0), 25 - 1);
+ HWRITE4(sc, PCIE_ATR_OB_ADDR0(0), 20 - 1);
HWRITE4(sc, PCIE_ATR_OB_ADDR1(0), 0);
HWRITE4(sc, PCIE_ATR_OB_DESC0(0), PCIE_ATR_HDR_CFG_TYPE0 | PCIE_ATR_HDR_RID);
HWRITE4(sc, PCIE_ATR_OB_DESC1(0), 0);
@@ -517,8 +520,13 @@ rkpcie_decompose_tag(void *v, pcitag_t t
/* Only one device on root port and the first subordinate port. */
static bool
-rkpcie_conf_ok(int bus, int dev, int fn, int bus_min)
+rkpcie_conf_ok(int bus, int dev, int fn, int offset, struct rkpcie_softc *sc)
{
+ int bus_min = sc->sc_phsc.sc_bus_min;
+
+ if ((unsigned int)offset >= (1<<12))
+ return false;
+ /* first two buses use type 0 cfg which doesn't use bus/device numbers */
if (dev != 0 && (bus == bus_min || bus == bus_min + 1))
return false;
return true;
@@ -528,33 +536,45 @@ pcireg_t
rkpcie_conf_read(void *v, pcitag_t tag, int offset)
{
struct rkpcie_softc *sc = v;
- struct pcihost_softc *phsc = &sc->sc_phsc;
+ int bus_min = sc->sc_phsc.sc_bus_min;
int bus, dev, fn;
u_int reg;
+ int32_t val;
KASSERT(offset >= 0);
KASSERT(offset < PCI_EXTCONF_SIZE);
rkpcie_decompose_tag(sc, tag, &bus, &dev, &fn);
- if (!rkpcie_conf_ok(bus, dev, fn, phsc->sc_bus_min))
+ if (!rkpcie_conf_ok(bus, dev, fn, offset, sc))
return 0x;
- reg = (bus << 20) | (dev << 15) | (fn << 12) | offset;
+ reg = (dev << 15) | (fn << 12) | offset;
- if (bus == phsc->sc_bus_min)
- return HREAD4(sc, PCIE_RC_NORMAL_BASE + reg);
+ if (bus == bus_min)
+ val = HREAD4(sc, PCIE_RC_NORMAL_BASE + reg);
else {
- uint32_t val;
+ mutex_spin_enter(&sc->sc_conf_lock);
+ HWRITE4(sc, PCIE_ATR_OB_ADDR0(0),
+ (bus << 20) | (20 - 1));
+ HWRITE4(sc, PCIE_ATR_OB_DESC0(0),
+ PCIE_ATR_HDR_RID | ((bus == bus_min + 1)
+ ? PCIE_ATR_HDR_CFG_TYPE0 : PCIE_ATR_HDR_CFG_TYPE1));
+ bus_space_barrier(sc->sc_iot, sc->sc_ioh, 0, sc->sc_apb_size,
+ BUS_SPACE_BARRIER_READ);
if (AXIPEEK4(sc, reg, &val) != 0)
- return 0x;
- return val;
+ val = 0x;
+ bus_space_barrier(sc->sc_iot, sc->sc_axi_ioh,
+ 0, sc->sc_axi_size,
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ mutex_spin_exit(&sc->sc_conf_lock);
}
+ return val;
}
void
rkpcie_conf_write(void *v, pcitag_t tag, int offset, pcireg_t data)
{
struct rkpcie_softc *sc = v;
- struct pcihost_softc *phsc = &sc->sc_phsc;
+ int bus_min = sc->sc_phsc.sc_b
CVS commit: src/distrib/evbarm/isoimage
Module Name:src
Committed By: jmcneill
Date: Sun Oct 11 14:54:08 UTC 2020
Modified Files:
src/distrib/evbarm/isoimage: Makefile
Log Message:
Exclude live images from install media
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/isoimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/isoimage/Makefile
diff -u src/distrib/evbarm/isoimage/Makefile:1.1 src/distrib/evbarm/isoimage/Makefile:1.2
--- src/distrib/evbarm/isoimage/Makefile:1.1 Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/isoimage/Makefile Sun Oct 11 14:54:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/10/11 14:24:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2020/10/11 14:54:08 jmcneill Exp $
.include
.include "${.CURDIR}/Makefile.cdrom"
@@ -13,3 +13,6 @@ prepare_md_post:
< ${.CURDIR}/boot.cfg.in > boot.cfg
.include "${.CURDIR}/../../common/Makefile.bootcd"
+
+# Exclude live images from installation media
+CDRELEASE_EXCLUDE+= -s ',./binary/gzimg.*,,gp'
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src
Committed By: jmcneill
Date: Sun Oct 11 14:24:31 UTC 2020
Modified Files:
src/distrib/evbarm/instkernel/ramdisk: dot.profile
Log Message:
Sync with amd64
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/evbarm/instkernel/ramdisk/dot.profile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/instkernel/ramdisk/dot.profile
diff -u src/distrib/evbarm/instkernel/ramdisk/dot.profile:1.3 src/distrib/evbarm/instkernel/ramdisk/dot.profile:1.4
--- src/distrib/evbarm/instkernel/ramdisk/dot.profile:1.3 Thu Jan 9 19:17:41 2020
+++ src/distrib/evbarm/instkernel/ramdisk/dot.profile Sun Oct 11 14:24:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: dot.profile,v 1.3 2020/01/09 19:17:41 martin Exp $
+# $NetBSD: dot.profile,v 1.4 2020/10/11 14:24:31 jmcneill Exp $
#
# Copyright (c) 1997 Perry E. Metzger
# Copyright (c) 1994 Christopher G. Demetriou
@@ -35,10 +35,14 @@
PATH=/sbin:/bin:/usr/bin:/usr/sbin:/
export PATH
-TERM=vt100
+TERM=wsvt25
export TERM
HOME=/
export HOME
+BLOCKSIZE=1k
+export BLOCKSIZE
+EDITOR=ed
+export EDITOR
umask 022
@@ -51,14 +55,22 @@ if [ "X${DONEPROFILE}" = "X" ]; then
# set up some sane defaults
echo 'erase ^?, werase ^W, kill ^U, intr ^C'
stty newcrt werase ^W intr ^C kill ^U erase ^?
- echo ''
+ mount -t tmpfs tmpfs /tmp
+ mount -t tmpfs tmpfs /var
+ mount -t tmpfs -o union tmpfs /etc
+
+ mkdir -p /var/run /var/db
# mount the ramdisk read write
mount -u $ROOTDEV /
- # mount the kern_fs so that we can examine the dmesg state
- mount -t kernfs /kern /kern
+ grep() sed -n "/$1/p"
- # run the installation or upgrade script.
- sysinst || stty sane
+ if [ -x /sysinst ]; then
+ # run the installation or upgrade script.
+ sysinst || stty sane
+ else
+ echo "This image contains utilities which may be needed"
+ echo "to get you out of a pinch."
+ fi
fi
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: jmcneill
Date: Sun Oct 11 14:24:50 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
Added Files:
src/distrib/evbarm/isoimage: Makefile Makefile.cdrom boot.cfg.in
Log Message:
Create a bootable El Torito installation ISO.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/evbarm/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/isoimage/Makefile \
src/distrib/evbarm/isoimage/Makefile.cdrom \
src/distrib/evbarm/isoimage/boot.cfg.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/Makefile
diff -u src/distrib/evbarm/Makefile:1.12 src/distrib/evbarm/Makefile:1.13
--- src/distrib/evbarm/Makefile:1.12 Thu May 28 15:27:59 2020
+++ src/distrib/evbarm/Makefile Sun Oct 11 14:24:50 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/05/28 15:27:59 jmcneill Exp $
+# $NetBSD: Makefile,v 1.13 2020/10/11 14:24:50 jmcneill Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -9,6 +9,9 @@ SUBDIR= gzboot instkernel
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
SUBDIR+= installimage
.endif
+.if ${MACHINE_ARCH} == "aarch64"
+SUBDIR+= isoimage
+.endif
TARGETS+= release
.if ${MACHINE_CPU} == "arm"
@@ -19,6 +22,9 @@ release: check_RELEASEDIR .WAIT ${MDECBO
${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.endif
+iso_image:
+ ${MAKEDIRTARGET} isoimage iso_image
+
install_image:
${MAKEDIRTARGET} installimage install_image
Added files:
Index: src/distrib/evbarm/isoimage/Makefile
diff -u /dev/null src/distrib/evbarm/isoimage/Makefile:1.1
--- /dev/null Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/isoimage/Makefile Sun Oct 11 14:24:50 2020
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2020/10/11 14:24:50 jmcneill Exp $
+
+.include
+.include "${.CURDIR}/Makefile.cdrom"
+
+CDBASE= evbarm-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
+CDRELEASE= true# include $RELEASEDIR/$RELEASEMACHINEDIR
+CDRELEASE_NODEBUG= true
+CLEANFILES+= boot.cfg
+
+prepare_md_post:
+ ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \
+ < ${.CURDIR}/boot.cfg.in > boot.cfg
+
+.include "${.CURDIR}/../../common/Makefile.bootcd"
Index: src/distrib/evbarm/isoimage/Makefile.cdrom
diff -u /dev/null src/distrib/evbarm/isoimage/Makefile.cdrom:1.1
--- /dev/null Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/isoimage/Makefile.cdrom Sun Oct 11 14:24:50 2020
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile.cdrom,v 1.1 2020/10/11 14:24:50 jmcneill Exp $
+
+.include
+.include
+
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+EFIBOOTIMG= efiboot.img
+CLEANFILES+= ${EFIBOOTIMG}
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+.endif
+
+# Need multidot for the boot loader to read kernel modules as it doesn't
+# understand rockridge.
+CDMAKEFSOPTIONS= bootimage=i386;${EFIBOOTIMG},platformid=efi,no-emul-boot
+CDRELEASE_NOISOS= true
+CD_SETS=
+
+${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootaa64.efi
+ ${RM} -f ${EFIBOOTIMG}
+ ${RM} -rf efiboot/EFI/boot efiboot/netbsd efiboot/ramdisk.fs
+ ${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
+ ${INSTALL} ${COPY} -m 0444 ${DESTDIR}/usr/mdec/bootaa64.efi efiboot/EFI/boot/
+ ${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} ${MAKEFS_TIMESTAMP} \
+ -t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
+
+image_md_pre: ${EFIBOOTIMG}
+ ${RM} -f cdrom/netbsd
+ ${INSTALL} ${COPY} -m 0444 ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC64.gz cdrom/netbsd.gz
+ ${INSTALL} ${COPY} -m 0444 boot.cfg cdrom/boot.cfg
+ ${TOOL_GZIP_N} -d cdrom/netbsd.gz
+ ${INSTALL} ${COPY} -m 0444 ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/ramdisk.fs cdrom/ramdisk.fs
Index: src/distrib/evbarm/isoimage/boot.cfg.in
diff -u /dev/null src/distrib/evbarm/isoimage/boot.cfg.in:1.1
--- /dev/null Sun Oct 11 14:24:50 2020
+++ src/distrib/evbarm/isoimage/boot.cfg.in Sun Oct 11 14:24:50 2020
@@ -0,0 +1,8 @@
+banner=Welcome to the NetBSD @@VERSION@@ installation CD
+banner
+banner=
+banner=If you encounter a problem while booting, report a bug at
+banner=https://www.NetBSD.org/.
+menu=Install NetBSD:initrd ramdisk.fs;boot netbsd
+menu=Drop to boot prompt:prompt
+timeout=30
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: jmcneill Date: Sun Oct 11 14:10:34 UTC 2020 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Include newfs_msdos To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/distrib/evbarm/instkernel/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/evbarm/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.28 src/distrib/evbarm/instkernel/ramdisk/list:1.29 --- src/distrib/evbarm/instkernel/ramdisk/list:1.28 Wed Jun 3 06:36:44 2020 +++ src/distrib/evbarm/instkernel/ramdisk/list Sun Oct 11 14:10:34 2020 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.28 2020/06/03 06:36:44 rin Exp $ +# $NetBSD: list,v 1.29 2020/10/11 14:10:34 jmcneill Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -42,6 +42,7 @@ PROG sbin/mount_nfs PROG sbin/mount_tmpfs PROG sbin/newfs sbin/mount_mfs PROG sbin/newfs_ext2fs +PROG sbin/newfs_msdos PROG sbin/ping PROG sbin/reboot sbin/halt PROG sbin/restore sbin/rrestore
CVS commit: src/distrib/common
Module Name:src
Committed By: jmcneill
Date: Sun Oct 11 14:10:04 UTC 2020
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Copy release to /${RELEASEMACHINEDIR} instead of /${MACHINE} to match
sysinst expectations.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.43 src/distrib/common/Makefile.bootcd:1.44
--- src/distrib/common/Makefile.bootcd:1.43 Fri Dec 20 19:46:51 2019
+++ src/distrib/common/Makefile.bootcd Sun Oct 11 14:10:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.43 2019/12/20 19:46:51 martin Exp $
+# $NetBSD: Makefile.bootcd,v 1.44 2020/10/11 14:10:04 jmcneill Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -188,8 +188,8 @@ copy-releasedir:
echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
exit 1; \
fi; \
- ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom/${MACHINE}"; \
- release_destdir="${CUROBJDIR}/cdrom/${MACHINE}"; \
+ ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom/${RELEASEMACHINEDIR}"; \
+ release_destdir="${CUROBJDIR}/cdrom/${RELEASEMACHINEDIR}"; \
cd ${RELEASEDIR}/${RELEASEMACHINEDIR}; \
echo Copying $$(pwd) to $$release_destdir ...; \
${TOOL_PAX} ${PAX_TIMESTAMP}\
CVS commit: src/sys/stand/efiboot
Module Name:src
Committed By: jmcneill
Date: Sun Oct 11 14:03:33 UTC 2020
Modified Files:
src/sys/stand/efiboot: Makefile.efiboot boot.c conf.c efiblock.c
efiblock.h efiboot.h version
Log Message:
Add ISO9660 support.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.27 -r1.28 src/sys/stand/efiboot/boot.c
cvs rdiff -u -r1.4 -r1.5 src/sys/stand/efiboot/conf.c
cvs rdiff -u -r1.7 -r1.8 src/sys/stand/efiboot/efiblock.c
cvs rdiff -u -r1.3 -r1.4 src/sys/stand/efiboot/efiblock.h
cvs rdiff -u -r1.13 -r1.14 src/sys/stand/efiboot/efiboot.h
cvs rdiff -u -r1.20 -r1.21 src/sys/stand/efiboot/version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/efiboot/Makefile.efiboot
diff -u src/sys/stand/efiboot/Makefile.efiboot:1.18 src/sys/stand/efiboot/Makefile.efiboot:1.19
--- src/sys/stand/efiboot/Makefile.efiboot:1.18 Sun Sep 6 07:20:31 2020
+++ src/sys/stand/efiboot/Makefile.efiboot Sun Oct 11 14:03:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.18 2020/09/06 07:20:31 mrg Exp $
+# $NetBSD: Makefile.efiboot,v 1.19 2020/10/11 14:03:33 jmcneill Exp $
S= ${.CURDIR}/../../..
@@ -71,7 +71,7 @@ CPPFLAGS+= -Wall -Wmissing-prototypes
CPPFLAGS+= -Wno-pointer-sign
CPPFLAGS+= -DHEAP_VARIABLE
-#CPPFLAGS+= -DSUPPORT_CD9660
+CPPFLAGS+= -DSUPPORT_CD9660
CPPFLAGS+= -D"devb2cdb(bno)=(bno)"
CPPFLAGS+= -DSUPPORT_DOSFS
#CPPFLAGS+= -DSUPPORT_EXT2FS
Index: src/sys/stand/efiboot/boot.c
diff -u src/sys/stand/efiboot/boot.c:1.27 src/sys/stand/efiboot/boot.c:1.28
--- src/sys/stand/efiboot/boot.c:1.27 Sun Jun 28 11:39:50 2020
+++ src/sys/stand/efiboot/boot.c Sun Oct 11 14:03:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.27 2020/06/28 11:39:50 jmcneill Exp $ */
+/* $NetBSD: boot.c,v 1.28 2020/10/11 14:03:33 jmcneill Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -75,6 +75,7 @@ static const char *efi_memory_type[] = {
};
static char default_device[32];
+static int default_fstype = FS_UNUSED;
static char initrd_path[255];
static char dtb_path[255];
static char netbsd_path[255];
@@ -128,6 +129,27 @@ const struct boot_command commands[] = {
{ NULL, NULL },
};
+static int
+bootcfg_path(char *pathbuf, size_t pathbuflen)
+{
+ /*
+ * Special handling of boot.cfg on ISO9660 because fs protocol doesn't
+ * seem to work.
+ */
+ if (default_fstype == FS_ISO9660) {
+ snprintf(pathbuf, pathbuflen, "%s:%s", default_device, BOOTCFG_FILENAME);
+ return 0;
+ }
+
+ /*
+ * Fall back to fs protocol for loading boot.cfg
+ */
+ if (efi_bootdp == NULL)
+ return ENXIO;
+
+ return efi_file_path(efi_bootdp, BOOTCFG_FILENAME, pathbuf, pathbuflen);
+}
+
void
command_help(char *arg)
{
@@ -318,8 +340,7 @@ command_version(char *arg)
ST->FirmwareRevision);
FreePool(ufirmware);
}
- if (efi_bootdp != NULL &&
- efi_file_path(efi_bootdp, BOOTCFG_FILENAME, pathbuf, sizeof(pathbuf)) == 0) {
+ if (bootcfg_path(pathbuf, sizeof(pathbuf)) == 0) {
printf("Config path: %s\n", pathbuf);
}
@@ -355,6 +376,18 @@ get_default_device(void)
return default_device;
}
+void
+set_default_fstype(int fstype)
+{
+ default_fstype = fstype;
+}
+
+int
+get_default_fstype(void)
+{
+ return default_fstype;
+}
+
int
set_initrd_path(const char *arg)
{
@@ -432,7 +465,7 @@ boot(void)
char pathbuf[80];
int currname, c;
- if (efi_bootdp != NULL && efi_file_path(efi_bootdp, BOOTCFG_FILENAME, pathbuf, sizeof(pathbuf)) == 0) {
+ if (bootcfg_path(pathbuf, sizeof(pathbuf)) == 0) {
twiddle_toggle = 1;
parsebootconf(pathbuf);
}
Index: src/sys/stand/efiboot/conf.c
diff -u src/sys/stand/efiboot/conf.c:1.4 src/sys/stand/efiboot/conf.c:1.5
--- src/sys/stand/efiboot/conf.c:1.4 Thu Nov 15 23:52:33 2018
+++ src/sys/stand/efiboot/conf.c Sun Oct 11 14:03:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.4 2018/11/15 23:52:33 jmcneill Exp $ */
+/* $NetBSD: conf.c,v 1.5 2020/10/11 14:03:33 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -55,6 +56,7 @@ struct fs_ops file_system[] = {
FS_OPS(ffsv1),
FS_OPS(ffsv2),
FS_OPS(dosfs),
+ FS_OPS(cd9660),
};
int nfsys = __arraycount(file_system);
Index: src/sys/stand/efiboot/efiblock.c
diff -u src/sys/stand/efiboot/efiblock.c:1.7 src/sys/stand/efiboot/efiblock.c:1.8
--- src/sys/stand/efiboot/efiblock.c:1.7 Fri Sep 27 20:10:42 2019
+++ src/sys/stand/efiboot/efiblock.c Sun Oct 11 14:03:33 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: efiblock.c,v 1.7 2019/09/27 20:10:42 jakllsch Exp $ */
+/* $NetBSD: efiblock.c,v 1.8 2020/10/11 14:03:33 jmcneill Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -33,6 +33,8 @@
#include
#include
+#include
+
#include "efiboot.h"
#include "efiblock.h"
@@ -116,6 +118,53 @@ efi_block_allocate_device_buffer(struct
}
static int
+ef
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Oct 11 12:36:14 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #1107, #1108 and #1110 To generate a diff of this commit: cvs rdiff -u -r1.1.2.120 -r1.1.2.121 src/doc/CHANGES-9.1 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-9.1 diff -u src/doc/CHANGES-9.1:1.1.2.120 src/doc/CHANGES-9.1:1.1.2.121 --- src/doc/CHANGES-9.1:1.1.2.120 Sat Oct 10 14:36:21 2020 +++ src/doc/CHANGES-9.1 Sun Oct 11 12:36:14 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.120 2020/10/10 14:36:21 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.121 2020/10/11 12:36:14 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -5112,3 +5112,49 @@ sys/compat/common/tty_43.c 1.38 tty_43: better input limit validation to avoid undefined behaviour. [nia, ticket #1106] +external/bsd/ntp/dist/libntp/work_fork.c 1.15 + + ndtpd(8): fix asynchronous DNS resolution to avoid bind(2) + socket errors on startup. + [kim, ticket #1107] + +external/public-domain/tz/dist/systemv delete +external/public-domain/tz/dist/pacificnew delete +external/public-domain/tz/dist/yearistype.shdelete +external/public-domain/tz/dist/Makefile up to 1.1.1.27 +external/public-domain/tz/dist/NEWS up to 1.1.1.30 +external/public-domain/tz/dist/README up to 1.1.1.9 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.20 +external/public-domain/tz/dist/africa up to 1.1.1.23 +external/public-domain/tz/dist/antarctica up to 1.1.1.13 +external/public-domain/tz/dist/asia up to 1.1.1.26 +external/public-domain/tz/dist/australasia up to 1.1.1.19 +external/public-domain/tz/dist/backzone up to 1.1.1.19 +external/public-domain/tz/dist/europe up to 1.1.1.27 +external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.14 +external/public-domain/tz/dist/leapseconds up to 1.1.1.16 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.11 +external/public-domain/tz/dist/northamerica up to 1.1.1.26 +external/public-domain/tz/dist/southamerica up to 1.1.1.17 +external/public-domain/tz/dist/theory.html up to 1.1.1.11 +external/public-domain/tz/dist/version up to 1.1.1.17 +external/public-domain/tz/dist/zishrink.awk up to 1.1.1.7 +external/public-domain/tz/dist/zoneinfo2tdf.pl up to 1.1.1.4 +external/public-domain/tz/share/zoneinfo/Makefile 1.4 +distrib/sets/lists/base/mi 1.1266 +doc/3RDPARTY 1.1750 (patch) + + Import tzdata2020b: + Revised predictions for Morocco's changes starting in 2023. + Canada's Yukon changes to -07 on 2020-11-01, not 2020-03-08. + Macquarie Island has stayed in sync with Tasmania since 2011. + Casey, Antarctica is at +08 in winter and +11 in summer. + [kre, ticket #1108] + +sbin/ccdconfig/ccdconfig.c 1.58 +sys/dev/ccd.c 1.185 +sys/dev/dkwedge/dk.c1.102 + + ccd(4): fix various bugs related to handling of dk(4) wedges. + [mlelstv, ticket #1110] +
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Sun Oct 11 12:34:30 UTC 2020
Modified Files:
src/sbin/ccdconfig [netbsd-9]: ccdconfig.c
src/sys/dev [netbsd-9]: ccd.c
src/sys/dev/dkwedge [netbsd-9]: dk.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1110):
sys/dev/dkwedge/dk.c: revision 1.102
sys/dev/ccd.c: revision 1.185
sbin/ccdconfig/ccdconfig.c: revision 1.58
Use raw device for configuring units. This is necessary as
having a block device opened prevents autodiscovery of wedges.
Fix ioctl locking. Add dkdriver.
Check dkdriver before calling a driver function.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.56.18.1 src/sbin/ccdconfig/ccdconfig.c
cvs rdiff -u -r1.179 -r1.179.4.1 src/sys/dev/ccd.c
cvs rdiff -u -r1.97.8.3 -r1.97.8.4 src/sys/dev/dkwedge/dk.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/ccdconfig/ccdconfig.c
diff -u src/sbin/ccdconfig/ccdconfig.c:1.56 src/sbin/ccdconfig/ccdconfig.c:1.56.18.1
--- src/sbin/ccdconfig/ccdconfig.c:1.56 Sun Dec 7 10:44:34 2014
+++ src/sbin/ccdconfig/ccdconfig.c Sun Oct 11 12:34:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ccdconfig.c,v 1.56 2014/12/07 10:44:34 mlelstv Exp $ */
+/* $NetBSD: ccdconfig.c,v 1.56.18.1 2020/10/11 12:34:29 martin Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1996, 1997\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: ccdconfig.c,v 1.56 2014/12/07 10:44:34 mlelstv Exp $");
+__RCSID("$NetBSD: ccdconfig.c,v 1.56.18.1 2020/10/11 12:34:29 martin Exp $");
#endif
#include
@@ -391,24 +391,38 @@ pathtounit(char *path, int *unitp)
static char *
resolve_ccdname(char *name)
{
- char c, *path;
+ char *path, *buf;
+ const char *p;
+ char c;
size_t len;
int rawpart;
if (name[0] == '/' || name[0] == '.') {
/* Assume they gave the correct pathname. */
- return estrdup(name);
- }
+ path = estrdup(name);
+ } else {
- len = strlen(name);
- c = name[len - 1];
+ len = strlen(name);
+ c = name[len - 1];
- if (isdigit((unsigned char)c)) {
- if ((rawpart = getrawpartition()) < 0)
- return NULL;
- easprintf(&path, "/dev/%s%c", name, 'a' + rawpart);
- } else
- easprintf(&path, "/dev/%s", name);
+ if (isdigit((unsigned char)c)) {
+ if ((rawpart = getrawpartition()) < 0)
+return NULL;
+ easprintf(&path, "/dev/%s%c", name, 'a' + rawpart);
+ } else
+ easprintf(&path, "/dev/%s", name);
+ }
+
+ /*
+ * Convert to raw device if possible.
+ */
+ buf = emalloc(MAXPATHLEN);
+ p = getdiskrawname(buf, MAXPATHLEN, path);
+ if (p) {
+ free(path);
+ path = estrdup(p);
+ }
+ free(buf);
return path;
}
@@ -562,6 +576,7 @@ dump_ccd(int argc, char **argv, int acti
continue;
}
errs += printccdinfo(i);
+ free(ccd);
}
return errs;
}
Index: src/sys/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.179 src/sys/dev/ccd.c:1.179.4.1
--- src/sys/dev/ccd.c:1.179 Wed Mar 27 19:13:34 2019
+++ src/sys/dev/ccd.c Sun Oct 11 12:34:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.179 2019/03/27 19:13:34 martin Exp $ */
+/* $NetBSD: ccd.c,v 1.179.4.1 2020/10/11 12:34:29 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.179 2019/03/27 19:13:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.179.4.1 2020/10/11 12:34:29 martin Exp $");
#include
#include
@@ -209,6 +209,11 @@ const struct cdevsw ccd_cdevsw = {
.d_flag = D_DISK | D_MPSAFE
};
+static const struct dkdriver ccddkdriver = {
+ .d_strategy = ccdstrategy,
+ .d_minphys = minphys
+};
+
#ifdef DEBUG
static void printiinfo(struct ccdiinfo *);
#endif
@@ -233,7 +238,7 @@ ccdcreate(int unit) {
sc->sc_iolock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
cv_init(&sc->sc_stop, "ccdstop");
cv_init(&sc->sc_push, "ccdthr");
- disk_init(&sc->sc_dkdev, sc->sc_xname, NULL); /* XXX */
+ disk_init(&sc->sc_dkdev, sc->sc_xname, &ccddkdriver);
return sc;
}
@@ -1138,8 +1143,6 @@ ccdioctl(dev_t dev, u_long cmd, void *da
return (EBADF);
}
- mutex_enter(&cs->sc_dvlock);
-
/* Must be initialized for these... */
switch (cmd) {
case CCDIOCCLR:
@@ -1163,15 +1166,102 @@ ccdioctl(dev_t dev, u_long cmd, void *da
case ODIOCWDINFO:
case ODIOCGDEFLABEL:
#endif
- if ((cs->sc_flags & CCDF_INITED) == 0) {
- error = ENXIO;
- goto out;
- }
+ if ((cs->sc_flags & CCDF_INITED) == 0)
+ return ENXIO;
}
error = disk_ioctl(&cs->sc_dkdev, dev, cmd, data, flag, l);
if (error != EPASSTHROUGH)
- goto out;
+ return error;
+
+ switch (cmd) {
+ case DIOCGSTRATEGY:
+ {
+ struct disk_strategy *dks = (void *)data;
+
+ mutex_enter(cs->sc_iolock);
+ if (cs->sc_bufq != NULL)
+ strlcpy(dks->dks_name,
+ bufq_getstrategyname(cs->sc_b
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Oct 11 12:31:49 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1615 To generate a diff of this commit: cvs rdiff -u -r1.1.2.42 -r1.1.2.43 src/doc/CHANGES-8.3 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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.42 src/doc/CHANGES-8.3:1.1.2.43 --- src/doc/CHANGES-8.3:1.1.2.42 Sat Oct 10 14:38:03 2020 +++ src/doc/CHANGES-8.3 Sun Oct 11 12:31:49 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.42 2020/10/10 14:38:03 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.43 2020/10/11 12:31:49 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1104,3 +1104,9 @@ sys/compat/common/tty_43.c 1.38 tty_43: better input limit validation to avoid undefined behaviour. [nia, ticket #1614] +external/bsd/ntp/dist/libntp/work_fork.c 1.15 + + ndtpd(8): fix asynchronous DNS resolution to avoid bind(2) + socket errors on startup. + [kim, ticket #1615] +
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sun Oct 11 11:26:25 UTC 2020 Modified Files: src/distrib/sets/lists/base [netbsd-9]: mi src/doc [netbsd-9]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-9]: Makefile NEWS README TZDATA_VERSION africa antarctica asia australasia backzone europe leap-seconds.list leapseconds leapseconds.awk northamerica southamerica theory.html version zishrink.awk zoneinfo2tdf.pl src/external/public-domain/tz/share/zoneinfo [netbsd-9]: Makefile Removed Files: src/external/public-domain/tz/dist [netbsd-9]: pacificnew systemv yearistype.sh Log Message: Pull up the following, requested by kre in #1108: external/public-domain/tz/dist/systemv delete external/public-domain/tz/dist/pacificnew delete external/public-domain/tz/dist/yearistype.shdelete external/public-domain/tz/dist/Makefile up to 1.1.1.27 external/public-domain/tz/dist/NEWS up to 1.1.1.30 external/public-domain/tz/dist/README up to 1.1.1.9 external/public-domain/tz/dist/TZDATA_VERSION up to 1.20 external/public-domain/tz/dist/africa up to 1.1.1.23 external/public-domain/tz/dist/antarctica up to 1.1.1.13 external/public-domain/tz/dist/asia up to 1.1.1.26 external/public-domain/tz/dist/australasia up to 1.1.1.19 external/public-domain/tz/dist/backzone up to 1.1.1.19 external/public-domain/tz/dist/europe up to 1.1.1.27 external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.14 external/public-domain/tz/dist/leapseconds up to 1.1.1.16 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.11 external/public-domain/tz/dist/northamerica up to 1.1.1.26 external/public-domain/tz/dist/southamerica up to 1.1.1.17 external/public-domain/tz/dist/theory.html up to 1.1.1.11 external/public-domain/tz/dist/version up to 1.1.1.17 external/public-domain/tz/dist/zishrink.awk up to 1.1.1.7 external/public-domain/tz/dist/zoneinfo2tdf.pl up to 1.1.1.4 external/public-domain/tz/share/zoneinfo/Makefile 1.4 distrib/sets/lists/base/mi 1.1266 doc/3RDPARTY1.1750 (patch) Import tzdata2020b: Revised predictions for Morocco's changes starting in 2023. Canada's Yukon changes to -07 on 2020-11-01, not 2020-03-08. Macquarie Island has stayed in sync with Tasmania since 2011. Casey, Antarctica is at +08 in winter and +11 in summer. To generate a diff of this commit: cvs rdiff -u -r1.1209.2.5 -r1.1209.2.6 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1640.2.17 -r1.1640.2.18 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.24.2.2 -r1.1.1.24.2.3 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.1.1.27.2.2 -r1.1.1.27.2.3 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \ src/external/public-domain/tz/dist/README cvs rdiff -u -r1.17.2.2 -r1.17.2.3 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.20.2.2 -r1.1.1.20.2.3 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.1.1.11.2.1 -r1.1.1.11.2.2 \ src/external/public-domain/tz/dist/antarctica cvs rdiff -u -r1.1.1.23.2.2 -r1.1.1.23.2.3 \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.17.2.1 -r1.1.1.17.2.2 \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.16.2.2 -r1.1.1.16.2.3 \ src/external/public-domain/tz/dist/backzone cvs rdiff -u -r1.1.1.11.2.2 -r1.1.1.11.2.3 \ src/external/public-domain/tz/dist/leap-seconds.list cvs rdiff -u -r1.1.1.13.2.2 -r1.1.1.13.2.3 \ src/external/public-domain/tz/dist/leapseconds cvs rdiff -u -r1.1.1.8.2.2 -r1.1.1.8.2.3 \ src/external/public-domain/tz/dist/leapseconds.awk \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.2.2.1 -r0 src/external/public-domain/tz/dist/pacificnew \ src/external/public-domain/tz/dist/systemv cvs rdiff -u -r1.1.1.15.2.1 -r1.1.1.15.2.2 \ src/external/public-domain/tz/dist/southamerica cvs rdiff -u -r1.1.1.14.2.2 -r1.1.1.14.2.3 \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.1.1.2 -r0 src/external/public-domain/tz/dist/yearistype.sh cvs rdiff -u -r1.1.1.5.2.1 -r1.1.1.5.2.2 \ src/external/public-domain/tz/dist/zishrink.awk cvs rdiff -u -r1.1.1.2.2.1 -r1.1.1.2.2.2 \ src/external/public-domain/tz/dist/zoneinfo2tdf.pl cvs rdiff -u -r1.3 -r1.3.18.1 \ src/external/public-domain/tz/share/zoneinfo/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: s
CVS commit: [netbsd-8] src/external/bsd/ntp/dist/libntp
Module Name:src
Committed By: martin
Date: Sun Oct 11 10:53:45 UTC 2020
Modified Files:
src/external/bsd/ntp/dist/libntp [netbsd-8]: work_fork.c
Log Message:
Pull up following revision(s) (requested by kim in ticket #1615):
external/bsd/ntp/dist/libntp/work_fork.c: revision 1.15
Wait for the asynchronous dns resolver child to be done (and close the
socket descriptors) before returning. Otherwise we might get bind errors.
Reported by kim@, fixed by mlelstv@.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.4.1 src/external/bsd/ntp/dist/libntp/work_fork.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/ntp/dist/libntp/work_fork.c
diff -u src/external/bsd/ntp/dist/libntp/work_fork.c:1.11 src/external/bsd/ntp/dist/libntp/work_fork.c:1.11.4.1
--- src/external/bsd/ntp/dist/libntp/work_fork.c:1.11 Thu Apr 13 20:17:42 2017
+++ src/external/bsd/ntp/dist/libntp/work_fork.c Sun Oct 11 10:53:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: work_fork.c,v 1.11 2017/04/13 20:17:42 christos Exp $ */
+/* $NetBSD: work_fork.c,v 1.11.4.1 2020/10/11 10:53:45 martin Exp $ */
/*
* work_fork.c - fork implementation for blocking worker child.
@@ -529,6 +529,9 @@ fork_blocking_child(
/* wire into I/O loop */
(*addremove_io_fd)(c->resp_read_pipe, is_pipe, FALSE);
+ /* wait until child is done */
+ rc = netread(c->resp_read_pipe, &rc, sizeof(rc));
+
return; /* parent returns */
}
@@ -565,6 +568,10 @@ fork_blocking_child(
c->resp_write_pipe = blocking_pipes[3];
kill_asyncio(0);
+
+ /* Tell parent we are ready */
+ rc = netwrite(c->resp_write_pipe, &rc, sizeof(rc));
+
closelog();
if (syslog_file != NULL) {
fclose(syslog_file);
CVS commit: [netbsd-9] src/external/bsd/ntp/dist/libntp
Module Name:src
Committed By: martin
Date: Sun Oct 11 10:51:02 UTC 2020
Modified Files:
src/external/bsd/ntp/dist/libntp [netbsd-9]: work_fork.c
Log Message:
Pull up following revision(s) (requested by kim in ticket #1107):
external/bsd/ntp/dist/libntp/work_fork.c: revision 1.15
Wait for the asynchronous dns resolver child to be done (and close the
socket descriptors) before returning. Otherwise we might get bind errors.
Reported by kim@, fixed by mlelstv@.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 src/external/bsd/ntp/dist/libntp/work_fork.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/ntp/dist/libntp/work_fork.c
diff -u src/external/bsd/ntp/dist/libntp/work_fork.c:1.13 src/external/bsd/ntp/dist/libntp/work_fork.c:1.13.2.1
--- src/external/bsd/ntp/dist/libntp/work_fork.c:1.13 Sat Sep 29 21:52:33 2018
+++ src/external/bsd/ntp/dist/libntp/work_fork.c Sun Oct 11 10:51:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: work_fork.c,v 1.13 2018/09/29 21:52:33 christos Exp $ */
+/* $NetBSD: work_fork.c,v 1.13.2.1 2020/10/11 10:51:02 martin Exp $ */
/*
* work_fork.c - fork implementation for blocking worker child.
@@ -557,6 +557,9 @@ fork_blocking_child(
/* wire into I/O loop */
(*addremove_io_fd)(c->resp_read_pipe, is_pipe, FALSE);
+ /* wait until child is done */
+ rc = netread(c->resp_read_pipe, &rc, sizeof(rc));
+
return; /* parent returns */
}
@@ -583,6 +586,10 @@ fork_blocking_child(
c->resp_write_pipe = blocking_pipes[3];
kill_asyncio(0);
+
+ /* Tell parent we are ready */
+ rc = netwrite(c->resp_write_pipe, &rc, sizeof(rc));
+
closelog();
if (syslog_file != NULL) {
fclose(syslog_file);
CVS commit: src/external/mit/ctwm/etc
Module Name:src
Committed By: nia
Date: Sun Oct 11 10:12:53 UTC 2020
Modified Files:
src/external/mit/ctwm/etc: system.ctwmrc
Log Message:
slightly lower workspace manager size
this works nicely on a 12.5" FHD screen
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/ctwm/etc/system.ctwmrc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/ctwm/etc/system.ctwmrc
diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.6 src/external/mit/ctwm/etc/system.ctwmrc:1.7
--- src/external/mit/ctwm/etc/system.ctwmrc:1.6 Sun Oct 11 10:02:51 2020
+++ src/external/mit/ctwm/etc/system.ctwmrc Sun Oct 11 10:12:53 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: system.ctwmrc,v 1.6 2020/10/11 10:02:51 nia Exp $
+# $NetBSD: system.ctwmrc,v 1.7 2020/10/11 10:12:53 nia Exp $
#
# ctwmrc by nia
#
@@ -129,7 +129,7 @@ ReverseCurrentWorkspace
StartInMapState
WMgrHorizButtonIndent 0
WMgrVertButtonIndent 0
-WorkSpaceManagerGeometry "70x270-4-4" 1
+WorkSpaceManagerGeometry "60x240-4-4" 1
WorkSpaces
{
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Sun Oct 11 10:09:09 UTC 2020 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: nice default xsetroot To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xinit/dist/xinitrc.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xdm/dist/config/Xsession.in diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.5 xsrc/external/mit/xdm/dist/config/Xsession.in:1.6 --- xsrc/external/mit/xdm/dist/config/Xsession.in:1.5 Fri Oct 2 13:45:07 2020 +++ xsrc/external/mit/xdm/dist/config/Xsession.in Sun Oct 11 10:09:09 2020 @@ -70,6 +70,7 @@ else #endif EOF fi + BINDIR/xsetroot -solid 'rgb:00/22/44' BINDIR/uxterm & exec BINDIR/ctwm -W fi Index: xsrc/external/mit/xinit/dist/xinitrc.cpp diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.7 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.8 --- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.7 Fri Oct 2 13:45:07 2020 +++ xsrc/external/mit/xinit/dist/xinitrc.cpp Sun Oct 11 10:09:09 2020 @@ -56,5 +56,6 @@ if [ -d XINITDIR/xinitrc.d ] ; then unset f fi +XSETROOT -solid 'rgb:00/22/44' UXTERM & exec CTWM -W
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Sun Oct 11 10:08:26 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
allow xsetroot to be used in default xinitrc
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/bin/xinit/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/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.9 src/external/mit/xorg/bin/xinit/Makefile:1.10
--- src/external/mit/xorg/bin/xinit/Makefile:1.9 Mon Sep 21 13:51:55 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Sun Oct 11 10:08:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/09/21 13:51:55 nia Exp $
+# $NetBSD: Makefile,v 1.10 2020/10/11 10:08:26 nia Exp $
.include
@@ -21,6 +21,7 @@ CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINI
-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
-DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm \
+ -DXSETROOT=${X11BINDIR}/xsetroot \
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Sun Oct 11 10:02:51 UTC 2020 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: allow the root window to be freely painted with e.g. xsetroot it came up during initial review that it may be confusing that xsetroot doesn't work by default To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/ctwm/etc/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/ctwm/etc/system.ctwmrc diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.5 src/external/mit/ctwm/etc/system.ctwmrc:1.6 --- src/external/mit/ctwm/etc/system.ctwmrc:1.5 Sun Oct 11 07:08:29 2020 +++ src/external/mit/ctwm/etc/system.ctwmrc Sun Oct 11 10:02:51 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: system.ctwmrc,v 1.5 2020/10/11 07:08:29 nia Exp $ +# $NetBSD: system.ctwmrc,v 1.6 2020/10/11 10:02:51 nia Exp $ # # ctwmrc by nia # @@ -44,6 +44,9 @@ RestartPreviousState DecorateTransients +# allow the user to have their root window recolored as they choose +DontPaintRootWindow + # hide window contents while altering windows for performance NoOpaqueMove NoOpaqueResize
CVS commit: src/external/bsd/ntp
Module Name:src
Committed By: rin
Date: Sun Oct 11 07:07:32 UTC 2020
Modified Files:
src/external/bsd/ntp: Makefile.inc
src/external/bsd/ntp/bin/ntp-keygen: Makefile
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/bin/ntpdc: Makefile
src/external/bsd/ntp/bin/ntpq: Makefile
src/external/bsd/ntp/bin/sntp: Makefile
Log Message:
Fix build; clean manpages only if they are generated automatically.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/bin/ntp-keygen/Makefile
cvs rdiff -u -r1.27 -r1.28 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/bin/ntpdc/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/bin/ntpq/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/bin/sntp/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/ntp/Makefile.inc
diff -u src/external/bsd/ntp/Makefile.inc:1.20 src/external/bsd/ntp/Makefile.inc:1.21
--- src/external/bsd/ntp/Makefile.inc:1.20 Sat Oct 10 14:23:34 2020
+++ src/external/bsd/ntp/Makefile.inc Sun Oct 11 07:07:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2020/10/10 14:23:34 christos Exp $
+# $NetBSD: Makefile.inc,v 1.21 2020/10/11 07:07:31 rin Exp $
.if !defined(NTP_MAKEFILE_INC)
NTP_MAKEFILE_INC=yes
@@ -90,8 +90,4 @@ COPTS.refclock_ulink.c+= -Wno-error=impl
.1sntpmdoc.1:
${TOOL_SED} -e 's/1sntpmdoc/1/g' < ${.IMPSRC} > ${.TARGET}
-
-
-CLEANFILES+=${MAN}
-
.endif
Index: src/external/bsd/ntp/bin/ntp-keygen/Makefile
diff -u src/external/bsd/ntp/bin/ntp-keygen/Makefile:1.6 src/external/bsd/ntp/bin/ntp-keygen/Makefile:1.7
--- src/external/bsd/ntp/bin/ntp-keygen/Makefile:1.6 Fri Oct 4 09:47:28 2019
+++ src/external/bsd/ntp/bin/ntp-keygen/Makefile Sun Oct 11 07:07:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/10/04 09:47:28 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2020/10/11 07:07:31 rin Exp $
.include
@@ -22,4 +22,6 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
COPTS.ntp-keygen.c+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} == 8:? -Wno-error=restrict :}
+CLEANFILES+=${MAN}
+
.include
Index: src/external/bsd/ntp/bin/ntpd/Makefile
diff -u src/external/bsd/ntp/bin/ntpd/Makefile:1.27 src/external/bsd/ntp/bin/ntpd/Makefile:1.28
--- src/external/bsd/ntp/bin/ntpd/Makefile:1.27 Sun Sep 6 07:20:26 2020
+++ src/external/bsd/ntp/bin/ntpd/Makefile Sun Oct 11 07:07:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/09/06 07:20:26 mrg Exp $
+# $NetBSD: Makefile,v 1.28 2020/10/11 07:07:31 rin Exp $
.include
@@ -97,4 +97,6 @@ COPTS.refclock_leitch.c+= ${GCC_NO_FORMA
COPTS.refclock_neoclock4x.c+= ${GCC_NO_FORMAT_TRUNCATION}
COPTS.ntp_io.c+= ${GCC_NO_ADDR_OF_PACKED_MEMBER}
+CLEANFILES+=${MAN}
+
.include
Index: src/external/bsd/ntp/bin/ntpdc/Makefile
diff -u src/external/bsd/ntp/bin/ntpdc/Makefile:1.6 src/external/bsd/ntp/bin/ntpdc/Makefile:1.7
--- src/external/bsd/ntp/bin/ntpdc/Makefile:1.6 Sat Dec 28 03:19:43 2013
+++ src/external/bsd/ntp/bin/ntpdc/Makefile Sun Oct 11 07:07:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/12/28 03:19:43 christos Exp $
+# $NetBSD: Makefile,v 1.7 2020/10/11 07:07:31 rin Exp $
.include
@@ -22,4 +22,6 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
.PATH: ${DIST}
+CLEANFILES+=${MAN}
+
.include
Index: src/external/bsd/ntp/bin/ntpq/Makefile
diff -u src/external/bsd/ntp/bin/ntpq/Makefile:1.8 src/external/bsd/ntp/bin/ntpq/Makefile:1.9
--- src/external/bsd/ntp/bin/ntpq/Makefile:1.8 Sun Oct 13 07:28:07 2019
+++ src/external/bsd/ntp/bin/ntpq/Makefile Sun Oct 11 07:07:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2019/10/13 07:28:07 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2020/10/11 07:07:31 rin Exp $
.include
@@ -23,4 +23,6 @@ CPPFLAGS+=-I${IDIST}/include -I${IDIST}/
COPTS.ntpq.c+= ${GCC_NO_STRINGOP_TRUNCATION}
+CLEANFILES+=${MAN}
+
.include
Index: src/external/bsd/ntp/bin/sntp/Makefile
diff -u src/external/bsd/ntp/bin/sntp/Makefile:1.8 src/external/bsd/ntp/bin/sntp/Makefile:1.9
--- src/external/bsd/ntp/bin/sntp/Makefile:1.8 Sat Oct 10 14:23:05 2020
+++ src/external/bsd/ntp/bin/sntp/Makefile Sun Oct 11 07:07:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/10/10 14:23:05 christos Exp $
+# $NetBSD: Makefile,v 1.9 2020/10/11 07:07:32 rin Exp $
USE_FORT?= yes # network client/server
@@ -35,4 +35,6 @@ DPADD+= ${LIBM} ${LIBEVENT}
COPTS.utilities.c+= ${GCC_NO_FORMAT_TRUNCATION}
+CLEANFILES+=${MAN}
+
.include
CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Sun Oct 11 07:08:29 UTC 2020 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: mute binding is annoying when there's hardware mute To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/ctwm/etc/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/ctwm/etc/system.ctwmrc diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.4 src/external/mit/ctwm/etc/system.ctwmrc:1.5 --- src/external/mit/ctwm/etc/system.ctwmrc:1.4 Sat Oct 10 10:36:16 2020 +++ src/external/mit/ctwm/etc/system.ctwmrc Sun Oct 11 07:08:29 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: system.ctwmrc,v 1.4 2020/10/10 10:36:16 nia Exp $ +# $NetBSD: system.ctwmrc,v 1.5 2020/10/11 07:08:29 nia Exp $ # # ctwmrc by nia # @@ -329,7 +329,7 @@ Button3 = mod4 : window : f.resize "XF86AudioRaiseVolume" = : all : !"mixerctl -w outputs.master+=5" "XF86AudioLowerVolume" = : all : !"mixerctl -w outputs.master-=5" -"XF86AudioMute"= : all : !"mixerctl -w outputs.master=0" +#"XF86AudioMute"= : all : !"mixerctl -w outputs.master=0" # # "Windows" style keyboard shortcuts
