CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Aug 15 10:04:53 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1691 To generate a diff of this commit: cvs rdiff -u -r1.1.2.95 -r1.1.2.96 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.95 src/doc/CHANGES-8.3:1.1.2.96 --- src/doc/CHANGES-8.3:1.1.2.95 Wed Aug 11 17:25:54 2021 +++ src/doc/CHANGES-8.3 Sun Aug 15 10:04:53 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.95 2021/08/11 17:25:54 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.96 2021/08/15 10:04:53 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1994,3 +1994,10 @@ sys/netinet6/in6_src.c1.88 mapped address. [kardel, ticket #1690] +sys/compat/common/vfs_syscalls_30.c 1.42 +sys/compat/common/vfs_syscalls_43.c 1.67 +sys/compat/common/vfs_syscalls_50.c 1.26 + + Fix compat stat(2) syscall kernel memory disclosure. + [christos, ticket #1691] +
CVS commit: [netbsd-8] src/sys/compat/common
Module Name:src
Committed By: martin
Date: Sun Aug 15 10:03:46 UTC 2021
Modified Files:
src/sys/compat/common [netbsd-8]: vfs_syscalls_30.c vfs_syscalls_43.c
vfs_syscalls_50.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1691):
sys/compat/common/vfs_syscalls_43.c: revision 1.67
sys/compat/common/vfs_syscalls_50.c: revision 1.26
sys/compat/common/vfs_syscalls_30.c: revision 1.42
- memset struct stat to avoid kernel memory disclosure of padded fields
(thanks Trend Micro for the report)
- use do_fhstat
- consistency in argument order of compat functions
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.12.1 src/sys/compat/common/vfs_syscalls_30.c
cvs rdiff -u -r1.59.8.2 -r1.59.8.3 src/sys/compat/common/vfs_syscalls_43.c
cvs rdiff -u -r1.18 -r1.18.12.1 src/sys/compat/common/vfs_syscalls_50.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/common/vfs_syscalls_30.c
diff -u src/sys/compat/common/vfs_syscalls_30.c:1.36 src/sys/compat/common/vfs_syscalls_30.c:1.36.12.1
--- src/sys/compat/common/vfs_syscalls_30.c:1.36 Mon Oct 20 11:58:01 2014
+++ src/sys/compat/common/vfs_syscalls_30.c Sun Aug 15 10:03:46 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_30.c,v 1.36 2014/10/20 11:58:01 christos Exp $ */
+/* $NetBSD: vfs_syscalls_30.c,v 1.36.12.1 2021/08/15 10:03:46 martin Exp $ */
/*-
* Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_30.c,v 1.36 2014/10/20 11:58:01 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_30.c,v 1.36.12.1 2021/08/15 10:03:46 martin Exp $");
#include
#include
@@ -55,7 +55,6 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_syscalls
#include
#include
-static void cvtstat(struct stat13 *, const struct stat *);
/*
* Convert from a new to an old stat structure.
@@ -64,6 +63,8 @@ static void
cvtstat(struct stat13 *ost, const struct stat *st)
{
+ /* Handle any padding. */
+ memset(ost, 0, sizeof(*ost));
ost->st_dev = st->st_dev;
ost->st_ino = (uint32_t)st->st_ino;
ost->st_mode = st->st_mode;
@@ -101,8 +102,7 @@ compat_30_sys___stat13(struct lwp *l, co
if (error)
return error;
cvtstat(&osb, &sb);
- error = copyout(&osb, SCARG(uap, ub), sizeof (osb));
- return error;
+ return copyout(&osb, SCARG(uap, ub), sizeof(osb));
}
@@ -125,8 +125,7 @@ compat_30_sys___lstat13(struct lwp *l, c
if (error)
return error;
cvtstat(&osb, &sb);
- error = copyout(&osb, SCARG(uap, ub), sizeof (osb));
- return error;
+ return copyout(&osb, SCARG(uap, ub), sizeof(osb));
}
/* ARGSUSED */
@@ -140,33 +139,12 @@ compat_30_sys_fhstat(struct lwp *l, cons
struct stat sb;
struct stat13 osb;
int error;
- struct compat_30_fhandle fh;
- struct mount *mp;
- struct vnode *vp;
-
- /*
- * Must be super user
- */
- if ((error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FILEHANDLE,
- 0, NULL, NULL, NULL)))
- return (error);
- if ((error = copyin(SCARG(uap, fhp), &fh, sizeof(fh))) != 0)
- return (error);
-
- if ((mp = vfs_getvfs(&fh.fh_fsid)) == NULL)
- return (ESTALE);
- if (mp->mnt_op->vfs_fhtovp == NULL)
- return EOPNOTSUPP;
- if ((error = VFS_FHTOVP(mp, (struct fid*)&fh.fh_fid, &vp)))
- return (error);
- error = vn_stat(vp, &sb);
- vput(vp);
+ error = do_fhstat(l, SCARG(uap, fhp), sizeof(*SCARG(uap, fhp)), &sb);
if (error)
- return (error);
+ return error;
cvtstat(&osb, &sb);
- error = copyout(&osb, SCARG(uap, sb), sizeof(sb));
- return (error);
+ return copyout(&osb, SCARG(uap, sb), sizeof(osb));
}
/*
@@ -188,8 +166,7 @@ compat_30_sys___fstat13(struct lwp *l, c
if (error)
return error;
cvtstat(&osb, &sb);
- error = copyout(&osb, SCARG(uap, sb), sizeof (osb));
- return error;
+ return copyout(&osb, SCARG(uap, sb), sizeof(osb));
}
/*
@@ -265,7 +242,7 @@ again:
bdp = (struct dirent *)inp;
reclen = bdp->d_reclen;
if (reclen & _DIRENT_ALIGN(bdp))
- panic("netbsd30_getdents: bad reclen %d", reclen);
+ panic("%s: bad reclen %d", __func__, reclen);
if (cookie)
off = *cookie++; /* each entry points to the next */
else
@@ -368,9 +345,8 @@ compat_30_sys_getfh(struct lwp *l, const
error = EINVAL;
}
if (error)
- return (error);
- error = copyout(&fh, SCARG(uap, fhp), sizeof(struct compat_30_fhandle));
- return (error);
+ return error;
+ return copyout(&fh, SCARG(uap, fhp), sizeof(fh));
}
/*
@@ -407,8 +383,7 @@ compat_30_sys___fhstat30(struct lwp *l,
if (error)
return error;
cvtstat(&osb, &sb);
- error = copyout(&osb, SCARG(uap_30, sb), sizeof (osb));
- return error;
+ return copyout(&osb, SCARG(uap_30, sb), sizeof(osb));
}
/* ARGSUSED */
Index: src/sys/compat/common/vfs_syscalls_43.c
diff -u src/sys/compat/common/vfs_syscalls_43.c:1.59.8.2 src/sys/compat/common/vfs_syscalls_43.c:1.59.8.3
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Aug 11 17:25:54 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1690 To generate a diff of this commit: cvs rdiff -u -r1.1.2.94 -r1.1.2.95 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.94 src/doc/CHANGES-8.3:1.1.2.95 --- src/doc/CHANGES-8.3:1.1.2.94 Wed Jul 14 17:55:18 2021 +++ src/doc/CHANGES-8.3 Wed Aug 11 17:25:54 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.94 2021/07/14 17:55:18 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.95 2021/08/11 17:25:54 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1988,3 +1988,9 @@ sys/arch/hppa/dev/sti_sgc.c 1.3 PR 52162: Fix silent freeze on probing sti(4) framebuffer on 712/60. [tsutsui, ticket #1689] +sys/netinet6/in6_src.c1.88 + + PR 56348: MTU discovery fails with IPv6 sockets bound to IPv4 + mapped address. + [kardel, ticket #1690] +
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src
Committed By: martin
Date: Wed Aug 11 17:24:43 UTC 2021
Modified Files:
src/sys/netinet6 [netbsd-8]: in6_src.c
Log Message:
Pull up following revision(s) (requested by kardel in ticket #1690):
sys/netinet6/in6_src.c: revision 1.88
PR kern/56348
MTU discovery fails with IPv6 sockets bound to IPv4 mapped address
pick up the IPv4 route for IPv4 mapped IPv6 address to get the correct
MTU and not any unrelated/inappropriate MTU from IPv6 routes. IPv4 mapped
IPv6 addresses are always handled by the IPv4 stack and MTU discovery
is solely handled with the IPv4 routing table.
To generate a diff of this commit:
cvs rdiff -u -r1.79.6.2 -r1.79.6.3 src/sys/netinet6/in6_src.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/netinet6/in6_src.c
diff -u src/sys/netinet6/in6_src.c:1.79.6.2 src/sys/netinet6/in6_src.c:1.79.6.3
--- src/sys/netinet6/in6_src.c:1.79.6.2 Sun Dec 10 09:24:30 2017
+++ src/sys/netinet6/in6_src.c Wed Aug 11 17:24:42 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_src.c,v 1.79.6.2 2017/12/10 09:24:30 snj Exp $ */
+/* $NetBSD: in6_src.c,v 1.79.6.3 2021/08/11 17:24:42 martin Exp $ */
/* $KAME: in6_src.c,v 1.159 2005/10/19 01:40:32 t-momose Exp $ */
/*
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.79.6.2 2017/12/10 09:24:30 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_src.c,v 1.79.6.3 2021/08/11 17:24:42 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -608,6 +608,7 @@ in6_selectroute(struct sockaddr_in6 *dst
struct rtentry *rt = NULL;
union {
struct sockaddr dst;
+ struct sockaddr_in dst4;
struct sockaddr_in6 dst6;
} u;
@@ -674,9 +675,17 @@ in6_selectroute(struct sockaddr_in6 *dst
* Use a cached route if it exists and is valid, else try to allocate
* a new one. Note that we should check the address family of the
* cached destination, in case of sharing the cache with IPv4.
+ *
+ * for V4 mapped addresses we want to pick up the v4 route
+ * see PR kern/56348
*/
- u.dst6 = *dstsock;
- u.dst6.sin6_scope_id = 0;
+ if (IN6_IS_ADDR_V4MAPPED(&dstsock->sin6_addr)) {
+ in6_sin6_2_sin(&u.dst4, dstsock);
+ } else {
+ u.dst6 = *dstsock;
+ u.dst6.sin6_scope_id = 0;
+ }
+
rt = rtcache_lookup1(*ro, &u.dst, 1);
if (rt == NULL)
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Jul 14 17:55:18 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1689 To generate a diff of this commit: cvs rdiff -u -r1.1.2.93 -r1.1.2.94 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.93 src/doc/CHANGES-8.3:1.1.2.94 --- src/doc/CHANGES-8.3:1.1.2.93 Fri Jun 25 19:14:29 2021 +++ src/doc/CHANGES-8.3 Wed Jul 14 17:55:18 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.93 2021/06/25 19:14:29 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.94 2021/07/14 17:55:18 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1983,3 +1983,8 @@ distrib/sun3/miniroot/Makefile 1.50 - The modules and rescue sets are also required on upgrade. [tsutsui, ticket #1686] +sys/arch/hppa/dev/sti_sgc.c 1.3 + + PR 52162: Fix silent freeze on probing sti(4) framebuffer on 712/60. + [tsutsui, ticket #1689] +
CVS commit: [netbsd-8] src/sys/arch/hppa/dev
Module Name:src
Committed By: martin
Date: Wed Jul 14 17:53:50 UTC 2021
Modified Files:
src/sys/arch/hppa/dev [netbsd-8]: sti_sgc.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1689):
sys/arch/hppa/dev/sti_sgc.c: revision 1.3
Fix silent freeze on probing sti(4) framebuffer on 712/60. PR/52162
Ok'ed by skrll@.
Should be pulled up to netbsd-9 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.28.1 src/sys/arch/hppa/dev/sti_sgc.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/hppa/dev/sti_sgc.c
diff -u src/sys/arch/hppa/dev/sti_sgc.c:1.1 src/sys/arch/hppa/dev/sti_sgc.c:1.1.28.1
--- src/sys/arch/hppa/dev/sti_sgc.c:1.1 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/dev/sti_sgc.c Wed Jul 14 17:53:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sti_sgc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: sti_sgc.c,v 1.1.28.1 2021/07/14 17:53:50 martin Exp $ */
/* $OpenBSD: sti_sgc.c,v 1.38 2009/02/06 22:51:04 miod Exp $ */
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.1 2014/02/24 07:23:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.1.28.1 2021/07/14 17:53:50 martin Exp $");
#include "opt_cputype.h"
@@ -73,6 +73,16 @@ extern int stidebug;
#define STI_ROMSIZE (sizeof(struct sti_dd) * 4)
#define STI_ID_FDDI 0x280b31af /* Medusa FDDI ROM id */
+/*
+ * hpa addresses to check on-board variants
+ * XXX should check via device_register(9)?
+ *
+ * 0xf400: HPA1991AC19 on 715/33, 715/50
+ * 0xf800: HPA1439A on 735/99, HPA208LCxxx on 715/80, 715/100, 712
+ */
+#define STI_ONBOARD_HPA0 0xf400
+#define STI_ONBOARD_HPA1 0xf800
+
/* gecko optional graphics */
#define STI_GOPT1_REV 0x17
#define STI_GOPT2_REV 0x70
@@ -118,7 +128,9 @@ sti_sgc_getrom(struct confargs *ca)
rom = PAGE0->pd_resv2[1];
hppa_pagezero_unmap(pagezero_cookie);
- if (ca->ca_type.iodc_sv_model == HPPA_FIO_GSGC) {
+ if (ca->ca_type.iodc_sv_model == HPPA_FIO_GSGC &&
+ ca->ca_hpa != STI_ONBOARD_HPA0 &&
+ ca->ca_hpa != STI_ONBOARD_HPA1) {
int i;
for (i = sizeof(sti_sgc_opt); i--; )
if (sti_sgc_opt[i] == ca->ca_type.iodc_revision)
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jun 25 19:14:30 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1686 To generate a diff of this commit: cvs rdiff -u -r1.1.2.92 -r1.1.2.93 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.92 src/doc/CHANGES-8.3:1.1.2.93 --- src/doc/CHANGES-8.3:1.1.2.92 Mon Jun 21 17:46:13 2021 +++ src/doc/CHANGES-8.3 Fri Jun 25 19:14:29 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.92 2021/06/21 17:46:13 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.93 2021/06/25 19:14:29 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1972,3 +1972,14 @@ compat/arm/oabi/bsd.oabi.mk (apply patc Fix PR 50192. [mrg, ticket #1684] +distrib/miniroot/install.sub 1.61,1.62 (patch) +distrib/sun2/miniroot/Makefile 1.40 +distrib/sun3/miniroot/Makefile 1.50 + + Fixes to sun2 and sun3 miniroot upgrade scripts: + - Replace RELEASE and VERSION strings proplery. + - Remove netstat(1) calls to print resolver info on upgrade using + miniroot, the binary is not available. + - The modules and rescue sets are also required on upgrade. + [tsutsui, ticket #1686] +
CVS commit: [netbsd-8] src/distrib
Module Name:src
Committed By: martin
Date: Fri Jun 25 19:13:20 UTC 2021
Modified Files:
src/distrib/miniroot [netbsd-8]: install.sub
src/distrib/sun2/miniroot [netbsd-8]: Makefile
src/distrib/sun3/miniroot [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1686):
distrib/sun3/miniroot/Makefile: revision 1.50
distrib/miniroot/install.sub: revision 1.61
distrib/miniroot/install.sub: revision 1.62 (patch)
distrib/sun2/miniroot/Makefile: revision 1.40
Replace RELEASE and VERSION strings proplery.
sun2 and sun3 don't use MI src/distrib/miniroot/list so this should
have been sync'ed with it.
http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/miniroot/list#rev1.36
> Use proper release version strings ("9.1" rather than "91") in banners.
>
> Also define and use "MACHINE" variable to describe port names
> (no uname(1) or sysctl(8) in miniroot binary list by default).
Should be pulled up to netbsd-9.
Remove netstat(1) calls to print resolver info on upgrade using miniroot.
netstat(1) was removed from miniroot 25 years ago.
http://cvsweb.netbsd.org/bsdweb.cgi/src/distrib/miniroot/list#rev1.5
The modules and rescue sets are also required on upgrade.
Should be pulled up to netbsd-9 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.45.56.3 -r1.45.56.4 src/distrib/miniroot/install.sub
cvs rdiff -u -r1.36 -r1.36.4.1 src/distrib/sun2/miniroot/Makefile
cvs rdiff -u -r1.46 -r1.46.4.1 src/distrib/sun3/miniroot/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/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.45.56.3 src/distrib/miniroot/install.sub:1.45.56.4
--- src/distrib/miniroot/install.sub:1.45.56.3 Sat Jun 5 10:41:20 2021
+++ src/distrib/miniroot/install.sub Fri Jun 25 19:13:20 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.45.56.3 2021/06/05 10:41:20 martin Exp $
+# $NetBSD: install.sub,v 1.45.56.4 2021/06/25 19:13:20 martin Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -40,7 +40,7 @@ RELEASE=# filled in automatically (s
export RELEASE
ALLSETS="base comp etc games man misc modules text" # default install sets
-UPGRSETS="base comp games man misc text" # default upgrade sets
+UPGRSETS="base comp games man misc modules text" # default upgrade sets
THESETS= # one of the above
local_sets_dir="" # Path searched for sets by install_sets
@@ -606,12 +606,8 @@ fi
echo ""
if [ "${_resolver_enabled:-FALSE}" = "TRUE" ]; then
- netstat -r
- echo ""
echo "Resolver enabled."
else
- netstat -rn
- echo ""
echo "Resolver not enabled."
fi
Index: src/distrib/sun2/miniroot/Makefile
diff -u src/distrib/sun2/miniroot/Makefile:1.36 src/distrib/sun2/miniroot/Makefile:1.36.4.1
--- src/distrib/sun2/miniroot/Makefile:1.36 Tue Jan 24 18:04:05 2017
+++ src/distrib/sun2/miniroot/Makefile Fri Jun 25 19:13:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/01/24 18:04:05 christos Exp $
+# $NetBSD: Makefile,v 1.36.4.1 2021/06/25 19:13:20 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -50,7 +50,9 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
${CRUNCHBIN}: libhack.o
install.sub: ${DISTRIBDIR}/miniroot/install.sub
- ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@
+ ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" \
+ -e "/^RELEASE=/s/=.*/=${DISTRIBVER}/" \
+ -e "/^MACHINE=/s/=.*/=${MACHINE}/" < $? > $@
CLEANFILES+= install.sub
Index: src/distrib/sun3/miniroot/Makefile
diff -u src/distrib/sun3/miniroot/Makefile:1.46 src/distrib/sun3/miniroot/Makefile:1.46.4.1
--- src/distrib/sun3/miniroot/Makefile:1.46 Tue Jan 24 18:04:05 2017
+++ src/distrib/sun3/miniroot/Makefile Fri Jun 25 19:13:20 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2017/01/24 18:04:05 christos Exp $
+# $NetBSD: Makefile,v 1.46.4.1 2021/06/25 19:13:20 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -50,7 +50,9 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
${CRUNCHBIN}: libhack.o
install.sub: ${DISTRIBDIR}/miniroot/install.sub
- ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@
+ ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" \
+ -e "/^RELEASE=/s/=.*/=${DISTRIBVER}/" \
+ -e "/^MACHINE=/s/=.*/=${MACHINE}/" < $? > $@
CLEANFILES+= install.sub
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jun 21 17:46:13 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1685 and #1684 To generate a diff of this commit: cvs rdiff -u -r1.1.2.91 -r1.1.2.92 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.91 src/doc/CHANGES-8.3:1.1.2.92 --- src/doc/CHANGES-8.3:1.1.2.91 Tue Jun 8 13:01:10 2021 +++ src/doc/CHANGES-8.3 Mon Jun 21 17:46:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.91 2021/06/08 13:01:10 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.92 2021/06/21 17:46:13 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1954,3 +1954,21 @@ sbin/dump/tape.c1.56 dump(8): prevent crashes for large file systems. [hannken, ticket #1683] +sys/kern/vfs_lookup.c1.226 +sys/kern/vfs_vnops.c1.215 +sys/sys/namei.src1.59 (patch) +sys/rump/include/rump/rump_namei.h (regen) +sys/sys/namei.h (regen) + + Add a new namei flag NONEXCLHACK for open with O_CREAT and not O_EXCL. + In the case where that target is the root, or a mount + point, such that there's no parent dir, "real" CREATE operations fail, + but O_CREAT without O_EXCL needs to succeed. + Fixes newer Samba usage of /proc/self/fd/NNN with O_CREAT. + [dholland, ticket #1685] + +compat/arm/oabi/bsd.oabi.mk (apply patch) + + Fix PR 50192. + [mrg, ticket #1684] +
CVS commit: [netbsd-8] src/compat/arm/oabi
Module Name:src
Committed By: martin
Date: Mon Jun 21 17:43:18 UTC 2021
Modified Files:
src/compat/arm/oabi [netbsd-8]: bsd.oabi.mk
Log Message:
Apply patch, requested by mrg in ticket #1684 (no corresponding
change in HEAD, oabi has been removed):
compat/arm/oabi/bsd.oabi.mk (apply patch)
Fix PR 50192.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/compat/arm/oabi/bsd.oabi.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/arm/oabi/bsd.oabi.mk
diff -u src/compat/arm/oabi/bsd.oabi.mk:1.4 src/compat/arm/oabi/bsd.oabi.mk:1.4.8.1
--- src/compat/arm/oabi/bsd.oabi.mk:1.4 Wed Jun 24 22:20:24 2015
+++ src/compat/arm/oabi/bsd.oabi.mk Mon Jun 21 17:43:18 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.oabi.mk,v 1.4 2015/06/24 22:20:24 matt Exp $
+# $NetBSD: bsd.oabi.mk,v 1.4.8.1 2021/06/21 17:43:18 martin Exp $
.if !defined(MLIBDIR)
MLIBDIR= oabi
@@ -15,10 +15,12 @@ ARM_APCS_FLAGS= ${${ACTIVE_CC} == "clang
ARM_MACHINE_ARCH= armeb
ARM_LD= -m armelfb_nbsd
LDFLAGS+= -Wl,-m,armelfb_nbsd
+ARM_APCS_FLAGS= -mcpu=arm10
.else
ARM_MACHINE_ARCH= arm
ARM_LD= -m armelf_nbsd
LDFLAGS+= -Wl,-m,armelf_nbsd
+ARM_APCS_FLAGS= -mcpu=arm10
.endif
LIBC_MACHINE_ARCH= ${ARM_MACHINE_ARCH}
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Mon Jun 21 14:56:46 UTC 2021
Modified Files:
src/sys/rump/include/rump [netbsd-8]: rump_namei.h
src/sys/sys [netbsd-8]: namei.h
Log Message:
Regen for ticket #1685
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.31.6.1 src/sys/rump/include/rump/rump_namei.h
cvs rdiff -u -r1.97 -r1.97.6.1 src/sys/sys/namei.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/rump/include/rump/rump_namei.h
diff -u src/sys/rump/include/rump/rump_namei.h:1.31 src/sys/rump/include/rump/rump_namei.h:1.31.6.1
--- src/sys/rump/include/rump/rump_namei.h:1.31 Tue Mar 21 10:20:38 2017
+++ src/sys/rump/include/rump/rump_namei.h Mon Jun 21 14:56:46 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: rump_namei.h,v 1.31 2017/03/21 10:20:38 riastradh Exp $ */
+/* $NetBSD: rump_namei.h,v 1.31.6.1 2021/06/21 14:56:46 martin Exp $ */
/*
* WARNING: GENERATED FILE. DO NOT EDIT
* (edit namei.src and run make namei in src/sys/sys)
* by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp
- * from: NetBSD: namei.src,v 1.41 2017/03/21 10:20:12 riastradh Exp
+ * from: NetBSD: namei.src,v 1.41.6.1 2021/06/21 14:55:15 martin Exp
*/
#ifndef _RUMP_RUMP_NAMEI_H_
@@ -24,7 +24,8 @@
#define RUMP_NAMEI_NOFOLLOW 0x
#define RUMP_NAMEI_EMULROOTSET 0x0080
#define RUMP_NAMEI_NOCHROOT 0x0100
-#define RUMP_NAMEI_MODMASK 0x01fc
+#define RUMP_NAMEI_NONEXCLHACK 0x0200
+#define RUMP_NAMEI_MODMASK 0x03fc
#define RUMP_NAMEI_NOCROSSMOUNT 0x100
#define RUMP_NAMEI_RDONLY 0x200
#define RUMP_NAMEI_ISDOTDOT 0x0002000
Index: src/sys/sys/namei.h
diff -u src/sys/sys/namei.h:1.97 src/sys/sys/namei.h:1.97.6.1
--- src/sys/sys/namei.h:1.97 Tue Mar 21 10:20:38 2017
+++ src/sys/sys/namei.h Mon Jun 21 14:56:46 2021
@@ -1,11 +1,11 @@
-/* $NetBSD: namei.h,v 1.97 2017/03/21 10:20:38 riastradh Exp $ */
+/* $NetBSD: namei.h,v 1.97.6.1 2021/06/21 14:56:46 martin Exp $ */
/*
* WARNING: GENERATED FILE. DO NOT EDIT
* (edit namei.src and run make namei in src/sys/sys)
* by: NetBSD: gennameih.awk,v 1.5 2009/12/23 14:17:19 pooka Exp
- * from: NetBSD: namei.src,v 1.41 2017/03/21 10:20:12 riastradh Exp
+ * from: NetBSD: namei.src,v 1.41.6.1 2021/06/21 14:55:15 martin Exp
*/
/*
@@ -160,7 +160,8 @@ struct nameidata {
#define EMULROOTSET 0x0080 /* emulation root already
in ni_erootdir */
#define NOCHROOT 0x0100 /* no chroot on abs path lookups */
-#define MODMASK 0x01fc /* mask of operational modifiers */
+#define NONEXCLHACK 0x0200 /* open wwith O_CREAT but not O_EXCL */
+#define MODMASK 0x03fc /* mask of operational modifiers */
/*
* Namei parameter descriptors.
*/
@@ -351,7 +352,8 @@ struct nchstats _NAMEI_CACHE_STATS(uint6
#define NAMEI_NOFOLLOW 0x
#define NAMEI_EMULROOTSET 0x0080
#define NAMEI_NOCHROOT 0x0100
-#define NAMEI_MODMASK 0x01fc
+#define NAMEI_NONEXCLHACK 0x0200
+#define NAMEI_MODMASK 0x03fc
#define NAMEI_NOCROSSMOUNT 0x100
#define NAMEI_RDONLY 0x200
#define NAMEI_ISDOTDOT 0x0002000
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Mon Jun 21 14:55:15 UTC 2021
Modified Files:
src/sys/kern [netbsd-8]: vfs_lookup.c vfs_vnops.c
src/sys/sys [netbsd-8]: namei.src
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1685):
sys/sys/namei.src: revision 1.59(via patch)
sys/kern/vfs_vnops.c: revision 1.215
sys/kern/vfs_lookup.c: revision 1.226
Add a new namei flag NONEXCLHACK for open with O_CREAT and not O_EXCL.
This case needs to be distinguished from the other CREATE operations
because it is supposed to successfully return (and open) the target if
it exists. In the case where that target is the root, or a mount
point, such that there's no parent dir, "real" CREATE operations fail,
but O_CREAT without O_EXCL needs to succeed.
So (a) add the flag, (b) test for it in namei in the situation
described above, (c) set it in open under the appropriate
circumstances, and (d) because this can result in namei returning
ni_dvp of NULL, cope with that case.
Should get into -9 and maybe even -8, because it was prompted by
issues with 3rd-party code. The use of a flag (vs. adding an
additional nameiop, which would be more appropriate) was deliberate to
make the patch small and noninvasive.
To generate a diff of this commit:
cvs rdiff -u -r1.207.2.1 -r1.207.2.2 src/sys/kern/vfs_lookup.c
cvs rdiff -u -r1.195.6.1 -r1.195.6.2 src/sys/kern/vfs_vnops.c
cvs rdiff -u -r1.41 -r1.41.6.1 src/sys/sys/namei.src
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/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.207.2.1 src/sys/kern/vfs_lookup.c:1.207.2.2
--- src/sys/kern/vfs_lookup.c:1.207.2.1 Mon Jul 10 13:02:47 2017
+++ src/sys/kern/vfs_lookup.c Mon Jun 21 14:55:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.207.2.1 2017/07/10 13:02:47 martin Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.207.2.2 2021/06/21 14:55:15 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.207.2.1 2017/07/10 13:02:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.207.2.2 2021/06/21 14:55:15 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_magiclinks.h"
@@ -1402,10 +1402,33 @@ namei_oneroot(struct namei_state *state,
* a CREATE, DELETE, or RENAME), and we don't have one
* (because this is the root directory, or we crossed
* a mount point), then we must fail.
+ *
+ * 20210604 dholland when NONEXCLHACK is set (open
+ * with O_CREAT but not O_EXCL) skip this logic. Since
+ * we have a foundobj, open will not be creating, so
+ * it doesn't actually need or use the searchdir, so
+ * it's ok to return it even if it's on a different
+ * volume, and it's also ok to return NULL; by setting
+ * NONEXCLHACK the open code promises to cope with
+ * those cases correctly. (That is, it should do what
+ * it would do anyway, that is, just release the
+ * searchdir, except not crash if it's null.) This is
+ * needed because otherwise opening mountpoints with
+ * O_CREAT but not O_EXCL fails... which is a silly
+ * thing to do but ought to work. (This whole issue
+ * came to light because 3rd party code wanted to open
+ * certain procfs nodes with O_CREAT for some 3rd
+ * party reason, and it failed.)
+ *
+ * Note that NONEXCLHACK is properly a different
+ * nameiop (it is partway between LOOKUP and CREATE)
+ * but it was stuffed in as a flag instead to make the
+ * resulting patch less invasive for pullup. Blah.
*/
if (cnp->cn_nameiop != LOOKUP &&
(searchdir == NULL ||
- searchdir->v_mount != foundobj->v_mount)) {
+ searchdir->v_mount != foundobj->v_mount) &&
+ (cnp->cn_flags & NONEXCLHACK) == 0) {
if (searchdir) {
vput(searchdir);
}
Index: src/sys/kern/vfs_vnops.c
diff -u src/sys/kern/vfs_vnops.c:1.195.6.1 src/sys/kern/vfs_vnops.c:1.195.6.2
--- src/sys/kern/vfs_vnops.c:1.195.6.1 Thu Apr 12 01:45:57 2018
+++ src/sys/kern/vfs_vnops.c Mon Jun 21 14:55:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_vnops.c,v 1.195.6.1 2018/04/12 01:45:57 msaitoh Exp $ */
+/* $NetBSD: vfs_vnops.c,v 1.195.6.2 2021/06/21 14:55:15 martin Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.195.6.1 2018/04/12 01:45:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_vnops.c,v 1.195.6.2 2021/06/21 14:55:15 martin Exp $");
#include "veriexec.h"
@@ -160,6 +160,8 @@ vn_open(struct nameidata *ndp, int fmode
if ((fmode & O_EXCL) == 0 &&
((fmode & O_NOFOLLOW) == 0))
ndp->ni_cnd.cn_flags |= FOLLOW;
+ if ((fmode & O_EXCL) == 0)
+ ndp->ni_cnd.cn_flags |= NONEXCLHACK;
} else {
ndp->ni_cnd.cn_nameiop = LOOKUP;
ndp->ni_cnd.cn_flags |= LOCKLEAF;
@@ -182,7 +184,12 @@ vn_open(struct nameid
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Jun 8 13:01:10 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1683 To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 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.90 src/doc/CHANGES-8.3:1.1.2.91 --- src/doc/CHANGES-8.3:1.1.2.90 Sat Jun 5 10:58:28 2021 +++ src/doc/CHANGES-8.3 Tue Jun 8 13:01:10 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.90 2021/06/05 10:58:28 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.91 2021/06/08 13:01:10 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1949,3 +1949,8 @@ sys/dev/pci/if_iwmreg.h1.8 iwm(4): fix various bit declarations - use unsigned for 2^32. [nia, ticket #1682] +sbin/dump/tape.c1.56 + + dump(8): prevent crashes for large file systems. + [hannken, ticket #1683] +
CVS commit: [netbsd-8] src/sbin/dump
Module Name:src
Committed By: martin
Date: Tue Jun 8 12:59:32 UTC 2021
Modified Files:
src/sbin/dump [netbsd-8]: tape.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #1683):
sbin/dump/tape.c: revision 1.56
Bitmaps (TS_BITS and TS_CLRI) dont use the "c_addr" array as they
cannot have holes. As bitmaps are written without TS_ADDR records
"c_count" may be larger than the "c_addr" size resulting in a
segmentation violation reading "c_addr" beyond its end.
Compute "blks" for TS_INODE and TS_ADDR only -- its used for multi
volume dumps and the bitmaps must both be on the first volume.
To generate a diff of this commit:
cvs rdiff -u -r1.54.8.1 -r1.54.8.2 src/sbin/dump/tape.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/dump/tape.c
diff -u src/sbin/dump/tape.c:1.54.8.1 src/sbin/dump/tape.c:1.54.8.2
--- src/sbin/dump/tape.c:1.54.8.1 Fri Mar 29 19:43:28 2019
+++ src/sbin/dump/tape.c Tue Jun 8 12:59:32 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tape.c,v 1.54.8.1 2019/03/29 19:43:28 martin Exp $ */
+/* $NetBSD: tape.c,v 1.54.8.2 2021/06/08 12:59:32 martin Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)tape.c 8.4 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: tape.c,v 1.54.8.1 2019/03/29 19:43:28 martin Exp $");
+__RCSID("$NetBSD: tape.c,v 1.54.8.2 2021/06/08 12:59:32 martin Exp $");
#endif
#endif /* not lint */
@@ -328,7 +328,8 @@ flushtape(void)
}
blks = 0;
- if (iswap32(spcl.c_type) != TS_END) {
+ if (iswap32(spcl.c_type) == TS_INODE ||
+ iswap32(spcl.c_type) == TS_ADDR) {
for (i = 0; i < iswap32(spcl.c_count); i++)
if (spcl.c_addr[i] != 0)
blks++;
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Jun 5 10:58:28 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1680 - #1682 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 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.89 src/doc/CHANGES-8.3:1.1.2.90 --- src/doc/CHANGES-8.3:1.1.2.89 Wed May 19 17:21:13 2021 +++ src/doc/CHANGES-8.3 Sat Jun 5 10:58:28 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.89 2021/05/19 17:21:13 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.90 2021/06/05 10:58:28 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1932,3 +1932,20 @@ xsrc/external/mit/libX11/dist/src/xlibi1 Reject string longer than USHRT_MAX before sending them on the wire. Fix out-of-bound access in KeySymToUcs4(). [mrg, ticket #1679] + +sys/arch/hp300/conf/INSTALL 1.67,1.68 + + Add missing 'nhpib at intio' for internal HP-IB. + Reduce maxusers to 8 (same as GENERIC). + [tsutsui, ticket #1680] + +distrib/miniroot/install.sub 1.60 + + Handle recent ifconfig(8) output in the miniroot installation script. + [tsutsui, ticket #1681] + +sys/dev/pci/if_iwmreg.h1.8 + + iwm(4): fix various bit declarations - use unsigned for 2^32. + [nia, ticket #1682] +
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Jun 5 10:57:11 UTC 2021
Modified Files:
src/sys/dev/pci [netbsd-8]: if_iwmreg.h
Log Message:
Pull up following revision(s) (requested by nia in ticket #1682):
sys/dev/pci/if_iwmreg.h: revision 1.8
Can't left shift a signed int by 31. Found by kubsan.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.6.1 src/sys/dev/pci/if_iwmreg.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/dev/pci/if_iwmreg.h
diff -u src/sys/dev/pci/if_iwmreg.h:1.6 src/sys/dev/pci/if_iwmreg.h:1.6.6.1
--- src/sys/dev/pci/if_iwmreg.h:1.6 Tue Mar 14 23:59:26 2017
+++ src/sys/dev/pci/if_iwmreg.h Sat Jun 5 10:57:11 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwmreg.h,v 1.6 2017/03/14 23:59:26 nonaka Exp $ */
+/* $NetBSD: if_iwmreg.h,v 1.6.6.1 2021/06/05 10:57:11 martin Exp $ */
/* OpenBSD: if_iwmreg.h,v 1.19 2016/09/20 11:46:09 stsp Exp */
/*-
@@ -191,7 +191,7 @@
/* interrupt flags in INTA, set by uCode or hardware (e.g. dma),
* acknowledged (reset) by host writing "1" to flagged bits. */
-#define IWM_CSR_INT_BIT_FH_RX (1 << 31) /* Rx DMA, cmd responses, FH_INT[17:16] */
+#define IWM_CSR_INT_BIT_FH_RX (1U << 31) /* Rx DMA, cmd responses, FH_INT[17:16] */
#define IWM_CSR_INT_BIT_HW_ERR (1 << 29) /* DMA hardware error FH_INT[31] */
#define IWM_CSR_INT_BIT_RX_PERIODIC (1 << 28) /* Rx periodic */
#define IWM_CSR_INT_BIT_FH_TX (1 << 27) /* Tx DMA FH_INT[1:0] */
@@ -214,7 +214,7 @@
IWM_CSR_INT_BIT_RX_PERIODIC)
/* interrupt flags in FH (flow handler) (PCI busmaster DMA) */
-#define IWM_CSR_FH_INT_BIT_ERR (1 << 31) /* Error */
+#define IWM_CSR_FH_INT_BIT_ERR (1U << 31) /* Error */
#define IWM_CSR_FH_INT_BIT_HI_PRIOR (1 << 30) /* High priority Rx, bypass coalescing */
#define IWM_CSR_FH_INT_BIT_RX_CHNL1 (1 << 17) /* Rx channel 1 */
#define IWM_CSR_FH_INT_BIT_RX_CHNL0 (1 << 16) /* Rx channel 0 */
@@ -405,7 +405,7 @@
#define IWM_CSR_DBG_HPET_MEM_REG_VAL (0x)
/* DRAM INT TABLE */
-#define IWM_CSR_DRAM_INT_TBL_ENABLE (1 << 31)
+#define IWM_CSR_DRAM_INT_TBL_ENABLE (1U << 31)
#define IWM_CSR_DRAM_INIT_TBL_WRITE_POINTER (1 << 28)
#define IWM_CSR_DRAM_INIT_TBL_WRAP_CHECK (1 << 27)
@@ -558,7 +558,7 @@ enum iwm_secure_load_status_reg {
#define IWM_HOST_INT_TIMEOUT_MAX (0xFF)
#define IWM_HOST_INT_TIMEOUT_DEF (0x40)
#define IWM_HOST_INT_TIMEOUT_MIN (0x0)
-#define IWM_HOST_INT_OPER_MODE (1 << 31)
+#define IWM_HOST_INT_OPER_MODE (1U << 31)
/*
*7000/3000 series SHR DTS addresses *
@@ -643,7 +643,7 @@ enum iwm_ucode_tlv_flag {
IWM_UCODE_TLV_FLAGS_P2P_PS_UAPSD = (1 << 26),
IWM_UCODE_TLV_FLAGS_BCAST_FILTERING = (1 << 29),
IWM_UCODE_TLV_FLAGS_GO_UAPSD = (1 << 30),
- IWM_UCODE_TLV_FLAGS_LTE_COEX = (1 << 31),
+ IWM_UCODE_TLV_FLAGS_LTE_COEX = (1U << 31),
};
#define IWM_UCODE_TLV_FLAG_BITS \
"\020\1PAN\2NEWSCAN\3MFP\4P2P\5DW_BC_TABLE\6NEWBT_COEX\7PM_CMD\10SHORT_BL\11RX_ENERGY\12TIME_EVENT_V2\13D3_6_IPV6\14BF_UPDATED\15NO_BASIC_SSID\17D3_CONTINUITY\20NEW_NSOFFL_S\21NEW_NSOFFL_L\22SCHED_SCAN\24STA_KEY_CMD\25DEVICE_PS_CMD\26P2P_PS\27P2P_PS_DCM\30P2P_PS_SCM\31UAPSD_SUPPORT\32EBS\33P2P_PS_UAPSD\36BCAST_FILTERING\37GO_UAPSD\40LTE_COEX"
@@ -4369,7 +4369,7 @@ enum iwm_tx_flags {
IWM_TX_CMD_FLG_FW_DROP = (1 << 26),
IWM_TX_CMD_FLG_EXEC_PAPD = (1 << 27),
IWM_TX_CMD_FLG_PAPD_TYPE = (1 << 28),
- IWM_TX_CMD_FLG_HCCA_CHUNK = (1 << 31)
+ IWM_TX_CMD_FLG_HCCA_CHUNK = (1U << 31)
}; /* IWM_TX_FLAGS_BITS_API_S_VER_1 */
/**
CVS commit: [netbsd-8] src/distrib/miniroot
Module Name:src
Committed By: martin
Date: Sat Jun 5 10:41:20 UTC 2021
Modified Files:
src/distrib/miniroot [netbsd-8]: install.sub
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1681):
distrib/miniroot/install.sub: revision 1.60
Handle recent ifconfig(8) outputs in the miniroot installation script.
- Remove netmask slash notation for IP addresses,
which has been changed between NetBSD 7.x and 8.0:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sbin/ifconfig/af_inet.c#rev1.24
- Ignore inet6 entries, which miniroot scripts don't support
Should be pulled up to netbsd-9 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.45.56.2 -r1.45.56.3 src/distrib/miniroot/install.sub
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.45.56.2 src/distrib/miniroot/install.sub:1.45.56.3
--- src/distrib/miniroot/install.sub:1.45.56.2 Sat Dec 19 19:02:52 2020
+++ src/distrib/miniroot/install.sub Sat Jun 5 10:41:20 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.45.56.2 2020/12/19 19:02:52 martin Exp $
+# $NetBSD: install.sub,v 1.45.56.3 2021/06/05 10:41:20 martin Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -403,8 +403,9 @@ configure_ifs() {
fi
set -- $(ifconfig $_interface_name | sed -n '
- /^[ ]*inet/{
+ /^[ ]*inet /{
s/inet//
+ s,/[0-9]*,,
s/--> [0-9.][0-9.]*//
s/netmask//
s/broadcast//
CVS commit: [netbsd-8] src/sys/arch/hp300/conf
Module Name:src Committed By: martin Date: Sat Jun 5 10:37:10 UTC 2021 Modified Files: src/sys/arch/hp300/conf [netbsd-8]: INSTALL Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1680): sys/arch/hp300/conf/INSTALL: revision 1.67 sys/arch/hp300/conf/INSTALL: revision 1.68 Add missed 'nhpib at intio' for internal HP-IB. Found on testing HPDisk. Also fix comments for HP-IB devices. Should be pulled up to netbsd-8 and netbsd-9. Reduce maxusers to 8 as GENERIC. Should be pulled up to netbsd-9 and netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.60.12.1 src/sys/arch/hp300/conf/INSTALL 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/hp300/conf/INSTALL diff -u src/sys/arch/hp300/conf/INSTALL:1.60 src/sys/arch/hp300/conf/INSTALL:1.60.12.1 --- src/sys/arch/hp300/conf/INSTALL:1.60 Sat Aug 23 20:26:58 2014 +++ src/sys/arch/hp300/conf/INSTALL Sat Jun 5 10:37:10 2021 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.60 2014/08/23 20:26:58 dholland Exp $ +# $NetBSD: INSTALL,v 1.60.12.1 2021/06/05 10:37:10 martin Exp $ # # INSTALL machine description file # @@ -39,7 +39,7 @@ options HP433 options FPSP # floating point interface for 68040 # Need to set locally -maxusers 32 +maxusers 8 # Standard system options #options COMPAT_43 # compatibility with 4.3BSD interfaces @@ -202,10 +202,11 @@ dcm* at dio? scode ? flags 0xe # DCM 4- le* at dio? scode ? # LANCE ethernet interfaces -nhpib0 at dio? scode 7 # slow internal HP-IB +nhpib* at intio? # internal HP-IB +nhpib0 at dio? scode 7 # 98624A HP-IB nhpib* at dio? scode ? -fhpib* at dio? scode ? # `fast' HP-IB +fhpib* at dio? scode ? # 98625A/98625B HP-IB hpibbus0 at nhpib0 hpibbus* at nhpib?
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed May 19 17:21:13 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1679 To generate a diff of this commit: cvs rdiff -u -r1.1.2.88 -r1.1.2.89 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.88 src/doc/CHANGES-8.3:1.1.2.89 --- src/doc/CHANGES-8.3:1.1.2.88 Fri May 7 17:48:47 2021 +++ src/doc/CHANGES-8.3 Wed May 19 17:21:13 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.88 2021/05/07 17:48:47 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.89 2021/05/19 17:21:13 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1914,3 +1914,21 @@ usr.sbin/installboot/machines.c 1.41,1 Avoid depending on common symbols. [mrg, ticket #1678] +xsrc/external/mit/libX11/dist/src/Font.c (apply patch) +xsrc/external/mit/libX11/dist/src/FontInfo.c (apply patch) +xsrc/external/mit/libX11/dist/src/FontNames.c (apply patch) +xsrc/external/mit/libX11/dist/src/GetColor.c (apply patch) +xsrc/external/mit/libX11/dist/src/LoadFont.c (apply patch) +xsrc/external/mit/libX11/dist/src/LookupCol.c (apply patch) +xsrc/external/mit/libX11/dist/src/ParseCol.c (apply patch) +xsrc/external/mit/libX11/dist/src/QuExt.c (apply patch) +xsrc/external/mit/libX11/dist/src/SetFPath.c (apply patch) +xsrc/external/mit/libX11/dist/src/SetHints.c (apply patch) +xsrc/external/mit/libX11/dist/src/StNColor.c (apply patch) +xsrc/external/mit/libX11/dist/src/StName.c (apply patch) +xsrc/external/mit/libX11/dist/src/xlibi18n/imKStoUCS.c (apply patch) + + Apply upstream fixes for CVE-2021-31535 (and one other bug). + Reject string longer than USHRT_MAX before sending them on the wire. + Fix out-of-bound access in KeySymToUcs4(). + [mrg, ticket #1679]
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri May 7 17:48:48 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1678 To generate a diff of this commit: cvs rdiff -u -r1.1.2.87 -r1.1.2.88 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.87 src/doc/CHANGES-8.3:1.1.2.88 --- src/doc/CHANGES-8.3:1.1.2.87 Mon May 3 09:16:00 2021 +++ src/doc/CHANGES-8.3 Fri May 7 17:48:47 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.87 2021/05/03 09:16:00 bouyer Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.88 2021/05/07 17:48:47 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1898,3 +1898,19 @@ sys/kern/kern_exec.c1.505 via patch Fix copy&pasto in handling of POSIX_SPAWN_RESETIDS in posix_spawn(3) [martin, ticket #1677] +bin/pax/extern.h1.60 +bin/pax/options.c1.119 +sbin/newfs_udf/newfs_udf.h 1.7 (patch) +sbin/newfs_udf/udf_create.c 1.27 (patch) +usr.bin/config/defs.h1.106 +usr.bin/config/main.c1.100 +usr.bin/config/scan.l1.32 +usr.bin/make/main.c1.274 +usr.bin/make/make.h1.105 +usr.sbin/installboot/Makefile 1.53,1.54 +usr.sbin/installboot/installboot.h 1.41 +usr.sbin/installboot/machines.c 1.41,1.42 + + Avoid depending on common symbols. + [mrg, ticket #1678] +
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Fri May 7 17:40:31 UTC 2021
Modified Files:
src/bin/pax [netbsd-8]: extern.h options.c
src/sbin/newfs_udf [netbsd-8]: newfs_udf.h udf_create.c
src/usr.bin/config [netbsd-8]: defs.h main.c scan.l
src/usr.bin/make [netbsd-8]: main.c make.h
src/usr.sbin/installboot [netbsd-8]: Makefile installboot.h machines.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1678):
bin/pax/options.c: revision 1.119
usr.bin/config/scan.l: revision 1.32
usr.bin/make/main.c: revision 1.274
bin/pax/extern.h: revision 1.60
usr.bin/config/defs.h: revision 1.106
usr.bin/make/make.h: revision 1.105
sbin/newfs_udf/udf_create.c: revision 1.27 (patch)
sbin/newfs_udf/newfs_udf.h: revision 1.7 (patch)
usr.bin/config/main.c: revision 1.100
usr.sbin/installboot/Makefile: revisions 1.53,1.54 (patch)
usr.sbin/installboot/installboot.h: revision 1.41 (patch)
usr.sbin/installboot/machines.c: revisisons 1.41,1.42 (patch)
Avoid depending on common symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.26.1 src/bin/pax/extern.h
cvs rdiff -u -r1.118 -r1.118.8.1 src/bin/pax/options.c
cvs rdiff -u -r1.5 -r1.5.22.1 src/sbin/newfs_udf/newfs_udf.h
cvs rdiff -u -r1.25 -r1.25.8.1 src/sbin/newfs_udf/udf_create.c
cvs rdiff -u -r1.98.6.1 -r1.98.6.2 src/usr.bin/config/defs.h
cvs rdiff -u -r1.91 -r1.91.6.1 src/usr.bin/config/main.c
cvs rdiff -u -r1.26 -r1.26.6.1 src/usr.bin/config/scan.l
cvs rdiff -u -r1.265.2.1 -r1.265.2.2 src/usr.bin/make/main.c
cvs rdiff -u -r1.102 -r1.102.6.1 src/usr.bin/make/make.h
cvs rdiff -u -r1.51 -r1.51.6.1 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.39 -r1.39.18.1 src/usr.sbin/installboot/installboot.h \
src/usr.sbin/installboot/machines.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/extern.h
diff -u src/bin/pax/extern.h:1.59 src/bin/pax/extern.h:1.59.26.1
--- src/bin/pax/extern.h:1.59 Thu Aug 9 08:09:21 2012
+++ src/bin/pax/extern.h Fri May 7 17:40:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.59 2012/08/09 08:09:21 christos Exp $ */
+/* $NetBSD: extern.h,v 1.59.26.1 2021/05/07 17:40:31 martin Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -204,9 +204,8 @@ void options(int, char **);
OPLIST * opt_next(void);
int bad_opt(void);
int mkpath(char *);
-char *chdname;
#if !HAVE_NBTOOL_CONFIG_H
-int do_chroot;
+extern int do_chroot;
#endif
/*
Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.118 src/bin/pax/options.c:1.118.8.1
--- src/bin/pax/options.c:1.118 Sat Dec 19 18:45:52 2015
+++ src/bin/pax/options.c Fri May 7 17:40:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.118 2015/12/19 18:45:52 christos Exp $ */
+/* $NetBSD: options.c,v 1.118.8.1 2021/05/07 17:40:31 martin Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: options.c,v 1.118 2015/12/19 18:45:52 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.118.8.1 2021/05/07 17:40:31 martin Exp $");
#endif
#endif /* not lint */
@@ -74,6 +74,11 @@ __RCSID("$NetBSD: options.c,v 1.118 2015
#include "mtree.h"
#endif /* SMALL */
+char *chdname;
+#if !HAVE_NBTOOL_CONFIG_H
+int do_chroot;
+#endif
+
/*
* Routines which handle command line options
*/
Index: src/sbin/newfs_udf/newfs_udf.h
diff -u src/sbin/newfs_udf/newfs_udf.h:1.5 src/sbin/newfs_udf/newfs_udf.h:1.5.22.1
--- src/sbin/newfs_udf/newfs_udf.h:1.5 Fri Aug 9 15:11:08 2013
+++ src/sbin/newfs_udf/newfs_udf.h Fri May 7 17:40:31 2021
@@ -52,10 +52,6 @@ extern int meta_perc;
extern float meta_fract;
-/* shared structure between udf_create.c users */
-struct udf_create_context context;
-struct udf_disclayout layout;
-
/* prototypes */
int udf_write_sector(void *sector, uint64_t location);
int udf_update_trackinfo(struct mmc_discinfo *di, struct mmc_trackinfo *ti);
Index: src/sbin/newfs_udf/udf_create.c
diff -u src/sbin/newfs_udf/udf_create.c:1.25 src/sbin/newfs_udf/udf_create.c:1.25.8.1
--- src/sbin/newfs_udf/udf_create.c:1.25 Tue Jun 16 23:18:55 2015
+++ src/sbin/newfs_udf/udf_create.c Fri May 7 17:40:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.c,v 1.25 2015/06/16 23:18:55 christos Exp $ */
+/* $NetBSD: udf_create.c,v 1.25.8.1 2021/05/07 17:40:31 martin Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include
-__RCSID("$NetBSD: udf_create.c,v 1.25 2015/06/16 23:18:55 christos Exp $");
+__RCSID("$NetBSD: udf_create.c,v 1.25.8.1 2021/05/07 17:40:31 martin Exp $");
#include
#include
@@ -52,6 +52,10 @@ __RCSID("$NetBSD: udf_create.c,v 1.25 20
# endif
#endif
+/* shared structure between udf_create.c users */
+struct udf_create_context context;
+struct ud
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: bouyer Date: Mon May 3 09:16:00 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: ticket #1677 To generate a diff of this commit: cvs rdiff -u -r1.1.2.86 -r1.1.2.87 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.86 src/doc/CHANGES-8.3:1.1.2.87 --- src/doc/CHANGES-8.3:1.1.2.86 Fri Apr 30 14:28:35 2021 +++ src/doc/CHANGES-8.3 Mon May 3 09:16:00 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.86 2021/04/30 14:28:35 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.87 2021/05/03 09:16:00 bouyer Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1893,3 +1893,8 @@ doc/3RDPARTY (apply patch) Update tzdata to 2021a. [kre, ticket #1676] +sys/kern/kern_exec.c1.505 via patch + + Fix copy&pasto in handling of POSIX_SPAWN_RESETIDS in posix_spawn(3) + [martin, ticket #1677] +
CVS commit: [netbsd-8] src/sys/kern
Module Name:src
Committed By: bouyer
Date: Mon May 3 09:15:31 UTC 2021
Modified Files:
src/sys/kern [netbsd-8]: kern_exec.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #1677):
sys/kern/kern_exec.c: revision 1.505 via patch
Fix copy&pasto in handling of POSIX_SPAWN_RESETIDS in posix_spawn(3)
To generate a diff of this commit:
cvs rdiff -u -r1.442.4.7 -r1.442.4.8 src/sys/kern/kern_exec.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_exec.c
diff -u src/sys/kern/kern_exec.c:1.442.4.7 src/sys/kern/kern_exec.c:1.442.4.8
--- src/sys/kern/kern_exec.c:1.442.4.7 Mon Aug 5 14:47:49 2019
+++ src/sys/kern/kern_exec.c Mon May 3 09:15:30 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.442.4.7 2019/08/05 14:47:49 martin Exp $ */
+/* $NetBSD: kern_exec.c,v 1.442.4.8 2021/05/03 09:15:30 bouyer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.442.4.7 2019/08/05 14:47:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.442.4.8 2021/05/03 09:15:30 bouyer Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -2143,7 +2143,7 @@ spawn_return(void *arg)
/* Reset user ID's */
if (spawn_data->sed_attrs->sa_flags & POSIX_SPAWN_RESETIDS) {
- error = do_setresuid(l, -1,
+ error = do_setresgid(l, -1,
kauth_cred_getgid(l->l_cred), -1,
ID_E_EQ_R | ID_E_EQ_S);
if (error)
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Apr 30 14:28:36 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1674 - #1676 To generate a diff of this commit: cvs rdiff -u -r1.1.2.85 -r1.1.2.86 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.85 src/doc/CHANGES-8.3:1.1.2.86 --- src/doc/CHANGES-8.3:1.1.2.85 Tue Apr 27 19:03:02 2021 +++ src/doc/CHANGES-8.3 Fri Apr 30 14:28:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.85 2021/04/27 19:03:02 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.86 2021/04/30 14:28:35 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1858,3 +1858,38 @@ xsrc/external/mit/xorg-server.old/dist/X Fix CVE-2021-3472 (local privilege escalation). [mrg, ticket #1673] + +distrib/notes/common/netboot 1.39 + + For netboot via DHCP, "next-server" in dhcpd.conf(5) is mandatory. + [tsutsui, ticket #1674] + +sys/arch/xen/x86/xen_ipi.c 1.24 (patch) + + PR 50282: fix build for XEN kernels without DDB. + [kre, ticket #1675] + +external/public-domain/tz/dist/Makefile up to 1.1.1.30 +external/public-domain/tz/dist/NEWS up to 1.1.1.34 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.24 +external/public-domain/tz/dist/africa up to 1.1.1.25 +external/public-domain/tz/dist/asia up to 1.1.1.28 +external/public-domain/tz/dist/australasia up to 1.1.1.21 +external/public-domain/tz/dist/backward up to 1.1.1.12 +external/public-domain/tz/dist/backzone up to 1.1.1.20 +external/public-domain/tz/dist/etcetera up to 1.1.1.5 +external/public-domain/tz/dist/europe up to 1.1.1.30 +external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.15 +external/public-domain/tz/dist/leapseconds up to 1.1.1.18 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.12 +external/public-domain/tz/dist/northamerica up to 1.1.1.27 +external/public-domain/tz/dist/theory.html up to 1.1.1.12 +external/public-domain/tz/dist/version up to 1.1.1.21 +external/public-domain/tz/dist/ziguard.awk up to 1.1.1.6 +external/public-domain/tz/dist/zone.tab up to 1.1.1.19 +external/public-domain/tz/dist/zone1970.tab up to 1.1.1.21 +doc/3RDPARTY (apply patch) + + Update tzdata to 2021a. + [kre, ticket #1676] +
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Fri Apr 30 14:26:39 UTC 2021 Modified Files: src/doc [netbsd-8]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-8]: Makefile NEWS TZDATA_VERSION africa asia australasia backward backzone etcetera europe leap-seconds.list leapseconds leapseconds.awk northamerica theory.html version ziguard.awk zone.tab zone1970.tab Log Message: Pull up the following, requested by kre in ticket #1676: external/public-domain/tz/dist/Makefile up to 1.1.1.30 external/public-domain/tz/dist/NEWS up to 1.1.1.34 external/public-domain/tz/dist/TZDATA_VERSION up to 1.24 external/public-domain/tz/dist/africa up to 1.1.1.25 external/public-domain/tz/dist/asia up to 1.1.1.28 external/public-domain/tz/dist/australasia up to 1.1.1.21 external/public-domain/tz/dist/backward up to 1.1.1.12 external/public-domain/tz/dist/backzone up to 1.1.1.20 external/public-domain/tz/dist/etcetera up to 1.1.1.5 external/public-domain/tz/dist/europe up to 1.1.1.30 external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.15 external/public-domain/tz/dist/leapseconds up to 1.1.1.18 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.12 external/public-domain/tz/dist/northamerica up to 1.1.1.27 external/public-domain/tz/dist/theory.html up to 1.1.1.12 external/public-domain/tz/dist/version up to 1.1.1.21 external/public-domain/tz/dist/ziguard.awk up to 1.1.1.6 external/public-domain/tz/dist/zone.tab up to 1.1.1.19 external/public-domain/tz/dist/zone1970.tab up to 1.1.1.21 doc/3RDPARTY(apply patch) Update from tzdata2020d to tzdata2021a. The significant changes are: Volgograd switched to Moscow time on 2020-12-27 at 02:00. (2020e) South Sudan changes from +03 to +02 on 2021-02-01 at 00:00. (2021a) To generate a diff of this commit: cvs rdiff -u -r1.1444.2.25 -r1.1444.2.26 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.17.4.7 -r1.1.1.17.4.8 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.1.1.18.4.8 -r1.1.1.18.4.9 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.8.4.8 -r1.8.4.9 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.11.4.8 -r1.1.1.11.4.9 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.1.1.16.4.7 -r1.1.1.16.4.8 \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.11.4.7 -r1.1.1.11.4.8 \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.7.4.3 -r1.1.1.7.4.4 \ src/external/public-domain/tz/dist/backward cvs rdiff -u -r1.1.1.11.4.5 -r1.1.1.11.4.6 \ src/external/public-domain/tz/dist/backzone cvs rdiff -u -r1.1.1.2.6.2 -r1.1.1.2.6.3 \ src/external/public-domain/tz/dist/etcetera cvs rdiff -u -r1.1.1.7.4.4 -r1.1.1.7.4.5 \ src/external/public-domain/tz/dist/leap-seconds.list cvs rdiff -u -r1.1.1.8.4.5 -r1.1.1.8.4.6 \ src/external/public-domain/tz/dist/leapseconds cvs rdiff -u -r1.1.1.5.8.4 -r1.1.1.5.8.5 \ src/external/public-domain/tz/dist/leapseconds.awk cvs rdiff -u -r1.1.1.1.2.9 -r1.1.1.1.2.10 \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.5.4.8 -r1.1.1.5.4.9 \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.1.1.1.2.6 -r1.1.1.1.2.7 \ src/external/public-domain/tz/dist/ziguard.awk cvs rdiff -u -r1.1.1.11.4.6 -r1.1.1.11.4.7 \ src/external/public-domain/tz/dist/zone.tab cvs rdiff -u -r1.1.1.13.4.6 -r1.1.1.13.4.7 \ src/external/public-domain/tz/dist/zone1970.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1444.2.25 src/doc/3RDPARTY:1.1444.2.26 --- src/doc/3RDPARTY:1.1444.2.25 Sat Dec 19 13:41:22 2020 +++ src/doc/3RDPARTY Fri Apr 30 14:26:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1444.2.25 2020/12/19 13:41:22 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.1444.2.26 2021/04/30 14:26:38 martin Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1411,8 +1411,8 @@ Notes: Added changes from a5 -> a12 manually. Package: tz -Version: tzcode2017b / tzdata2020d -Current Vers: tzcode2020d / tzdata2020d +Version: tzcode2017b / tzdata2021a +Current Vers: tzcode2021a / tzdata2021a Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/external/public-domain/tz/dist/Makefile diff -u src/external/public-domain/tz/dist/Makefile:1.1.1.17.4.7 src/e
CVS commit: [netbsd-8] src/sys/arch/xen/x86
Module Name:src
Committed By: martin
Date: Fri Apr 30 14:22:24 UTC 2021
Modified Files:
src/sys/arch/xen/x86 [netbsd-8]: xen_ipi.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1675):
sys/arch/xen/x86/xen_ipi.c: revision 1.24 (patch)
make compile without DDB
PR port-xen/50282
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.10.1 src/sys/arch/xen/x86/xen_ipi.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/xen/x86/xen_ipi.c
diff -u src/sys/arch/xen/x86/xen_ipi.c:1.20 src/sys/arch/xen/x86/xen_ipi.c:1.20.10.1
--- src/sys/arch/xen/x86/xen_ipi.c:1.20 Thu Jul 7 06:55:40 2016
+++ src/sys/arch/xen/x86/xen_ipi.c Fri Apr 30 14:22:24 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $ */
+/* $NetBSD: xen_ipi.c,v 1.20.10.1 2021/04/30 14:22:24 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -33,10 +33,12 @@
/*
* Based on: x86/ipi.c
- * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $");
+ * __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20.10.1 2021/04/30 14:22:24 martin Exp $");
*/
-__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v 1.20.10.1 2021/04/30 14:22:24 martin Exp $");
+
+#include "opt_ddb.h"
#include
@@ -59,15 +61,17 @@ __KERNEL_RCSID(0, "$NetBSD: xen_ipi.c,v
#include
#include
+#ifdef DDB
#ifdef __x86_64__
extern void ddb_ipi(struct trapframe);
#else
extern void ddb_ipi(int, struct trapframe);
#endif /* __x86_64__ */
+static void xen_ipi_ddb(struct cpu_info *, struct intrframe *);
+#endif
static void xen_ipi_halt(struct cpu_info *, struct intrframe *);
static void xen_ipi_synch_fpu(struct cpu_info *, struct intrframe *);
-static void xen_ipi_ddb(struct cpu_info *, struct intrframe *);
static void xen_ipi_xcall(struct cpu_info *, struct intrframe *);
static void xen_ipi_hvcb(struct cpu_info *, struct intrframe *);
static void xen_ipi_generic(struct cpu_info *, struct intrframe *);
@@ -76,7 +80,11 @@ static void (*ipifunc[XEN_NIPIS])(struct
{ /* In order of priority (see: xen/include/intrdefs.h */
xen_ipi_halt,
xen_ipi_synch_fpu,
+#ifdef DDB
xen_ipi_ddb,
+#else
+ NULL,
+#endif
xen_ipi_xcall,
xen_ipi_hvcb,
xen_ipi_generic,
@@ -226,6 +234,7 @@ xen_ipi_synch_fpu(struct cpu_info *ci, s
fpusave_cpu(true);
}
+#ifdef DDB
static void
xen_ipi_ddb(struct cpu_info *ci, struct intrframe *intrf)
{
@@ -264,6 +273,7 @@ xen_ipi_ddb(struct cpu_info *ci, struct
ddb_ipi(SEL_KPL, tf);
#endif
}
+#endif /* DDB */
static void
xen_ipi_xcall(struct cpu_info *ci, struct intrframe *intrf)
CVS commit: [netbsd-8] src/distrib/notes/common
Module Name:src
Committed By: martin
Date: Fri Apr 30 13:59:23 UTC 2021
Modified Files:
src/distrib/notes/common [netbsd-8]: netboot
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1674):
distrib/notes/common/netboot: revision 1.39
For netboot via DHCP, "next-server" in dhcpd.conf(5) is mandatory.
Pointed out by Anders Gustafsson on port-hp300@.
https://mail-index.netbsd.org/port-hp300/2021/04/21/msg000201.html
Should be pulled up to netbsd-8 and netbsd-9.
XXX: kernel should use the dhcpd/bootp server address for nfsroot
if the specified next-server (siaddr) is 0.0.0.0?
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.8.1 src/distrib/notes/common/netboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/netboot
diff -u src/distrib/notes/common/netboot:1.36 src/distrib/notes/common/netboot:1.36.8.1
--- src/distrib/notes/common/netboot:1.36 Tue May 19 19:30:27 2015
+++ src/distrib/notes/common/netboot Fri Apr 30 13:59:23 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: netboot,v 1.36 2015/05/19 19:30:27 snj Exp $
+.\" $NetBSD: netboot,v 1.36.8.1 2021/04/30 13:59:23 martin Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -345,16 +345,15 @@ group {
.\}
#
-# If your DHCP server is not your NFS server, supply the
-# address of the NFS server. Since we assume you run everything
-# on one server, this is not needed.
+# The host address of the NFS server. This is mandatory for
+# NetBSD kernels even it's the same host as the DHCP server.
.if \n[macppc] \{\
#
# macppc machines will look for their bootloader,
# ofwboot.xcf, on the next-server as well.
.\}
#
-# next-server server.test.net;
+next-server server.test.net;
}
#you may paste another "host" entry here for additional
#clients on this network
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Apr 27 19:03:03 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1673 To generate a diff of this commit: cvs rdiff -u -r1.1.2.84 -r1.1.2.85 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.84 src/doc/CHANGES-8.3:1.1.2.85 --- src/doc/CHANGES-8.3:1.1.2.84 Mon Apr 26 18:41:05 2021 +++ src/doc/CHANGES-8.3 Tue Apr 27 19:03:02 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.84 2021/04/26 18:41:05 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.85 2021/04/27 19:03:02 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1853,3 +1853,8 @@ sys/arch/arm/include/lock.h 1.36,1.37 ARM: lock and atomic fixes. [skrll, ticket #1672] +xsrc/external/mit/xorg-server/dist/Xi/chgfctl.c (apply patch) +xsrc/external/mit/xorg-server.old/dist/Xi/chgfctl.c (apply patch) + + Fix CVE-2021-3472 (local privilege escalation). + [mrg, ticket #1673]
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Apr 26 18:41:05 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1672 To generate a diff of this commit: cvs rdiff -u -r1.1.2.83 -r1.1.2.84 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.83 src/doc/CHANGES-8.3:1.1.2.84 --- src/doc/CHANGES-8.3:1.1.2.83 Wed Apr 21 17:50:03 2021 +++ src/doc/CHANGES-8.3 Mon Apr 26 18:41:05 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.83 2021/04/21 17:50:03 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.84 2021/04/26 18:41:05 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1845,3 +1845,11 @@ external/bsd/file/dist/magic/magdir/wind Enhance regex portability (by copying over the versions from file 5.40). [mrg, ticket #1671} + +common/lib/libc/arch/arm/atomic/atomic_swap.S 1.15,1.16 +common/lib/libc/arch/arm/atomic/atomic_swap_64.S 1.11 +sys/arch/arm/include/lock.h 1.36,1.37 + + ARM: lock and atomic fixes. + [skrll, ticket #1672] +
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Mon Apr 26 18:39:26 UTC 2021
Modified Files:
src/common/lib/libc/arch/arm/atomic [netbsd-8]: atomic_swap.S
atomic_swap_64.S
src/sys/arch/arm/include [netbsd-8]: lock.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1672):
sys/arch/arm/include/lock.h: revision 1.37
common/lib/libc/arch/arm/atomic/atomic_swap_64.S: revision 1.11
common/lib/libc/arch/arm/atomic/atomic_swap.S: revision 1.15
common/lib/libc/arch/arm/atomic/atomic_swap.S: revision 1.16
sys/arch/arm/include/lock.h: revision 1.36
Fix ARMv8 instructions
Fix __sync_lock_release_4 to actually zeroise the whole 4bytes/32bits.
Trailing whitespace
Change #ifdef FOO to #if defined(FOO). NFCI.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.8.1 \
src/common/lib/libc/arch/arm/atomic/atomic_swap.S
cvs rdiff -u -r1.10 -r1.10.8.1 \
src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S
cvs rdiff -u -r1.32 -r1.32.10.1 src/sys/arch/arm/include/lock.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/atomic/atomic_swap.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.14 src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.14.8.1
--- src/common/lib/libc/arch/arm/atomic/atomic_swap.S:1.14 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/atomic_swap.S Mon Apr 26 18:39:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap.S,v 1.14 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: atomic_swap.S,v 1.14.8.1 2021/04/26 18:39:26 martin Exp $ */
/*-
* Copyright (c) 2007,2012 The NetBSD Foundation, Inc.
@@ -15,7 +15,7 @@
* 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
@@ -92,7 +92,7 @@ ENTRY_NP(__sync_lock_release_4)
#else
mcr p15, 0, r1, c7, c10, 5 /* data memory barrier */
#endif
- strb r1, [r0]
+ str r1, [r0]
RET
END(__sync_lock_release_4)
#endif
Index: src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S
diff -u src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S:1.10 src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S:1.10.8.1
--- src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S:1.10 Sun May 17 20:57:11 2015
+++ src/common/lib/libc/arch/arm/atomic/atomic_swap_64.S Mon Apr 26 18:39:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_swap_64.S,v 1.10 2015/05/17 20:57:11 justin Exp $ */
+/* $NetBSD: atomic_swap_64.S,v 1.10.8.1 2021/04/26 18:39:26 martin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -14,7 +14,7 @@
* 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
Index: src/sys/arch/arm/include/lock.h
diff -u src/sys/arch/arm/include/lock.h:1.32 src/sys/arch/arm/include/lock.h:1.32.10.1
--- src/sys/arch/arm/include/lock.h:1.32 Wed Feb 25 13:52:42 2015
+++ src/sys/arch/arm/include/lock.h Mon Apr 26 18:39:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.32 2015/02/25 13:52:42 joerg Exp $ */
+/* $NetBSD: lock.h,v 1.32.10.1 2021/04/26 18:39:26 martin Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@ __cpu_simple_lock_set(__cpu_simple_lock_
#define mb_memory drain_writebuf /* in cpufunc.h */
#endif
-#ifdef _ARM_ARCH_6
+#if defined(_ARM_ARCH_6)
static __inline unsigned int
__arm_load_exclusive(__cpu_simple_lock_t *__alp)
{
@@ -142,7 +142,7 @@ __swp(int __val, __cpu_simple_lock_t *__
static __inline void
__arm_membar_producer(void)
{
-#ifdef _ARM_ARCH_7
+#if defined(_ARM_ARCH_7)
__asm __volatile("dsb" ::: "memory");
#elif defined(_ARM_ARCH_6)
__asm __volatile("mcr\tp15,0,%0,c7,c10,4" :: "r"(0) : "memory");
@@ -152,7 +152,7 @@ __arm_membar_producer(void)
static __inline void
__arm_membar_consumer(void)
{
-#ifdef _ARM_ARCH_7
+#if defined(_ARM_ARCH_7)
__asm __volatile("dmb" ::: "memory");
#elif defined(_ARM_ARCH_6)
__asm __volatile("mcr\tp15,0,%0,c7,c10,5" :: "r"(0) : "memory");
@@ -171,7 +171,7 @@ __cpu_simple_lock_init(__cpu_simple_lock
static __inline void __unused
__cpu_simple_lock(__cpu_simple_lock_t *
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Apr 21 17:50:03 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1671 To generate a diff of this commit: cvs rdiff -u -r1.1.2.82 -r1.1.2.83 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.82 src/doc/CHANGES-8.3:1.1.2.83 --- src/doc/CHANGES-8.3:1.1.2.82 Tue Apr 6 18:10:43 2021 +++ src/doc/CHANGES-8.3 Wed Apr 21 17:50:03 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.82 2021/04/06 18:10:43 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.83 2021/04/21 17:50:03 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1840,3 +1840,8 @@ bin/ps/print.c 1.133 column header is specified. [simonb, ticket #1669] +external/bsd/file/dist/magic/magdir/python (apply patch) +external/bsd/file/dist/magic/magdir/windows (apply patch) + + Enhance regex portability (by copying over the versions from file 5.40). + [mrg, ticket #1671}
CVS commit: [netbsd-8] src/external/bsd/file/dist/magic/magdir
Module Name:src
Committed By: martin
Date: Wed Apr 21 17:47:40 UTC 2021
Modified Files:
src/external/bsd/file/dist/magic/magdir [netbsd-8]: python windows
Log Message:
Apply patch, requested by mrg in ticket #1671:
external/bsd/file/dist/magic/magdir/python
external/bsd/file/dist/magic/magdir/windows
Enhance regex portability (by copying over the versions from file 5.40).
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9 -r1.1.1.9.2.1 \
src/external/bsd/file/dist/magic/magdir/python
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \
src/external/bsd/file/dist/magic/magdir/windows
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/file/dist/magic/magdir/python
diff -u src/external/bsd/file/dist/magic/magdir/python:1.1.1.9 src/external/bsd/file/dist/magic/magdir/python:1.1.1.9.2.1
--- src/external/bsd/file/dist/magic/magdir/python:1.1.1.9 Wed May 24 23:59:57 2017
+++ src/external/bsd/file/dist/magic/magdir/python Wed Apr 21 17:47:40 2021
@@ -71,7 +71,8 @@
!:mime text/x-python
# def name(args, args):
-0 regex \^(\ |\\t){0,50}def\ {1,50}[a-zA-Z]{1,100}
->&0 regex \ {0,50}\\(([a-zA-Z]|,|\ ){1,255}\\):$ Python script text executable
-!:mime text/x-python
+0 search/8192 def\
+>0 regex \^[[:space:]]{0,50}def\ {1,50}[_a-zA-Z]{1,100}
+>>&0 regex \\(([[:alpha:]*_,\ ]){0,255}\\):$ Python script text executable
!:strength + 15
+!:mime text/x-script.python
Index: src/external/bsd/file/dist/magic/magdir/windows
diff -u src/external/bsd/file/dist/magic/magdir/windows:1.1.1.8 src/external/bsd/file/dist/magic/magdir/windows:1.1.1.8.2.1
--- src/external/bsd/file/dist/magic/magdir/windows:1.1.1.8 Wed May 24 23:59:57 2017
+++ src/external/bsd/file/dist/magic/magdir/windows Wed Apr 21 17:47:40 2021
@@ -299,7 +299,7 @@
# Windows *.INF *.INI files updated by Joerg Jenderek at Apr 2013
# empty ,comment , section
# PR/383: remove unicode BOM because it is not portable across regex impls
-0 regex/s \\`(\\r\\n|;|[[])
+#0 regex/s \\`(\\r\\n|;|[[])
# left bracket in section line
>&0 search/8192 [
# http://en.wikipedia.org/wiki/Autorun.inf
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Apr 6 18:10:43 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1669 To generate a diff of this commit: cvs rdiff -u -r1.1.2.81 -r1.1.2.82 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.81 src/doc/CHANGES-8.3:1.1.2.82 --- src/doc/CHANGES-8.3:1.1.2.81 Sat Mar 27 13:41:50 2021 +++ src/doc/CHANGES-8.3 Tue Apr 6 18:10:43 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.81 2021/03/27 13:41:50 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.82 2021/04/06 18:10:43 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1834,4 +1834,9 @@ testsuite/t18.out 1.1 (patch) Update bozohttpd to 20210227. [mrg, ticket #1668] +bin/ps/print.c 1.133 + + Fix the column width calculation for the lstart column if an empty + column header is specified. + [simonb, ticket #1669]
CVS commit: [netbsd-8] src/bin/ps
Module Name:src
Committed By: martin
Date: Tue Apr 6 18:09:52 UTC 2021
Modified Files:
src/bin/ps [netbsd-8]: print.c
Log Message:
Pull up following revision(s) (requested by simonb in ticket #1669):
bin/ps/print.c: revision 1.133
Fix the column width calculation for the lstart column if an empty
column header is specified.
Fixes bug pointed out by Ted Spradley in
https://mail-index.netbsd.org/netbsd-users/2021/04/05/msg026808.html .
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.127.6.1 src/bin/ps/print.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ps/print.c
diff -u src/bin/ps/print.c:1.127 src/bin/ps/print.c:1.127.6.1
--- src/bin/ps/print.c:1.127 Mon Dec 12 20:35:36 2016
+++ src/bin/ps/print.c Tue Apr 6 18:09:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.127 2016/12/12 20:35:36 christos Exp $ */
+/* $NetBSD: print.c,v 1.127.6.1 2021/04/06 18:09:52 martin Exp $ */
/*
* Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
#if 0
static char sccsid[] = "@(#)print.c 8.6 (Berkeley) 4/16/94";
#else
-__RCSID("$NetBSD: print.c,v 1.127 2016/12/12 20:35:36 christos Exp $");
+__RCSID("$NetBSD: print.c,v 1.127.6.1 2021/04/06 18:09:52 martin Exp $");
#endif
#endif /* not lint */
@@ -810,22 +810,33 @@ lstarted(struct pinfo *pi, VARENT *ve, e
char buf[100];
v = ve->var;
- if (!k->p_uvalid) {
+ startt = k->p_ustart_sec;
+
+ if (mode == WIDTHMODE) {
/*
- * Minimum width is less than header - we don't
- * need to check it every time.
+ * We only need to set the width once, as we assume
+ * that all times are the same length. We do need to
+ * check against the header length as well, as "no
+ * header" mode for this variable will set the field
+ * width to the length of the header anyway (ref: the
+ * P1003.1-2004 comment in findvar()).
+ *
+ * XXX: The hardcoded "STARTED" string. Better or
+ * worse than a "<= 7" or some other arbitary number?
*/
- if (mode == PRINTMODE)
+ if (v->width <= (int)strlen("STARTED")) {
+ (void)strftime(buf, sizeof(buf) -1, "%c",
+ localtime(&startt));
+ strprintorsetwidth(v, buf, mode);
+ }
+ } else {
+ if (!k->p_uvalid) {
(void)printf("%*s", v->width, "-");
- return;
- }
- startt = k->p_ustart_sec;
-
- /* assume all times are the same length */
- if (mode != WIDTHMODE || v->width == 0) {
- (void)strftime(buf, sizeof(buf) -1, "%c",
- localtime(&startt));
- strprintorsetwidth(v, buf, mode);
+ } else {
+ (void)strftime(buf, sizeof(buf) -1, "%c",
+ localtime(&startt));
+ strprintorsetwidth(v, buf, mode);
+ }
}
}
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Mar 27 13:41:50 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1667 and #1668 To generate a diff of this commit: cvs rdiff -u -r1.1.2.80 -r1.1.2.81 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.80 src/doc/CHANGES-8.3:1.1.2.81 --- src/doc/CHANGES-8.3:1.1.2.80 Mon Mar 22 18:08:34 2021 +++ src/doc/CHANGES-8.3 Sat Mar 27 13:41:50 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.80 2021/03/22 18:08:34 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.81 2021/03/27 13:41:50 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1801,3 +1801,37 @@ sys/net/if_l2tp.h1.10 Fix l2tp(4) ioctl type. [knakahara, ticket #1665] +sys/dev/usb/usbdevs1.793 +sys/dev/usb/usbdevs.h(regen) +sys/dev/usb/usbdevs_data.h (regen) + + PR 56056: fix usb device id for BELKIN F5D7050E. + [nia, ticket #1667] + +Makefile 1.30-1.31 (patch) +Makefile.boot 1.7-1.9 (patch) +auth-bozo.c 1.25-1.26 (patch) +bozohttpd.8 1.80-1.87 (patch) +bozohttpd.c 1.114-1.123,1.125-1.128 (patch) +bozohttpd.h 1.61-1.68 (patch) +cgi-bozo.c 1.49-1.53 (patch) +content-bozo.c 1.17-1.20 (patch) +daemon-bozo.c 1-.22 (patch) +dir-index-bozo.c 1.33-1.34 (patch) +main.c1.23-1.27 (patch) +printenv.lua 1.4-1.5 (patch) +ssl-bozo.c 1.27-1.29 (patch) +libbozohttpd/libbozohttpd.3 1.5-1.6 (patch) +small/Makefile 1.4 (patch) +testsuite/Makefile 1.14 (patch) +testsuite/t16.in 1.1 (patch) +testsuite/t16.out 1.1 (patch) +testsuite/t17.in 1.1 (patch) +testsuite/t17.out 1.1 (patch) +testsuite/t18.in 1.1 (patch) +testsuite/t18.out 1.1 (patch) + + Update bozohttpd to 20210227. + [mrg, ticket #1668] + +
CVS commit: [netbsd-8] src/libexec/httpd
Module Name:src
Committed By: martin
Date: Sat Mar 27 13:38:52 UTC 2021
Modified Files:
src/libexec/httpd [netbsd-8]: CHANGES Makefile Makefile.boot
auth-bozo.c bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c
content-bozo.c daemon-bozo.c dir-index-bozo.c main.c printenv.lua
ssl-bozo.c
src/libexec/httpd/libbozohttpd [netbsd-8]: Makefile libbozohttpd.3
src/libexec/httpd/small [netbsd-8]: Makefile
src/libexec/httpd/testsuite [netbsd-8]: Makefile
Added Files:
src/libexec/httpd/testsuite [netbsd-8]: t16.in t16.out t17.in t17.out
t18.in t18.out
Log Message:
Pull up the following via patch, requested by mrg in ticket #1668:
Makefile1.30-1.31
Makefile.boot 1.7-1.9
auth-bozo.c 1.25-1.26
bozohttpd.8 1.80-1.87
bozohttpd.c 1.114-1.123,1.125-1.128
bozohttpd.h 1.61-1.68
cgi-bozo.c 1.49-1.53
content-bozo.c 1.17-1.20
daemon-bozo.c 1-.22
dir-index-bozo.c1.33-1.34
main.c 1.23-1.27
printenv.lua1.4-1.5
ssl-bozo.c 1.27-1.29
libbozohttpd/libbozohttpd.3 1.5-1.6
small/Makefile 1.4
testsuite/Makefile 1.14
testsuite/t16.in1.1
testsuite/t16.out 1.1
testsuite/t17.in1.1
testsuite/t17.out 1.1
testsuite/t18.in1.1
testsuite/t18.out 1.1
Update to bozohttpd 20210227.
changes in bozohttpd 20210227:
o new support for content types: .tar.bz2, .tar.xz, .tar.lz,
.tar.zst, .tbz2, .txz, .tlz, .zipx, .xz, .zst, .sz, .lz, .lzma,
.lzo, .7z, .lzo, .cab, .dmg, .jar, and .rar. should fix
netbsd PR#56026:
MIME type of .tar.xz file on ny{cdn,ftp}.NetBSD.org is invalid
changes in bozohttpd 20210211:
o fix various NULL derefs from malformed headers. mostly from
.
o fix memory leaks in library interface: add bozo_cleanup().
changes in bozohttpd 20201014:
o also set -D_GNU_SOURCE in Makefile.boot. from
hadrien.lac...@posteo.net.
o fix array size botch (assertion, not exploitable.) from
mar...@netbsd.org.
o also match %2F as well as %2f. from l...@vuxu.org.
o many manual and help fixes. clean ups for higher lint levels,
consistency/style clean ups. various option fixes including made
-f imply -b. from for freebsd.
changes in bozohttpd 20200912:
o add .m4a and .m4v file extensions.
changes in bozohttpd 20200820:
o make this work on sun2 by reducing mmap window there.
o fix SSL shutdown sequence. from s...@netbsd.org.
o add readme support to directory indexing. from jmcne...@netbsd.org
o add blocklist(8) support. from jru...@netbsd.org.
To generate a diff of this commit:
cvs rdiff -u -r1.25.4.3 -r1.25.4.4 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.27.2.1 -r1.27.2.2 src/libexec/httpd/Makefile
cvs rdiff -u -r1.6 -r1.6.18.1 src/libexec/httpd/Makefile.boot
cvs rdiff -u -r1.18.8.2 -r1.18.8.3 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.65.4.2 -r1.65.4.3 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.86.4.5 -r1.86.4.6 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.47.4.3 -r1.47.4.4 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.37.4.4 -r1.37.4.5 src/libexec/httpd/cgi-bozo.c
cvs rdiff -u -r1.14.6.1 -r1.14.6.2 src/libexec/httpd/content-bozo.c
cvs rdiff -u -r1.17.8.2 -r1.17.8.3 src/libexec/httpd/daemon-bozo.c
cvs rdiff -u -r1.25.8.2 -r1.25.8.3 src/libexec/httpd/dir-index-bozo.c
cvs rdiff -u -r1.16.6.2 -r1.16.6.3 src/libexec/httpd/main.c
cvs rdiff -u -r1.3 -r1.3.8.1 src/libexec/httpd/printenv.lua
cvs rdiff -u -r1.22.8.2 -r1.22.8.3 src/libexec/httpd/ssl-bozo.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/libexec/httpd/libbozohttpd/Makefile
cvs rdiff -u -r1.4 -r1.4.4.1 src/libexec/httpd/libbozohttpd/libbozohttpd.3
cvs rdiff -u -r1.3 -r1.3.16.1 src/libexec/httpd/small/Makefile
cvs rdiff -u -r1.7.4.2 -r1.7.4.3 src/libexec/httpd/testsuite/Makefile
cvs rdiff -u -r0 -r1.1.2.2 src/libexec/httpd/testsuite/t16.in \
src/libexec/httpd/testsuite/t17.in src/libexec/httpd/testsuite/t18.in
cvs rdiff -u -r0 -r1.1.4.2 src/libexec/httpd/testsuite/t16.out \
src/libexec/httpd/testsuite/t17.out src/libexec/httpd/testsuite/t18.out
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.25.4.3 src/libexec/httpd/CHANGES:1.25.4.4
--- src/libexec/httpd/CHANGES:1.25.4.3 Wed Jun 12 10:
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sat Mar 27 13:10:45 UTC 2021 Modified Files: src/sys/dev/usb [netbsd-8]: usbdevs.h usbdevs_data.h Log Message: Regen for ticket #1667 (BELKIN F5D7050E fix) To generate a diff of this commit: cvs rdiff -u -r1.727.2.6 -r1.727.2.7 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.728.2.6 -r1.728.2.7 src/sys/dev/usb/usbdevs_data.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/dev/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.727.2.6 src/sys/dev/usb/usbdevs.h:1.727.2.7 --- src/sys/dev/usb/usbdevs.h:1.727.2.6 Thu Feb 27 14:34:11 2020 +++ src/sys/dev/usb/usbdevs.h Sat Mar 27 13:10:43 2021 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.727.2.6 2020/02/27 14:34:11 martin Exp $ */ +/* $NetBSD: usbdevs.h,v 1.727.2.7 2021/03/27 13:10:43 martin Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.736.2.6 2020/02/27 14:32:31 martin Exp + * NetBSD: usbdevs,v 1.736.2.7 2021/03/27 13:09:46 martin Exp */ /*- @@ -1087,7 +1087,7 @@ #define USB_PRODUCT_BELKIN_F5D7051 0x7051 /* F5D7051 54g USB Network Adapter */ #define USB_PRODUCT_BELKIN_F5D7050A 0x705a /* F5D705A 54g USB Network Adapter */ #define USB_PRODUCT_BELKIN_F5D7050C 0x705c /* F5D705C 54g USB Network Adapter */ -#define USB_PRODUCT_BELKIN_F5D7050E 0x705c /* F5D705E 54g USB Network Adapter */ +#define USB_PRODUCT_BELKIN_F5D7050E 0x705e /* F5D705E 54g USB Network Adapter */ #define USB_PRODUCT_BELKIN_RT2870_1 0x8053 /* RT2870 */ #define USB_PRODUCT_BELKIN_RT2870_2 0x805c /* RT2870 */ #define USB_PRODUCT_BELKIN_F5D8053V3 0x815c /* F5D8053 v3 */ Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.728.2.6 src/sys/dev/usb/usbdevs_data.h:1.728.2.7 --- src/sys/dev/usb/usbdevs_data.h:1.728.2.6 Thu Feb 27 14:34:11 2020 +++ src/sys/dev/usb/usbdevs_data.h Sat Mar 27 13:10:43 2021 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.728.2.6 2020/02/27 14:34:11 martin Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.728.2.7 2021/03/27 13:10:43 martin Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.736.2.6 2020/02/27 14:32:31 martin Exp + * NetBSD: usbdevs,v 1.736.2.7 2021/03/27 13:09:46 martin Exp */ /*-
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sat Mar 27 13:09:46 UTC 2021 Modified Files: src/sys/dev/usb [netbsd-8]: usbdevs Log Message: Pull up following revision(s) (requested by nia in ticket #1667): sys/dev/usb/usbdevs: revision 1.793 correct usb device id for BELKIN F5D7050E matches freebsd / openbsd (sources of urtw driver), various online sources PR kern/56056 To generate a diff of this commit: cvs rdiff -u -r1.736.2.6 -r1.736.2.7 src/sys/dev/usb/usbdevs 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/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.736.2.6 src/sys/dev/usb/usbdevs:1.736.2.7 --- src/sys/dev/usb/usbdevs:1.736.2.6 Thu Feb 27 14:32:31 2020 +++ src/sys/dev/usb/usbdevs Sat Mar 27 13:09:46 2021 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.736.2.6 2020/02/27 14:32:31 martin Exp $ +$NetBSD: usbdevs,v 1.736.2.7 2021/03/27 13:09:46 martin Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -1080,7 +1080,7 @@ product BELKIN F5D7050 0x7050 F5D7050 5 product BELKIN F5D7051 0x7051 F5D7051 54g USB Network Adapter product BELKIN F5D7050A 0x705a F5D705A 54g USB Network Adapter product BELKIN F5D7050C 0x705c F5D705C 54g USB Network Adapter -product BELKIN F5D7050E 0x705c F5D705E 54g USB Network Adapter +product BELKIN F5D7050E 0x705e F5D705E 54g USB Network Adapter product BELKIN RT2870_1 0x8053 RT2870 product BELKIN RT2870_2 0x805c RT2870 product BELKIN F5D8053V3 0x815c F5D8053 v3
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Mar 22 18:08:34 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1665 To generate a diff of this commit: cvs rdiff -u -r1.1.2.79 -r1.1.2.80 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.79 src/doc/CHANGES-8.3:1.1.2.80 --- src/doc/CHANGES-8.3:1.1.2.79 Thu Mar 11 16:17:46 2021 +++ src/doc/CHANGES-8.3 Mon Mar 22 18:08:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.79 2021/03/11 16:17:46 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.80 2021/03/22 18:08:34 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1796,3 +1796,8 @@ share/man/man4/ixv.41.3, 1.6-1.7 - Fix typo in comment or debug message. [msaitoh, ticket #1663] +sys/net/if_l2tp.h1.10 + + Fix l2tp(4) ioctl type. + [knakahara, ticket #1665] +
CVS commit: [netbsd-8] src/sys/net
Module Name:src
Committed By: martin
Date: Mon Mar 22 18:07:38 UTC 2021
Modified Files:
src/sys/net [netbsd-8]: if_l2tp.h
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1665):
sys/net/if_l2tp.h: revision 1.10
Fix l2tp(4) ioctl type. Pointed out by yamaguchi@n.o, thanks.
XXX pullup-[89]
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.4 -r1.2.2.5 src/sys/net/if_l2tp.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/net/if_l2tp.h
diff -u src/sys/net/if_l2tp.h:1.2.2.4 src/sys/net/if_l2tp.h:1.2.2.5
--- src/sys/net/if_l2tp.h:1.2.2.4 Tue Sep 24 18:27:09 2019
+++ src/sys/net/if_l2tp.h Mon Mar 22 18:07:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_l2tp.h,v 1.2.2.4 2019/09/24 18:27:09 martin Exp $ */
+/* $NetBSD: if_l2tp.h,v 1.2.2.5 2021/03/22 18:07:38 martin Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -44,11 +44,11 @@
#include
#include
-#define SIOCSL2TPSESSION _IOW('i', 151, struct l2tp_req)
-#define SIOCDL2TPSESSION _IOW('i', 152, struct l2tp_req)
-#define SIOCSL2TPCOOKIE _IOW('i', 153, struct l2tp_req)
-#define SIOCDL2TPCOOKIE _IOW('i', 154, struct l2tp_req)
-#define SIOCSL2TPSTATE _IOW('i', 155, struct l2tp_req)
+#define SIOCSL2TPSESSION _IOW('i', 151, struct ifreq)
+#define SIOCDL2TPSESSION _IOW('i', 152, struct ifreq)
+#define SIOCSL2TPCOOKIE _IOW('i', 153, struct ifreq)
+#define SIOCDL2TPCOOKIE _IOW('i', 154, struct ifreq)
+#define SIOCSL2TPSTATE _IOW('i', 155, struct ifreq)
#define SIOCGL2TP SIOCGIFGENERIC
struct l2tp_req {
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Mar 11 16:17:46 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1663 To generate a diff of this commit: cvs rdiff -u -r1.1.2.78 -r1.1.2.79 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.78 src/doc/CHANGES-8.3:1.1.2.79 --- src/doc/CHANGES-8.3:1.1.2.78 Tue Mar 9 16:00:14 2021 +++ src/doc/CHANGES-8.3 Thu Mar 11 16:17:46 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.78 2021/03/09 16:00:14 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.79 2021/03/11 16:17:46 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1771,3 +1771,28 @@ sys/netinet/tcp_timer.c1.96 Avoid information disclosure. [christos, ticket #1662] +sys/dev/pci/ixgbe/ixgbe.c 1.259, 1.278-1.279 +sys/dev/pci/ixgbe/ixgbe.h 1.75 +sys/dev/pci/ixgbe/ixgbe_netbsd.h 1.12 +sys/dev/pci/ixgbe/ixgbe_vf.c 1.24-1.26 +sys/dev/pci/ixgbe/ixgbe_x550.c 1.17 +sys/dev/pci/ixgbe/ixv.c1.155-1.156 +sys/dev/pci/ixgbe/ix_txrx.c 1.64-67 +sys/dev/pci/files.pci1.436 +share/man/man4/ixg.41.13-1.14 +share/man/man4/ixv.41.3, 1.6-1.7 + + - Fix a problem that the RX path stalled when the mbuf cluster is + exhausted. + - Modify some parameters to reduce packet dropping. See also the + manual's OPTIONS section for the detail. + - ixv(4): The max number of queue(pair) is not 7 but 8. Correctly + reset the hardware. + - Add "TX " to "Queue No Descriptor Available" evcnt(9) name to make + it more understandable. + - Fix a bug that some advertise speeds can't be set with + hw.ixgN.advertise_speed if both 2.5G and 5G are set. Fix the error + message, too. + - Fix typo in comment or debug message. + [msaitoh, ticket #1663] +
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Thu Mar 11 16:04:25 UTC 2021 Modified Files: src/share/man/man4 [netbsd-8]: ixg.4 ixv.4 src/sys/dev/pci [netbsd-8]: files.pci src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h ixgbe_netbsd.h ixgbe_vf.c ixgbe_x540.c ixv.c Log Message: Pull up the following (all via patch), requested by msaitoh in ticket #1663: sys/dev/pci/ixgbe/ixgbe.c 1.259, 1.278-1.279 sys/dev/pci/ixgbe/ixgbe.h 1.75 sys/dev/pci/ixgbe/ixgbe_netbsd.h1.12 sys/dev/pci/ixgbe/ixgbe_vf.c1.24-1.26 sys/dev/pci/ixgbe/ixgbe_x550.c 1.17 sys/dev/pci/ixgbe/ixv.c 1.155-1.156 sys/dev/pci/ixgbe/ix_txrx.c 1.64-67 sys/dev/pci/files.pci 1.436 share/man/man4/ixg.41.13-1.14 share/man/man4/ixv.41.3, 1.6-1.7 - Fix a problem that the RX path stalled when the mbuf cluster is exhausted. - Modify some parameters to reduce packet dropping. See also the manual's OPTIONS section for the detail. - ixv(4): The max number of queue(pair) is not 7 but 8. Correctly reset the hardware. - Add "TX " to "Queue No Descriptor Available" evcnt(9) name to make it more understandable. - Fix a bug that some advertise speeds can't be set with hw.ixgN.advertise_speed if both 2.5G and 5G are set. Fix the error message, too. - Fix typo in comment or debug message. To generate a diff of this commit: cvs rdiff -u -r1.10.4.1 -r1.10.4.2 src/share/man/man4/ixg.4 cvs rdiff -u -r1.3.2.3 -r1.3.2.4 src/share/man/man4/ixv.4 cvs rdiff -u -r1.388.4.4 -r1.388.4.5 src/sys/dev/pci/files.pci cvs rdiff -u -r1.24.2.20 -r1.24.2.21 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.88.2.42 -r1.88.2.43 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.24.6.20 -r1.24.6.21 src/sys/dev/pci/ixgbe/ixgbe.h cvs rdiff -u -r1.7.6.2 -r1.7.6.3 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h cvs rdiff -u -r1.12.8.5 -r1.12.8.6 src/sys/dev/pci/ixgbe/ixgbe_vf.c cvs rdiff -u -r1.9.6.4 -r1.9.6.5 src/sys/dev/pci/ixgbe/ixgbe_x540.c cvs rdiff -u -r1.56.2.30 -r1.56.2.31 src/sys/dev/pci/ixgbe/ixv.c 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/man4/ixg.4 diff -u src/share/man/man4/ixg.4:1.10.4.1 src/share/man/man4/ixg.4:1.10.4.2 --- src/share/man/man4/ixg.4:1.10.4.1 Sat May 12 10:35:45 2018 +++ src/share/man/man4/ixg.4 Thu Mar 11 16:04:25 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: ixg.4,v 1.10.4.1 2018/05/12 10:35:45 martin Exp $ +.\" $NetBSD: ixg.4,v 1.10.4.2 2021/03/11 16:04:25 martin Exp $ .\" .\" Copyright (c) 2001-2008, Intel Corporation .\" All rights reserved. @@ -33,7 +33,7 @@ .\" .\" $FreeBSD: src/share/man/man4/ixgbe.4,v 1.3 2010/12/19 23:54:31 yongari Exp $ .\" -.Dd May 9, 2018 +.Dd March 9, 2021 .Dt IXG 4 .Os .Sh NAME @@ -83,6 +83,26 @@ go to the Intel support website at: .\" with a supported adapter, email the specific information related to the .\" issue to .\" .Aq freebsd...@mailbox.intel.com . +.Sh OPTIONS +The +.Nm +driver doesn't use the common +.Xr MCLGET 9 +interface and use the driver specific cluster allocation mechanism. +If it's exhausted, the +.Xr evcnt 9 +counter "ixgX qY Rx no jumbo mbuf" is incremented. +If this is observed, +the number can be changed by the following config parameter: +.Bl -tag -width IXGBE_JCLNUM_MULTI -offset 3n +.It Dv IXGBE_JCLNUM_MULTI +The number of RX jumbo buffers (clusters) per queue is calculated by +.Dv IXGBE_JCLNUM_MULTI +* (number of rx descriptors). +The total number of clusters per queue is available via the +.Li hw.ixgN.num_jcl_per_queue +.Xr sysctl 7 . +.El .Sh SEE ALSO .Xr arp 4 , .Xr ixv 4 , Index: src/share/man/man4/ixv.4 diff -u src/share/man/man4/ixv.4:1.3.2.3 src/share/man/man4/ixv.4:1.3.2.4 --- src/share/man/man4/ixv.4:1.3.2.3 Thu Sep 26 18:19:27 2019 +++ src/share/man/man4/ixv.4 Thu Mar 11 16:04:25 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: ixv.4,v 1.3.2.3 2019/09/26 18:19:27 martin Exp $ +.\" $NetBSD: ixv.4,v 1.3.2.4 2021/03/11 16:04:25 martin Exp $ .\" .\" Copyright (c) 2018 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,20 +27,42 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 5, 2019 +.Dd March 9, 2021 .Dt IXV 4 .Os .Sh NAME .Nm ixv -.Nd Intel 10 giabit Ethernet virtual function +.Nd Intel 10 Gigabit Ethernet virtual function .Sh SYNOPSIS .Cd "ixv* at pci? dev ? function ?" .Sh DESCRIPTION The .Nm -driver supports Intel 10 gigabit Ethernet virtual function that 82599 and +driver supports Intel 10 Gigabit Ethernet virtual function that 82599 and newer chips support. -It can be used on a NetBSD guest that the host supports SR-IOV. +It can be
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Mar 9 16:00:14 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1662 To generate a diff of this commit: cvs rdiff -u -r1.1.2.77 -r1.1.2.78 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.77 src/doc/CHANGES-8.3:1.1.2.78 --- src/doc/CHANGES-8.3:1.1.2.77 Sun Mar 7 19:14:54 2021 +++ src/doc/CHANGES-8.3 Tue Mar 9 16:00:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.77 2021/03/07 19:14:54 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.78 2021/03/09 16:00:14 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1764,3 +1764,10 @@ sys/netinet6/ip6_var.h1.88 - replace randomid() by cprng_fast32() [christos, ticket #1661] +sys/netinet/in_var.h1.99,1.102 +sys/netinet/tcp_subr.c1.286 +sys/netinet/tcp_timer.c1.96 + + Avoid information disclosure. + [christos, ticket #1662] +
CVS commit: [netbsd-8] src/sys/netinet
Module Name:src
Committed By: martin
Date: Tue Mar 9 15:56:51 UTC 2021
Modified Files:
src/sys/netinet [netbsd-8]: in_var.h tcp_subr.c tcp_timer.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1662):
sys/netinet/tcp_subr.c: revision 1.286
sys/netinet/tcp_timer.c: revision 1.96
sys/netinet/in_var.h: revision 1.102
sys/netinet/in_var.h: revision 1.99
Don't increment the iss sequence on each connection because it exposes
information (Amit Klein)
Add some randomness to the iss offset
Use a random IPv4 ID because the shuffling algorithm used before could expose
information (Amit Klein)
mv include to the kernel portion
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.95.2.1 src/sys/netinet/in_var.h
cvs rdiff -u -r1.270.6.2 -r1.270.6.3 src/sys/netinet/tcp_subr.c
cvs rdiff -u -r1.91.8.1 -r1.91.8.2 src/sys/netinet/tcp_timer.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/netinet/in_var.h
diff -u src/sys/netinet/in_var.h:1.95 src/sys/netinet/in_var.h:1.95.2.1
--- src/sys/netinet/in_var.h:1.95 Fri May 12 17:53:54 2017
+++ src/sys/netinet/in_var.h Tue Mar 9 15:56:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: in_var.h,v 1.95 2017/05/12 17:53:54 ryo Exp $ */
+/* $NetBSD: in_var.h,v 1.95.2.1 2021/03/09 15:56:51 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -374,6 +374,7 @@ struct in_multi {
#ifdef _KERNEL
#include
+#include
extern pktqueue_t *ip_pktq;
@@ -450,7 +451,8 @@ ip_newid_range(const struct in_ifaddr *i
if (ip_do_randomid) {
/* XXX ignore num */
- return ip_randomid(ip_ids, ia ? ia->ia_idsalt : 0);
+ id = (uint16_t)cprng_fast32();
+ return id ? id : 1;
}
/* Never allow an IP ID of 0 (detect wrap). */
Index: src/sys/netinet/tcp_subr.c
diff -u src/sys/netinet/tcp_subr.c:1.270.6.2 src/sys/netinet/tcp_subr.c:1.270.6.3
--- src/sys/netinet/tcp_subr.c:1.270.6.2 Sun Mar 7 19:13:24 2021
+++ src/sys/netinet/tcp_subr.c Tue Mar 9 15:56:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_subr.c,v 1.270.6.2 2021/03/07 19:13:24 martin Exp $ */
+/* $NetBSD: tcp_subr.c,v 1.270.6.3 2021/03/09 15:56:51 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.270.6.2 2021/03/07 19:13:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.270.6.3 2021/03/09 15:56:51 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2301,7 +2301,6 @@ tcp_new_iss1(void *laddr, void *faddr, u
* XXX Use `addin'?
* XXX TCP_ISSINCR too large to use?
*/
- tcp_iss_seq += TCP_ISSINCR;
#ifdef TCPISS_DEBUG
printf("ISS hash 0x%08x, ", tcp_iss);
#endif
@@ -2337,7 +2336,6 @@ tcp_new_iss1(void *laddr, void *faddr, u
} else {
tcp_iss &= TCP_ISS_RANDOM_MASK;
tcp_iss += tcp_iss_seq;
- tcp_iss_seq += TCP_ISSINCR;
#ifdef TCPISS_DEBUG
printf("ISS %08x\n", tcp_iss);
#endif
Index: src/sys/netinet/tcp_timer.c
diff -u src/sys/netinet/tcp_timer.c:1.91.8.1 src/sys/netinet/tcp_timer.c:1.91.8.2
--- src/sys/netinet/tcp_timer.c:1.91.8.1 Sat Feb 3 22:07:26 2018
+++ src/sys/netinet/tcp_timer.c Tue Mar 9 15:56:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_timer.c,v 1.91.8.1 2018/02/03 22:07:26 snj Exp $ */
+/* $NetBSD: tcp_timer.c,v 1.91.8.2 2021/03/09 15:56:51 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -93,7 +93,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.91.8.1 2018/02/03 22:07:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,v 1.91.8.2 2021/03/09 15:56:51 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -111,6 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: tcp_timer.c,
#include
#include
#include
+#include
#include
@@ -261,7 +262,7 @@ tcp_slowtimo_work(struct work *wk, void
{
mutex_enter(softnet_lock);
- tcp_iss_seq += TCP_ISSINCR; /* increment iss */
+ tcp_iss_seq += TCP_ISSINCR + (TCP_ISS_RANDOM_MASK & cprng_fast32());
tcp_now++; /* for timestamps */
mutex_exit(softnet_lock);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Mar 7 19:14:55 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1661 To generate a diff of this commit: cvs rdiff -u -r1.1.2.76 -r1.1.2.77 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.76 src/doc/CHANGES-8.3:1.1.2.77 --- src/doc/CHANGES-8.3:1.1.2.76 Fri Feb 26 13:33:07 2021 +++ src/doc/CHANGES-8.3 Sun Mar 7 19:14:54 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.76 2021/02/26 13:33:07 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.77 2021/03/07 19:14:54 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1751,3 +1751,16 @@ usr.bin/patch/patch.c1.30 patch(1): make '-V none' work. [nia, ticket #1660] +sys/netinet/ip6.h1.30 +sys/netinet/ip_input.c1.400 +sys/netinet/tcp_subr.c1.285 +sys/netinet6/ip6_id.c1.19-1.21 +sys/netinet6/ip6_var.h1.88 + + netinet: + - enable random IP fragment ids by default + - enable RFC 1948 pseudorandom TCP ISS selection by default. + netinet6: + - replace randomid() by cprng_fast32() + [christos, ticket #1661] +
CVS commit: [netbsd-8] src/sys
Module Name:src Committed By: martin Date: Sun Mar 7 19:13:24 UTC 2021 Modified Files: src/sys/netinet [netbsd-8]: ip6.h ip_input.c tcp_subr.c src/sys/netinet6 [netbsd-8]: ip6_id.c ip6_var.h Log Message: Pull up following revision(s) (requested by christos in ticket #1661): sys/netinet6/ip6_id.c: revision 1.19-1.21 sys/netinet6/ip6_var.h: revision 1.88 sys/netinet/ip_input.c: revision 1.400 sys/netinet/tcp_subr.c: revision 1.285 sys/netinet/ip6.h: revision 1.30 netinet: Enable random IP fragment ids by default (from riastradh) netinet: Enable RFC 1948 pseudorandom TCP ISS selection by default. (from riastradh) netinet6: Mark randomid unused. Will make merging and bisection easier if anything goes wrong with flow label or fragment id randomization changes. (from riastradh) netinet/netinet6: Add necessary includes to make these standalone. (from riastradh) Replace randomid() by cprng_fast32() To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.90.1 src/sys/netinet/ip6.h cvs rdiff -u -r1.355.2.8 -r1.355.2.9 src/sys/netinet/ip_input.c cvs rdiff -u -r1.270.6.1 -r1.270.6.2 src/sys/netinet/tcp_subr.c cvs rdiff -u -r1.18 -r1.18.10.1 src/sys/netinet6/ip6_id.c cvs rdiff -u -r1.74.6.3 -r1.74.6.4 src/sys/netinet6/ip6_var.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/netinet/ip6.h diff -u src/sys/netinet/ip6.h:1.23 src/sys/netinet/ip6.h:1.23.90.1 --- src/sys/netinet/ip6.h:1.23 Tue Dec 25 18:33:46 2007 +++ src/sys/netinet/ip6.h Sun Mar 7 19:13:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6.h,v 1.23 2007/12/25 18:33:46 perry Exp $ */ +/* $NetBSD: ip6.h,v 1.23.90.1 2021/03/07 19:13:24 martin Exp $ */ /* $KAME: ip6.h,v 1.45 2003/06/05 04:46:38 keiichi Exp $ */ /* @@ -64,6 +64,11 @@ #ifndef _NETINET_IP6_H_ #define _NETINET_IP6_H_ +#include +#include + +#include + /* * Definition for internet protocol version 6. * RFC 2460 Index: src/sys/netinet/ip_input.c diff -u src/sys/netinet/ip_input.c:1.355.2.8 src/sys/netinet/ip_input.c:1.355.2.9 --- src/sys/netinet/ip_input.c:1.355.2.8 Tue Sep 24 18:27:10 2019 +++ src/sys/netinet/ip_input.c Sun Mar 7 19:13:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.355.2.8 2019/09/24 18:27:10 martin Exp $ */ +/* $NetBSD: ip_input.c,v 1.355.2.9 2021/03/07 19:13:24 martin Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.355.2.8 2019/09/24 18:27:10 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.355.2.9 2021/03/07 19:13:24 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -202,7 +202,7 @@ int ip_mtudisc_timeout = IPMTUDISCTIMEOU int ipprintfs = 0; #endif -int ip_do_randomid = 0; +int ip_do_randomid = 1; /* * XXX - Setting ip_checkinterface mostly implements the receive side of Index: src/sys/netinet/tcp_subr.c diff -u src/sys/netinet/tcp_subr.c:1.270.6.1 src/sys/netinet/tcp_subr.c:1.270.6.2 --- src/sys/netinet/tcp_subr.c:1.270.6.1 Sat Feb 3 22:07:26 2018 +++ src/sys/netinet/tcp_subr.c Sun Mar 7 19:13:24 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_subr.c,v 1.270.6.1 2018/02/03 22:07:26 snj Exp $ */ +/* $NetBSD: tcp_subr.c,v 1.270.6.2 2021/03/07 19:13:24 martin Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.270.6.1 2018/02/03 22:07:26 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.270.6.2 2021/03/07 19:13:24 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -169,7 +169,7 @@ int tcp_mssdflt = TCP_MSS; int tcp_minmss = TCP_MINMSS; int tcp_rttdflt = TCPTV_SRTTDFLT / PR_SLOWHZ; int tcp_do_rfc1323 = 1; /* window scaling / timestamps (obsolete) */ -int tcp_do_rfc1948 = 0; /* ISS by cryptographic hash */ +int tcp_do_rfc1948 = 1; /* ISS by cryptographic hash */ int tcp_do_sack = 1; /* selective acknowledgement */ int tcp_do_win_scale = 1; /* RFC1323 window scaling */ int tcp_do_timestamps = 1; /* RFC1323 timestamps */ Index: src/sys/netinet6/ip6_id.c diff -u src/sys/netinet6/ip6_id.c:1.18 src/sys/netinet6/ip6_id.c:1.18.10.1 --- src/sys/netinet6/ip6_id.c:1.18 Fri Aug 7 08:11:33 2015 +++ src/sys/netinet6/ip6_id.c Sun Mar 7 19:13:23 2021 @@ -1,9 +1,7 @@ -/* $NetBSD: ip6_id.c,v 1.18 2015/08/07 08:11:33 ozaki-r Exp $ */ -/* $KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $ */ -/* $OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $ */ +/* $NetBSD: ip6_id.c,v 1.18.10.1 2021/03/07 19:13:23 martin Exp $ */ -/* - * Copyright (C) 2003 WIDE Project. +/*- + * Copyright (c) 2020 The NetBSD Foundation, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -14,241 +12,38 @@ * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of con
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Feb 26 13:33:07 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1660 To generate a diff of this commit: cvs rdiff -u -r1.1.2.75 -r1.1.2.76 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.75 src/doc/CHANGES-8.3:1.1.2.76 --- src/doc/CHANGES-8.3:1.1.2.75 Thu Feb 25 09:39:58 2021 +++ src/doc/CHANGES-8.3 Fri Feb 26 13:33:07 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.75 2021/02/25 09:39:58 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.76 2021/02/26 13:33:07 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1744,3 +1744,10 @@ sys/arch/m68k/m68k/reenter_syscall.s 1. m68k: PR 55990: fix kernel stack overflow panic [tsutsui, ticket #1659] +usr.bin/patch/backupfile.c 1.16 +usr.bin/patch/backupfile.h 1.7 +usr.bin/patch/patch.c1.30 + + patch(1): make '-V none' work. + [nia, ticket #1660] +
CVS commit: [netbsd-8] src/usr.bin/patch
Module Name:src
Committed By: martin
Date: Fri Feb 26 13:32:14 UTC 2021
Modified Files:
src/usr.bin/patch [netbsd-8]: backupfile.c backupfile.h patch.c
Log Message:
Pull up following revision(s) (requested by nia in ticket #1660):
usr.bin/patch/backupfile.c: revision 1.16
usr.bin/patch/backupfile.h: revision 1.7
usr.bin/patch/patch.c: revision 1.30
patch: make '-V none' work in the expected way
Internally the code confuses the concept of "the user doesn't want
a backup file" and "the user hasn't defined a type of backup file".
Introduce a new "undefined" backup type to serve the purpose "none"
previously did, and make "none" not generate backup files, as expected.
http://mail-index.netbsd.org/tech-userlevel/2021/02/19/msg012901.html
XXX pullup?
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.16.1 src/usr.bin/patch/backupfile.c
cvs rdiff -u -r1.6 -r1.6.52.1 src/usr.bin/patch/backupfile.h
cvs rdiff -u -r1.29 -r1.29.34.1 src/usr.bin/patch/patch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/patch/backupfile.c
diff -u src/usr.bin/patch/backupfile.c:1.15 src/usr.bin/patch/backupfile.c:1.15.16.1
--- src/usr.bin/patch/backupfile.c:1.15 Fri Apr 11 17:30:03 2014
+++ src/usr.bin/patch/backupfile.c Fri Feb 26 13:32:14 2021
@@ -1,7 +1,7 @@
/*
* $OpenBSD: backupfile.c,v 1.19 2006/03/11 19:41:30 otto Exp $
* $DragonFly: src/usr.bin/patch/backupfile.c,v 1.5 2008/08/11 00:05:06 joerg Exp $
- * $NetBSD: backupfile.c,v 1.15 2014/04/11 17:30:03 christos Exp $
+ * $NetBSD: backupfile.c,v 1.15.16.1 2021/02/26 13:32:14 martin Exp $
*/
/*
@@ -22,7 +22,7 @@
*/
#include
-__RCSID("$NetBSD: backupfile.c,v 1.15 2014/04/11 17:30:03 christos Exp $");
+__RCSID("$NetBSD: backupfile.c,v 1.15.16.1 2021/02/26 13:32:14 martin Exp $");
#include
#include
@@ -38,7 +38,7 @@ __RCSID("$NetBSD: backupfile.c,v 1.15 20
#define ISDIGIT(c) (isascii ((unsigned char)c) && isdigit ((unsigned char)c))
/* Which type of backup file names are generated. */
-enum backup_type backup_type = none;
+enum backup_type backup_type = undefined;
/*
* The extension added to file names to produce a simple (as opposed to
Index: src/usr.bin/patch/backupfile.h
diff -u src/usr.bin/patch/backupfile.h:1.6 src/usr.bin/patch/backupfile.h:1.6.52.1
--- src/usr.bin/patch/backupfile.h:1.6 Fri Sep 19 18:33:34 2008
+++ src/usr.bin/patch/backupfile.h Fri Feb 26 13:32:14 2021
@@ -1,7 +1,7 @@
/*
* $OpenBSD: backupfile.h,v 1.6 2003/07/28 18:35:36 otto Exp $
* $DragonFly: src/usr.bin/patch/backupfile.h,v 1.3 2007/09/29 23:11:10 swildner Exp $
- * $NetBSD: backupfile.h,v 1.6 2008/09/19 18:33:34 joerg Exp $
+ * $NetBSD: backupfile.h,v 1.6.52.1 2021/02/26 13:32:14 martin Exp $
*/
/*
@@ -19,6 +19,8 @@
/* When to make backup files. */
enum backup_type {
+ undefined,
+
/* Never make backups. */
none,
Index: src/usr.bin/patch/patch.c
diff -u src/usr.bin/patch/patch.c:1.29 src/usr.bin/patch/patch.c:1.29.34.1
--- src/usr.bin/patch/patch.c:1.29 Tue Sep 6 18:25:14 2011
+++ src/usr.bin/patch/patch.c Fri Feb 26 13:32:14 2021
@@ -1,7 +1,7 @@
/*
* $OpenBSD: patch.c,v 1.45 2007/04/18 21:52:24 sobrado Exp $
* $DragonFly: src/usr.bin/patch/patch.c,v 1.10 2008/08/10 23:39:56 joerg Exp $
- * $NetBSD: patch.c,v 1.29 2011/09/06 18:25:14 joerg Exp $
+ * $NetBSD: patch.c,v 1.29.34.1 2021/02/26 13:32:14 martin Exp $
*/
/*
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: patch.c,v 1.29 2011/09/06 18:25:14 joerg Exp $");
+__RCSID("$NetBSD: patch.c,v 1.29.34.1 2021/02/26 13:32:14 martin Exp $");
#include
#include
@@ -197,17 +197,18 @@ main(int argc, char *argv[])
else
simple_backup_suffix = ORIGEXT;
+ if ((v = getenv("PATCH_VERSION_CONTROL")) == NULL)
+ v = getenv("VERSION_CONTROL");
+ if (v != NULL)
+ backup_type = get_version(v);
+
/* parse switches */
Argc = argc;
Argv = argv;
get_some_switches();
- if (backup_type == none) {
- if ((v = getenv("PATCH_VERSION_CONTROL")) == NULL)
- v = getenv("VERSION_CONTROL");
- if (v != NULL || !posix)
- backup_type = get_version(v); /* OK to pass NULL. */
- }
+ if (backup_type == undefined)
+ backup_type = posix ? none : numbered_existing;
/* make sure we clean up /tmp in case of disaster */
set_signals(0);
@@ -493,7 +494,7 @@ get_some_switches(void)
while ((ch = getopt_long(Argc, Argv, options, longopts, NULL)) != -1) {
switch (ch) {
case 'b':
- if (backup_type == none)
+ if (backup_type == undefined)
backup_type = numbered_existing;
if (optarg == NULL)
break;
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Feb 25 09:39:58 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1659 To generate a diff of this commit: cvs rdiff -u -r1.1.2.74 -r1.1.2.75 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.74 src/doc/CHANGES-8.3:1.1.2.75 --- src/doc/CHANGES-8.3:1.1.2.74 Tue Feb 23 18:57:36 2021 +++ src/doc/CHANGES-8.3 Thu Feb 25 09:39:58 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.74 2021/02/23 18:57:36 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.75 2021/02/25 09:39:58 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1739,3 +1739,8 @@ bin/ksh/siglist.sh1.13 PR/56007: ksh unable to execute ERR traps. [christos, ticket #1658] +sys/arch/m68k/m68k/reenter_syscall.s 1.5-1.7 + + m68k: PR 55990: fix kernel stack overflow panic + [tsutsui, ticket #1659] +
CVS commit: [netbsd-8] src/sys/arch/m68k/m68k
Module Name:src
Committed By: martin
Date: Thu Feb 25 09:38:48 UTC 2021
Modified Files:
src/sys/arch/m68k/m68k [netbsd-8]: reenter_syscall.s
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1659):
sys/arch/m68k/m68k/reenter_syscall.s: revision 1.5
sys/arch/m68k/m68k/reenter_syscall.s: revision 1.6
sys/arch/m68k/m68k/reenter_syscall.s: revision 1.7
Replace magic numbers with proper macros prepared in assym.h.
No binary changes.
Note this is a preparation for a possible fix of PR port-m68k/55990.
Consistently use motorola style. No binary changes.
Seems missed in rev 1.3:
https://mail-index.netbsd.org/source-changes/2013/08/01/msg046378.html
Plug kernel stack leaks in reenter_syscall() for setcontext(2).
This fixes long standing kernel crashes (MMU fault, address error,
and silent freeze by a double bus fault etc. seen for ~10 years)
caused by kernel stack overflow, especially on x68k and sun3 running
Xorg based servers. See PR/55990 for more details.
"This change seems perfectly reasonable" from thorpej@ and
jklos@ also reported this also solved freeze of his mac68k system
with 10 megabyes of memory.
Should be pulled up to netbsd-9 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.22.1 src/sys/arch/m68k/m68k/reenter_syscall.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/reenter_syscall.s
diff -u src/sys/arch/m68k/m68k/reenter_syscall.s:1.4 src/sys/arch/m68k/m68k/reenter_syscall.s:1.4.22.1
--- src/sys/arch/m68k/m68k/reenter_syscall.s:1.4 Sat Sep 7 19:06:29 2013
+++ src/sys/arch/m68k/m68k/reenter_syscall.s Thu Feb 25 09:38:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: reenter_syscall.s,v 1.4 2013/09/07 19:06:29 chs Exp $ */
+/* $NetBSD: reenter_syscall.s,v 1.4.22.1 2021/02/25 09:38:48 martin Exp $ */
/*
* Written by ITOH Yasufumi.
@@ -6,6 +6,7 @@
*/
#include
+#include "assym.h"
/*
* void reenter_syscall(struct frame *fp, int stkadj)
@@ -38,18 +39,31 @@ ENTRY_NOPROFILE(reenter_syscall)
.Lcpfr: movel (%a0)+,(%a1)+
dbra %d0,.Lcpfr
- movew %d1,%sp@(16*4+2) | set stack adjust count
+ movew %d1,FR_ADJ(%sp) | set stack adjust count
movel (%sp),-(%sp) | push syscall no (original d0 value)
jbsr _C_LABEL(syscall) | re-enter syscall()
addql #4,%sp | pop syscall no
#ifdef DEBUG
- tstw %sp@(16*4+2) | stack adjust must be zero
+ tstw FR_ADJ(%sp) | stack adjust must be zero
jeq .Ladjzero
PANIC("reenter_syscall")
.Ladjzero:
#endif
- moveal %sp@(15*4),%a0 | grab and restore
+ moveal FR_SP(%sp),%a0 | grab and restore
movel %a0,%usp | user SP
+ movw FR_ADJ(%sp),%d0 | need to adjust stack?
+ jne .Ladjstk | yes, go to it
moveml (%sp)+,#0x7FFF | restore user registers
addql #8,%sp | pop SP and stack adjust
jra _ASM_LABEL(rei) | rte
+.Ladjstk:
+ lea FR_HW(%sp),%a1 | pointer to HW frame
+ addql #8,%a1 | source pointer
+ movl %a1,%a0 | source
+ addw %d0,%a0 | + hole size = dest pointer
+ movl -(%a1),-(%a0) | copy
+ movl -(%a1),-(%a0) | 8 bytes
+ movl %a0,FR_SP(%sp) | new SSP
+ moveml (%sp)+,#0x7FFF | restore user register
+ movl (%sp),%sp | and do real RTE
+ jra _ASM_LABEL(rei) | rte
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Feb 23 18:57:36 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1658 To generate a diff of this commit: cvs rdiff -u -r1.1.2.73 -r1.1.2.74 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.73 src/doc/CHANGES-8.3:1.1.2.74 --- src/doc/CHANGES-8.3:1.1.2.73 Fri Feb 19 17:50:39 2021 +++ src/doc/CHANGES-8.3 Tue Feb 23 18:57:36 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.73 2021/02/19 17:50:39 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.74 2021/02/23 18:57:36 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1734,3 +1734,8 @@ sys/arch/x86/x86/intr.c1.154 (patch) x86: fix pci_intr_disestablish clean up routine. [knakahara, ticket #1657] +bin/ksh/siglist.sh1.13 + + PR/56007: ksh unable to execute ERR traps. + [christos, ticket #1658] +
CVS commit: [netbsd-8] src/bin/ksh
Module Name:src
Committed By: martin
Date: Tue Feb 23 18:56:12 UTC 2021
Modified Files:
src/bin/ksh [netbsd-8]: siglist.sh
Log Message:
Pull up following revision(s) (requested by christos in ticket #1658):
bin/ksh/siglist.sh: revision 1.13
PR/56007: Greg A. Woods: ksh unable to execute ERR traps
(probably since 2016/03/17 - i.e. 8.x and 9.x)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.8.1 src/bin/ksh/siglist.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ksh/siglist.sh
diff -u src/bin/ksh/siglist.sh:1.12 src/bin/ksh/siglist.sh:1.12.8.1
--- src/bin/ksh/siglist.sh:1.12 Thu Mar 17 13:59:02 2016
+++ src/bin/ksh/siglist.sh Tue Feb 23 18:56:12 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: siglist.sh,v 1.12 2016/03/17 13:59:02 christos Exp $
+# $NetBSD: siglist.sh,v 1.12.8.1 2021/02/23 18:56:12 martin Exp $
#
# Script to generate a sorted, complete list of signals, suitable
# for inclusion in trap.c as array initializer.
@@ -21,16 +21,17 @@ CPP="${1-cc -E}"
# The trap here to make up for a bug in bash (1.14.3(1)) that calls the trap
(trap $trapsigs;
echo '#include "sh.h"';
- echo ' { QwErTy SIGNALS , "DUMMY" , "hook for number of signals" },';
+ echo ' { QwErTy /* dummy for sed sillies */ },';
${SED} -e '/^[ ]*#/d' -e 's/^[ ]*\([^ ][^ ]*\)[ ][ ]*\(.*[^ ]\)[ ]*$/#ifdef SIG\1\
{ QwErTy .signal = SIG\1 , .name = "\1", .mess = "\2" },\
#endif/') > $in
-# work around for gcc 5
+echo ' { QwErTy .signal = SIGNALS , .name = "DUMMY", .mess = "hook to expand array to total signals" },' >> $in
+# work around for gcc > 5
$CPP $in | grep -v '^#' | tr -d '\n' | ${SED} 's/},/},\
/g' > $out
${SED} -n 's/{ QwErTy/{/p' < $out | ${AWK} '{print NR, $0}' | sort -k 5n -k 1n |
-${SED} 's/^[0-9]* //' |
-${AWK} 'BEGIN { last=0; nsigs=0; }
+${SED} -E -e 's/^[0-9]* //' -e 's/ +/ /' |
+${AWK} 'BEGIN { last=0; }
{
if ($4 ~ /^[0-9][0-9]*$/ && $5 == ",") {
n = $4;
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Feb 19 17:50:39 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1657 To generate a diff of this commit: cvs rdiff -u -r1.1.2.72 -r1.1.2.73 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.72 src/doc/CHANGES-8.3:1.1.2.73 --- src/doc/CHANGES-8.3:1.1.2.72 Wed Feb 17 09:56:53 2021 +++ src/doc/CHANGES-8.3 Fri Feb 19 17:50:39 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.72 2021/02/17 09:56:53 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.73 2021/02/19 17:50:39 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1729,3 +1729,8 @@ external/mit/xorg/bin/xterm/Makefile 1. for combining characters. [mrg, ticket #1656] +sys/arch/x86/x86/intr.c1.154 (patch) + + x86: fix pci_intr_disestablish clean up routine. + [knakahara, ticket #1657] +
CVS commit: [netbsd-8] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Fri Feb 19 17:49:19 UTC 2021
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: intr.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1657):
sys/arch/x86/x86/intr.c: revision 1.154 (via patch)
Fix x86's pci_intr_disestablish clean up routine. Pointed out by t-kusaba@IIJ,
thanks.
Fix panic on x86 by the following code.
sc_ih = pci_intr_establish_xname(sc_pc, ...);
pci_intr_disestablish(sc_pc, sc_ih);
sc_ih = pci_intr_establish(sc_pc, ...);
ena(4) do such processing when ifconfig down/up.
XXX pullup-8,9
To generate a diff of this commit:
cvs rdiff -u -r1.101.2.7 -r1.101.2.8 src/sys/arch/x86/x86/intr.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/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.101.2.7 src/sys/arch/x86/x86/intr.c:1.101.2.8
--- src/sys/arch/x86/x86/intr.c:1.101.2.7 Thu Nov 14 15:58:06 2019
+++ src/sys/arch/x86/x86/intr.c Fri Feb 19 17:49:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.101.2.7 2019/11/14 15:58:06 martin Exp $ */
+/* $NetBSD: intr.c,v 1.101.2.8 2021/02/19 17:49:19 martin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.101.2.7 2019/11/14 15:58:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.101.2.8 2021/02/19 17:49:19 martin Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -807,6 +807,9 @@ intr_source_free(struct cpu_info *ci, in
ci->ci_isources[slot] = NULL;
if (pic != &i8259_pic)
idt_vec_free(idtvec);
+
+ isp->is_recurse = NULL;
+ isp->is_resume = NULL;
}
#ifdef MULTIPROCESSOR
@@ -1161,12 +1164,12 @@ intr_disestablish_xcall(void *arg1, void
else
(*pic->pic_hwunmask)(pic, ih->ih_pin);
- /* Re-enable interrupts. */
- x86_write_psl(psl);
-
/* If the source is free we can drop it now. */
intr_source_free(ci, ih->ih_slot, pic, idtvec);
+ /* Re-enable interrupts. */
+ x86_write_psl(psl);
+
DPRINTF(("%s: remove slot %d (pic %s pin %d vec %d)\n",
device_xname(ci->ci_dev), ih->ih_slot, pic->pic_name,
ih->ih_pin, idtvec));
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Feb 17 09:56:53 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1655 and #1656 To generate a diff of this commit: cvs rdiff -u -r1.1.2.71 -r1.1.2.72 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.71 src/doc/CHANGES-8.3:1.1.2.72 --- src/doc/CHANGES-8.3:1.1.2.71 Thu Feb 11 13:05:16 2021 +++ src/doc/CHANGES-8.3 Wed Feb 17 09:56:53 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.71 2021/02/11 13:05:16 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.72 2021/02/17 09:56:53 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1577,3 +1577,155 @@ sys/arch/x68k/x68k/machdep.c 1.204 fixing kernel crash dumps for x68k. [tsutsui, ticket #1654] +sys/dev/raidframe/rf_reconstruct.c 1.125 + + raid(4): fix am issue where a RAID reconstruction would also rebuild + the unused end portion of a component. + [oster, ticket #1655] + +xsrc/external/mit/xterm/dist/package/debian/xterm-dev.lintian-overrides up to 1.1.1.1 +xsrc/external/mit/xterm/dist/package/freebsd/distinfo up to 1.1.1.1 +xsrc/external/mit/xterm/dist/package/freebsd/pkg-message.wchar up to 1.1.1.1 +xsrc/external/mit/xterm/dist/package/pkgsrc/Makefile up to 1.1.1.1 +xsrc/external/mit/xterm/dist/package/pkgsrc/DESCRup to 1.1.1.1 +xsrc/external/mit/xterm/dist/package/pkgsrc/distinfo up to 1.1.1.1 +xsrc/external/mit/xterm/dist/package/pkgsrc/PLISTup to 1.1.1.1 +xsrc/external/mit/xterm/dist/package/pkgsrc/options.mk up to 1.1.1.1 +xsrc/external/mit/xterm/dist/vttests/closest-rgb.pl up to 1.1.1.2 +xsrc/external/mit/xterm/dist/vttests/query-status.pl up to 1.1.1.2 +xsrc/external/mit/xterm/dist/vttests/modify-keys.pl up to 1.1.1.1 +xsrc/external/mit/xterm/dist/vttests/mouse-codes up to 1.1.1.1 +xsrc/external/mit/xterm/dist/vttests/other-sgr.shup to 1.1.1.1 +xsrc/external/mit/xterm/dist/vttests/print-vt-chars.pl up to 1.1.1.1 +xsrc/external/mit/xterm/dist/vttests/query-dynamic.pl up to 1.1.1.1 +xsrc/external/mit/xterm/dist/vttests/query-xres.pl up to 1.1.1.1 +xsrc/external/mit/xterm/dist/vttests/report-sgr.pl up to 1.1.1.1 +xsrc/external/mit/xterm/dist/vttests/sgrPushPop.pl up to 1.1.1.1 +xsrc/external/mit/xterm/dist/vttests/sgrPushPop2.pl up to 1.1.1.1 +xsrc/external/mit/xterm/dist/COPYING up to 1.1.1.1 +xsrc/external/mit/xterm/dist/gen-charsets.pl up to 1.1.1.1 +xsrc/external/mit/xterm/include/Tekparse.hin delete +xsrc/external/mit/xterm/include/VTparse.hin delete +xsrc/external/mit/xterm/dist/INSTALL up to 1.1.1.12 +xsrc/external/mit/xterm/dist/Imakefile up to 1.1.1.10 +xsrc/external/mit/xterm/dist/MANIFESTup to 1.1.1.16 +xsrc/external/mit/xterm/dist/Makefile.in up to 1.1.1.13 +xsrc/external/mit/xterm/dist/NEWSup to 1.1.1.3 +xsrc/external/mit/xterm/dist/THANKS up to 1.1.1.9 +xsrc/external/mit/xterm/dist/TekPrsTbl.c up to 1.1.1.2 +xsrc/external/mit/xterm/dist/Tekproc.c up to 1.1.1.14 +xsrc/external/mit/xterm/dist/UXTerm.ad up to 1.1.1.3 +xsrc/external/mit/xterm/dist/VTPrsTbl.c up to 1.1.1.9 +xsrc/external/mit/xterm/dist/VTparse.def up to 1.1.1.8 +xsrc/external/mit/xterm/dist/VTparse.h up to 1.1.1.10 +xsrc/external/mit/xterm/dist/XTerm.adup to 1.11 +xsrc/external/mit/xterm/dist/aclocal.m4 up to 1.1.1.14 +xsrc/external/mit/xterm/dist/button.cup to 1.1.1.16 +xsrc/external/mit/xterm/dist/cachedGCs.c up to 1.1.1.11 +xsrc/external/mit/xterm/dist/charclass.c up to 1.1.1.6 +xsrc/external/mit/xterm/dist/charclass.h up to 1.1.1.3 +xsrc/external/mit/xterm/dist/charproc.c up to 1.1.1.15 +xsrc/external/mit/xterm/dist/charsets.c up to 1.1.1.6 +xsrc/external/mit/xterm/dist/config.guessup to 1.1.1.12 +xsrc/external/mit/xterm/dist/config.sub up to 1.1.1.12 +xsrc/external/mit/xterm/dist/configure up to 1.1.1.14 +xsrc/external/mit/xterm/dist/configure.inup to 1.1.1.13 +xsrc/external/mit/xterm/dist/ctlseqs.ms up to 1.1.1.15 +xsrc/external/mit/xterm/dist/ctlseqs.txt up to 1.1.1.15 +xsrc/external/mit/xterm/dist/cursor.cup to 1.1.1.9 +xsrc/external/mit/xterm/dist/data.c up to 1.1.1.7 +xsrc/external/mit/xterm/dist/data.h up to 1.1.1.10 +xsrc/external/mit/xterm/dist/df-install.in up to 1.1.1.3 +xsrc/external/mit/xterm/dist/doublechr.c up to 1.1.1.9 +xsrc/external/mit/xterm/dist/error.h up to 1.1.1.6 +xsrc/external/mit/xterm/dist/fontutils.c up to 1.8 +xsrc/e
CVS commit: [netbsd-8] src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: martin
Date: Wed Feb 17 09:55:20 UTC 2021
Modified Files:
src/external/mit/xorg/bin/xterm [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1656):
external/mit/xorg/bin/xterm/Makefile: revision 1.20 (patch)
add new files for xterm 366.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.15.8.1 src/external/mit/xorg/bin/xterm/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/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.15 src/external/mit/xorg/bin/xterm/Makefile:1.15.8.1
--- src/external/mit/xorg/bin/xterm/Makefile:1.15 Thu Jul 23 09:37:59 2015
+++ src/external/mit/xorg/bin/xterm/Makefile Wed Feb 17 09:55:20 2021
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.15 2015/07/23 09:37:59 mrg Exp $
+# $NetBSD: Makefile,v 1.15.8.1 2021/02/17 09:55:20 martin Exp $
.include
PROG= xterm
SRCS= button.c charproc.c charsets.c cursor.c data.c doublechr.c \
- fontutils.c input.c linedata.c menu.c misc.c print.c ptydata.c \
- screen.c scrollback.c scrollbar.c tabs.c util.c xstrings.c \
- TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \
- wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c
+ graphics.c graphics_sixel.c fontutils.c input.c linedata.c menu.c \
+ misc.c print.c ptydata.c screen.c scrollback.c scrollbar.c tabs.c \
+ util.c xstrings.c TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c \
+ charclass.c precompose.c wcwidth.c xutf8.c cachedGCs.c xtermcap.c \
+ svg.c html.c version.c
# graphics_regis.c graphics_sixel.c
# xterm.appdata.xml
-CPPFLAGS+= -I${X11SRCDIR.${PROG}} \
+CPPFLAGS+= -I. \
+ -I${X11SRCDIR.${PROG}} \
-I${X11SRCDIR.${PROG}}/../include \
-I${DESTDIR}${X11INCDIR}/freetype2 \
-DPROJECTROOT=${X11ROOTDIR} \
@@ -44,6 +46,12 @@ COPTS.input.c+= -Wno-error # uses XKeyco
# XXXMRG should probably build builtin_icons.h
+.SUFFIXES: .def .hin
+.def.hin:
+ ${TOOL_AWK} '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
+DPSRCS+= Tekparse.hin VTparse.hin
+CLEANFILES+= Tekparse.hin VTparse.hin
+
.include "Makefile.inc"
.include
CVS commit: [netbsd-8] src/sys/dev/raidframe
Module Name:src
Committed By: martin
Date: Wed Feb 17 09:36:10 UTC 2021
Modified Files:
src/sys/dev/raidframe [netbsd-8]: rf_reconstruct.c
Log Message:
Pull up following revision(s) (requested by oster in ticket #1655):
sys/dev/raidframe/rf_reconstruct.c: revision 1.125
Fix a long long-standing off-by-one error in computing lastPSID.
SUsPerPU is only really supported for a value of 1, and since the
first PSID is 0, the last will be numStripe-1. Also update the
setting of pending_writes to reflect the change to lastPSID.
Needs pullups to -8 and -9.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.121.12.1 src/sys/dev/raidframe/rf_reconstruct.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/raidframe/rf_reconstruct.c
diff -u src/sys/dev/raidframe/rf_reconstruct.c:1.121 src/sys/dev/raidframe/rf_reconstruct.c:1.121.12.1
--- src/sys/dev/raidframe/rf_reconstruct.c:1.121 Fri Nov 14 14:29:16 2014
+++ src/sys/dev/raidframe/rf_reconstruct.c Wed Feb 17 09:36:10 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconstruct.c,v 1.121 2014/11/14 14:29:16 oster Exp $ */
+/* $NetBSD: rf_reconstruct.c,v 1.121.12.1 2021/02/17 09:36:10 martin Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.121 2014/11/14 14:29:16 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.121.12.1 2021/02/17 09:36:10 martin Exp $");
#include
#include
@@ -616,7 +616,7 @@ rf_ContinueReconstructFailedDisk(RF_Raid
mapPtr = raidPtr->reconControl->reconMap;
incPSID = RF_RECONMAP_SIZE;
- lastPSID = raidPtr->Layout.numStripe / raidPtr->Layout.SUsPerPU;
+ lastPSID = raidPtr->Layout.numStripe / raidPtr->Layout.SUsPerPU - 1;
RUsPerPU = raidPtr->Layout.SUsPerPU / raidPtr->Layout.SUsPerRU;
recon_error = 0;
write_error = 0;
@@ -631,7 +631,7 @@ rf_ContinueReconstructFailedDisk(RF_Raid
raidPtr->reconControl->lastPSID = lastPSID;
if (pending_writes > lastPSID)
- pending_writes = lastPSID;
+ pending_writes = lastPSID + 1;
/* start the actual reconstruction */
@@ -796,7 +796,6 @@ rf_ContinueReconstructFailedDisk(RF_Raid
pending_writes = lastPSID - prev;
raidPtr->reconControl->lastPSID = lastPSID;
}
-
/* back down curPSID to get ready for the next round... */
for (i = 0; i < raidPtr->numCol; i++) {
if (i != col) {
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Feb 11 13:05:16 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1652 - #1654 To generate a diff of this commit: cvs rdiff -u -r1.1.2.70 -r1.1.2.71 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.70 src/doc/CHANGES-8.3:1.1.2.71 --- src/doc/CHANGES-8.3:1.1.2.70 Wed Feb 10 16:57:42 2021 +++ src/doc/CHANGES-8.3 Thu Feb 11 13:05:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.70 2021/02/10 16:57:42 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.71 2021/02/11 13:05:16 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1559,3 +1559,21 @@ usr.bin/nl/nl.c 1.13-1.15 minor cleanup. [ginsbach, ticket #1651] +sys/dev/scsipi/cd.c1.350 +sys/dev/scsipi/sd.c1.331 + + PR 55986: DK_BUSY must have mask as second argument. + [ryoon, ticket #1652] + +sys/fs/msdosfs/msdosfs_vfsops.c 1.136 + + PR 55985: do not insist on valid MSDOS bootloader signatures for + mounting an msdosfs. + [ryoon, ticket #1653] + +sys/arch/x68k/x68k/machdep.c 1.204 + + Restore fixes for PR 51663 lost in r1.195 (uvm_hotplug(9) merge), + fixing kernel crash dumps for x68k. + [tsutsui, ticket #1654] +
CVS commit: [netbsd-8] src/sys/arch/x68k/x68k
Module Name:src
Committed By: martin
Date: Thu Feb 11 13:04:01 UTC 2021
Modified Files:
src/sys/arch/x68k/x68k [netbsd-8]: machdep.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1654):
sys/arch/x68k/x68k/machdep.c: revision 1.204
Restore fixes for PR/51663 lost in r1.195 (uvm_hotplug(9) merge).
The kernel crashdump and savecore(8) on NetBSD/x68k have been broken
(even without EXTNEDED_MEMORY) since NetBSD 8.0. Oops.
Should be pulled up to netbsd-9 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.196.6.1 src/sys/arch/x68k/x68k/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.196 src/sys/arch/x68k/x68k/machdep.c:1.196.6.1
--- src/sys/arch/x68k/x68k/machdep.c:1.196 Mon Apr 3 17:37:29 2017
+++ src/sys/arch/x68k/x68k/machdep.c Thu Feb 11 13:04:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.196 2017/04/03 17:37:29 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.196.6.1 2021/02/11 13:04:01 martin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.196 2017/04/03 17:37:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.196.6.1 2021/02/11 13:04:01 martin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -554,7 +554,10 @@ cpu_init_kcore_hdr(void)
{
cpu_kcore_hdr_t *h = &cpu_kcore_hdr;
struct m68k_kcore_hdr *m = &h->un._m68k;
- uvm_physseg_t i;
+ psize_t size;
+#ifdef EXTENDED_MEMORY
+ int i, seg;
+#endif
memset(&cpu_kcore_hdr, 0, sizeof(cpu_kcore_hdr));
@@ -603,25 +606,20 @@ cpu_init_kcore_hdr(void)
/*
* X68k has multiple RAM segments on some models.
*/
- m->ram_segs[0].start = lowram;
- m->ram_segs[0].size = mem_size - lowram;
-
- i = uvm_physseg_get_first();
-
-for (uvm_physseg_get_next(i); uvm_physseg_valid_p(i); i = uvm_physseg_get_next(i)) {
- if (uvm_physseg_valid_p(i) == false)
- break;
-
- const paddr_t startpfn = uvm_physseg_get_start(i);
- const paddr_t endpfn = uvm_physseg_get_end(i);
-
- KASSERT(startpfn != -1 && endpfn != -1);
-
- m->ram_segs[i].start =
- ctob(startpfn);
- m->ram_segs[i].size =
- ctob(endpfn - startpfn);
+ size = phys_basemem_seg.end - phys_basemem_seg.start;
+ m->ram_segs[0].start = phys_basemem_seg.start;
+ m->ram_segs[0].size = size;
+#ifdef EXTENDED_MEMORY
+ seg = 1;
+ for (i = 0; i < EXTMEM_SEGS; i++) {
+ size = phys_extmem_seg[i].end - phys_extmem_seg[i].start;
+ if (size == 0)
+ continue;
+ m->ram_segs[seg].start = phys_extmem_seg[i].start;
+ m->ram_segs[seg].size = size;
+ seg++;
}
+#endif
}
/*
CVS commit: [netbsd-8] src/sys/fs/msdosfs
Module Name:src
Committed By: martin
Date: Thu Feb 11 12:59:38 UTC 2021
Modified Files:
src/sys/fs/msdosfs [netbsd-8]: msdosfs_vfsops.c
Log Message:
Pull up following revision(s) (requested by ryoon in ticket #1653):
sys/fs/msdosfs/msdosfs_vfsops.c: revision 1.136
Enable to mount Raspberry Pi Pico's USB mass storage partition
Fix PR kern/55985.
O.k. by thorpej@.
Pull-up to netbsd-8 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.127.4.2 -r1.127.4.3 src/sys/fs/msdosfs/msdosfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.127.4.2 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.127.4.3
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.127.4.2 Mon Jan 22 12:34:25 2018
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Thu Feb 11 12:59:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.127.4.2 2018/01/22 12:34:25 martin Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.127.4.3 2021/02/11 12:59:38 martin Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.127.4.2 2018/01/22 12:34:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vfsops.c,v 1.127.4.3 2021/02/11 12:59:38 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -518,6 +518,13 @@ msdosfs_mountfs(struct vnode *devvp, str
b50 = (struct byte_bpb50 *)bsp->bs50.bsBPB;
b710 = (struct byte_bpb710 *)bsp->bs710.bsBPB;
+#if 0
+ /*
+ * Some FAT partition, for example Raspberry Pi Pico's
+ * USB mass storage, does not have exptected BOOTSIGs.
+ * According to FreeBSD's comment, some PC-9800/9821
+ * FAT floppy disks have similar problems.
+ */
if (!(argp->flags & MSDOSFSMNT_GEMDOSFS)) {
if (bsp->bs50.bsBootSectSig0 != BOOTSIG0
|| bsp->bs50.bsBootSectSig1 != BOOTSIG1) {
@@ -528,6 +535,7 @@ msdosfs_mountfs(struct vnode *devvp, str
goto error_exit;
}
}
+#endif
pmp = malloc(sizeof(*pmp), M_MSDOSFSMNT, M_WAITOK|M_ZERO);
pmp->pm_mountp = mp;
CVS commit: [netbsd-8] src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Thu Feb 11 12:54:56 UTC 2021
Modified Files:
src/sys/dev/scsipi [netbsd-8]: cd.c sd.c
Log Message:
Pull up following revision(s) (requested by ryoon in ticket #1652):
sys/dev/scsipi/cd.c: revision 1.350
sys/dev/scsipi/sd.c: revision 1.331
PR 55986: Ryo Onodera: DK_BUSY must have mask as second argument. Make cd.c
consistent by also using __BIT()
To generate a diff of this commit:
cvs rdiff -u -r1.340.6.2 -r1.340.6.3 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.324.6.1 -r1.324.6.2 src/sys/dev/scsipi/sd.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/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.340.6.2 src/sys/dev/scsipi/cd.c:1.340.6.3
--- src/sys/dev/scsipi/cd.c:1.340.6.2 Sun Mar 29 12:10:37 2020
+++ src/sys/dev/scsipi/cd.c Thu Feb 11 12:54:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.340.6.2 2020/03/29 12:10:37 martin Exp $ */
+/* $NetBSD: cd.c,v 1.340.6.3 2021/02/11 12:54:56 martin Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.340.6.2 2020/03/29 12:10:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.340.6.3 2021/02/11 12:54:56 martin Exp $");
#include
#include
@@ -1378,7 +1378,7 @@ cdioctl(dev_t dev, u_long cmd, void *add
XS_CTL_IGNORE_NOT_READY | XS_CTL_IGNORE_MEDIA_CHANGE));
case DIOCEJECT:
if (*(int *)addr == 0) {
- int pmask = 1 << part;
+ int pmask = __BIT(part);
/*
* Don't force eject: check that we are the only
* partition open. If so, unlock it.
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.324.6.1 src/sys/dev/scsipi/sd.c:1.324.6.2
--- src/sys/dev/scsipi/sd.c:1.324.6.1 Wed Jun 21 18:18:55 2017
+++ src/sys/dev/scsipi/sd.c Thu Feb 11 12:54:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.324.6.1 2017/06/21 18:18:55 snj Exp $ */
+/* $NetBSD: sd.c,v 1.324.6.2 2021/02/11 12:54:56 martin Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.324.6.1 2017/06/21 18:18:55 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.324.6.2 2021/02/11 12:54:56 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -950,11 +950,12 @@ sdioctl(dev_t dev, u_long cmd, void *add
if ((periph->periph_flags & PERIPH_REMOVABLE) == 0)
return (ENOTTY);
if (*(int *)addr == 0) {
+ int pmask = __BIT(part);
/*
* Don't force eject: check that we are the only
* partition open. If so, unlock it.
*/
- if (DK_BUSY(dksc, part) == 0) {
+ if (DK_BUSY(dksc, pmask) == 0) {
error = scsipi_prevent(periph, SPAMR_ALLOW,
XS_CTL_IGNORE_NOT_READY);
if (error)
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Feb 10 16:57:42 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1651 To generate a diff of this commit: cvs rdiff -u -r1.1.2.69 -r1.1.2.70 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.69 src/doc/CHANGES-8.3:1.1.2.70 --- src/doc/CHANGES-8.3:1.1.2.69 Sun Feb 7 13:56:00 2021 +++ src/doc/CHANGES-8.3 Wed Feb 10 16:57:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.69 2021/02/07 13:56:00 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.70 2021/02/10 16:57:42 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1553,3 +1553,9 @@ usr.sbin/isibootd/isibootd.c 1.4 Fix isibootd(8) "Cannot allocate memory" failure on amd64. [tsutsui, ticket #1650] +usr.bin/nl/nl.c 1.13-1.15 + + nl(1): fix PR 55891 and a delimiter parsing error plus + minor cleanup. + [ginsbach, ticket #1651] +
CVS commit: [netbsd-8] src/usr.bin/nl
Module Name:src
Committed By: martin
Date: Wed Feb 10 16:56:52 UTC 2021
Modified Files:
src/usr.bin/nl [netbsd-8]: nl.c
Log Message:
Pull up following revision(s) (requested by ginsbach in ticket #1651):
usr.bin/nl/nl.c: revision 1.13
usr.bin/nl/nl.c: revision 1.14
usr.bin/nl/nl.c: revision 1.15
nl(1): remove superfluous exit
Remove exit(3) call missed when errors were converted to errx(3).
nl: fix -d delim parsing for POSIX
POSIX specifies it is possible to specify a one delimiter character.
Fix the logic so that both one and two character delimiters are accepted.
PR/55891 supress displaying separator when numbers supressed
Fix based on patch provided by Kobayashi Takashi. This brings nl(1) further
in to POSIX compliance. Verified behavior with classic SysV nl(1) and GNU
nl(1). There could still be edge cases here not specified by POSIX.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.18.1 src/usr.bin/nl/nl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/nl/nl.c
diff -u src/usr.bin/nl/nl.c:1.12 src/usr.bin/nl/nl.c:1.12.18.1
--- src/usr.bin/nl/nl.c:1.12 Tue Sep 17 20:00:50 2013
+++ src/usr.bin/nl/nl.c Wed Feb 10 16:56:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: nl.c,v 1.12 2013/09/17 20:00:50 wiz Exp $ */
+/* $NetBSD: nl.c,v 1.12.18.1 2021/02/10 16:56:52 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1999\
The NetBSD Foundation, Inc. All rights reserved.");
-__RCSID("$NetBSD: nl.c,v 1.12 2013/09/17 20:00:50 wiz Exp $");
+__RCSID("$NetBSD: nl.c,v 1.12.18.1 2021/02/10 16:56:52 martin Exp $");
#endif
#include
@@ -157,14 +157,15 @@ main(int argc, char *argv[])
case 'd':
if (optarg[0] != '\0')
delim[0] = optarg[0];
- if (optarg[1] != '\0')
+ if (optarg[1] != '\0') {
delim[1] = optarg[1];
- /* at most two delimiter characters */
- if (optarg[2] != '\0') {
-errx(EXIT_FAILURE,
-"invalid delim argument -- %s",
-optarg);
-/* NOTREACHED */
+/* at most two delimiter characters */
+if (optarg[2] != '\0') {
+ errx(EXIT_FAILURE,
+ "invalid delim argument -- %s",
+ optarg);
+ /* NOTREACHED */
+}
}
break;
case 'f':
@@ -331,13 +332,13 @@ filter(void)
if (donumber) {
consumed = snprintf(intbuffer, intbuffersize, format,
width, line);
- (void)printf("%s",
- intbuffer + max(0, consumed - width));
+ (void)printf("%s%s",
+ intbuffer + max(0, consumed - width), sep);
line += incr;
} else {
- (void)printf("%*s", width, "");
+ (void)printf("%*s%*s", width, "", (int)strlen(sep), "");
}
- (void)printf("%s%s", sep, buffer);
+ (void)printf("%s", buffer);
if (ferror(stdout))
err(EXIT_FAILURE, "output error");
@@ -392,7 +393,6 @@ parse_numbering(const char *argstr, int
errx(EXIT_FAILURE,
"illegal %s line numbering type -- %s",
numbering_properties[section].name, argstr);
- exit(EXIT_FAILURE);
}
}
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Feb 7 13:56:00 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1650 To generate a diff of this commit: cvs rdiff -u -r1.1.2.68 -r1.1.2.69 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.68 src/doc/CHANGES-8.3:1.1.2.69 --- src/doc/CHANGES-8.3:1.1.2.68 Sat Feb 6 15:29:14 2021 +++ src/doc/CHANGES-8.3 Sun Feb 7 13:56:00 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.68 2021/02/06 15:29:14 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.69 2021/02/07 13:56:00 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1548,3 +1548,8 @@ lib/libc/arch/mips/sys/cerror.S 1.20 (eg __posix_cerror() in libposix). [simonb, ticket #1648] +usr.sbin/isibootd/isibootd.c 1.4 + + Fix isibootd(8) "Cannot allocate memory" failure on amd64. + [tsutsui, ticket #1650] +
CVS commit: [netbsd-8] src/usr.sbin/isibootd
Module Name:src Committed By: martin Date: Sun Feb 7 13:54:01 UTC 2021 Modified Files: src/usr.sbin/isibootd [netbsd-8]: isibootd.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1650): usr.sbin/isibootd/isibootd.c: revision 1.4 Fix "Cannot allocate memory" failure on amd64. BIOCGBLEN ioctl of bpf(4) requires u_int, not size_t. The problem is reported by Kenji Aoyama. Should be pulled up to netbsd-9 and netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.26.1 src/usr.sbin/isibootd/isibootd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/isibootd/isibootd.c diff -u src/usr.sbin/isibootd/isibootd.c:1.3 src/usr.sbin/isibootd/isibootd.c:1.3.26.1 --- src/usr.sbin/isibootd/isibootd.c:1.3 Mon Apr 2 09:01:30 2012 +++ src/usr.sbin/isibootd/isibootd.c Sun Feb 7 13:54:01 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: isibootd.c,v 1.3 2012/04/02 09:01:30 nisimura Exp $ */ +/* $NetBSD: isibootd.c,v 1.3.26.1 2021/02/07 13:54:01 martin Exp $ */ /* Id: isiboot.c,v 1.2 1999/12/26 14:33:33 nisimura Exp */ /*- @@ -364,7 +364,7 @@ createbpfport(char *ifname, uint8_t **io struct ifreq ifr; int fd; u_int type; - size_t buflen; + u_int buflen; uint8_t dladdr[ETHER_ADDR_LEN], *buf; #ifdef BIOCIMMEDIATE u_int flag;
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Feb 6 15:29:14 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1648 and #1649 To generate a diff of this commit: cvs rdiff -u -r1.1.2.67 -r1.1.2.68 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.67 src/doc/CHANGES-8.3:1.1.2.68 --- src/doc/CHANGES-8.3:1.1.2.67 Fri Jan 29 18:19:21 2021 +++ src/doc/CHANGES-8.3 Sat Feb 6 15:29:14 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.67 2021/01/29 18:19:21 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.68 2021/02/06 15:29:14 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1532,3 +1532,19 @@ sys/dev/hyperv/vmbus.c1.12 (patch) hvkbd(4), vmbus(4), hvn(4): don't wait forever. [nonaka, ticket #1647] +sys/conf/param.c1.69 +sys/kern/init_main.c1.533 (via patch) +sys/sys/param.h 1.679 + + Set a better default for MAXFILES on larger RAM machines if not + otherwise specified the kernel config file. Arbitary numbers are + 20,000 files for 16GB RAM or more and 10,000 files for 1GB RAM or + more. + [simonb, ticket #1649] + +lib/libc/arch/mips/sys/cerror.S 1.20 + + MIPS n32/n64: fix __errno() calls from other libraries + (eg __posix_cerror() in libposix). + [simonb, ticket #1648] +
CVS commit: [netbsd-8] src/lib/libc/arch/mips/sys
Module Name:src
Committed By: martin
Date: Sat Feb 6 15:26:16 UTC 2021
Modified Files:
src/lib/libc/arch/mips/sys [netbsd-8]: cerror.S
Log Message:
Pull up following revision(s) (requested by simonb in ticket #1648):
lib/libc/arch/mips/sys/cerror.S: revision 1.20
For mips n32/n64 explicitly save the GP reg on the stack, and
restore it _after_ the call to __errno(). Fixes sending the
__errno() call off to nowhereland when this code is included
in another library (eg __posix_cerror() in libposix). Failure
picked up by the ATF lib/libposix/posix1/t_rename test.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.18.1 src/lib/libc/arch/mips/sys/cerror.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/mips/sys/cerror.S
diff -u src/lib/libc/arch/mips/sys/cerror.S:1.19 src/lib/libc/arch/mips/sys/cerror.S:1.19.18.1
--- src/lib/libc/arch/mips/sys/cerror.S:1.19 Thu Sep 12 15:36:15 2013
+++ src/lib/libc/arch/mips/sys/cerror.S Sat Feb 6 15:26:16 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cerror.S,v 1.19 2013/09/12 15:36:15 joerg Exp $ */
+/* $NetBSD: cerror.S,v 1.19.18.1 2021/02/06 15:26:16 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
RCSID("from: @(#)cerror.s 8.1 (Berkeley) 6/16/93")
#else
- RCSID("$NetBSD: cerror.S,v 1.19 2013/09/12 15:36:15 joerg Exp $")
+ RCSID("$NetBSD: cerror.S,v 1.19.18.1 2021/02/06 15:26:16 martin Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -50,24 +50,33 @@
.globl _C_LABEL(__errno)
NESTED_NOPROFILE(__cerror, CALLFRAME_SIZ, ra)
.mask 0x8000, (CALLFRAME_RA - CALLFRAME_SIZ)
- PIC_PROLOGUE(__cerror)
+ PIC_PROLOGUE(__cerror) # saves caller gp in t3 (n32/n64)
PTR_SUBU sp, CALLFRAME_SIZ
PTR_S ra, CALLFRAME_RA(sp)
INT_S v0, CALLFRAME_S0(sp) # save errno value
+#if defined(__mips_n32) || defined(__mips_n64)
+ PTR_S t3, CALLFRAME_GP(sp) # save caller gp (in t3)
+#endif
SAVE_GP(CALLFRAME_GP)
PTR_LA t9, _C_LABEL(__errno) # locate address of errno
- RESTORE_GP64# restore GP (from t3)
+
jalr t9 # __errno()
+#if defined(__mips_n32) || defined(__mips_n64)
+ PTR_L gp, CALLFRAME_GP(sp) # restore caller gp
+#endif
INT_L t0, CALLFRAME_S0(sp)
PTR_L ra, CALLFRAME_RA(sp)
INT_S t0, 0(v0) # update errno value
PTR_ADDU sp, CALLFRAME_SIZ
li v0, -1
li v1, -1
- j ra # GP has been restored.
+
+ # Note we don't use PIC_RETURN() here as the GP is stored
+ # on the stack and not in the t3 reg (for the n32/n64 case).
+ j ra
END(__cerror)
#else
.globl _C_LABEL(errno)
CVS commit: [netbsd-8] src/sys
Module Name:src Committed By: martin Date: Sat Feb 6 15:22:20 UTC 2021 Modified Files: src/sys/conf [netbsd-8]: param.c src/sys/kern [netbsd-8]: init_main.c src/sys/sys [netbsd-8]: param.h Log Message: Pull up following revision(s) (requested by simonb in ticket #1649): sys/sys/param.h: revision 1.679 sys/conf/param.c: revision 1.69 sys/kern/init_main.c: revision 1.533 (via patch) Set a better default for MAXFILES on larger RAM machines if not otherwise specified the kernel config file. Arbitary numbers are 20,000 files for 16GB RAM or more and 10,000 files for 1GB RAM or more. TODO: Adjust this and other values totally dynamically. To generate a diff of this commit: cvs rdiff -u -r1.67.10.1 -r1.67.10.2 src/sys/conf/param.c cvs rdiff -u -r1.490.6.1 -r1.490.6.2 src/sys/kern/init_main.c cvs rdiff -u -r1.542.2.10 -r1.542.2.11 src/sys/sys/param.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/conf/param.c diff -u src/sys/conf/param.c:1.67.10.1 src/sys/conf/param.c:1.67.10.2 --- src/sys/conf/param.c:1.67.10.1 Wed Apr 10 07:39:31 2019 +++ src/sys/conf/param.c Sat Feb 6 15:22:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: param.c,v 1.67.10.1 2019/04/10 07:39:31 martin Exp $ */ +/* $NetBSD: param.c,v 1.67.10.2 2021/02/06 15:22:19 martin Exp $ */ /* * Copyright (c) 1980, 1986, 1989 Regents of the University of California. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: param.c,v 1.67.10.1 2019/04/10 07:39:31 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: param.c,v 1.67.10.2 2021/02/06 15:22:19 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_hz.h" @@ -105,10 +105,6 @@ __KERNEL_RCSID(0, "$NetBSD: param.c,v 1. #define HZ 100 #endif -#ifndef MAXFILES -#define MAXFILES (3 * (NPROC + MAXUSERS) + 80) -#endif - #ifndef MAXEXEC #define MAXEXEC 16 #endif Index: src/sys/kern/init_main.c diff -u src/sys/kern/init_main.c:1.490.6.1 src/sys/kern/init_main.c:1.490.6.2 --- src/sys/kern/init_main.c:1.490.6.1 Fri Jul 13 15:49:55 2018 +++ src/sys/kern/init_main.c Sat Feb 6 15:22:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: init_main.c,v 1.490.6.1 2018/07/13 15:49:55 martin Exp $ */ +/* $NetBSD: init_main.c,v 1.490.6.2 2021/02/06 15:22:19 martin Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.490.6.1 2018/07/13 15:49:55 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.490.6.2 2021/02/06 15:22:19 martin Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -447,7 +447,23 @@ main(void) 10, VNODE_KMEM_MAXPCT) / VNODE_COST; if (usevnodes > desiredvnodes) desiredvnodes = usevnodes; -#endif +#endif /* NVNODE_IMPLICIT */ +#ifdef MAXFILES_IMPLICIT + /* + * If maximum number of files is not explicitly defined in + * kernel config, adjust the number so that it is somewhat + * more reasonable on machines with larger memory sizes. + * Arbitary numbers are 20,000 files for 16GB RAM or more + * and 10,000 files for 1GB RAM or more. + * + * XXXtodo: adjust this and other values totally dynamically + */ + if (ctob((uint64_t)physmem) >= 16ULL * 1024 * 1024 * 1024) + maxfiles = MAX(maxfiles, 2); + if (ctob((uint64_t)physmem) >= 1024 * 1024 * 1024) + maxfiles = MAX(maxfiles, 1); +#endif /* MAXFILES_IMPLICIT */ + vfsinit(); lf_init(); Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.542.2.10 src/sys/sys/param.h:1.542.2.11 --- src/sys/sys/param.h:1.542.2.10 Tue Apr 14 15:50:28 2020 +++ src/sys/sys/param.h Sat Feb 6 15:22:19 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.542.2.10 2020/04/14 15:50:28 martin Exp $ */ +/* $NetBSD: param.h,v 1.542.2.11 2021/02/06 15:22:19 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -148,13 +148,17 @@ #include #include #ifndef NPROC -#define NPROC (20 + 16 * MAXUSERS) +#define NPROC (20 + 16 * MAXUSERS) +#endif +#ifndef MAXFILES +#define MAXFILES (3 * (NPROC + MAXUSERS) + 80) +#define MAXFILES_IMPLICIT #endif #ifndef NTEXT -#define NTEXT (80 + NPROC / 8) /* actually the object cache */ +#define NTEXT (80 + NPROC / 8) /* actually the object cache */ #endif #ifndef NVNODE -#define NVNODE (NPROC + NTEXT + 100) +#define NVNODE (NPROC + NTEXT + 100) #define NVNODE_IMPLICIT #endif #ifndef VNODE_KMEM_MAXPCT @@ -163,7 +167,7 @@ #ifndef BUFCACHE_VA_MAXPCT #define BUFCACHE_VA_MAXPCT 20 #endif -#define VNODE_COST 2048 /* assumed space in bytes */ +#define VNODE_COST 2048 /* assumed space in bytes */ #endif /* _KERNEL */ /* Signals. */
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jan 29 18:19:22 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1647 To generate a diff of this commit: cvs rdiff -u -r1.1.2.66 -r1.1.2.67 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.66 src/doc/CHANGES-8.3:1.1.2.67 --- src/doc/CHANGES-8.3:1.1.2.66 Fri Jan 8 13:03:54 2021 +++ src/doc/CHANGES-8.3 Fri Jan 29 18:19:21 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.66 2021/01/08 13:03:54 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.67 2021/01/29 18:19:21 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1525,3 +1525,10 @@ external/bsd/ipf/Makefile.inc 1.6 userland is 32bit). Works around missing COMPAT_NETBSD32 for ipf. [simonb, ticket #1646] +sys/dev/hyperv/hvkbd.c1.7 (patch) +sys/dev/hyperv/if_hvn.c1.20 (patch) +sys/dev/hyperv/vmbus.c1.12 (patch) + + hvkbd(4), vmbus(4), hvn(4): don't wait forever. + [nonaka, ticket #1647] +
CVS commit: [netbsd-8] src/sys/dev/hyperv
Module Name:src
Committed By: martin
Date: Fri Jan 29 18:18:25 UTC 2021
Modified Files:
src/sys/dev/hyperv [netbsd-8]: hvkbd.c if_hvn.c vmbus.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1647):
sys/dev/hyperv/if_hvn.c: revision 1.20 (via patch)
sys/dev/hyperv/hvkbd.c: revision 1.7 (via patch)
sys/dev/hyperv/vmbus.c: revision 1.12 (via patch)
hvkbd(4): Don't wait forever.
vmbus(4): Don't wait forever.
hvn(4): Don't wait forever.
To generate a diff of this commit:
cvs rdiff -u -r1.1.4.6 -r1.1.4.7 src/sys/dev/hyperv/hvkbd.c
cvs rdiff -u -r1.2.2.8 -r1.2.2.9 src/sys/dev/hyperv/if_hvn.c
cvs rdiff -u -r1.2.2.5 -r1.2.2.6 src/sys/dev/hyperv/vmbus.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/hyperv/hvkbd.c
diff -u src/sys/dev/hyperv/hvkbd.c:1.1.4.6 src/sys/dev/hyperv/hvkbd.c:1.1.4.7
--- src/sys/dev/hyperv/hvkbd.c:1.1.4.6 Sun Nov 24 08:11:06 2019
+++ src/sys/dev/hyperv/hvkbd.c Fri Jan 29 18:18:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.1.4.6 2019/11/24 08:11:06 martin Exp $ */
+/* $NetBSD: hvkbd.c,v 1.1.4.7 2021/01/29 18:18:25 martin Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.1.4.6 2019/11/24 08:11:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.1.4.7 2021/01/29 18:18:25 martin Exp $");
#include
#include
@@ -363,7 +363,8 @@ hvkbd_connect(struct hvkbd_softc *sc)
hvkbd_intr(sc);
splx(s);
} else
- tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", mstohz(1));
+ tsleep(sc, PRIBIO | PCATCH, "hvkbdcon",
+ max(1, mstohz(1)));
} while (--timo > 0 && sc->sc_connected == 0);
if (timo == 0 && sc->sc_connected == 0) {
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.2.2.8 src/sys/dev/hyperv/if_hvn.c:1.2.2.9
--- src/sys/dev/hyperv/if_hvn.c:1.2.2.8 Fri Dec 11 15:48:02 2020
+++ src/sys/dev/hyperv/if_hvn.c Fri Jan 29 18:18:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.2.2.8 2020/12/11 15:48:02 martin Exp $ */
+/* $NetBSD: if_hvn.c,v 1.2.2.9 2021/01/29 18:18:25 martin Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.2.2.8 2020/12/11 15:48:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.2.2.9 2021/01/29 18:18:25 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1065,7 +1065,8 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *
if (cold)
delay(1000);
else
-tsleep(cmd, PRIBIO, "nvsout", mstohz(1));
+tsleep(cmd, PRIBIO, "nvsout",
+max(1, mstohz(1)));
} else if (rv) {
DPRINTF("%s: NVSP operation %u send error %d\n",
device_xname(sc->sc_dev), hdr->nvs_type, rv);
@@ -1090,7 +1091,7 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *
splx(s);
} else
tsleep(sc->sc_nvsrsp, PRIBIO | PCATCH, "nvscmd",
- mstohz(1));
+ max(1, mstohz(1)));
} while (--timo > 0 && sc->sc_nvsdone != 1);
if (timo == 0 && sc->sc_nvsdone != 1) {
@@ -1388,7 +1389,8 @@ hvn_rndis_cmd(struct hvn_softc *sc, stru
if (cold)
delay(1000);
else
-tsleep(rc, PRIBIO, "rndisout", mstohz(1));
+tsleep(rc, PRIBIO, "rndisout",
+max(1, mstohz(1)));
} else if (rv) {
DPRINTF("%s: RNDIS operation %u send error %d\n",
device_xname(sc->sc_dev), hdr->rm_type, rv);
@@ -1413,7 +1415,8 @@ hvn_rndis_cmd(struct hvn_softc *sc, stru
hvn_nvs_intr(sc);
splx(s);
} else
- tsleep(rc, PRIBIO | PCATCH, "rndiscmd", mstohz(1));
+ tsleep(rc, PRIBIO | PCATCH, "rndiscmd",
+ max(1, mstohz(1)));
} while (--timo > 0 && rc->rc_done != 1);
bus_dmamap_sync(sc->sc_dmat, rc->rc_dmap, 0, PAGE_SIZE,
Index: src/sys/dev/hyperv/vmbus.c
diff -u src/sys/dev/hyperv/vmbus.c:1.2.2.5 src/sys/dev/hyperv/vmbus.c:1.2.2.6
--- src/sys/dev/hyperv/vmbus.c:1.2.2.5 Sun Nov 24 08:11:06 2019
+++ src/sys/dev/hyperv/vmbus.c Fri Jan 29 18:18:25 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vmbus.c,v 1.2.2.5 2019/11/24 08:11:06 martin Exp $ */
+/* $NetBSD: vmbus.c,v 1.2.2.6 2021/01/29 18:18:25 martin Exp $ */
/* $OpenBSD: hyperv.c,v 1.43 2017/06/27 13:56:15 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.2.2.5 2019/11/24 08:11:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.2.2.6 2021/01/29 18:18:25 martin Exp $");
#include
#include
@@ -604,7 +604,8 @@ vmbus_start(struct vmbus_softc *sc, stru
hyperv_intr();
splx(s);
} else
- tsleep(wchan, PRIBIO, wchan, mstohz(delays[i]));
+ tsleep(wchan, PRIBIO, wchan,
+ max(1, mstohz(delays[i] / 1000)));
}
if (status != HYPERCALL_STATUS_SUCCESS) {
device_printf(sc->sc_dev,
@@ -667,7 +668,7 @@ vmbus_wait(struct vmbus_softc *sc,
splx(s);
} else
tsleep(wchan, PRIBIO, wmsg ? wmsg : "hvwait",
-
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jan 8 13:03:54 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1646 To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 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.65 src/doc/CHANGES-8.3:1.1.2.66 --- src/doc/CHANGES-8.3:1.1.2.65 Fri Jan 1 13:21:11 2021 +++ src/doc/CHANGES-8.3 Fri Jan 8 13:03:54 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.65 2021/01/01 13:21:11 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.66 2021/01/08 13:03:54 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1518,3 +1518,10 @@ sys/ufs/ufs/ufs_quota1.c 1.23 Avoid out of bounds array access. [nia, ticket #1645] +compat/exec.mk 1.5 +external/bsd/ipf/Makefile.inc 1.6 + + ipf(4): build tools as 64bit binaries on mips64 (where most + userland is 32bit). Works around missing COMPAT_NETBSD32 for ipf. + [simonb, ticket #1646] +
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Fri Jan 8 13:02:57 UTC 2021
Modified Files:
src/compat [netbsd-8]: exec.mk
src/external/bsd/ipf [netbsd-8]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by simonb in ticket #1646):
external/bsd/ipf/Makefile.inc: revision 1.6
compat/exec.mk: revision 1.5
Use the compat machinery to build "native" IPF binaries as ipfilter
doesn't use compat32 64-bit alignment/size safe structures.
Fixes IPF on at least mips64.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/compat/exec.mk
cvs rdiff -u -r1.3 -r1.3.6.1 src/external/bsd/ipf/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/exec.mk
diff -u src/compat/exec.mk:1.3 src/compat/exec.mk:1.3.8.1
--- src/compat/exec.mk:1.3 Thu Jan 5 21:28:42 2017
+++ src/compat/exec.mk Fri Jan 8 13:02:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: exec.mk,v 1.3 2017/01/05 21:28:42 skrll Exp $
+# $NetBSD: exec.mk,v 1.3.8.1 2021/01/08 13:02:56 martin Exp $
# this makefile fragment can be included to modify the default
# ABI a program is compiled with. this is designed to be used
@@ -7,6 +7,7 @@
# currently this file is used by these Makefiles:
#
+# external/bsd/ipf/Makefile.inc
# sbin/savecore/Makefile
# usr.bin/fstat/Makefile
# usr.bin/netstat/Makefile
@@ -22,7 +23,9 @@
# can be considered "not a bug". all the *stat tools should
# be converted to use sysctl(3) on the running kernel, and
# anyone who needs kvm-access on crash dumps can build their
-# own 64 bit version as necessary.
+# own 64 bit version as necessary. ipfilter doesn't use
+# 64-bit alignment/size safe structures.
+#
# mips64 defaults to 32 bit userland, but with a 64 bit kernel
# most kvm-using tools are happier with 64 bit.
Index: src/external/bsd/ipf/Makefile.inc
diff -u src/external/bsd/ipf/Makefile.inc:1.3 src/external/bsd/ipf/Makefile.inc:1.3.6.1
--- src/external/bsd/ipf/Makefile.inc:1.3 Wed Jan 11 12:19:43 2017
+++ src/external/bsd/ipf/Makefile.inc Fri Jan 8 13:02:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2017/01/11 12:19:43 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.3.6.1 2021/01/08 13:02:56 martin Exp $
WARNS?= 1 # XXX -Wcast-qual -Wshadow
CWARNFLAGS.clang+= -Wno-format -Wno-tautological-compare \
@@ -36,3 +36,5 @@ CLEANFILES+= y.tab.c y.tab.h
${UDIST}/lib \
${UDIST}/tools \
${UDIST}/man
+
+.include "../../compat/exec.mk"
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jan 1 13:21:11 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1645 To generate a diff of this commit: cvs rdiff -u -r1.1.2.64 -r1.1.2.65 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.64 src/doc/CHANGES-8.3:1.1.2.65 --- src/doc/CHANGES-8.3:1.1.2.64 Mon Dec 28 19:54:42 2020 +++ src/doc/CHANGES-8.3 Fri Jan 1 13:21:11 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.64 2020/12/28 19:54:42 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.65 2021/01/01 13:21:11 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1513,3 +1513,8 @@ sys/arch/hp300/dev/hil_intio.c 1.4 to make ddb(4) and kernel prompts for root device work. [tsutsui, ticket #1642] +sys/ufs/ufs/ufs_quota1.c 1.23 + + Avoid out of bounds array access. + [nia, ticket #1645] +
CVS commit: [netbsd-8] src/sys/ufs/ufs
Module Name:src
Committed By: martin
Date: Fri Jan 1 13:19:58 UTC 2021
Modified Files:
src/sys/ufs/ufs [netbsd-8]: ufs_quota1.c
Log Message:
Pull up following revision(s) (requested by nia in ticket #1645):
sys/ufs/ufs/ufs_quota1.c: revision 1.23
Avoid potentially accessing an array with an index out of range.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.10.1 src/sys/ufs/ufs/ufs_quota1.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/ufs/ufs/ufs_quota1.c
diff -u src/sys/ufs/ufs/ufs_quota1.c:1.22 src/sys/ufs/ufs/ufs_quota1.c:1.22.10.1
--- src/sys/ufs/ufs/ufs_quota1.c:1.22 Mon Jun 20 00:52:04 2016
+++ src/sys/ufs/ufs/ufs_quota1.c Fri Jan 1 13:19:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_quota1.c,v 1.22 2016/06/20 00:52:04 dholland Exp $ */
+/* $NetBSD: ufs_quota1.c,v 1.22.10.1 2021/01/01 13:19:57 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.22 2016/06/20 00:52:04 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota1.c,v 1.22.10.1 2021/01/01 13:19:57 martin Exp $");
#include
#include
@@ -311,6 +311,9 @@ quota1_handle_cmd_quotaon(struct lwp *l,
struct pathbuf *pb;
struct nameidata nd;
+ if (type < 0 || type >= MAXQUOTAS)
+ return EINVAL;
+
if (ump->um_flags & UFS_QUOTA2) {
uprintf("%s: quotas v2 already enabled\n",
mp->mnt_stat.f_mntonname);
@@ -421,6 +424,9 @@ quota1_handle_cmd_quotaoff(struct lwp *l
kauth_cred_t cred;
int i, error;
+ if (type < 0 || type >= MAXQUOTAS)
+ return EINVAL;
+
mutex_enter(&dqlock);
while ((ump->umq1_qflags[type] & (QTF_CLOSING | QTF_OPENING)) != 0)
cv_wait(&dqcv, &dqlock);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Dec 28 19:54:42 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1642 To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 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.63 src/doc/CHANGES-8.3:1.1.2.64 --- src/doc/CHANGES-8.3:1.1.2.63 Mon Dec 28 16:02:57 2020 +++ src/doc/CHANGES-8.3 Mon Dec 28 19:54:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.63 2020/12/28 16:02:57 snj Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.64 2020/12/28 19:54:42 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1506,3 +1506,10 @@ etc/rc.d/ntpdate1.21 Adjust to "pool" usage in our standard ntp.conf. [martin, ticket #1643] +sys/arch/hp300/dev/dnkbd.c 1.11 +sys/arch/hp300/dev/hil_intio.c 1.4 + + Fix a longstanding bug in hilkbd (and dnkbd) console attachment + to make ddb(4) and kernel prompts for root device work. + [tsutsui, ticket #1642] +
CVS commit: [netbsd-8] src/sys/arch/hp300/dev
Module Name:src
Committed By: martin
Date: Mon Dec 28 19:52:59 UTC 2020
Modified Files:
src/sys/arch/hp300/dev [netbsd-8]: dnkbd.c hil_intio.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1642):
sys/arch/hp300/dev/dnkbd.c: revision 1.11
sys/arch/hp300/dev/hil_intio.c: revision 1.4
Fix a longstanding bug in hilkbd (and dnkbd) console attachment.
cn_tab->cn_dev is initialized in wsdisplay_emul_attach()
(but not in wsdiaplay_cnattach()) so it cannot be used
when hil(4) is attached before wsdisplay(4) is attached.
Instead, use exported wsdisplay_cnputc() that is actually
set in early wsdisplay_cnattach().
Now we can use ddb and RB_ASKNAME via HIL keyboard console.
Should be pulleld up to netbsd-8 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.6.1 src/sys/arch/hp300/dev/dnkbd.c
cvs rdiff -u -r1.3 -r1.3.52.1 src/sys/arch/hp300/dev/hil_intio.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/hp300/dev/dnkbd.c
diff -u src/sys/arch/hp300/dev/dnkbd.c:1.10 src/sys/arch/hp300/dev/dnkbd.c:1.10.6.1
--- src/sys/arch/hp300/dev/dnkbd.c:1.10 Sat Apr 8 17:04:56 2017
+++ src/sys/arch/hp300/dev/dnkbd.c Mon Dec 28 19:52:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dnkbd.c,v 1.10 2017/04/08 17:04:56 tsutsui Exp $ */
+/* $NetBSD: dnkbd.c,v 1.10.6.1 2020/12/28 19:52:59 martin Exp $ */
/* $OpenBSD: dnkbd.c,v 1.17 2009/07/23 21:05:56 blambert Exp $ */
/*
@@ -69,6 +69,9 @@
#include "opt_wsdisplay_compat.h"
+#include "wsdisplay.h"
+#include "wsmouse.h"
+
#include
#include
#include
@@ -87,7 +90,9 @@
#include
#include
#include
-#include "wsmouse.h"
+#if NWSDISPLAY > 0
+#include
+#endif
#if NWSMOUSE > 0
#include
#endif
@@ -354,7 +359,8 @@ dnkbd_attach_subdevices(struct dnkbd_sof
* plugged), unless the console keyboard has been claimed already
* (i.e. late hotplug with hil keyboard plugged first).
*/
- if (major(cn_tab->cn_dev) == devsw_name2chr("wsdisplay", NULL, 0)) {
+#if NWSDISPLAY > 0
+ if (cn_tab->cn_putc == wsdisplay_cnputc) {
#if NHILKBD > 0
if (hil_is_console == -1) {
ka.console = 1;
@@ -365,7 +371,10 @@ dnkbd_attach_subdevices(struct dnkbd_sof
ka.console = 1;
#endif
} else
+#endif
+ {
ka.console = 0;
+ }
ka.keymap = &dnkbd_keymapdata;
ka.accessops = &dnkbd_accessops;
Index: src/sys/arch/hp300/dev/hil_intio.c
diff -u src/sys/arch/hp300/dev/hil_intio.c:1.3 src/sys/arch/hp300/dev/hil_intio.c:1.3.52.1
--- src/sys/arch/hp300/dev/hil_intio.c:1.3 Sat Feb 19 05:36:49 2011
+++ src/sys/arch/hp300/dev/hil_intio.c Mon Dec 28 19:52:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hil_intio.c,v 1.3 2011/02/19 05:36:49 tsutsui Exp $ */
+/* $NetBSD: hil_intio.c,v 1.3.52.1 2020/12/28 19:52:59 martin Exp $ */
/* $OpenBSD: hil_intio.c,v 1.8 2007/01/06 20:10:57 miod Exp $ */
/*
@@ -28,6 +28,8 @@
*
*/
+#include "wsdisplay.h"
+
#include
#include
#include
@@ -38,6 +40,9 @@
#include
#include
+#if NWSDISPLAY > 0
+#include
+#endif
#include
@@ -88,8 +93,12 @@ hil_intio_attach(device_t parent, device
/*
* Check that the configured console device is a wsdisplay.
*/
- if (major(cn_tab->cn_dev) != devsw_name2chr("wsdisplay", NULL, 0))
+#if NWSDISPLAY > 0
+ if (cn_tab->cn_putc != wsdisplay_cnputc)
+#endif
+ {
hil_is_console = 0;
+ }
hil_attach(sc, &hil_is_console);
intr_establish(hil_intr, sc, ia->ia_ipl, IPL_TTY);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: snj Date: Mon Dec 28 16:02:57 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: 1643 To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 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.62 src/doc/CHANGES-8.3:1.1.2.63 --- src/doc/CHANGES-8.3:1.1.2.62 Sun Dec 27 14:10:28 2020 +++ src/doc/CHANGES-8.3 Mon Dec 28 16:02:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.62 2020/12/27 14:10:28 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.63 2020/12/28 16:02:57 snj Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1501,3 +1501,8 @@ usr.bin/calendar/calendars/calendar.juda Update to 2021. [maya, ticket #1641] +etc/rc.d/ntpdate1.21 + + Adjust to "pool" usage in our standard ntp.conf. + [martin, ticket #1643] +
CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src
Committed By: snj
Date: Mon Dec 28 16:02:34 UTC 2020
Modified Files:
src/etc/rc.d [netbsd-8]: ntpdate
Log Message:
Pull up following revision(s) (requested by martin in ticket #1643):
etc/rc.d/ntpdate: revision 1.21
Adjust to "pool" usage in our standard ntp.conf, pointed out
by Connor McLaughlan.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.40.1 src/etc/rc.d/ntpdate
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/ntpdate
diff -u src/etc/rc.d/ntpdate:1.20 src/etc/rc.d/ntpdate:1.20.40.1
--- src/etc/rc.d/ntpdate:1.20 Mon Aug 3 18:43:48 2009
+++ src/etc/rc.d/ntpdate Mon Dec 28 16:02:33 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ntpdate,v 1.20 2009/08/03 18:43:48 perry Exp $
+# $NetBSD: ntpdate,v 1.20.40.1 2020/12/28 16:02:33 snj Exp $
#
# PROVIDE: ntpdate
@@ -21,7 +21,7 @@ ntpdate_start()
ntpdate_hosts=$(awk '
/^#/{ next }
/^(server|peer)[ \t]*127.127/ { next }
- /^(server|peer)/ { if ($2 ~ /^-[46]/)
+ /^(server|peer|pool)/ { if ($2 ~ /^-[46]/)
print $3
else
print $2 }
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Dec 27 14:10:28 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1641 To generate a diff of this commit: cvs rdiff -u -r1.1.2.61 -r1.1.2.62 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.61 src/doc/CHANGES-8.3:1.1.2.62 --- src/doc/CHANGES-8.3:1.1.2.61 Sat Dec 19 19:06:12 2020 +++ src/doc/CHANGES-8.3 Sun Dec 27 14:10:28 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.61 2020/12/19 19:06:12 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.62 2020/12/27 14:10:28 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1496,3 +1496,8 @@ sys/dev/scsipi/scsiconf.c 1.283 Add NOLUNS quirk for more SEAGATE SCA/WIDE drives. [tsutsui, ticket #1640] +usr.bin/calendar/calendars/calendar.judaic 1.8-1.10 + + Update to 2021. + [maya, ticket #1641] +
CVS commit: [netbsd-8] src/usr.bin/calendar/calendars
Module Name:src Committed By: martin Date: Sun Dec 27 14:09:22 UTC 2020 Modified Files: src/usr.bin/calendar/calendars [netbsd-8]: calendar.judaic Log Message: Pull up following revision(s) (requested by maya in ticket #1160): usr.bin/calendar/calendars/calendar.judaic: revision 1.8-1.10 Update to 2021, hopefully less errors made in this year. To generate a diff of this commit: cvs rdiff -u -r1.6.6.1 -r1.6.6.2 \ src/usr.bin/calendar/calendars/calendar.judaic Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/calendar/calendars/calendar.judaic diff -u src/usr.bin/calendar/calendars/calendar.judaic:1.6.6.1 src/usr.bin/calendar/calendars/calendar.judaic:1.6.6.2 --- src/usr.bin/calendar/calendars/calendar.judaic:1.6.6.1 Fri Jul 13 14:35:55 2018 +++ src/usr.bin/calendar/calendars/calendar.judaic Sun Dec 27 14:09:22 2020 @@ -1,27 +1,29 @@ -01/21* Tu B'Shvat (Feast of Trees) -03/19* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) -03/20* Purim (Feast of Lots; 30 days before Pesach) -04/19* Pesach (First Day of Passover; sabbatical) -04/20* Pesach (sabbatical) -04/21* Pesach (sabbatical) -04/26* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) -05/09* Yom HaAtzma'ut (Israel Independence Day) -05/23* Lag B'Omer (Commemoration of the Great Rebellion) -06/01* Yom Yerushalayim (Reunification of Jerusalem) -06/08* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) -07/20* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; +01/28* Tu B'Shvat (Feast of Trees) +02/25* Fast of Esther (Battle of Purim; 1 day before Purim; fast day) +02/26* Purim (Feast of Lots; 30 days before Pesach) +03/29* Pesach (First Day of Passover; sabbatical) +03/30* Pesach (sabbatical) +03/31* Pesach (sabbatical) +04/04* Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) +04/05* Mimouna (Morrocan Jewish Celebration of End of Pesach) +04/15* Yom HaAtzma'ut (Israel Independence Day) +04/30* Lag B'Omer (Commemoration of the Great Rebellion) +05/10* Yom Yerushalayim (Reunification of Jerusalem) +05/17* Shavuot (Festival of Weeks; 50 days after Pesach; sabbatical) +06/27* Fast of Shiv'a Asar B'Tammuz (Tzom Tammuz) (Romans breach Wall of Jerusalem; fast day) -07/21* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) -09/09* First Day of Rosh Hashanah (Jewish Lunar New Year; 5778 == 2017; +07/18* Fast of Tish'a B'Av (Babylon/Rome destroys Holy Temple; fast day) +09/07* First Day of Rosh Hashanah (Jewish Lunar New Year; 5782 == 2022; sabbatical) -09/09* Rosh Hashanah (sabbatical) -09/10* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day +09/08* Rosh Hashanah (sabbatical) +09/09* Fast of Gedalya (Murder of Gedalya and subsequent Exile; 1 day after Rosh Hashanah; fast day) -09/18* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; +09/16* Yom Kippur (Day of Atonement; 9 days after Rosh Hashanah; sabbatical, fast day) -09/23* Succos (Festival of Tabernacles; 14 days after Rosh Hashanah; +09/21* Sukkot (Festival of Tabernacles; 14 days after Rosh Hashanah; sabbatical) -09/30* Hoshanah Rabba (7th day of Succos) -10/01* Shmini Atzeres (8th Day of Gathering; 1 day after Succos; sabbatical) -12/02* First Day of Chanukah -12/18* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day) +09/27* Hoshanah Rabba (7th day of Sukkot) +09/28* Shmini Atzeret (8th Day of Gathering; 1 day after Sukkot; sabbatical) +11/04* Sigd (Beta Israel; 50 days after Yom Kippur) +11/28* First Day of Chanukah +12/14* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day)
CVS commit: [netbsd-8] src/doc
Module Name:src
Committed By: martin
Date: Sat Dec 19 19:06:12 UTC 2020
Modified Files:
src/doc [netbsd-8]: CHANGES-8.3
Log Message:
Tickets #1639 and #1640
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.60 -r1.1.2.61 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.60 src/doc/CHANGES-8.3:1.1.2.61
--- src/doc/CHANGES-8.3:1.1.2.60 Sat Dec 19 13:43:04 2020
+++ src/doc/CHANGES-8.3 Sat Dec 19 19:06:12 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.3,v 1.1.2.60 2020/12/19 13:43:04 martin Exp $
+# $NetBSD: CHANGES-8.3,v 1.1.2.61 2020/12/19 19:06:12 martin Exp $
A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
release:
@@ -1469,3 +1469,30 @@ doc/3RDPARTY (manually edited)
package installs using /var/db/pkg.
[maya, #1638]
+distrib/amiga/miniroot/install.md 1.31
+distrib/hp300/miniroot/install.md 1.18-1.20
+distrib/mac68k/miniroot/install.md 1.6-1.8
+distrib/miniroot/install.sh 1.26,1.27
+distrib/miniroot/install.sub 1.47,1.50-1.54,1.56-1.59 (patch)
+distrib/miniroot/list1.36
+distrib/miniroot/upgrade.sh 1.23,1.24
+distrib/mvme68k/miniroot/install.md 1.9,1.10
+distrib/sun2/miniroot/install.md 1.6,1.7
+distrib/sun3/miniroot/install.md 1.6,1.7
+
+ Various miniroot installation fixes:
+ Simplify/modernize sh(1) usage.
+ PR 54833: fix miniroot installation failure on network configuration.
+ The kernel and X sets should be specified in MD miniroot scripts.
+ Add modules set for default sets on miniroot installation.
+ Add missing md_get_partition_range() that causes installation failure.
+ Explicitly sort set names fetched via ftp nlist.
+ Use proper release version strings ("9.1" rather than "91") in banners.
+ Fetch files via ftp using auto-fetching with URL per each binary set.
+ [tsutsui, ticket #1639]
+
+sys/dev/scsipi/scsiconf.c 1.283
+
+ Add NOLUNS quirk for more SEAGATE SCA/WIDE drives.
+ [tsutsui, ticket #1640]
+
CVS commit: [netbsd-8] src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Sat Dec 19 19:04:49 UTC 2020
Modified Files:
src/sys/dev/scsipi [netbsd-8]: scsiconf.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1640):
sys/dev/scsipi/scsiconf.c: revision 1.283
Add NOLUNS quirk for more SEAGATE SCA/WIDE drives.
Tested on NetBSD/luna68k and LUNA with SCA 80pin -> NARROW 50pin and
WIDE 68pin -> NARROW 50pin connectors.
To generate a diff of this commit:
cvs rdiff -u -r1.279.6.2 -r1.279.6.3 src/sys/dev/scsipi/scsiconf.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/scsipi/scsiconf.c
diff -u src/sys/dev/scsipi/scsiconf.c:1.279.6.2 src/sys/dev/scsipi/scsiconf.c:1.279.6.3
--- src/sys/dev/scsipi/scsiconf.c:1.279.6.2 Mon Jul 13 14:10:25 2020
+++ src/sys/dev/scsipi/scsiconf.c Sat Dec 19 19:04:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: scsiconf.c,v 1.279.6.2 2020/07/13 14:10:25 martin Exp $ */
+/* $NetBSD: scsiconf.c,v 1.279.6.3 2020/12/19 19:04:49 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.279.6.2 2020/07/13 14:10:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsiconf.c,v 1.279.6.3 2020/12/19 19:04:49 martin Exp $");
#include
#include
@@ -674,6 +674,12 @@ static const struct scsi_quirk_inquiry_p
{{T_DIRECT, T_FIXED,
"SEAGATE ", "ST318404LC ", ""}, PQUIRK_NOLUNS},
{{T_DIRECT, T_FIXED,
+ "SEAGATE ", "ST336753LC ", ""}, PQUIRK_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "SEAGATE ", "ST336753LW ", ""}, PQUIRK_NOLUNS},
+ {{T_DIRECT, T_FIXED,
+ "SEAGATE ", "ST336754LC ", ""}, PQUIRK_NOLUNS},
+ {{T_DIRECT, T_FIXED,
"SEAGATE ", "ST39236LC ", ""}, PQUIRK_NOLUNS},
{{T_DIRECT, T_FIXED,
"SEAGATE ", "ST15150N", ""}, PQUIRK_NOTAG},
CVS commit: [netbsd-8] src/distrib
Module Name:src
Committed By: martin
Date: Sat Dec 19 19:02:53 UTC 2020
Modified Files:
src/distrib/amiga/miniroot [netbsd-8]: install.md
src/distrib/hp300/miniroot [netbsd-8]: install.md
src/distrib/mac68k/miniroot [netbsd-8]: install.md
src/distrib/miniroot [netbsd-8]: install.sh install.sub list upgrade.sh
src/distrib/mvme68k/miniroot [netbsd-8]: install.md
src/distrib/sun2/miniroot [netbsd-8]: install.md
src/distrib/sun3/miniroot [netbsd-8]: install.md
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1639):
distrib/miniroot/install.sub: revision 1.54 (patch)
distrib/miniroot/install.sub: revision 1.56 (patch)
distrib/miniroot/install.sub: revision 1.57 (patch)
distrib/miniroot/install.sub: revision 1.58 (patch)
distrib/miniroot/install.sub: revision 1.59 (patch)
distrib/hp300/miniroot/install.md: revision 1.20
distrib/miniroot/list: revision 1.36
distrib/mvme68k/miniroot/install.md: revision 1.9
distrib/mvme68k/miniroot/install.md: revision 1.10
distrib/sun3/miniroot/install.md: revision 1.6
distrib/miniroot/install.sub: revision 1.47 (patch)
distrib/sun3/miniroot/install.md: revision 1.7
distrib/sun2/miniroot/install.md: revision 1.6
distrib/sun2/miniroot/install.md: revision 1.7
distrib/amiga/miniroot/install.md: revision 1.31
distrib/mac68k/miniroot/install.md: revision 1.6
distrib/mac68k/miniroot/install.md: revision 1.7
distrib/mac68k/miniroot/install.md: revision 1.8
distrib/miniroot/upgrade.sh: revision 1.23
distrib/miniroot/install.sh: revision 1.26
distrib/miniroot/upgrade.sh: revision 1.24
distrib/miniroot/install.sh: revision 1.27
distrib/hp300/miniroot/install.md: revision 1.18
distrib/hp300/miniroot/install.md: revision 1.19
distrib/miniroot/install.sub: revision 1.50 (patch)
distrib/miniroot/install.sub: revision 1.51 (patch)
distrib/miniroot/install.sub: revision 1.52 (patch)
distrib/miniroot/install.sub: revision 1.53 (patch)
Remove uses of test ... -a ... and test ... -o ...
eXorcize and `` -> $()
Fix miniroot installation failure on network configuration. PR/54833
No particular comment in the PR.
Should be pulled up to netbsd-9.
Fix "[: SMALL test, no fallback usage" error on miniroot installation.
Avoid and replace use of '-a', '(' and ')' operatos marked obsolescent
by modern POSIX.1-2017:
https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html#tag_20_128_16
as suggested by kre@ in PR/54835.
Should be pulled up to netbsd-9.
The idiom
set $whatever
while [ $# - gt 10 ]; do shift 10; done
eval echo \$$#
fails when $# turns out to be 10 (or any multiple), it would need
to be instead
while [ $# -ge 10 ]; do shift 9; done
but there hasn't been a shell that cannot handle ${10} (etc) correctly
in a very long time, so let's just use that instead (properly quoted,
in case IFS happens to contain a digit for some bizarre reason).
We should also "set -f" / "set +f" (or better, restore the prev setting of -f)
around the "set $whatever" part, but if that was ever going to cause a problem
here, it would have already, so leave that for now.
test ! -n "$foo" is just a quaint way of saying test -z "$foo"
and test ! -z "$foo" is really just test -n "$foo" so let's just
use the simple (and more obvious) forms.
NFCI.
The kernel and X sets should be specified in MD miniroot scripts.
Otherwise they are not listed at least on ftp installation.
The problem was reported by Martin Trusler on port-hp300@:
https://mail-index.netbsd.org/port-hp300/2020/11/21/msg000174.html
Should be pulled up to netbsd-9 and netbsd-8.
Add modules set for default sets on miniroot installation.
Should be pulled up to netbsd-9 and netbsd-8.
Add missing md_get_partition_range() that causes installation failure.
Also reported by Martin Trusler on testing hp300 miniroot.
Should be pulled up to netbsd-9 and netbsd-8.
Explicitly sort set names fetched via ftp nlist.
Several binary sets are stored as symbolic links on releases and
it seems some ftpd doesn't sort nlist outputs by name in such case.
Worth to pullup to netbsd-9 and netbsd-8.
Use proper release version strings ("9.1" rather than "91") in banners.
Also define and use "MACHINE" variable to describe port names
(no uname(1) or sysctl(8) in miniroot binary list by default).
I guess the short format like "91" by ${DISTRIBREV} was used only
for split sets for floppies in 1990's releases.
Worth to pullup to netbsd-9.
Inform the default installation directory in the official ftp server.
Fetch files via ftp using auto-fetching with URL per each binary set.
On slower machines, it takes more than five minutes to get a large
set binary and it could cause timeout of ftp control session, so
getting multiple binary set
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Dec 19 13:43:04 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1638 To generate a diff of this commit: cvs rdiff -u -r1.1.2.59 -r1.1.2.60 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.59 src/doc/CHANGES-8.3:1.1.2.60 --- src/doc/CHANGES-8.3:1.1.2.59 Sat Dec 12 20:31:57 2020 +++ src/doc/CHANGES-8.3 Sat Dec 19 13:43:04 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.59 2020/12/12 20:31:57 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.60 2020/12/19 13:43:04 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1456,3 +1456,16 @@ sys/dev/usb/ohcivar.h1.62 PR 22646, PR 55835: restructure the abort code for TD based transfers. [skrll, ticket #1637] +external/bsd/pkg_install/dist/add/perform.c up to 1.8 +external/bsd/pkg_install/dist/lib/lib.h up to 1.11 +external/bsd/pkg_install/dist/lib/parse-config.c up to 1.4 +external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in up to 1.4 +external/bsd/pkg_install/dist/lib/pkgdb.c up to 1.5 +external/bsd/pkg_install/dist/lib/plist.c up to 1.6 +external/bsd/pkg_install/dist/lib/version.h up to 1.19 +doc/3RDPARTY (manually edited) + + Merge pkg_install 20201218 - provide backwards compatibility for existing + package installs using /var/db/pkg. + [maya, #1638] +
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Sat Dec 19 13:41:22 UTC 2020
Modified Files:
src/doc [netbsd-8]: 3RDPARTY
src/external/bsd/pkg_install/dist/add [netbsd-8]: perform.c
src/external/bsd/pkg_install/dist/lib [netbsd-8]: lib.h parse-config.c
pkg_install.conf.5.in pkgdb.c plist.c version.h
Log Message:
Pull up the following, requested by maya in #1638:
external/bsd/pkg_install/dist/add/perform.c up to 1.8
external/bsd/pkg_install/dist/lib/lib.h up to 1.11
external/bsd/pkg_install/dist/lib/parse-config.c up to 1.4
external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in up to 1.4
external/bsd/pkg_install/dist/lib/pkgdb.c up to 1.5
external/bsd/pkg_install/dist/lib/plist.c up to 1.6
external/bsd/pkg_install/dist/lib/version.h up to 1.19
doc/3RDPARTY(manually edited)
Merge pkg_install 20201218.
Provide silent backwards compatibility for existing package installs
using /var/db/pkg.
To generate a diff of this commit:
cvs rdiff -u -r1.1444.2.24 -r1.1444.2.25 src/doc/3RDPARTY
cvs rdiff -u -r1.5.4.2 -r1.5.4.3 \
src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.8.4.2 -r1.8.4.3 src/external/bsd/pkg_install/dist/lib/lib.h
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 \
src/external/bsd/pkg_install/dist/lib/parse-config.c \
src/external/bsd/pkg_install/dist/lib/pkgdb.c \
src/external/bsd/pkg_install/dist/lib/plist.c
cvs rdiff -u -r1.3 -r1.3.4.1 \
src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in
cvs rdiff -u -r1.11.4.2 -r1.11.4.3 \
src/external/bsd/pkg_install/dist/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1444.2.24 src/doc/3RDPARTY:1.1444.2.25
--- src/doc/3RDPARTY:1.1444.2.24 Mon Dec 7 19:52:52 2020
+++ src/doc/3RDPARTY Sat Dec 19 13:41:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1444.2.24 2020/12/07 19:52:52 martin Exp $
+# $NetBSD: 3RDPARTY,v 1.1444.2.25 2020/12/19 13:41:22 martin Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -1145,8 +1145,8 @@ definition (files.pf). userland code is
reachover Makefiles are in src/usr.sbin/pf.
Package: pkg_install
-Version: 20170419
-Current Vers: 20170419
+Version: 20201218
+Current Vers: 20201218
Maintainer: The pkgsrc developers
Home Page: http://www.pkgsrc.org/
Mailing List: tech-...@netbsd.org
Index: src/external/bsd/pkg_install/dist/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.5.4.2 src/external/bsd/pkg_install/dist/add/perform.c:1.5.4.3
--- src/external/bsd/pkg_install/dist/add/perform.c:1.5.4.2 Tue Dec 8 18:48:58 2020
+++ src/external/bsd/pkg_install/dist/add/perform.c Sat Dec 19 13:41:22 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.5.4.2 2020/12/08 18:48:58 martin Exp $ */
+/* $NetBSD: perform.c,v 1.5.4.3 2020/12/19 13:41:22 martin Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -6,7 +6,7 @@
#if HAVE_SYS_CDEFS_H
#include
#endif
-__RCSID("$NetBSD: perform.c,v 1.5.4.2 2020/12/08 18:48:58 martin Exp $");
+__RCSID("$NetBSD: perform.c,v 1.5.4.3 2020/12/19 13:41:22 martin Exp $");
/*-
* Copyright (c) 2003 Grant Beattie
@@ -151,6 +151,15 @@ compatible_platform(const char *opsys, c
{
int i = 0;
+/*
+ * If the user has set the CHECK_OS_VERSION variable to "no" then skip any
+ * uname version checks and assume they know what they are doing. This can
+ * be useful on OS where the kernel version is not a good indicator of
+ * userland compatibility, or differs but retains ABI compatibility.
+ */
+if (strcasecmp(check_os_version, "no") == 0)
+ return 1;
+
/* returns 1 if host and package operating system match */
if (strcmp(host, package) == 0)
return 1;
@@ -1179,6 +1188,10 @@ check_dependencies(struct pkg_task *pkg)
continue;
best_installed = find_best_matching_installed_pkg(p->name, 0);
+ if (best_installed == NULL) {
+ warnx("Expected dependency %s still missing", p->name);
+ return -1;
+ }
for (i = 0; i < pkg->dep_length; ++i) {
if (strcmp(best_installed, pkg->dependencies[i]) == 0)
@@ -1225,6 +1238,8 @@ preserve_meta_data_file(struct pkg_task
static int
start_replacing(struct pkg_task *pkg)
{
+ int result = -1;
+
if (preserve_meta_data_file(pkg, REQUIRED_BY_FNAME))
return -1;
@@ -1241,14 +1256,19 @@ start_replacing(struct pkg_task *pkg)
Destdir ? " -P ": "", Destdir ? Destdir : "",
pkg->other_version);
}
- if (!Fake)
- fexec_skipempty(BINDIR "/pkg_delete", "-K", pkgdb_get_dir(),
+ if (!Fake) {
+ result = fexec_skipempty(BINDIR "/pkg_delete", "-K", pkgdb_get_dir(),
"-p", pkg->prefix,
Destdir ? "-P": "", Destdir ? Destdir : "",
pkg->other
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Dec 12 20:31:57 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1637 To generate a diff of this commit: cvs rdiff -u -r1.1.2.58 -r1.1.2.59 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.58 src/doc/CHANGES-8.3:1.1.2.59 --- src/doc/CHANGES-8.3:1.1.2.58 Sat Dec 12 13:00:18 2020 +++ src/doc/CHANGES-8.3 Sat Dec 12 20:31:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.58 2020/12/12 13:00:18 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.59 2020/12/12 20:31:57 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1450,3 +1450,9 @@ sys/dev/usb/ucom.c1.128 when detaching the device. [mrg, ticket #1636] +sys/dev/usb/ohci.c1.311,1.312 +sys/dev/usb/ohcivar.h1.62 + + PR 22646, PR 55835: restructure the abort code for TD based transfers. + [skrll, ticket #1637] +
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sat Dec 12 20:30:57 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-8]: ohci.c ohcivar.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1637):
sys/dev/usb/ohci.c: revision 1.311
sys/dev/usb/ohci.c: revision 1.312
sys/dev/usb/ohcivar.h: revision 1.62
Restructure the abort code for TD based transfers (ctrl, bulk, intr).
In PR kern/22646 some TDs can be on the done queue when the abort start
and, if this is the case, they need to processed after the WDH interrupt.
Instead of waiting for WDH we release TDs that have been touched by the
HC and replace them with new ones. Once WDH happens the floating TDs
will be returned to the free list.
Also addresses the issue seen in PR kern/55835
Thanks to both Andreas Gustafsson and Edgar Fu=C3=9F for testing. Apologi=
es to
Andreas Gustafsson for not committing this to HEAD for 4y6m.w
Remove leading space that crept in in the last change
To generate a diff of this commit:
cvs rdiff -u -r1.273.6.6 -r1.273.6.7 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.58.10.1 -r1.58.10.2 src/sys/dev/usb/ohcivar.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/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.273.6.6 src/sys/dev/usb/ohci.c:1.273.6.7
--- src/sys/dev/usb/ohci.c:1.273.6.6 Tue Feb 25 18:52:44 2020
+++ src/sys/dev/usb/ohci.c Sat Dec 12 20:30:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.273.6.6 2020/02/25 18:52:44 martin Exp $ */
+/* $NetBSD: ohci.c,v 1.273.6.7 2020/12/12 20:30:57 martin Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.6 2020/02/25 18:52:44 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.7 2020/12/12 20:30:57 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -390,6 +390,7 @@ ohci_detach(struct ohci_softc *sc, int f
if (sc->sc_hcca != NULL)
usb_freemem(&sc->sc_bus, &sc->sc_hccadma);
pool_cache_destroy(sc->sc_xferpool);
+ cv_destroy(&sc->sc_abort_cv);
return rv;
}
@@ -492,6 +493,7 @@ ohci_alloc_std(ohci_softc_t *sc)
memset(&std->td, 0, sizeof(ohci_td_t));
std->nexttd = NULL;
std->xfer = NULL;
+ std->held = NULL;
return std;
}
@@ -539,14 +541,17 @@ ohci_alloc_std_chain(ohci_softc_t *sc, s
DPRINTFN(8, "xfer %#jx nstd %jd", (uintptr_t)xfer, nstd, 0, 0);
- for (size_t j = 0; j < ox->ox_nstd;) {
+ for (size_t j = 0; j < ox->ox_nstd; j++) {
ohci_soft_td_t *cur = ohci_alloc_std(sc);
if (cur == NULL)
goto nomem;
- ox->ox_stds[j++] = cur;
+ ox->ox_stds[j] = cur;
+ cur->held = &ox->ox_stds[j];
cur->xfer = xfer;
cur->flags = 0;
+ DPRINTFN(10, "xfer=%#jx new std=%#jx held at %#jx", (uintptr_t)ox,
+ (uintptr_t)cur, (uintptr_t)cur->held, 0);
}
return 0;
@@ -797,6 +802,9 @@ ohci_init(ohci_softc_t *sc)
for (i = 0; i < OHCI_HASH_SIZE; i++)
LIST_INIT(&sc->sc_hash_itds[i]);
+ TAILQ_INIT(&sc->sc_abortingxfers);
+ cv_init(&sc->sc_abort_cv, "ohciabt");
+
sc->sc_xferpool = pool_cache_init(sizeof(struct ohci_xfer), 0, 0, 0,
"ohcixfer", NULL, IPL_USB, NULL, NULL, NULL);
@@ -1313,6 +1321,21 @@ ohci_intr1(ohci_softc_t *sc)
*/
usb_schedsoftintr(&sc->sc_bus);
}
+ if (eintrs & OHCI_SF) {
+ struct ohci_xfer *ox, *tmp;
+ TAILQ_FOREACH_SAFE(ox, &sc->sc_abortingxfers, ox_abnext, tmp) {
+ DPRINTFN(10, "SF %#jx xfer %#jx", (uintptr_t)sc,
+ (uintptr_t)ox, 0, 0);
+ ox->ox_abintrs &= ~OHCI_SF;
+ KASSERT(ox->ox_abintrs == 0);
+ TAILQ_REMOVE(&sc->sc_abortingxfers, ox, ox_abnext);
+ }
+ cv_broadcast(&sc->sc_abort_cv);
+
+ KASSERT(TAILQ_EMPTY(&sc->sc_abortingxfers));
+ DPRINTFN(10, "end SOF %#jx", (uintptr_t)sc, 0, 0, 0);
+ /* Don't remove OHIC_SF from eintrs so it is blocked below */
+ }
if (eintrs & OHCI_RD) {
/* 1 argument, but zero format strings */
DPRINTFN(5, "resume detect", (uintptr_t)sc, 0, 0, 0);
@@ -1391,12 +1414,22 @@ ohci_softintr(void *v)
struct ohci_pipe *opipe;
int len, cc;
int i, j, actlen, iframes, uedir;
- ohci_physaddr_t done;
+ ohci_physaddr_t done = 0;
KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
OHCIHIST_FUNC(); OHCIHIST_CALLED();
+ /*
+ * Only read hccadone if WDH is set - we might get here from places
+ * other than an interrupt
+ */
+ if (!(OREAD4(sc, OHCI_INTERRUPT_STATUS) & OHCI_WDH)) {
+ DPRINTFN(10, "no WDH %#jx", (uintptr_t)sc, 0, 0, 0);
+ return;
+ }
+
+ DPRINTFN(10, "WDH %#jx", (uintptr_t)sc, 0, 0, 0);
usb_syncmem(&sc->sc_hccadma, offsetof(struct ohci_hcca, hcca_done_head),
sizeof(sc->sc_hcca->hcca_done_head),
BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
@@ -1449,11 +1482,19 @@ ohci_softintr(void *v)
DPRINTFN(10, "--- TD dump end ---", 0, 0, 0, 0);
for (std = sdone; std; std = stdnext) {
- xfer = std->xfer;
stdnext = std->dnext;
-
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Dec 12 13:00:18 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1636 To generate a diff of this commit: cvs rdiff -u -r1.1.2.57 -r1.1.2.58 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.57 src/doc/CHANGES-8.3:1.1.2.58 --- src/doc/CHANGES-8.3:1.1.2.57 Fri Dec 11 19:35:16 2020 +++ src/doc/CHANGES-8.3 Sat Dec 12 13:00:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.57 2020/12/11 19:35:16 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.58 2020/12/12 13:00:18 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1444,3 +1444,9 @@ sys/dev/hyperv/if_hvn.c1.19 (via pat hvn(4): fix SIOCSIFFLAGS ioctl handling to make ifconfig up/down work. [nonaka, ticket #1635] +sys/dev/usb/ucom.c1.128 + + Properly wait for refcounts to drain to avoid potential panics + when detaching the device. + [mrg, ticket #1636] +
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sat Dec 12 12:58:51 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-8]: ucom.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1636):
sys/dev/usb/ucom.c: revision 1.128
properly wait for refcounts to drain.
fixes panic at detach that jmnceill saw.
XXX: pullup-[89].
To generate a diff of this commit:
cvs rdiff -u -r1.118.8.4 -r1.118.8.5 src/sys/dev/usb/ucom.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/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.118.8.4 src/sys/dev/usb/ucom.c:1.118.8.5
--- src/sys/dev/usb/ucom.c:1.118.8.4 Tue May 7 18:47:01 2019
+++ src/sys/dev/usb/ucom.c Sat Dec 12 12:58:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.118.8.4 2019/05/07 18:47:01 martin Exp $ */
+/* $NetBSD: ucom.c,v 1.118.8.5 2020/12/12 12:58:51 martin Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.118.8.4 2019/05/07 18:47:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.118.8.5 2020/12/12 12:58:51 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -431,7 +431,7 @@ ucom_detach(device_t self, int flags)
}
sc->sc_refcnt--;
- while (sc->sc_refcnt > 0) {
+ while (sc->sc_refcnt >= 0) {
/* Wake up anyone waiting */
if (tp != NULL) {
mutex_spin_enter(&tty_lock);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Dec 11 19:35:16 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ammend ticket #1626 To generate a diff of this commit: cvs rdiff -u -r1.1.2.56 -r1.1.2.57 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.56 src/doc/CHANGES-8.3:1.1.2.57 --- src/doc/CHANGES-8.3:1.1.2.56 Fri Dec 11 15:48:59 2020 +++ src/doc/CHANGES-8.3 Fri Dec 11 19:35:16 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.56 2020/12/11 15:48:59 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.57 2020/12/11 19:35:16 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1417,7 +1417,7 @@ xsrc/external/mit/libX11/dist/modules/im PR 55640: fix off by one in X Input Method. [maya, ticket #1634] -external/bsd/pkg_install/Makefile.inc up to 1.7 +external/bsd/pkg_install/Makefile.inc up to 1.7 (adapted) external/bsd/pkg_install/dist/add/perform.c up to 1.7 external/bsd/pkg_install/dist/admin/check.c up to 1.4 external/bsd/pkg_install/dist/admin/main.c up to 1.6
CVS commit: [netbsd-8] src/external/bsd/pkg_install
Module Name:src
Committed By: martin
Date: Fri Dec 11 19:34:06 UTC 2020
Modified Files:
src/external/bsd/pkg_install [netbsd-8]: Makefile.inc
Log Message:
Remove options unknown to all native gcc on this branch.
The version check did not work because on this branch the numbering
scheme wass different (e.g. gcc 5.x is used and HAVE_GCC is 53, which
numerically clearly is > 7 - but that is not what the new check meant).
To generate a diff of this commit:
cvs rdiff -u -r1.4.34.1 -r1.4.34.2 src/external/bsd/pkg_install/Makefile.inc
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/pkg_install/Makefile.inc
diff -u src/external/bsd/pkg_install/Makefile.inc:1.4.34.1 src/external/bsd/pkg_install/Makefile.inc:1.4.34.2
--- src/external/bsd/pkg_install/Makefile.inc:1.4.34.1 Tue Dec 8 18:48:58 2020
+++ src/external/bsd/pkg_install/Makefile.inc Fri Dec 11 19:34:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4.34.1 2020/12/08 18:48:58 martin Exp $
+# $NetBSD: Makefile.inc,v 1.4.34.2 2020/12/11 19:34:06 martin Exp $
DIST= ${NETBSDSRCDIR}/external/bsd/pkg_install/dist
@@ -13,9 +13,3 @@ WARNS= 4
CWARNFLAGS+= -Wno-missing-noreturn
.include
-
-# show_version() does not return
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.main.c+= -Wno-error=implicit-fallthrough
-COPTS.pkg_delete.c+= -Wno-error=implicit-fallthrough
-.endif
CVS commit: [netbsd-8] src/doc
Module Name:src
Committed By: martin
Date: Fri Dec 11 15:48:59 UTC 2020
Modified Files:
src/doc [netbsd-8]: CHANGES-8.3
Log Message:
Ticket #1635
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.55 -r1.1.2.56 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.55 src/doc/CHANGES-8.3:1.1.2.56
--- src/doc/CHANGES-8.3:1.1.2.55 Tue Dec 8 18:49:33 2020
+++ src/doc/CHANGES-8.3 Fri Dec 11 15:48:59 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.3,v 1.1.2.55 2020/12/08 18:49:33 martin Exp $
+# $NetBSD: CHANGES-8.3,v 1.1.2.56 2020/12/11 15:48:59 martin Exp $
A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
release:
@@ -1438,3 +1438,9 @@ external/bsd/pkg_install/lib/config.h
Import pkg_info 20201205, move the default pkg database from
/var/db/pkg to ${PREFIX/pkgdb.
[wiz, ticket #1626]
+
+sys/dev/hyperv/if_hvn.c1.19 (via patch)
+
+ hvn(4): fix SIOCSIFFLAGS ioctl handling to make ifconfig up/down work.
+ [nonaka, ticket #1635]
+
CVS commit: [netbsd-8] src/sys/dev/hyperv
Module Name:src
Committed By: martin
Date: Fri Dec 11 15:48:02 UTC 2020
Modified Files:
src/sys/dev/hyperv [netbsd-8]: if_hvn.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #1635):
sys/dev/hyperv/if_hvn.c: revision 1.19 (via patch)
hvn(4): fix unable to ifconfig up/down.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.7 -r1.2.2.8 src/sys/dev/hyperv/if_hvn.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/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.2.2.7 src/sys/dev/hyperv/if_hvn.c:1.2.2.8
--- src/sys/dev/hyperv/if_hvn.c:1.2.2.7 Tue Nov 26 08:25:28 2019
+++ src/sys/dev/hyperv/if_hvn.c Fri Dec 11 15:48:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.2.2.7 2019/11/26 08:25:28 martin Exp $ */
+/* $NetBSD: if_hvn.c,v 1.2.2.8 2020/12/11 15:48:02 martin Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.2.2.7 2019/11/26 08:25:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.2.2.8 2020/12/11 15:48:02 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -379,20 +379,6 @@ hvn_ioctl(struct ifnet *ifp, u_long comm
s = splnet();
switch (command) {
- case SIOCSIFFLAGS:
- if (ifp->if_flags & IFF_UP) {
- if (ifp->if_flags & IFF_RUNNING)
-error = ENETRESET;
- else {
-error = hvn_init(ifp);
-if (error)
- ifp->if_flags &= ~IFF_UP;
- }
- } else {
- if (ifp->if_flags & IFF_RUNNING)
-hvn_stop(ifp, 1);
- }
- break;
case SIOCGIFMEDIA:
case SIOCSIFMEDIA:
error = ifmedia_ioctl(ifp, ifr, &sc->sc_media, command);
CVS commit: [netbsd-8] src/doc
Module Name:src
Committed By: martin
Date: Tue Dec 8 18:49:33 UTC 2020
Modified Files:
src/doc [netbsd-8]: CHANGES-8.3
Log Message:
Ticket #1626
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.54 -r1.1.2.55 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.54 src/doc/CHANGES-8.3:1.1.2.55
--- src/doc/CHANGES-8.3:1.1.2.54 Mon Dec 7 20:24:05 2020
+++ src/doc/CHANGES-8.3 Tue Dec 8 18:49:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.3,v 1.1.2.54 2020/12/07 20:24:05 martin Exp $
+# $NetBSD: CHANGES-8.3,v 1.1.2.55 2020/12/08 18:49:33 martin Exp $
A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
release:
@@ -1416,3 +1416,25 @@ xsrc/external/mit/libX11/dist/modules/im
PR 55640: fix off by one in X Input Method.
[maya, ticket #1634]
+
+external/bsd/pkg_install/Makefile.inc up to 1.7
+external/bsd/pkg_install/dist/add/perform.c up to 1.7
+external/bsd/pkg_install/dist/admin/check.c up to 1.4
+external/bsd/pkg_install/dist/admin/main.c up to 1.6
+external/bsd/pkg_install/dist/admin/pkg_admin.1 up to 1.6
+external/bsd/pkg_install/dist/create/perform.c up to 1.3
+external/bsd/pkg_install/dist/create/pl.c up to 1.4
+external/bsd/pkg_install/dist/info/perform.cup to 1.3
+external/bsd/pkg_install/dist/lib/iterate.c up to 1.3
+external/bsd/pkg_install/dist/lib/lib.h up to 1.10
+external/bsd/pkg_install/dist/lib/license.c up to 1.10
+external/bsd/pkg_install/dist/lib/pkgdb.c up to 1.4
+external/bsd/pkg_install/dist/lib/plist.c up to 1.4
+external/bsd/pkg_install/dist/lib/version.h up to 1.17
+external/bsd/pkg_install/dist/lib/vulnerabilities-file.c up to 1.4
+external/bsd/pkg_install/lib/Makefile up to 1.11
+external/bsd/pkg_install/lib/config.h up to 1.3
+
+ Import pkg_info 20201205, move the default pkg database from
+ /var/db/pkg to ${PREFIX/pkgdb.
+ [wiz, ticket #1626]
CVS commit: [netbsd-8] src/external/bsd/pkg_install
Module Name:src
Committed By: martin
Date: Tue Dec 8 18:48:59 UTC 2020
Modified Files:
src/external/bsd/pkg_install [netbsd-8]: Makefile.inc
src/external/bsd/pkg_install/dist/add [netbsd-8]: perform.c
src/external/bsd/pkg_install/dist/admin [netbsd-8]: check.c main.c
pkg_admin.1
src/external/bsd/pkg_install/dist/create [netbsd-8]: perform.c pl.c
src/external/bsd/pkg_install/dist/info [netbsd-8]: perform.c
src/external/bsd/pkg_install/dist/lib [netbsd-8]: iterate.c lib.h
license.c pkgdb.c plist.c version.h vulnerabilities-file.c
src/external/bsd/pkg_install/lib [netbsd-8]: Makefile config.h
Log Message:
Sync external/bsd/pkg_install with -current, requested by wiz in ticket #1626:
external/bsd/pkg_install/Makefile.inc up to 1.7
external/bsd/pkg_install/dist/add/perform.c up to 1.7
external/bsd/pkg_install/dist/admin/check.c up to 1.4
external/bsd/pkg_install/dist/admin/main.c up to 1.6
external/bsd/pkg_install/dist/admin/pkg_admin.1 up to 1.6
external/bsd/pkg_install/dist/create/perform.c up to 1.3
external/bsd/pkg_install/dist/create/pl.c up to 1.4
external/bsd/pkg_install/dist/info/perform.cup to 1.3
external/bsd/pkg_install/dist/lib/iterate.c up to 1.3
external/bsd/pkg_install/dist/lib/lib.h up to 1.10
external/bsd/pkg_install/dist/lib/license.c up to 1.10
external/bsd/pkg_install/dist/lib/pkgdb.c up to 1.4
external/bsd/pkg_install/dist/lib/plist.c up to 1.4
external/bsd/pkg_install/dist/lib/version.h up to 1.17
external/bsd/pkg_install/dist/lib/vulnerabilities-file.c up to 1.4
external/bsd/pkg_install/lib/Makefile up to 1.11
external/bsd/pkg_install/lib/config.h up to 1.3
Import pkg_info 20201205, move the default pkg database from /var/db/pkg
to ${PREFIX/pkgdb.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.34.1 src/external/bsd/pkg_install/Makefile.inc
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 \
src/external/bsd/pkg_install/dist/add/perform.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/pkg_install/dist/admin/check.c
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 \
src/external/bsd/pkg_install/dist/admin/main.c \
src/external/bsd/pkg_install/dist/admin/pkg_admin.1
cvs rdiff -u -r1.2 -r1.2.4.1 \
src/external/bsd/pkg_install/dist/create/perform.c \
src/external/bsd/pkg_install/dist/create/pl.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/pkg_install/dist/info/perform.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/bsd/pkg_install/dist/lib/iterate.c \
src/external/bsd/pkg_install/dist/lib/pkgdb.c \
src/external/bsd/pkg_install/dist/lib/plist.c
cvs rdiff -u -r1.8.4.1 -r1.8.4.2 src/external/bsd/pkg_install/dist/lib/lib.h
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 \
src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.11.4.1 -r1.11.4.2 \
src/external/bsd/pkg_install/dist/lib/version.h
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 \
src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c
cvs rdiff -u -r1.9 -r1.9.38.1 src/external/bsd/pkg_install/lib/Makefile
cvs rdiff -u -r1.2 -r1.2.38.1 src/external/bsd/pkg_install/lib/config.h
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/pkg_install/Makefile.inc
diff -u src/external/bsd/pkg_install/Makefile.inc:1.4 src/external/bsd/pkg_install/Makefile.inc:1.4.34.1
--- src/external/bsd/pkg_install/Makefile.inc:1.4 Fri Sep 16 16:41:20 2011
+++ src/external/bsd/pkg_install/Makefile.inc Tue Dec 8 18:48:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2011/09/16 16:41:20 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.4.34.1 2020/12/08 18:48:58 martin Exp $
DIST= ${NETBSDSRCDIR}/external/bsd/pkg_install/dist
@@ -11,3 +11,11 @@ CPPFLAGS+=-DSYSCONFDIR='"/etc"'
WARNS= 4
CWARNFLAGS+= -Wno-missing-noreturn
+
+.include
+
+# show_version() does not return
+.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
+COPTS.main.c+= -Wno-error=implicit-fallthrough
+COPTS.pkg_delete.c+= -Wno-error=implicit-fallthrough
+.endif
Index: src/external/bsd/pkg_install/dist/add/perform.c
diff -u src/external/bsd/pkg_install/dist/add/perform.c:1.5.4.1 src/external/bsd/pkg_install/dist/add/perform.c:1.5.4.2
--- src/external/bsd/pkg_install/dist/add/perform.c:1.5.4.1 Mon Oct 21 16:57:40 2019
+++ src/external/bsd/pkg_install/dist/add/perform.c Tue Dec 8 18:48:58 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: perform.c,v 1.5.4.1 2019/10/21 16:57:40 martin Exp $ */
+/* $NetBSD: perform.c,v 1.5.4.2 2020/12/08 18:48:58 martin Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
#endif
@@ -6,7 +6,7 @@
#if HAVE_SYS_CDEFS_H
#include
#endif
-__RCSID("$NetBSD: perform.c,v 1.5.4.1 2019/10/21 16:57:40 martin Exp $");
+__RCSID("$NetBSD: perform.c,v 1.5.4.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Dec 7 20:24:05 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1628 - #1634 To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 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.53 src/doc/CHANGES-8.3:1.1.2.54 --- src/doc/CHANGES-8.3:1.1.2.53 Sun Dec 6 10:28:28 2020 +++ src/doc/CHANGES-8.3 Mon Dec 7 20:24:05 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.53 2020/12/06 10:28:28 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.54 2020/12/07 20:24:05 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1345,3 +1345,74 @@ xsrc/external/mit/xorg-server/dist/xkb/x Overflow [mrg, ticket #1627] +xsrc/external/mit/xorg-server.old/dist/xkb/xkb.c 1.2 + + Apply upstream patches for: + * CVE-2020-14360 / ZDI CAN 11572 XkbSetMap Out-Of-Bounds Access + * CVE-2020-25712 / ZDI-CAN-11839 XkbSetDeviceInfo Heap-based Buffer + Overflow + [mrg, ticket #1628] + +bin/sh/exec.c 1.54 + + PR bin/55526: fix "command foo" when a function "foo" exists. + [kre, ticket #1629] + +sbin/dump/dump.h1.59 +sbin/dump/main.c1.78 + + PR 55834: fix status updates for files larger than 2TiB. + [kre, ticket #1630] + +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.29 +external/public-domain/tz/dist/NEWS up to 1.1.1.32 +external/public-domain/tz/dist/README up to 1.1.1.9 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.22 +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.27 +external/public-domain/tz/dist/australasia up to 1.1.1.20 +external/public-domain/tz/dist/backward up to 1.1.1.11 +external/public-domain/tz/dist/backzone up to 1.1.1.19 +external/public-domain/tz/dist/checktab.awk up to 1.1.1.10 +external/public-domain/tz/dist/etcetera up to 1.1.1.4 +external/public-domain/tz/dist/europe up to 1.1.1.29 +external/public-domain/tz/dist/factory up to 1.1.1.4 +external/public-domain/tz/dist/iso3166.tab up to 1.1.1.6 +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.19 +external/public-domain/tz/dist/ziguard.awk up to 1.1.1.5 +external/public-domain/tz/dist/zishrink.awk up to 1.1.1.7 +external/public-domain/tz/dist/zone.tab up to 1.1.1.18 +external/public-domain/tz/dist/zone1970.tab up to 1.1.1.20 +external/public-domain/tz/dist/zoneinfo2tdf.pl up to 1.1.1.4 +distrib/sets/lists/base/mi (apply patch) +doc/3RDPARTY (apply patch) +external/public-domain/tz/share/zoneinfo/Makefile (apply patch) + + Update timezone data to 2020d. + [kre, ticket #1631] + +sys/netinet/ip_mroute.c1.164 (patch) + + PR 55779: restore non-desctructive guarantee of ip_mforward() mbuf + argument. + [kardel, ticket #1632] + +sys/dev/ic/nvme.c1.53 + + PR 55839: avoid mulitple bus rescans when loading the module. + [kardel, ticket #1633] + +xsrc/external/mit/libX11/dist/modules/im/ximcp/imRmAttr.c(patch) + + PR 55640: fix off by one in X Input Method. + [maya, ticket #1634]
CVS commit: [netbsd-8] src/sys/dev/ic
Module Name:src Committed By: martin Date: Mon Dec 7 20:05:36 UTC 2020 Modified Files: src/sys/dev/ic [netbsd-8]: nvme.c Log Message: Pull up following revision(s) (requested by kardel in ticket #1633): sys/dev/ic/nvme.c: revision 1.53 PR kern/55839: handle multiple nvme_rescan()s correctly by doing the name-space identify only once per nsid. fixes issue where modloading triggers multiple rescans. To generate a diff of this commit: cvs rdiff -u -r1.30.2.8 -r1.30.2.9 src/sys/dev/ic/nvme.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/ic/nvme.c diff -u src/sys/dev/ic/nvme.c:1.30.2.8 src/sys/dev/ic/nvme.c:1.30.2.9 --- src/sys/dev/ic/nvme.c:1.30.2.8 Sun Sep 27 10:33:45 2020 +++ src/sys/dev/ic/nvme.c Mon Dec 7 20:05:36 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: nvme.c,v 1.30.2.8 2020/09/27 10:33:45 martin Exp $ */ +/* $NetBSD: nvme.c,v 1.30.2.9 2020/12/07 20:05:36 martin Exp $ */ /* $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */ /* @@ -18,7 +18,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.30.2.8 2020/09/27 10:33:45 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.30.2.9 2020/12/07 20:05:36 martin Exp $"); #include #include @@ -625,6 +625,12 @@ nvme_ns_identify(struct nvme_softc *sc, KASSERT(nsid > 0); + ns = nvme_ns_get(sc, nsid); + KASSERT(ns); + + if (ns->ident != NULL) + return 0; + ccb = nvme_ccb_get(sc->sc_admin_q, false); KASSERT(ccb != NULL); /* it's a bug if we don't have spare ccb here */ @@ -662,9 +668,6 @@ nvme_ns_identify(struct nvme_softc *sc, /* Convert data to host endian */ nvme_identify_namespace_swapbytes(identify); - ns = nvme_ns_get(sc, nsid); - KASSERT(ns); - KASSERT(ns->ident == NULL); ns->ident = identify; done:
CVS commit: [netbsd-8] src/sys/netinet
Module Name:src
Committed By: martin
Date: Mon Dec 7 20:01:02 UTC 2020
Modified Files:
src/sys/netinet [netbsd-8]: ip_mroute.c
Log Message:
Pull up following revision(s) (requested by kardel in ticket #1632):
sys/netinet/ip_mroute.c: revision 1.164 (patch)
PR kern/55779:
restore non-desctructive guarantee of ip_mforward() mbuf
argument. This avoids generation invalid UDP checksums
on multicast packets in ip_output().
XXX the root cause of the misguided fix in 2008 should be
XXX investigated
To generate a diff of this commit:
cvs rdiff -u -r1.146.6.4 -r1.146.6.5 src/sys/netinet/ip_mroute.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/netinet/ip_mroute.c
diff -u src/sys/netinet/ip_mroute.c:1.146.6.4 src/sys/netinet/ip_mroute.c:1.146.6.5
--- src/sys/netinet/ip_mroute.c:1.146.6.4 Fri Jul 13 14:26:47 2018
+++ src/sys/netinet/ip_mroute.c Mon Dec 7 20:01:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_mroute.c,v 1.146.6.4 2018/07/13 14:26:47 martin Exp $ */
+/* $NetBSD: ip_mroute.c,v 1.146.6.5 2020/12/07 20:01:01 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -93,7 +93,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.146.6.4 2018/07/13 14:26:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_mroute.c,v 1.146.6.5 2020/12/07 20:01:01 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -239,6 +239,8 @@ static int tbf_dq_sel(struct vif *, stru
static void tbf_send_packet(struct vif *, struct mbuf *);
static void tbf_update_tokens(struct vif *);
static int priority(struct vif *, struct ip *);
+static int ip_mforward_real(struct mbuf *, struct ifnet *);
+
/*
* Bandwidth monitoring
@@ -1309,6 +1311,34 @@ ip_mforward(struct mbuf *m, struct ifnet
ip_mforward(struct mbuf *m, struct ifnet *ifp)
#endif /* RSVP_ISI */
{
+ int rc;
+ /*
+ * save csum_flags to uphold the
+ * "unscathed" guarantee.
+ * ip_output() relies on that and
+ * without it we send out
+ * multicast packets with an invalid
+ * checksum
+ *
+ * see PR kern/55779
+ */
+ int csum_flags = m->m_pkthdr.csum_flags;
+
+ /*
+ * Temporarily clear any in-bound checksum flags for this packet.
+ */
+ m->m_pkthdr.csum_flags = 0;
+
+ rc = ip_mforward_real(m, ifp);
+
+ m->m_pkthdr.csum_flags = csum_flags;
+
+ return rc;
+}
+
+static int
+ip_mforward_real(struct mbuf *m, struct ifnet *ifp)
+{
struct ip *ip = mtod(m, struct ip *);
struct mfc *rt;
static int srctun = 0;
@@ -1340,11 +1370,6 @@ ip_mforward(struct mbuf *m, struct ifnet
return (1);
}
- /*
- * Clear any in-bound checksum flags for this packet.
- */
- m->m_pkthdr.csum_flags = 0;
-
#ifdef RSVP_ISI
if (imo && ((vifi = imo->imo_multicast_vif) < numvifs)) {
if (ip->ip_ttl < MAXTTL)
CVS commit: [netbsd-8] src/bin/sh
Module Name:src
Committed By: martin
Date: Mon Dec 7 19:39:09 UTC 2020
Modified Files:
src/bin/sh [netbsd-8]: exec.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1629):
bin/sh/exec.c: revision 1.54
PR bin/55526
Fix a bug that has existed since the "command" command was added in
2003. "command foo" would cause the definition of a function "foo"
to be lost (not freed, simply discarded) if "foo" is (in addition to
being a function) a filesystem command. The case where "foo" is
a builtin was handled.
For now, when a function exists with the same name as a filesystem
command, the latter can never appear in the command hash table, and
when used (which can only be via "command foo", just "foo" finds
the function) will always result in a full PATH search.
XXX pullup everything (from NetBSD 2.0 onwards). (really -8 and -9)
To generate a diff of this commit:
cvs rdiff -u -r1.47.2.4 -r1.47.2.5 src/bin/sh/exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/exec.c
diff -u src/bin/sh/exec.c:1.47.2.4 src/bin/sh/exec.c:1.47.2.5
--- src/bin/sh/exec.c:1.47.2.4 Sat Aug 25 14:48:22 2018
+++ src/bin/sh/exec.c Mon Dec 7 19:39:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.47.2.4 2018/08/25 14:48:22 martin Exp $ */
+/* $NetBSD: exec.c,v 1.47.2.5 2020/12/07 19:39:09 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)exec.c 8.4 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: exec.c,v 1.47.2.4 2018/08/25 14:48:22 martin Exp $");
+__RCSID("$NetBSD: exec.c,v 1.47.2.5 2020/12/07 19:39:09 martin Exp $");
#endif
#endif /* not lint */
@@ -667,6 +667,10 @@ loop:
cmdp = &loc_cmd;
} else
cmdp = cmdlookup(name, 1);
+
+ if (cmdp->cmdtype == CMDFUNCTION)
+ cmdp = &loc_cmd;
+
cmdp->cmdtype = CMDNORMAL;
cmdp->param.index = idx;
INTON;
CVS commit: [netbsd-8] src/sbin/dump
Module Name:src
Committed By: martin
Date: Mon Dec 7 19:35:50 UTC 2020
Modified Files:
src/sbin/dump [netbsd-8]: dump.h main.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1630):
sbin/dump/dump.h: revision 1.59
sbin/dump/main.c: revision 1.78
PR bin/55834
count blocks written in unsigned 64 bit counter
rather than signed int which overflows after 2^31-1
blocks (2TiB) after which neither the 5 minute
status updates or SIGINFO (^T) reports are issued
until the negative numbers increase past 0 and
wildly inaccurate reports would be written.
To generate a diff of this commit:
cvs rdiff -u -r1.54.8.1 -r1.54.8.2 src/sbin/dump/dump.h
cvs rdiff -u -r1.73.8.1 -r1.73.8.2 src/sbin/dump/main.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/dump/dump.h
diff -u src/sbin/dump/dump.h:1.54.8.1 src/sbin/dump/dump.h:1.54.8.2
--- src/sbin/dump/dump.h:1.54.8.1 Fri Mar 29 19:43:28 2019
+++ src/sbin/dump/dump.h Mon Dec 7 19:35:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dump.h,v 1.54.8.1 2019/03/29 19:43:28 martin Exp $ */
+/* $NetBSD: dump.h,v 1.54.8.2 2020/12/07 19:35:50 martin Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -134,7 +134,7 @@ int unlimited; /* if set, write to end o
extern int density; /* density in 0.1" units */
extern int notify; /* notify operator flag */
extern int timestamp; /* timestamp messages */
-extern int blockswritten; /* number of blocks written on current tape */
+extern u_int64_t blockswritten; /* blocks written on current tape */
extern int tapeno; /* current tape number */
extern int is_ufs2;
Index: src/sbin/dump/main.c
diff -u src/sbin/dump/main.c:1.73.8.1 src/sbin/dump/main.c:1.73.8.2
--- src/sbin/dump/main.c:1.73.8.1 Fri Mar 29 19:43:28 2019
+++ src/sbin/dump/main.c Mon Dec 7 19:35:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.73.8.1 2019/03/29 19:43:28 martin Exp $ */
+/* $NetBSD: main.c,v 1.73.8.2 2020/12/07 19:35:50 martin Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95";
#else
-__RCSID("$NetBSD: main.c,v 1.73.8.1 2019/03/29 19:43:28 martin Exp $");
+__RCSID("$NetBSD: main.c,v 1.73.8.2 2020/12/07 19:35:50 martin Exp $");
#endif
#endif /* not lint */
@@ -71,7 +71,7 @@ __RCSID("$NetBSD: main.c,v 1.73.8.1 2019
int timestamp; /* print message timestamps */
int notify; /* notify operator flag */
-int blockswritten; /* number of blocks written on current tape */
+u_int64_t blockswritten; /* number of blocks written on current tape */
int tapeno; /* current tape number */
int density; /* density in bytes/0.1" */
int ntrec = NTREC; /* # tape blocks in each tape record */
