CVS import: xsrc/external/mit/util-macros/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:55:29 UTC 2018

Update of /cvsroot/xsrc/external/mit/util-macros/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv15965

Log Message:
initial import of util-macros-1.19.2

Status:

Vendor Tag: xorg
Release Tags:   util-macros-1-19-2

U xsrc/external/mit/util-macros/dist/xorgversion.m4
U xsrc/external/mit/util-macros/dist/COPYING
U xsrc/external/mit/util-macros/dist/xorg-macros.m4.in
U xsrc/external/mit/util-macros/dist/configure
U xsrc/external/mit/util-macros/dist/configure.ac
U xsrc/external/mit/util-macros/dist/xorg-macros.pc.in
U xsrc/external/mit/util-macros/dist/ChangeLog
U xsrc/external/mit/util-macros/dist/Makefile.am
U xsrc/external/mit/util-macros/dist/README
U xsrc/external/mit/util-macros/dist/Makefile.in
U xsrc/external/mit/util-macros/dist/missing
U xsrc/external/mit/util-macros/dist/INSTALL
U xsrc/external/mit/util-macros/dist/aclocal.m4
U xsrc/external/mit/util-macros/dist/install-sh

No conflicts created by this import

CVS import: xsrc/external/mit/viewres/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:55:30 UTC 2018

Update of /cvsroot/xsrc/external/mit/viewres/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv25471

Log Message:
initial import of viewres-1.0.5

Status:

Vendor Tag: xorg
Release Tags:   viewres-1-0-5

U xsrc/external/mit/viewres/dist/Makefile.in
U xsrc/external/mit/viewres/dist/install-sh
U xsrc/external/mit/viewres/dist/aclocal.m4
U xsrc/external/mit/viewres/dist/README
U xsrc/external/mit/viewres/dist/depcomp
U xsrc/external/mit/viewres/dist/missing
U xsrc/external/mit/viewres/dist/configure.ac
U xsrc/external/mit/viewres/dist/COPYING
U xsrc/external/mit/viewres/dist/Makefile.am
U xsrc/external/mit/viewres/dist/viewres.c
C xsrc/external/mit/viewres/dist/compile
U xsrc/external/mit/viewres/dist/config.sub
U xsrc/external/mit/viewres/dist/config.h.in
U xsrc/external/mit/viewres/dist/config.guess
U xsrc/external/mit/viewres/dist/configure
U xsrc/external/mit/viewres/dist/ChangeLog
U xsrc/external/mit/viewres/dist/INSTALL
U xsrc/external/mit/viewres/dist/app-defaults/Viewres-color
U xsrc/external/mit/viewres/dist/app-defaults/Viewres
U xsrc/external/mit/viewres/dist/man/viewres.man
U xsrc/external/mit/viewres/dist/man/Makefile.in
U xsrc/external/mit/viewres/dist/man/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/viewres/dist

CVS import: xsrc/external/mit/oclock/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:55:25 UTC 2018

Update of /cvsroot/xsrc/external/mit/oclock/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv26081

Log Message:
initial import of oclock-1.0.4

Status:

Vendor Tag: xorg
Release Tags:   oclock-1-0-4

C xsrc/external/mit/oclock/dist/compile
U xsrc/external/mit/oclock/dist/Makefile.am
U xsrc/external/mit/oclock/dist/missing
U xsrc/external/mit/oclock/dist/configure.ac
U xsrc/external/mit/oclock/dist/depcomp
U xsrc/external/mit/oclock/dist/oclock.c
U xsrc/external/mit/oclock/dist/Makefile.in
U xsrc/external/mit/oclock/dist/Clock.c
U xsrc/external/mit/oclock/dist/README
U xsrc/external/mit/oclock/dist/config.sub
U xsrc/external/mit/oclock/dist/transform.h
U xsrc/external/mit/oclock/dist/COPYING
U xsrc/external/mit/oclock/dist/ChangeLog
U xsrc/external/mit/oclock/dist/oclock.bit
U xsrc/external/mit/oclock/dist/configure
U xsrc/external/mit/oclock/dist/ClockP.h
U xsrc/external/mit/oclock/dist/transform.c
U xsrc/external/mit/oclock/dist/INSTALL
U xsrc/external/mit/oclock/dist/aclocal.m4
U xsrc/external/mit/oclock/dist/oclmask.bit
U xsrc/external/mit/oclock/dist/install-sh
U xsrc/external/mit/oclock/dist/config.h.in
U xsrc/external/mit/oclock/dist/config.guess
U xsrc/external/mit/oclock/dist/Clock.h
U xsrc/external/mit/oclock/dist/man/oclock.man
U xsrc/external/mit/oclock/dist/man/Makefile.am
U xsrc/external/mit/oclock/dist/man/Makefile.in
U xsrc/external/mit/oclock/dist/app-defaults/Clock-color

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/oclock/dist

CVS import: xsrc/external/mit/mkfontscale/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:55:24 UTC 2018

Update of /cvsroot/xsrc/external/mit/mkfontscale/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10799

Log Message:
initial import of mkfontscale-1.1.3

Status:

Vendor Tag: xorg
Release Tags:   mkfontscale-1-1-3

U xsrc/external/mit/mkfontscale/dist/config.h.in
U xsrc/external/mit/mkfontscale/dist/README
U xsrc/external/mit/mkfontscale/dist/install-sh
U xsrc/external/mit/mkfontscale/dist/list.c
U xsrc/external/mit/mkfontscale/dist/hash.c
C xsrc/external/mit/mkfontscale/dist/mkfontscale.c
U xsrc/external/mit/mkfontscale/dist/aclocal.m4
U xsrc/external/mit/mkfontscale/dist/ident.h
U xsrc/external/mit/mkfontscale/dist/config.guess
U xsrc/external/mit/mkfontscale/dist/INSTALL
U xsrc/external/mit/mkfontscale/dist/list.h
U xsrc/external/mit/mkfontscale/dist/hash.h
U xsrc/external/mit/mkfontscale/dist/configure.ac
U xsrc/external/mit/mkfontscale/dist/ChangeLog
U xsrc/external/mit/mkfontscale/dist/Makefile.in
U xsrc/external/mit/mkfontscale/dist/configure
U xsrc/external/mit/mkfontscale/dist/data.h
U xsrc/external/mit/mkfontscale/dist/missing
U xsrc/external/mit/mkfontscale/dist/depcomp
U xsrc/external/mit/mkfontscale/dist/COPYING
C xsrc/external/mit/mkfontscale/dist/ident.c
U xsrc/external/mit/mkfontscale/dist/compile
U xsrc/external/mit/mkfontscale/dist/Makefile.am
U xsrc/external/mit/mkfontscale/dist/config.sub
U xsrc/external/mit/mkfontscale/dist/man/mkfontscale.man
U xsrc/external/mit/mkfontscale/dist/man/Makefile.am
U xsrc/external/mit/mkfontscale/dist/man/Makefile.in

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/mkfontscale/dist

CVS import: xsrc/external/mit/twm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:55:28 UTC 2018

Update of /cvsroot/xsrc/external/mit/twm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv1229

Log Message:
initial import of twm-1.0.10

Status:

Vendor Tag: xorg
Release Tags:   twm-1-0-10

U xsrc/external/mit/twm/dist/README
U xsrc/external/mit/twm/dist/config.sub
U xsrc/external/mit/twm/dist/ChangeLog
U xsrc/external/mit/twm/dist/configure
U xsrc/external/mit/twm/dist/INSTALL
U xsrc/external/mit/twm/dist/Makefile.am
U xsrc/external/mit/twm/dist/configure.ac
U xsrc/external/mit/twm/dist/Makefile.in
U xsrc/external/mit/twm/dist/missing
U xsrc/external/mit/twm/dist/config.guess
U xsrc/external/mit/twm/dist/COPYING
U xsrc/external/mit/twm/dist/compile
U xsrc/external/mit/twm/dist/aclocal.m4
U xsrc/external/mit/twm/dist/install-sh
U xsrc/external/mit/twm/dist/config.h.in
U xsrc/external/mit/twm/dist/ylwrap
U xsrc/external/mit/twm/dist/depcomp
U xsrc/external/mit/twm/dist/man/Makefile.in
U xsrc/external/mit/twm/dist/man/Makefile.am
U xsrc/external/mit/twm/dist/man/twm.man
U xsrc/external/mit/twm/dist/sample-twmrc/keith.twmrc
U xsrc/external/mit/twm/dist/sample-twmrc/jim.twmrc
U xsrc/external/mit/twm/dist/sample-twmrc/lemke.twmrc
U xsrc/external/mit/twm/dist/src/deftwmrc.c
U xsrc/external/mit/twm/dist/src/iconmgr.c
U xsrc/external/mit/twm/dist/src/resize.c
C xsrc/external/mit/twm/dist/src/util.h
C xsrc/external/mit/twm/dist/src/gram.h
U xsrc/external/mit/twm/dist/src/version.c
U xsrc/external/mit/twm/dist/src/lex.l
U xsrc/external/mit/twm/dist/src/add_window.c
U xsrc/external/mit/twm/dist/src/events.h
U xsrc/external/mit/twm/dist/src/siconify.bm
U xsrc/external/mit/twm/dist/src/list.h
U xsrc/external/mit/twm/dist/src/icons.h
U xsrc/external/mit/twm/dist/src/gc.c
U xsrc/external/mit/twm/dist/src/twm.c
U xsrc/external/mit/twm/dist/src/menus.c
U xsrc/external/mit/twm/dist/src/session.c
U xsrc/external/mit/twm/dist/src/parse.h
C xsrc/external/mit/twm/dist/src/gram.c
U xsrc/external/mit/twm/dist/src/version.h
U xsrc/external/mit/twm/dist/src/add_window.h
U xsrc/external/mit/twm/dist/src/events.c
U xsrc/external/mit/twm/dist/src/Makefile.in
U xsrc/external/mit/twm/dist/src/cursor.c
C xsrc/external/mit/twm/dist/src/util.c
U xsrc/external/mit/twm/dist/src/parse.c
U xsrc/external/mit/twm/dist/src/deftwmrc.sed
U xsrc/external/mit/twm/dist/src/resize.h
U xsrc/external/mit/twm/dist/src/screen.h
U xsrc/external/mit/twm/dist/src/iconmgr.h
U xsrc/external/mit/twm/dist/src/session.h
U xsrc/external/mit/twm/dist/src/Makefile.am
U xsrc/external/mit/twm/dist/src/system.twmrc
U xsrc/external/mit/twm/dist/src/gc.h
U xsrc/external/mit/twm/dist/src/twm.h
U xsrc/external/mit/twm/dist/src/menus.h
U xsrc/external/mit/twm/dist/src/list.c
U xsrc/external/mit/twm/dist/src/icons.c
C xsrc/external/mit/twm/dist/src/lex.c
U xsrc/external/mit/twm/dist/src/gram.y

5 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/twm/dist

CVS commit: [pgoyette-compat] src/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 07:26:00 UTC 2018

Modified Files:
src/sys/kern [pgoyette-compat]: kern_module.c sys_module.c
src/sys/sys [pgoyette-compat]: module.h

Log Message:
(Re)implement the alias list as a "const char * const (*list)[]" and
store a pointer to this list in the mod_info structure (which lives
in the modules' linkset data).  Don't allow any duplication of module
names _or_ aliases when loading; for dependencies, they will be met
if the required module name matches any loaded module name or alias.


To generate a diff of this commit:
cvs rdiff -u -r1.130.2.1 -r1.130.2.2 src/sys/kern/kern_module.c
cvs rdiff -u -r1.23.2.1 -r1.23.2.2 src/sys/kern/sys_module.c
cvs rdiff -u -r1.41.14.5 -r1.41.14.6 src/sys/sys/module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.130.2.1 src/sys/kern/kern_module.c:1.130.2.2
--- src/sys/kern/kern_module.c:1.130.2.1	Sun Mar 11 00:44:32 2018
+++ src/sys/kern/kern_module.c	Sun Mar 11 07:25:59 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.130.2.1 2018/03/11 00:44:32 pgoyette Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.130.2.2 2018/03/11 07:25:59 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.1 2018/03/11 00:44:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.2 2018/03/11 07:25:59 pgoyette Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -666,9 +666,9 @@ module_unload(const char *name)
 int
 module_alias_lookup(const char *name, module_t *mod)
 {
-	const char * const *aliasp;
+	const char * const	aliasp[];
 
-	aliasp = mod->mod_info->mi_aliases;
+	aliasp = *mod->mod_info->mi_aliases;
 	if (aliasp == NULL)
 		return 0;
 	while (*aliasp)
@@ -784,7 +784,7 @@ module_do_builtin(const module_t *pmod, 
 prop_dictionary_t props)
 {
 	const char *p, *s;
-	const char * const *aliasp;
+	const char * const	aliasp[];
 	char buf[MAXMODNAME];
 	modinfo_t *mi = NULL;
 	module_t *mod, *mod2, *mod_loaded, *prev_active;
@@ -858,7 +858,7 @@ module_do_builtin(const module_t *pmod, 
 	 * Retrieve that none of the module's aliases already exist
 	 */
 
-	if ((aliasp = mod->mod_info->mi_aliases) != NULL) {
+	if ((aliasp = *mod->mod_info->mi_aliases) != NULL) {
 		while (*aliasp)
 			if (module_lookup(*aliasp++) != NULL)
 return EEXIST;
@@ -910,7 +910,7 @@ module_do_load(const char *name, bool is
 	prop_dictionary_t filedict;
 	char buf[MAXMODNAME];
 	const char *s, *p;
-	const char * const *aliasp;
+	const char * const aliasp[];
 	int error;
 	size_t len;
 
@@ -1171,7 +1171,7 @@ module_do_load(const char *name, bool is
 	/*
 	 * One last check for duplicate module name/alias
 	 */
-	if ((aliasp = mod->mod_info->mi_aliases) != NULL)
+	if ((aliasp = *mod->mod_info->mi_aliases) != NULL)
 		while (*aliasp != NULL)
 			if (module_lookup(*aliasp) != NULL) {
 module_error("Module `%s' alias `%s' already "

Index: src/sys/kern/sys_module.c
diff -u src/sys/kern/sys_module.c:1.23.2.1 src/sys/kern/sys_module.c:1.23.2.2
--- src/sys/kern/sys_module.c:1.23.2.1	Sun Mar 11 00:44:32 2018
+++ src/sys/kern/sys_module.c	Sun Mar 11 07:25:59 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_module.c,v 1.23.2.1 2018/03/11 00:44:32 pgoyette Exp $	*/
+/*	$NetBSD: sys_module.c,v 1.23.2.2 2018/03/11 07:25:59 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.1 2018/03/11 00:44:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_module.c,v 1.23.2.2 2018/03/11 07:25:59 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_modular.h"
@@ -122,7 +122,7 @@ handle_modctl_stat(struct iovec *iov, vo
 	int error;
 	int mscnt;
 	bool stataddr;
-	const char * const *aliasp;
+	const char * const aliasp[];
 
 	/* If not privileged, don't expose kernel addresses. */
 	error = kauth_authorize_system(kauth_cred_get(), KAUTH_SYSTEM_MODULE,
@@ -134,7 +134,7 @@ handle_modctl_stat(struct iovec *iov, vo
 	TAILQ_FOREACH(mod, _list, mod_chain) {
 		mscnt++;
 		mi = mod->mod_info;
-		if ((aliasp = mi->mi_aliases) != NULL) {
+		if ((aliasp = *mi->mi_aliases) != NULL) {
 			while (*aliasp++ != NULL)
 mslen++;
 		}
@@ -159,7 +159,7 @@ handle_modctl_stat(struct iovec *iov, vo
 		ms->ms_source = mod->mod_source;
 		ms->ms_flags = mod->mod_flags;
 		ms++;
-		aliasp = mi->mi_aliases;
+		aliasp = *mi->mi_aliases;
 		if (aliasp == NULL)
 			continue;
 		while (*aliasp) {

Index: src/sys/sys/module.h
diff -u src/sys/sys/module.h:1.41.14.5 src/sys/sys/module.h:1.41.14.6
--- src/sys/sys/module.h:1.41.14.5	Sun Mar 11 00:58:12 2018
+++ src/sys/sys/module.h	Sun Mar 11 07:25:59 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: module.h,v 1.41.14.5 2018/03/11 00:58:12 pgoyette Exp $	*/
+/*	$NetBSD: module.h,v 

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:23:59 UTC 2018

Added Files:
xsrc/external/mit/appres/dist: compile
xsrc/external/mit/listres/dist: compile

Log Message:
merge appres 1.0.5 and listres 1.0.4.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/appres/dist/compile
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/listres/dist/compile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: xsrc/external/mit/appres/dist/compile
diff -u /dev/null xsrc/external/mit/appres/dist/compile:1.3
--- /dev/null	Sun Mar 11 07:23:59 2018
+++ xsrc/external/mit/appres/dist/compile	Sun Mar 11 07:23:59 2018
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see .
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to  or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+/ | /[!/]*) # absolute file, and not a UNC file
+  if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	file_conv=mingw
+	;;
+	  CYGWIN*)
+	file_conv=cygwin
+	;;
+	  *)
+	file_conv=wine
+	;;
+	esac
+  fi
+  case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+  esac
+  ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+lib_path=$file
+  else
+lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+IFS=$save_IFS
+if $shared && test -f "$dir/$lib.dll.lib"; then
+  found=yes
+  lib=$dir/$lib.dll.lib
+  break
+fi
+if test -f "$dir/$lib.lib"; then
+  found=yes
+  lib=$dir/$lib.lib
+  break
+fi
+if test -f "$dir/lib$lib.a"; then
+  found=yes
+  lib=$dir/lib$lib.a
+  break
+fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+if test -n "$eat"; then
+  eat=
+else
+  case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	*.o | *.[oO][bB][jJ])
+	  func_file_conv "$2"
+	  set x "$@" -Fo"$file"
+	  shift
+	  ;;
+	*)
+	  func_file_conv "$2"
+	  set x "$@" -Fe"$file"
+	  shift
+	  ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)

CVS import: xsrc/external/mit/iceauth/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:23:10 UTC 2018

Update of /cvsroot/xsrc/external/mit/iceauth/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv488

Log Message:
initial import of iceauth-1.0.8

Status:

Vendor Tag: xorg
Release Tags:   iceauth-1-0-8

U xsrc/external/mit/iceauth/dist/ChangeLog
U xsrc/external/mit/iceauth/dist/depcomp
U xsrc/external/mit/iceauth/dist/aclocal.m4
U xsrc/external/mit/iceauth/dist/missing
U xsrc/external/mit/iceauth/dist/iceauth.h
U xsrc/external/mit/iceauth/dist/install-sh
U xsrc/external/mit/iceauth/dist/configure
U xsrc/external/mit/iceauth/dist/compile
U xsrc/external/mit/iceauth/dist/config.h.in
U xsrc/external/mit/iceauth/dist/README
U xsrc/external/mit/iceauth/dist/COPYING
U xsrc/external/mit/iceauth/dist/config.guess
U xsrc/external/mit/iceauth/dist/iceauth.c
U xsrc/external/mit/iceauth/dist/configure.ac
U xsrc/external/mit/iceauth/dist/config.sub
U xsrc/external/mit/iceauth/dist/process.c
U xsrc/external/mit/iceauth/dist/Makefile.am
U xsrc/external/mit/iceauth/dist/INSTALL
U xsrc/external/mit/iceauth/dist/Makefile.in
U xsrc/external/mit/iceauth/dist/man/Makefile.in
U xsrc/external/mit/iceauth/dist/man/Makefile.am
U xsrc/external/mit/iceauth/dist/man/iceauth.man

No conflicts created by this import

CVS import: xsrc/external/mit/listres/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:23:13 UTC 2018

Update of /cvsroot/xsrc/external/mit/listres/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv13475

Log Message:
initial import of listres-1.0.4

Status:

Vendor Tag: xorg
Release Tags:   listres-1-0-4

C xsrc/external/mit/listres/dist/compile
U xsrc/external/mit/listres/dist/ChangeLog
U xsrc/external/mit/listres/dist/COPYING
U xsrc/external/mit/listres/dist/config.h.in
U xsrc/external/mit/listres/dist/configure
U xsrc/external/mit/listres/dist/install-sh
U xsrc/external/mit/listres/dist/aclocal.m4
U xsrc/external/mit/listres/dist/config.guess
U xsrc/external/mit/listres/dist/missing
U xsrc/external/mit/listres/dist/depcomp
U xsrc/external/mit/listres/dist/listres.c
U xsrc/external/mit/listres/dist/README
U xsrc/external/mit/listres/dist/Makefile.in
U xsrc/external/mit/listres/dist/configure.ac
U xsrc/external/mit/listres/dist/INSTALL
U xsrc/external/mit/listres/dist/config.sub
U xsrc/external/mit/listres/dist/Makefile.am
U xsrc/external/mit/listres/dist/man/Makefile.in
U xsrc/external/mit/listres/dist/man/listres.man
U xsrc/external/mit/listres/dist/man/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/listres/dist

CVS import: xsrc/external/mit/ico/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:23:12 UTC 2018

Update of /cvsroot/xsrc/external/mit/ico/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23766

Log Message:
initial import of ico-1.0.5

Status:

Vendor Tag: xorg
Release Tags:   ico-1-0-5

U xsrc/external/mit/ico/dist/ico.c
U xsrc/external/mit/ico/dist/Makefile.am
U xsrc/external/mit/ico/dist/missing
U xsrc/external/mit/ico/dist/depcomp
U xsrc/external/mit/ico/dist/objcube.h
U xsrc/external/mit/ico/dist/install-sh
U xsrc/external/mit/ico/dist/COPYING
U xsrc/external/mit/ico/dist/aclocal.m4
U xsrc/external/mit/ico/dist/configure
U xsrc/external/mit/ico/dist/Makefile.in
U xsrc/external/mit/ico/dist/configure.ac
U xsrc/external/mit/ico/dist/ChangeLog
N xsrc/external/mit/ico/dist/compile
U xsrc/external/mit/ico/dist/objocta.h
U xsrc/external/mit/ico/dist/README
U xsrc/external/mit/ico/dist/objico.h
U xsrc/external/mit/ico/dist/config.guess
U xsrc/external/mit/ico/dist/allobjs.h
U xsrc/external/mit/ico/dist/objpyr.h
U xsrc/external/mit/ico/dist/polyinfo.h
U xsrc/external/mit/ico/dist/config.h.in
U xsrc/external/mit/ico/dist/objplane.h
U xsrc/external/mit/ico/dist/config.sub
U xsrc/external/mit/ico/dist/INSTALL
U xsrc/external/mit/ico/dist/man/Makefile.in
U xsrc/external/mit/ico/dist/man/Makefile.am
U xsrc/external/mit/ico/dist/man/ico.man

No conflicts created by this import

CVS import: xsrc/external/mit/editres/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:23:09 UTC 2018

Update of /cvsroot/xsrc/external/mit/editres/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv7858

Log Message:
initial import of editres-1.0.7

Status:

Vendor Tag: xorg
Release Tags:   editres-1-0-7

U xsrc/external/mit/editres/dist/geometry.c
U xsrc/external/mit/editres/dist/editres.c
U xsrc/external/mit/editres/dist/depcomp
U xsrc/external/mit/editres/dist/Makefile.am
U xsrc/external/mit/editres/dist/missing
U xsrc/external/mit/editres/dist/svpopup.c
U xsrc/external/mit/editres/dist/wtree.c
U xsrc/external/mit/editres/dist/editresP.h
U xsrc/external/mit/editres/dist/comm.c
U xsrc/external/mit/editres/dist/AUTHORS
U xsrc/external/mit/editres/dist/compile
U xsrc/external/mit/editres/dist/configure.ac
U xsrc/external/mit/editres/dist/Makefile.in
U xsrc/external/mit/editres/dist/aclocal.m4
U xsrc/external/mit/editres/dist/install-sh
U xsrc/external/mit/editres/dist/COPYING
U xsrc/external/mit/editres/dist/setvalues.c
U xsrc/external/mit/editres/dist/actions.c
U xsrc/external/mit/editres/dist/configure
U xsrc/external/mit/editres/dist/utils.c
U xsrc/external/mit/editres/dist/config.guess
U xsrc/external/mit/editres/dist/ChangeLog
U xsrc/external/mit/editres/dist/config.sub
U xsrc/external/mit/editres/dist/INSTALL
U xsrc/external/mit/editres/dist/handler.c
U xsrc/external/mit/editres/dist/README
U xsrc/external/mit/editres/dist/config.h.in
U xsrc/external/mit/editres/dist/widgets.c
U xsrc/external/mit/editres/dist/app-defaults/Editres-color
U xsrc/external/mit/editres/dist/app-defaults/Editres
U xsrc/external/mit/editres/dist/man/editres.man
U xsrc/external/mit/editres/dist/man/Makefile.am
U xsrc/external/mit/editres/dist/man/Makefile.in

No conflicts created by this import

CVS import: xsrc/external/mit/appres/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Sun Mar 11 07:23:08 UTC 2018

Update of /cvsroot/xsrc/external/mit/appres/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv13218

Log Message:
initial import of appres-1.0.5

Status:

Vendor Tag: xorg
Release Tags:   appres-1-0-5

U xsrc/external/mit/appres/dist/configure.ac
U xsrc/external/mit/appres/dist/INSTALL
U xsrc/external/mit/appres/dist/COPYING
U xsrc/external/mit/appres/dist/config.h.in
U xsrc/external/mit/appres/dist/config.sub
U xsrc/external/mit/appres/dist/appres.c
U xsrc/external/mit/appres/dist/AUTHORS
C xsrc/external/mit/appres/dist/compile
U xsrc/external/mit/appres/dist/ChangeLog
U xsrc/external/mit/appres/dist/configure
U xsrc/external/mit/appres/dist/Makefile.am
U xsrc/external/mit/appres/dist/install-sh
U xsrc/external/mit/appres/dist/depcomp
U xsrc/external/mit/appres/dist/missing
U xsrc/external/mit/appres/dist/README
U xsrc/external/mit/appres/dist/config.guess
U xsrc/external/mit/appres/dist/Makefile.in
U xsrc/external/mit/appres/dist/aclocal.m4
U xsrc/external/mit/appres/dist/man/Makefile.am
U xsrc/external/mit/appres/dist/man/Makefile.in
U xsrc/external/mit/appres/dist/man/appres.man

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/appres/dist

CVS commit: src

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Sun Mar 11 07:18:49 UTC 2018

Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xcomp: mi shl.mi
src/distrib/sets/lists/xdebug: mi shl.mi
src/external/mit/xorg/lib: Makefile
src/share/mk: bsd.README bsd.own.mk
Removed Files:
src/external/mit/xorg/lib/libXfontcache: Makefile shlib_version

Log Message:
stop building libXfontcache as it is obsolete for a decade.


To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.192 -r1.193 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/xcomp/shl.mi
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.40 -r1.41 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/libXfontcache/Makefile \
src/external/mit/xorg/lib/libXfontcache/shlib_version
cvs rdiff -u -r1.367 -r1.368 src/share/mk/bsd.README
cvs rdiff -u -r1.1047 -r1.1048 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.79 src/distrib/sets/lists/xbase/shl.mi:1.80
--- src/distrib/sets/lists/xbase/shl.mi:1.79	Wed Jan 24 09:51:26 2018
+++ src/distrib/sets/lists/xbase/shl.mi	Sun Mar 11 07:18:49 2018
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.79 2018/01/24 09:51:26 wiz Exp $
+# $NetBSD: shl.mi,v 1.80 2018/03/11 07:18:49 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -92,9 +92,6 @@
 ./usr/X11R7/lib/libXfont.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so.3			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXfont.so.3.0			-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libXfontcache.so		-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libXfontcache.so.2		-unknown-		xorg,compatx11file
-./usr/X11R7/lib/libXfontcache.so.2.0		-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXft.so			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXft.so.3			-unknown-		xorg,compatx11file
 ./usr/X11R7/lib/libXft.so.3.0			-unknown-		xorg,compatx11file

Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.192 src/distrib/sets/lists/xcomp/mi:1.193
--- src/distrib/sets/lists/xcomp/mi:1.192	Mon Mar  6 05:58:00 2017
+++ src/distrib/sets/lists/xcomp/mi	Sun Mar 11 07:18:49 2018
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.192 2017/03/06 05:58:00 nakayama Exp $
+#	 $NetBSD: mi,v 1.193 2018/03/11 07:18:49 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1138,8 +1138,8 @@
 ./usr/X11R7/lib/libXfixes_p.a-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXfont.a-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXfont_p.a-unknown-	profile,xorg,compatx11file
-./usr/X11R7/lib/libXfontcache.a-unknown-	xorg,compatx11file
-./usr/X11R7/lib/libXfontcache_p.a			-unknown-	profile,xorg,compatx11file
+./usr/X11R7/lib/libXfontcache.a-unknown-	obsolete
+./usr/X11R7/lib/libXfontcache_p.a			-unknown-	obsolete
 ./usr/X11R7/lib/libXft.a-unknown-	xorg,compatx11file
 ./usr/X11R7/lib/libXft_p.a-unknown-	profile,xorg,compatx11file
 ./usr/X11R7/lib/libXi.a	-unknown-	xorg,compatx11file
@@ -1976,7 +1976,7 @@
 ./usr/X11R7/man/cat3/XevieSendEvent.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/XevieStart.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/Xfixes.0-unknown-	.cat,xorg
-./usr/X11R7/man/cat3/Xfontcache.0			-unknown-	.cat,xorg
+./usr/X11R7/man/cat3/Xfontcache.0			-unknown-	obsolete
 ./usr/X11R7/man/cat3/Xft.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/Xinerama.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat3/XineramaIsActive.0			-unknown-	.cat,xorg
@@ -2887,7 +2887,7 @@
 ./usr/X11R7/man/html3/XevieSendEvent.html		-unknown-	html,xorg
 ./usr/X11R7/man/html3/XevieStart.html			-unknown-	html,xorg
 ./usr/X11R7/man/html3/Xfixes.html			-unknown-	html,xorg
-./usr/X11R7/man/html3/Xfontcache.html			-unknown-	html,xorg
+./usr/X11R7/man/html3/Xfontcache.html			-unknown-	obsolete
 ./usr/X11R7/man/html3/Xft.html-unknown-	html,xorg
 ./usr/X11R7/man/html3/Xinerama.html			-unknown-	html,xorg
 ./usr/X11R7/man/html3/XineramaIsActive.html		-unknown-	html,xorg
@@ -3797,7 +3797,7 @@
 ./usr/X11R7/man/man3/XevieSendEvent.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XevieStart.3			-unknown-	.man,xorg
 ./usr/X11R7/man/man3/Xfixes.3-unknown-	.man,xorg
-./usr/X11R7/man/man3/Xfontcache.3			-unknown-	.man,xorg
+./usr/X11R7/man/man3/Xfontcache.3			-unknown-	obsolete
 ./usr/X11R7/man/man3/Xft.3-unknown-	.man,xorg
 ./usr/X11R7/man/man3/Xinerama.3-unknown-	.man,xorg
 ./usr/X11R7/man/man3/XineramaIsActive.3			-unknown-	.man,xorg
@@ -4209,7 +4209,7 @@
 ./usr/libdata/lint/llib-lXext.ln			-unknown-	lint,xorg
 

CVS commit: [pgoyette-compat] src/sys/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 00:58:12 UTC 2018

Modified Files:
src/sys/sys [pgoyette-compat]: module.h

Log Message:
Don't use () around __CONCAT as the expression is no longer constant


To generate a diff of this commit:
cvs rdiff -u -r1.41.14.4 -r1.41.14.5 src/sys/sys/module.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/module.h
diff -u src/sys/sys/module.h:1.41.14.4 src/sys/sys/module.h:1.41.14.5
--- src/sys/sys/module.h:1.41.14.4	Sun Mar 11 00:53:13 2018
+++ src/sys/sys/module.h	Sun Mar 11 00:58:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: module.h,v 1.41.14.4 2018/03/11 00:53:13 pgoyette Exp $	*/
+/*	$NetBSD: module.h,v 1.41.14.5 2018/03/11 00:58:12 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -153,9 +153,9 @@ static void __CONCAT(moddtor_,name)(void
 #endif /* RUMP_USE_CTOR */
 
 #define	MODULE(class, name, required)\
-	MODULE_ALIAS(class, name, required, NULL)
+	MODULE_WITH_ALIAS(class, name, required, NULL)
 
-#define	MODULE_ALIAS(class, name, required, aliases)		\
+#define	MODULE_WITH_ALIAS(class, name, required, aliases)	\
 static int __CONCAT(name,_modcmd)(modcmd_t, void *);		\
 static const char * const * __CONCAT(name,_aliases) = { aliases }; \
 static const modinfo_t __CONCAT(name,_modinfo) = {		\
@@ -163,7 +163,7 @@ static const modinfo_t __CONCAT(name,_mo
 	.mi_class = (class),	\
 	.mi_modcmd = __CONCAT(name,_modcmd),			\
 	.mi_name = __STRING(name),\
-	.mi_aliases = (__CONCAT(name,_aliases)),		\
+	.mi_aliases = __CONCAT(name,_aliases),			\
 	.mi_required = (required)\
 }; \
 _MODULE_REGISTER(name)

CVS commit: [pgoyette-compat] src/sys/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 00:53:13 UTC 2018

Modified Files:
src/sys/sys [pgoyette-compat]: module.h

Log Message:
Actually allocate the list of aliases.


To generate a diff of this commit:
cvs rdiff -u -r1.41.14.3 -r1.41.14.4 src/sys/sys/module.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/module.h
diff -u src/sys/sys/module.h:1.41.14.3 src/sys/sys/module.h:1.41.14.4
--- src/sys/sys/module.h:1.41.14.3	Sun Mar 11 00:44:32 2018
+++ src/sys/sys/module.h	Sun Mar 11 00:53:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: module.h,v 1.41.14.3 2018/03/11 00:44:32 pgoyette Exp $	*/
+/*	$NetBSD: module.h,v 1.41.14.4 2018/03/11 00:53:13 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -157,12 +157,13 @@ static void __CONCAT(moddtor_,name)(void
 
 #define	MODULE_ALIAS(class, name, required, aliases)		\
 static int __CONCAT(name,_modcmd)(modcmd_t, void *);		\
+static const char * const * __CONCAT(name,_aliases) = { aliases }; \
 static const modinfo_t __CONCAT(name,_modinfo) = {		\
 	.mi_version = __NetBSD_Version__,			\
 	.mi_class = (class),	\
 	.mi_modcmd = __CONCAT(name,_modcmd),			\
 	.mi_name = __STRING(name),\
-	.mi_aliases = (required),\
+	.mi_aliases = (__CONCAT(name,_aliases)),		\
 	.mi_required = (required)\
 }; \
 _MODULE_REGISTER(name)

CVS commit: [pgoyette-compat] src

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sun Mar 11 00:44:32 UTC 2018

Modified Files:
src/share/man/man9 [pgoyette-compat]: module.9
src/sys/kern [pgoyette-compat]: kern_module.c sys_module.c
src/sys/sys [pgoyette-compat]: module.h

Log Message:
Store the aliases list in the mod_info struct, since it is totally
static data.  This saves us having to make a special xxx_modcmd()
call to retrieve the data.  Update module(9) man page accordingly.


To generate a diff of this commit:
cvs rdiff -u -r1.42.2.2 -r1.42.2.3 src/share/man/man9/module.9
cvs rdiff -u -r1.130 -r1.130.2.1 src/sys/kern/kern_module.c
cvs rdiff -u -r1.23 -r1.23.2.1 src/sys/kern/sys_module.c
cvs rdiff -u -r1.41.14.2 -r1.41.14.3 src/sys/sys/module.h

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/man9/module.9
diff -u src/share/man/man9/module.9:1.42.2.2 src/share/man/man9/module.9:1.42.2.3
--- src/share/man/man9/module.9:1.42.2.2	Sat Mar 10 11:34:19 2018
+++ src/share/man/man9/module.9	Sun Mar 11 00:44:32 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: module.9,v 1.42.2.2 2018/03/10 11:34:19 pgoyette Exp $
+.\"	$NetBSD: module.9,v 1.42.2.3 2018/03/11 00:44:32 pgoyette Exp $
 .\"
 .\" Copyright (c) 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -170,9 +170,6 @@ Perform module-specific clean-up before 
 Notify the module that it is about to be unloaded.
 .It Dv MODULE_CMD_STAT
 Request the module to provide status information (not currently implemented).
-.It Dv MODULE_CMD_GETALIASES
-Request the module to provide a list of its alias names (typically used
-for included modules).
 .El
 .Pp
 All modules'
@@ -198,14 +195,6 @@ For the
 command, the
 .Fa data
 argument points to a buffer where the status information should be placed.
-For the
-.Dv MODULE_CMD_GETALIASES
-command, the
-.Fa data
-argument points to an array of type
-.Vt const char *[] ;
-the module's command routine should store the addresses of each alias
-name for the module.
 .Pp
 The __link_set mechanism is used to enable the
 .Nm

Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.130 src/sys/kern/kern_module.c:1.130.2.1
--- src/sys/kern/kern_module.c:1.130	Thu Dec 14 22:28:59 2017
+++ src/sys/kern/kern_module.c	Sun Mar 11 00:44:32 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.130 2017/12/14 22:28:59 pgoyette Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.130.2.1 2018/03/11 00:44:32 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130 2017/12/14 22:28:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.130.2.1 2018/03/11 00:44:32 pgoyette Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -99,6 +99,7 @@ static int	module_fetch_info(module_t *)
 static void	module_thread(void *);
 
 static module_t	*module_lookup(const char *);
+int		module_alias_lookup(const char *, module_t *);
 static void	module_enqueue(module_t *);
 
 static bool	module_merge_dicts(prop_dictionary_t, const prop_dictionary_t);
@@ -658,6 +659,25 @@ module_unload(const char *name)
 }
 
 /*
+ * module_alias_lookup
+ *
+ *	locate a name within a module's alias list
+ */
+int
+module_alias_lookup(const char *name, module_t *mod)
+{
+	const char * const *aliasp;
+
+	aliasp = mod->mod_info->mi_aliases;
+	if (aliasp == NULL)
+		return 0;
+	while (*aliasp)
+		if (strcmp(*aliasp++, name) == 0)
+			return 1;
+	return 0;
+}
+
+/*
  * module_lookup:
  *
  *	Look up a module by name.
@@ -672,6 +692,8 @@ module_lookup(const char *name)
 	TAILQ_FOREACH(mod, _list, mod_chain) {
 		if (strcmp(mod->mod_info->mi_name, name) == 0) {
 			break;
+		if (module_alias_lookup(name, mod))
+			break;
 		}
 	}
 
@@ -762,6 +784,7 @@ module_do_builtin(const module_t *pmod, 
 prop_dictionary_t props)
 {
 	const char *p, *s;
+	const char * const *aliasp;
 	char buf[MAXMODNAME];
 	modinfo_t *mi = NULL;
 	module_t *mod, *mod2, *mod_loaded, *prev_active;
@@ -832,6 +855,15 @@ module_do_builtin(const module_t *pmod, 
 	}
 
 	/*
+	 * Retrieve that none of the module's aliases already exist
+	 */
+
+	if ((aliasp = mod->mod_info->mi_aliases) != NULL) {
+		while (*aliasp)
+			if (module_lookup(*aliasp++) != NULL)
+return EEXIST;
+	}
+	/*
 	 * Try to initialize the module.
 	 */
 	prev_active = module_active;
@@ -878,6 +910,7 @@ module_do_load(const char *name, bool is
 	prop_dictionary_t filedict;
 	char buf[MAXMODNAME];
 	const char *s, *p;
+	const char * const *aliasp;
 	int error;
 	size_t len;
 
@@ -1135,6 +1168,17 @@ module_do_load(const char *name, bool is
 			goto fail;
 		}
 	}
+	/*
+	 * One last check for duplicate module name/alias
+	 */
+	if ((aliasp = mod->mod_info->mi_aliases) != NULL)
+		while (*aliasp != NULL)
+			if (module_lookup(*aliasp) != NULL) {
+module_error("Module `%s' alias `%s' already "
+"exists", mod->mod_info->mi_name, 

CVS commit: src/sys/dev/sdmmc

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Sun Mar 11 00:17:29 UTC 2018

Modified Files:
src/sys/dev/sdmmc: if_bwfm_sdio.c

Log Message:
Outsource setting the backplane window into a specific function so it
can be called and reused in different places.

>From OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/sdmmc/if_bwfm_sdio.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/sdmmc/if_bwfm_sdio.c
diff -u src/sys/dev/sdmmc/if_bwfm_sdio.c:1.1 src/sys/dev/sdmmc/if_bwfm_sdio.c:1.2
--- src/sys/dev/sdmmc/if_bwfm_sdio.c:1.1	Tue Nov  7 16:30:32 2017
+++ src/sys/dev/sdmmc/if_bwfm_sdio.c	Sun Mar 11 00:17:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwfm_sdio.c,v 1.1 2017/11/07 16:30:32 khorben Exp $ */
+/* $NetBSD: if_bwfm_sdio.c,v 1.2 2018/03/11 00:17:28 khorben Exp $ */
 /* $OpenBSD: if_bwfm_sdio.c,v 1.1 2017/10/11 17:19:50 patrick Exp $ */
 /*
  * Copyright (c) 2010-2016 Broadcom Corporation
@@ -73,6 +73,7 @@ int		 bwfm_sdio_match(device_t, cfdata_t
 void		 bwfm_sdio_attach(device_t, struct device *, void *);
 int		 bwfm_sdio_detach(device_t, int);
 
+void		 bwfm_sdio_backplane(struct bwfm_sdio_softc *, uint32_t);
 uint8_t		 bwfm_sdio_read_1(struct bwfm_sdio_softc *, uint32_t);
 uint32_t	 bwfm_sdio_read_4(struct bwfm_sdio_softc *, uint32_t);
 void		 bwfm_sdio_write_1(struct bwfm_sdio_softc *, uint32_t,
@@ -218,6 +219,21 @@ bwfm_sdio_detach(struct device *self, in
 	return 0;
 }
 
+void
+bwfm_sdio_backplane(struct bwfm_sdio_softc *sc, uint32_t bar0)
+{
+	if (sc->sc_bar0 == bar0)
+		return;
+
+	bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_SBADDRLOW,
+	(bar0 >>  8) & 0x80);
+	bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_SBADDRMID,
+	(bar0 >> 16) & 0xff);
+	bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_SBADDRHIGH,
+	(bar0 >> 24) & 0xff);
+	sc->sc_bar0 = bar0;
+}
+
 uint8_t
 bwfm_sdio_read_1(struct bwfm_sdio_softc *sc, uint32_t addr)
 {
@@ -246,15 +262,7 @@ bwfm_sdio_read_4(struct bwfm_sdio_softc 
 	uint32_t bar0 = addr & ~BWFM_SDIO_SB_OFT_ADDR_MASK;
 	uint32_t rv;
 
-	if (sc->sc_bar0 != bar0) {
-		bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_SBADDRLOW,
-		(bar0 >>  8) & 0x80);
-		bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_SBADDRMID,
-		(bar0 >> 16) & 0xff);
-		bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_SBADDRHIGH,
-		(bar0 >> 24) & 0xff);
-		sc->sc_bar0 = bar0;
-	}
+	bwfm_sdio_backplane(sc, bar0);
 
 	addr &= BWFM_SDIO_SB_OFT_ADDR_MASK;
 	addr |= BWFM_SDIO_SB_ACCESS_2_4B_FLAG;
@@ -299,15 +307,7 @@ bwfm_sdio_write_4(struct bwfm_sdio_softc
 	struct sdmmc_function *sf;
 	uint32_t bar0 = addr & ~BWFM_SDIO_SB_OFT_ADDR_MASK;
 
-	if (sc->sc_bar0 != bar0) {
-		bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_SBADDRLOW,
-		(bar0 >>  8) & 0x80);
-		bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_SBADDRMID,
-		(bar0 >> 16) & 0xff);
-		bwfm_sdio_write_1(sc, BWFM_SDIO_FUNC1_SBADDRHIGH,
-		(bar0 >> 24) & 0xff);
-		sc->sc_bar0 = bar0;
-	}
+	bwfm_sdio_backplane(sc, bar0);
 
 	addr &= BWFM_SDIO_SB_OFT_ADDR_MASK;
 	addr |= BWFM_SDIO_SB_ACCESS_2_4B_FLAG;

CVS commit: src/sys/netinet

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Sat Mar 10 23:28:13 UTC 2018

Modified Files:
src/sys/netinet: tcp_output.c

Log Message:
Fix spello in a comment


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/netinet/tcp_output.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/tcp_output.c
diff -u src/sys/netinet/tcp_output.c:1.198 src/sys/netinet/tcp_output.c:1.199
--- src/sys/netinet/tcp_output.c:1.198	Mon Feb 12 08:22:26 2018
+++ src/sys/netinet/tcp_output.c	Sat Mar 10 23:28:13 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_output.c,v 1.198 2018/02/12 08:22:26 maxv Exp $	*/
+/*	$NetBSD: tcp_output.c,v 1.199 2018/03/10 23:28:13 khorben Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -135,7 +135,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.198 2018/02/12 08:22:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_output.c,v 1.199 2018/03/10 23:28:13 khorben Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1720,7 +1720,7 @@ out:
 			error = 0;
 		}
 
-		/* Back out the seqence number advance. */
+		/* Back out the sequence number advance. */
 		if (sack_rxmit)
 			p->rxmit -= len;
 

CVS commit: src/sys/dev/wscons

[Pierre Pronchery]

Module Name:src
Committed By:   khorben
Date:   Sat Mar 10 23:25:59 UTC 2018

Modified Files:
src/sys/dev/wscons: mra.c

Log Message:
Fix spello in a comment


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/wscons/mra.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/wscons/mra.c
diff -u src/sys/dev/wscons/mra.c:1.6 src/sys/dev/wscons/mra.c:1.7
--- src/sys/dev/wscons/mra.c:1.6	Fri Mar 14 05:03:19 2014
+++ src/sys/dev/wscons/mra.c	Sat Mar 10 23:25:59 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: mra.c,v 1.6 2014/03/14 05:03:19 khorben Exp $	*/
+/*	$NetBSD: mra.c,v 1.7 2018/03/10 23:25:59 khorben Exp $	*/
 
 /*
  * Copyright (c) 1999 Shin Takemura All rights reserved.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mra.c,v 1.6 2014/03/14 05:03:19 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mra.c,v 1.7 2018/03/10 23:25:59 khorben Exp $");
 
 #include 
 #include 
@@ -61,7 +61,7 @@ mra_Y_AX1_BX2_C(const int *y, int ys,
 #define Y(i)		AA(y, ys, i)
 
 	/*
-	 * get avarage and sum
+	 * get average and sum
 	 */
 	X1a = 0;	X2a = 0;	Ya = 0;
 	X1X1s = 0;	X2X2s = 0;	X1X2s = 0;

CVS commit: src/sys/netipsec

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sat Mar 10 17:52:50 UTC 2018

Modified Files:
src/sys/netipsec: ipsec_mbuf.c

Log Message:
Add KASSERTs.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/netipsec/ipsec_mbuf.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/netipsec/ipsec_mbuf.c
diff -u src/sys/netipsec/ipsec_mbuf.c:1.21 src/sys/netipsec/ipsec_mbuf.c:1.22
--- src/sys/netipsec/ipsec_mbuf.c:1.21	Mon Mar  5 12:42:28 2018
+++ src/sys/netipsec/ipsec_mbuf.c	Sat Mar 10 17:52:50 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: ipsec_mbuf.c,v 1.21 2018/03/05 12:42:28 maxv Exp $	*/
+/*	$NetBSD: ipsec_mbuf.c,v 1.22 2018/03/10 17:52:50 maxv Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ipsec_mbuf.c,v 1.21 2018/03/05 12:42:28 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_mbuf.c,v 1.22 2018/03/10 17:52:50 maxv Exp $");
 
 /*
  * IPsec-specific mbuf routines.
@@ -214,6 +214,7 @@ m_makespace(struct mbuf *m0, int skip, i
 	unsigned remain;
 
 	KASSERT(m0 != NULL);
+	KASSERT(m0->m_flags & M_PKTHDR);
 	KASSERTMSG(hlen < MHLEN, "hlen too big: %u", hlen);
 
 	for (m = m0; m && skip > m->m_len; m = m->m_next)
@@ -320,6 +321,7 @@ m_pad(struct mbuf *m, int n)
 	if (__predict_false(n > MLEN)) {
 		panic("%s: %d > MLEN", __func__, n);
 	}
+	KASSERT(m->m_flags & M_PKTHDR);
 
 	len = m->m_pkthdr.len;
 	pad = n;
@@ -386,6 +388,8 @@ m_striphdr(struct mbuf *m, int skip, int
 	struct mbuf *m1;
 	int roff;
 
+	KASSERT(m->m_flags & M_PKTHDR);
+
 	/* Find beginning of header */
 	m1 = m_getptr(m, skip, );
 	if (m1 == NULL)

CVS commit: src/sys/netipsec

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Sat Mar 10 17:48:32 UTC 2018

Modified Files:
src/sys/netipsec: xform_ipcomp.c

Log Message:
Fix the computation. Normally that's harmless since ip6_output recomputes
ip6_plen.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/netipsec/xform_ipcomp.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/netipsec/xform_ipcomp.c
diff -u src/sys/netipsec/xform_ipcomp.c:1.59 src/sys/netipsec/xform_ipcomp.c:1.60
--- src/sys/netipsec/xform_ipcomp.c:1.59	Fri Feb 16 09:24:55 2018
+++ src/sys/netipsec/xform_ipcomp.c	Sat Mar 10 17:48:32 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: xform_ipcomp.c,v 1.59 2018/02/16 09:24:55 maxv Exp $	*/
+/*	$NetBSD: xform_ipcomp.c,v 1.60 2018/03/10 17:48:32 maxv Exp $	*/
 /*	$FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $	*/
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.59 2018/02/16 09:24:55 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.60 2018/03/10 17:48:32 maxv Exp $");
 
 /* IP payload compression protocol (IPComp), see RFC 2393 */
 #if defined(_KERNEL_OPT)
@@ -614,7 +614,7 @@ ipcomp_output_cb(struct cryptop *crp)
 #ifdef INET6
 		case AF_INET6:
 			mtod(m, struct ip6_hdr *)->ip6_plen =
-			htons(m->m_pkthdr.len) - sizeof(struct ip6_hdr);
+			htons(m->m_pkthdr.len - sizeof(struct ip6_hdr));
 			break;
 #endif
 		default:

CVS commit: [netbsd-7-0] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Mar 10 16:12:07 UTC 2018

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
1583


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-7.0.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-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.90 src/doc/CHANGES-7.0.3:1.1.2.91
--- src/doc/CHANGES-7.0.3:1.1.2.90	Fri Mar  9 19:50:24 2018
+++ src/doc/CHANGES-7.0.3	Sat Mar 10 16:12:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.90 2018/03/09 19:50:24 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.91 2018/03/10 16:12:07 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -5303,3 +5303,9 @@ sys/conf/copyright1.16
 	Update for 2018 new year
 	[maya, ticket #1581]
 
+etc/namedb/bind.keys1.2
+
+	Update the keys file to the latest version from
+	https://ftp.isc.org/isc/bind9/keys/9.11/bind.keys.v9_11
+	[maya, ticket #1583]
+

CVS commit: [netbsd-7] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Mar 10 16:12:24 UTC 2018

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
1583


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.77 -r1.1.2.78 src/doc/CHANGES-7.2

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-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.77 src/doc/CHANGES-7.2:1.1.2.78
--- src/doc/CHANGES-7.2:1.1.2.77	Fri Mar  9 19:51:02 2018
+++ src/doc/CHANGES-7.2	Sat Mar 10 16:12:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.77 2018/03/09 19:51:02 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.78 2018/03/10 16:12:24 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -5301,3 +5301,9 @@ sys/conf/copyright1.16
 	Update for 2018 new year
 	[maya, ticket #1581]
 
+etc/namedb/bind.keys1.2
+
+	Update the keys file to the latest version from
+	https://ftp.isc.org/isc/bind9/keys/9.11/bind.keys.v9_11
+	[maya, ticket #1583]
+

CVS commit: [netbsd-7] src/etc/namedb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Mar 10 16:11:48 UTC 2018

Modified Files:
src/etc/namedb [netbsd-7]: bind.keys

Log Message:
Pull up following revision(s) (requested by maya in ticket #1583):
etc/namedb/bind.keys: 1.2
Update the keys file to the latest version from:
https://ftp.isc.org/isc/bind9/keys/9.11/bind.keys.v9_11
This includes the new KSK2017 key which is planned to replace the KSK2010
in October 11th, 2018. It is important to have software that ships with
both before September 11th 2018. Anything that bootstraps after that could
have trouble switching.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.12.1 src/etc/namedb/bind.keys

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/namedb/bind.keys
diff -u src/etc/namedb/bind.keys:1.1 src/etc/namedb/bind.keys:1.1.12.1
--- src/etc/namedb/bind.keys:1.1	Thu Apr 25 17:02:29 2013
+++ src/etc/namedb/bind.keys	Sat Mar 10 16:11:48 2018
@@ -1,5 +1,4 @@
-/*	$NetBSD: bind.keys,v 1.1 2013/04/25 17:02:29 christos Exp $	*/
-/* Id: bind.keys,v 1.7 2011-01-03 23:45:07 each Exp  */
+/*	$NetBSD: bind.keys,v 1.1.12.1 2018/03/10 16:11:48 snj Exp $	*/
 # The bind.keys file is used to override the built-in DNSSEC trust anchors
 # which are included as part of BIND 9.  As of the current release, the only
 # trust anchors it contains are those for the DNS root zone ("."), and for
@@ -16,15 +15,18 @@
 #
 # This file is NOT expected to be user-configured.
 #
-# These keys are current as of January 2011.  If any key fails to
+# These keys are current as of February 2017.  If any key fails to
 # initialize correctly, it may have expired.  In that event you should
 # replace this file with a current version.  The latest version of
 # bind.keys can always be obtained from ISC at https://www.isc.org/bind-keys.
 
 managed-keys {
 	# ISC DLV: See https://www.isc.org/solutions/dlv for details.
-# NOTE: This key is activated by setting "dnssec-lookaside auto;"
-# in named.conf.
+	#
+	# NOTE: The ISC DLV zone is being phased out as of February 2017;
+	# the key will remain in place but the zone will be otherwise empty.
+	# Configuring "dnssec-lookaside auto;" to activate this key is
+	# harmless, but is no longer useful and is not recommended.
 	dlv.isc.org. initial-key 257 3 5 "BEPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2
 		brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+
 		1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5
@@ -33,10 +35,16 @@ managed-keys {
 		QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt
 		TDN0YUuWrBNh";
 
-	# ROOT KEY: See https://data.iana.org/root-anchors/root-anchors.xml
+	# ROOT KEYS: See https://data.iana.org/root-anchors/root-anchors.xml
 	# for current trust anchor information.
-# NOTE: This key is activated by setting "dnssec-validation auto;"
-# in named.conf.
+	#
+	# These keys are activated by setting "dnssec-validation auto;"
+	# in named.conf.
+	#
+	# This key (19036) is to be phased out starting in 2017. It will
+	# remain in the root zone for some time after its successor key
+	# has been added. It will remain this file until it is removed from
+	# the root zone.
 	. initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
 		FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
 		bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
@@ -44,4 +52,19 @@ managed-keys {
 		W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
 		Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
 		QxA+Uk1ihz0=";
+
+	# This key (20326) is to be published in the root zone in 2017.
+	# Servers which were already using the old key (19036) should
+	# roll seamlessly to this new one via RFC 5011 rollover. Servers
+	# being set up for the first time can use the contents of this
+	# file as initializing keys; thereafter, the keys in the
+	# managed key database will be trusted and maintained
+	# automatically.
+	. initial-key 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3
+		+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv
+		ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF
+		0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e
+		oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd
+		RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN
+		R1AkUTV74bU=";
 };

CVS commit: [netbsd-7-1] src/doc

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Mar 10 16:12:16 UTC 2018

Modified Files:
src/doc [netbsd-7-1]: CHANGES-7.1.2

Log Message:
1583


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-7.1.2

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-7.1.2
diff -u src/doc/CHANGES-7.1.2:1.1.2.20 src/doc/CHANGES-7.1.2:1.1.2.21
--- src/doc/CHANGES-7.1.2:1.1.2.20	Fri Mar  9 19:50:30 2018
+++ src/doc/CHANGES-7.1.2	Sat Mar 10 16:12:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.2,v 1.1.2.20 2018/03/09 19:50:30 snj Exp $
+# $NetBSD: CHANGES-7.1.2,v 1.1.2.21 2018/03/10 16:12:16 snj Exp $
 
 A complete list of changes from the NetBSD 7.1.1 release to the NetBSD 7.1.2
 release:
@@ -191,3 +191,9 @@ sys/conf/copyright1.16
 	Update for 2018 new year
 	[maya, ticket #1581]
 
+etc/namedb/bind.keys1.2
+
+	Update the keys file to the latest version from
+	https://ftp.isc.org/isc/bind9/keys/9.11/bind.keys.v9_11
+	[maya, ticket #1583]
+

CVS commit: [netbsd-7-0] src/etc/namedb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Mar 10 16:11:46 UTC 2018

Modified Files:
src/etc/namedb [netbsd-7-0]: bind.keys

Log Message:
Pull up following revision(s) (requested by maya in ticket #1583):
etc/namedb/bind.keys: 1.2
Update the keys file to the latest version from:
https://ftp.isc.org/isc/bind9/keys/9.11/bind.keys.v9_11
This includes the new KSK2017 key which is planned to replace the KSK2010
in October 11th, 2018. It is important to have software that ships with
both before September 11th 2018. Anything that bootstraps after that could
have trouble switching.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.14.1 src/etc/namedb/bind.keys

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/namedb/bind.keys
diff -u src/etc/namedb/bind.keys:1.1 src/etc/namedb/bind.keys:1.1.14.1
--- src/etc/namedb/bind.keys:1.1	Thu Apr 25 17:02:29 2013
+++ src/etc/namedb/bind.keys	Sat Mar 10 16:11:45 2018
@@ -1,5 +1,4 @@
-/*	$NetBSD: bind.keys,v 1.1 2013/04/25 17:02:29 christos Exp $	*/
-/* Id: bind.keys,v 1.7 2011-01-03 23:45:07 each Exp  */
+/*	$NetBSD: bind.keys,v 1.1.14.1 2018/03/10 16:11:45 snj Exp $	*/
 # The bind.keys file is used to override the built-in DNSSEC trust anchors
 # which are included as part of BIND 9.  As of the current release, the only
 # trust anchors it contains are those for the DNS root zone ("."), and for
@@ -16,15 +15,18 @@
 #
 # This file is NOT expected to be user-configured.
 #
-# These keys are current as of January 2011.  If any key fails to
+# These keys are current as of February 2017.  If any key fails to
 # initialize correctly, it may have expired.  In that event you should
 # replace this file with a current version.  The latest version of
 # bind.keys can always be obtained from ISC at https://www.isc.org/bind-keys.
 
 managed-keys {
 	# ISC DLV: See https://www.isc.org/solutions/dlv for details.
-# NOTE: This key is activated by setting "dnssec-lookaside auto;"
-# in named.conf.
+	#
+	# NOTE: The ISC DLV zone is being phased out as of February 2017;
+	# the key will remain in place but the zone will be otherwise empty.
+	# Configuring "dnssec-lookaside auto;" to activate this key is
+	# harmless, but is no longer useful and is not recommended.
 	dlv.isc.org. initial-key 257 3 5 "BEPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2
 		brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+
 		1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5
@@ -33,10 +35,16 @@ managed-keys {
 		QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt
 		TDN0YUuWrBNh";
 
-	# ROOT KEY: See https://data.iana.org/root-anchors/root-anchors.xml
+	# ROOT KEYS: See https://data.iana.org/root-anchors/root-anchors.xml
 	# for current trust anchor information.
-# NOTE: This key is activated by setting "dnssec-validation auto;"
-# in named.conf.
+	#
+	# These keys are activated by setting "dnssec-validation auto;"
+	# in named.conf.
+	#
+	# This key (19036) is to be phased out starting in 2017. It will
+	# remain in the root zone for some time after its successor key
+	# has been added. It will remain this file until it is removed from
+	# the root zone.
 	. initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
 		FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
 		bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
@@ -44,4 +52,19 @@ managed-keys {
 		W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
 		Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
 		QxA+Uk1ihz0=";
+
+	# This key (20326) is to be published in the root zone in 2017.
+	# Servers which were already using the old key (19036) should
+	# roll seamlessly to this new one via RFC 5011 rollover. Servers
+	# being set up for the first time can use the contents of this
+	# file as initializing keys; thereafter, the keys in the
+	# managed key database will be trusted and maintained
+	# automatically.
+	. initial-key 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3
+		+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv
+		ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF
+		0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e
+		oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd
+		RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN
+		R1AkUTV74bU=";
 };

CVS commit: [netbsd-7-1] src/etc/namedb

[Soren Jacobsen]

Module Name:src
Committed By:   snj
Date:   Sat Mar 10 16:11:47 UTC 2018

Modified Files:
src/etc/namedb [netbsd-7-1]: bind.keys

Log Message:
Pull up following revision(s) (requested by maya in ticket #1583):
etc/namedb/bind.keys: 1.2
Update the keys file to the latest version from:
https://ftp.isc.org/isc/bind9/keys/9.11/bind.keys.v9_11
This includes the new KSK2017 key which is planned to replace the KSK2010
in October 11th, 2018. It is important to have software that ships with
both before September 11th 2018. Anything that bootstraps after that could
have trouble switching.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.22.1 src/etc/namedb/bind.keys

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/etc/namedb/bind.keys
diff -u src/etc/namedb/bind.keys:1.1 src/etc/namedb/bind.keys:1.1.22.1
--- src/etc/namedb/bind.keys:1.1	Thu Apr 25 17:02:29 2013
+++ src/etc/namedb/bind.keys	Sat Mar 10 16:11:47 2018
@@ -1,5 +1,4 @@
-/*	$NetBSD: bind.keys,v 1.1 2013/04/25 17:02:29 christos Exp $	*/
-/* Id: bind.keys,v 1.7 2011-01-03 23:45:07 each Exp  */
+/*	$NetBSD: bind.keys,v 1.1.22.1 2018/03/10 16:11:47 snj Exp $	*/
 # The bind.keys file is used to override the built-in DNSSEC trust anchors
 # which are included as part of BIND 9.  As of the current release, the only
 # trust anchors it contains are those for the DNS root zone ("."), and for
@@ -16,15 +15,18 @@
 #
 # This file is NOT expected to be user-configured.
 #
-# These keys are current as of January 2011.  If any key fails to
+# These keys are current as of February 2017.  If any key fails to
 # initialize correctly, it may have expired.  In that event you should
 # replace this file with a current version.  The latest version of
 # bind.keys can always be obtained from ISC at https://www.isc.org/bind-keys.
 
 managed-keys {
 	# ISC DLV: See https://www.isc.org/solutions/dlv for details.
-# NOTE: This key is activated by setting "dnssec-lookaside auto;"
-# in named.conf.
+	#
+	# NOTE: The ISC DLV zone is being phased out as of February 2017;
+	# the key will remain in place but the zone will be otherwise empty.
+	# Configuring "dnssec-lookaside auto;" to activate this key is
+	# harmless, but is no longer useful and is not recommended.
 	dlv.isc.org. initial-key 257 3 5 "BEPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2
 		brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+
 		1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5
@@ -33,10 +35,16 @@ managed-keys {
 		QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt
 		TDN0YUuWrBNh";
 
-	# ROOT KEY: See https://data.iana.org/root-anchors/root-anchors.xml
+	# ROOT KEYS: See https://data.iana.org/root-anchors/root-anchors.xml
 	# for current trust anchor information.
-# NOTE: This key is activated by setting "dnssec-validation auto;"
-# in named.conf.
+	#
+	# These keys are activated by setting "dnssec-validation auto;"
+	# in named.conf.
+	#
+	# This key (19036) is to be phased out starting in 2017. It will
+	# remain in the root zone for some time after its successor key
+	# has been added. It will remain this file until it is removed from
+	# the root zone.
 	. initial-key 257 3 8 "AwEAAagAIKlVZrpC6Ia7gEzahOR+9W29euxhJhVVLOyQbSEW0O8gcCjF
 		FVQUTf6v58fLjwBd0YI0EzrAcQqBGCzh/RStIoO8g0NfnfL2MTJRkxoX
 		bfDaUeVPQuYEhg37NZWAJQ9VnMVDxP/VHL496M/QZxkjf5/Efucp2gaD
@@ -44,4 +52,19 @@ managed-keys {
 		W5hOA2hzCTMjJPJ8LbqF6dsV6DoBQzgul0sGIcGOYl7OyQdXfZ57relS
 		Qageu+ipAdTTJ25AsRTAoub8ONGcLmqrAmRLKBP1dfwhYB4N7knNnulq
 		QxA+Uk1ihz0=";
+
+	# This key (20326) is to be published in the root zone in 2017.
+	# Servers which were already using the old key (19036) should
+	# roll seamlessly to this new one via RFC 5011 rollover. Servers
+	# being set up for the first time can use the contents of this
+	# file as initializing keys; thereafter, the keys in the
+	# managed key database will be trusted and maintained
+	# automatically.
+	. initial-key 257 3 8 "AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTOiW1vkIbzxeF3
+		+/4RgWOq7HrxRixHlFlExOLAJr5emLvN7SWXgnLh4+B5xQlNVz8Og8kv
+		ArMtNROxVQuCaSnIDdD5LKyWbRd2n9WGe2R8PzgCmr3EgVLrjyBxWezF
+		0jLHwVN8efS3rCj/EWgvIWgb9tarpVUDK/b58Da+sqqls3eNbuv7pr+e
+		oZG+SrDK6nWeL3c6H5Apxz7LjVc1uTIdsIXxuOLYA4/ilBmSVIzuDWfd
+		RUfhHdY6+cn8HFRm+2hM8AnXGXws9555KrUB5qihylGa8subX2Nn6UwN
+		R1AkUTV74bU=";
 };

CVS commit: [pgoyette-compat] src/sys/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sat Mar 10 11:35:44 UTC 2018

Modified Files:
src/sys/sys [pgoyette-compat]: module.h

Log Message:
Use an array of alias names, rather than a comma-separated list.


To generate a diff of this commit:
cvs rdiff -u -r1.41.14.1 -r1.41.14.2 src/sys/sys/module.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/module.h
diff -u src/sys/sys/module.h:1.41.14.1 src/sys/sys/module.h:1.41.14.2
--- src/sys/sys/module.h:1.41.14.1	Sat Mar 10 10:33:02 2018
+++ src/sys/sys/module.h	Sat Mar 10 11:35:44 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: module.h,v 1.41.14.1 2018/03/10 10:33:02 pgoyette Exp $	*/
+/*	$NetBSD: module.h,v 1.41.14.2 2018/03/10 11:35:44 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@ typedef struct modinfo {
 	int		(*mi_modcmd)(modcmd_t, void *);
 	const char	*mi_name;
 	const char	*mi_required;
-	const char	*mi_aliases;
+	const char	*mi_alias[];
 } const modinfo_t;
 
 /* Per module information, maintained by kern_module.c */ 

CVS commit: [pgoyette-compat] src/share/man/man9

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sat Mar 10 11:34:19 UTC 2018

Modified Files:
src/share/man/man9 [pgoyette-compat]: module.9

Log Message:
We'll use an array of individual aliases, rather than a single, comma-
separated list.  This saves us parsing the list each time through.


To generate a diff of this commit:
cvs rdiff -u -r1.42.2.1 -r1.42.2.2 src/share/man/man9/module.9

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/man9/module.9
diff -u src/share/man/man9/module.9:1.42.2.1 src/share/man/man9/module.9:1.42.2.2
--- src/share/man/man9/module.9:1.42.2.1	Sat Mar 10 10:51:27 2018
+++ src/share/man/man9/module.9	Sat Mar 10 11:34:19 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: module.9,v 1.42.2.1 2018/03/10 10:51:27 pgoyette Exp $
+.\"	$NetBSD: module.9,v 1.42.2.2 2018/03/10 11:34:19 pgoyette Exp $
 .\"
 .\" Copyright (c) 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -202,10 +202,10 @@ For the
 .Dv MODULE_CMD_GETALIASES
 command, the
 .Fa data
-argument points to a variable of type
-.Vt const char * ;
-the module's command routine should store the address of a quoted string
-containing a comma-separated list of alias names.
+argument points to an array of type
+.Vt const char *[] ;
+the module's command routine should store the addresses of each alias
+name for the module.
 .Pp
 The __link_set mechanism is used to enable the
 .Nm

CVS commit: [pgoyette-compat] src/share/man/man9

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sat Mar 10 10:51:27 UTC 2018

Modified Files:
src/share/man/man9 [pgoyette-compat]: module.9

Log Message:
Document the MODULE_CMD_GETALIASES command


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.42.2.1 src/share/man/man9/module.9

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/man9/module.9
diff -u src/share/man/man9/module.9:1.42 src/share/man/man9/module.9:1.42.2.1
--- src/share/man/man9/module.9:1.42	Wed Dec 20 10:01:38 2017
+++ src/share/man/man9/module.9	Sat Mar 10 10:51:27 2018
@@ -1,4 +1,4 @@
-.\"	$NetBSD: module.9,v 1.42 2017/12/20 10:01:38 wiz Exp $
+.\"	$NetBSD: module.9,v 1.42.2.1 2018/03/10 10:51:27 pgoyette Exp $
 .\"
 .\" Copyright (c) 2010 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -170,6 +170,9 @@ Perform module-specific clean-up before 
 Notify the module that it is about to be unloaded.
 .It Dv MODULE_CMD_STAT
 Request the module to provide status information (not currently implemented).
+.It Dv MODULE_CMD_GETALIASES
+Request the module to provide a list of its alias names (typically used
+for included modules).
 .El
 .Pp
 All modules'
@@ -195,6 +198,14 @@ For the
 command, the
 .Fa data
 argument points to a buffer where the status information should be placed.
+For the
+.Dv MODULE_CMD_GETALIASES
+command, the
+.Fa data
+argument points to a variable of type
+.Vt const char * ;
+the module's command routine should store the address of a quoted string
+containing a comma-separated list of alias names.
 .Pp
 The __link_set mechanism is used to enable the
 .Nm

CVS commit: [pgoyette-compat] src/sbin/modstat

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sat Mar 10 10:36:26 UTC 2018

Modified Files:
src/sbin/modstat [pgoyette-compat]: modstat.8

Log Message:
Document the new A-is-for-Alias flag value


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.12.1 src/sbin/modstat/modstat.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/modstat/modstat.8
diff -u src/sbin/modstat/modstat.8:1.22 src/sbin/modstat/modstat.8:1.22.12.1
--- src/sbin/modstat/modstat.8:1.22	Mon Sep 12 06:54:00 2016
+++ src/sbin/modstat/modstat.8	Sat Mar 10 10:36:26 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: modstat.8,v 1.22 2016/09/12 06:54:00 wiz Exp $
+.\" $NetBSD: modstat.8,v 1.22.12.1 2018/03/10 10:36:26 pgoyette Exp $
 .\"
 .\" Copyright (c) 1993 Christopher G. Demetriou
 .\" All rights reserved.
@@ -97,11 +97,16 @@ The module flags:
 .It Dv a
 Module is auto-loaded.
 .It Dv f
-Required the
+Requires the
 .Xr modload 8
 flag
 .Fl f
 (force) to be loaded.
+.It Dv A
+Module is an alias for another module.
+The REQUIRES column contains the
+.Dq real
+alias name.
 .El
 .It Li REFS
 Number of references held on the module.

CVS commit: [pgoyette-compat] src/sbin/modstat

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sat Mar 10 10:33:40 UTC 2018

Modified Files:
src/sbin/modstat [pgoyette-compat]: main.c

Log Message:
Update for new A-is-for-Alias flag value(s)


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.12.1 src/sbin/modstat/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/modstat/main.c
diff -u src/sbin/modstat/main.c:1.24 src/sbin/modstat/main.c:1.24.12.1
--- src/sbin/modstat/main.c:1.24	Wed Nov 16 10:43:37 2016
+++ src/sbin/modstat/main.c	Sat Mar 10 10:33:40 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.24 2016/11/16 10:43:37 pgoyette Exp $	*/
+/*	$NetBSD: main.c,v 1.24.12.1 2018/03/10 10:33:40 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.24 2016/11/16 10:43:37 pgoyette Exp $");
+__RCSID("$NetBSD: main.c,v 1.24.12.1 2018/03/10 10:33:40 pgoyette Exp $");
 #endif /* !lint */
 
 #include 
@@ -67,7 +67,7 @@ static const char *sources[] = {
 const unsigned int source_max = __arraycount(sources);
 
 static const char *modflags[] = {
-	"-", "f", "a", "af"
+	"-", "f", "a", "af", "A", "Af", "Aa", "Aaf"
 };
 
 int

CVS commit: [pgoyette-compat] src/sys/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Sat Mar 10 10:33:02 UTC 2018

Modified Files:
src/sys/sys [pgoyette-compat]: module.h

Log Message:
Add new fields and flags needed to support module aliases


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.14.1 src/sys/sys/module.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/module.h
diff -u src/sys/sys/module.h:1.41 src/sys/sys/module.h:1.41.14.1
--- src/sys/sys/module.h:1.41	Wed Nov 16 10:42:14 2016
+++ src/sys/sys/module.h	Sat Mar 10 10:33:02 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: module.h,v 1.41 2016/11/16 10:42:14 pgoyette Exp $	*/
+/*	$NetBSD: module.h,v 1.41.14.1 2018/03/10 10:33:02 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,6 +62,7 @@ typedef enum modcmd {
 	MODULE_CMD_FINI,		/* mandatory */
 	MODULE_CMD_STAT,		/* optional */
 	MODULE_CMD_AUTOUNLOAD,		/* optional */
+	MODULE_CMD_GETALIASES,		/* optional */
 } modcmd_t;
 
 #ifdef _KERNEL
@@ -78,6 +79,7 @@ typedef struct modinfo {
 	int		(*mi_modcmd)(modcmd_t, void *);
 	const char	*mi_name;
 	const char	*mi_required;
+	const char	*mi_aliases;
 } const modinfo_t;
 
 /* Per module information, maintained by kern_module.c */ 
@@ -95,6 +97,7 @@ typedef struct module {
 	int			mod_flags;
 #define MODFLG_MUST_FORCE	0x01
 #define MODFLG_AUTO_LOADED	0x02
+#define	MODFLG_IS_ALIAS		0x04	/* only for export via modstat_t */
 
 } module_t;
 

CVS commit: src/lib/libm/src

[Eitan Adler]

Module Name:src
Committed By:   eadler
Date:   Sat Mar 10 09:44:47 UTC 2018

Modified Files:
src/lib/libm/src: e_atan2.c

Log Message:
Fix signed overflow in atan2

As a component of atan2(y, x), the case of x == 1.0 is farmed out to
atan(y). The current implementation of this comparison is vulnerable
to signed integer underflow (that is, undefined behavior), and it's
performed in a somewhat more complicated way than it need be. Change
it to not be quite so cute, rather directly comparing the high/low
bits of x to the specific IEEE-754 bit pattern that encodes 1.0.

ok martin@ pgoyette@ maya@
obtained from FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libm/src/e_atan2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libm/src/e_atan2.c
diff -u src/lib/libm/src/e_atan2.c:1.12 src/lib/libm/src/e_atan2.c:1.13
--- src/lib/libm/src/e_atan2.c:1.12	Sun May 26 22:01:48 2002
+++ src/lib/libm/src/e_atan2.c	Sat Mar 10 09:44:47 2018
@@ -12,7 +12,7 @@
 
 #include 
 #if defined(LIBM_SCCS) && !defined(lint)
-__RCSID("$NetBSD: e_atan2.c,v 1.12 2002/05/26 22:01:48 wiz Exp $");
+__RCSID("$NetBSD: e_atan2.c,v 1.13 2018/03/10 09:44:47 eadler Exp $");
 #endif
 
 /* __ieee754_atan2(y,x)
@@ -67,7 +67,7 @@ __ieee754_atan2(double y, double x)
 	if(((ix|((lx|-lx)>>31))>0x7ff0)||
 	   ((iy|((ly|-ly)>>31))>0x7ff0))	/* x or y is NaN */
 	   return x+y;
-	if(((hx-0x3ff0)|lx)==0) return atan(y);   /* x=1.0 */
+	if(hx==0x3ff0&==0) return atan(y);   /* x=1.0 */
 	m = ((hy>>31)&1)|((hx>>30)&2);	/* 2*sign(x)+sign(y) */
 
 /* when y = 0 */

CVS commit: src/share/dict

[Eitan Adler]

Module Name:src
Committed By:   eadler
Date:   Sat Mar 10 09:37:59 UTC 2018

Modified Files:
src/share/dict: propernames

Log Message:
Add "Eitan" to propernames

ok pgoyette@


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/dict/propernames

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/dict/propernames
diff -u src/share/dict/propernames:1.3 src/share/dict/propernames:1.4
--- src/share/dict/propernames:1.3	Wed Mar 26 07:14:32 1997
+++ src/share/dict/propernames	Sat Mar 10 09:37:59 2018
@@ -294,6 +294,7 @@ Edward
 Edwin
 Eva
 Eileen
+Eitan
 Erick
 Erik
 Eric