CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: skrll Date: Mon Jan 10 06:00:00 UTC 2022 Modified Files: src/distrib/sets/lists/base: md.alpha Log Message: Fix alpha build To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/md.alpha 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/base/md.alpha diff -u src/distrib/sets/lists/base/md.alpha:1.43 src/distrib/sets/lists/base/md.alpha:1.44 --- src/distrib/sets/lists/base/md.alpha:1.43 Sun Jan 9 18:11:09 2022 +++ src/distrib/sets/lists/base/md.alpha Mon Jan 10 06:00:00 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.43 2022/01/09 18:11:09 martin Exp $ +# $NetBSD: md.alpha,v 1.44 2022/01/10 06:00:00 skrll Exp $ ./usr/bin/fdformatbase-util-bin ./usr/lib/libalpha.sobase-sys-shlib ./usr/lib/libalpha.so.0base-sys-shlib @@ -19,7 +19,7 @@ ./usr/mdec/setnetbootinfo base-sysutil-bin ./usr/mdec/ustarbootbase-sysutil-bin ./usr/sbin/bad144base-sysutil-bin -./usr/share/sysinst/catalog/sysinstmsgs.de base-util-share share -./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share share -./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share share -./usr/share/sysinst/catalog/sysinstmsgs.pl base-util-share share +./usr/share/sysinst/catalog/sysinstmsgs.de base-util-share +./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share +./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share +./usr/share/sysinst/catalog/sysinstmsgs.pl base-util-share
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: skrll Date: Mon Jan 10 06:00:00 UTC 2022 Modified Files: src/distrib/sets/lists/base: md.alpha Log Message: Fix alpha build To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/base/md.alpha Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/microcode/radeon
Module Name:src Committed By: khorben Date: Mon Jan 10 01:47:49 UTC 2022 Modified Files: src/sys/dev/microcode/radeon: Makefile Log Message: Typo in a comment To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/microcode/radeon/Makefile 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/microcode/radeon/Makefile diff -u src/sys/dev/microcode/radeon/Makefile:1.8 src/sys/dev/microcode/radeon/Makefile:1.9 --- src/sys/dev/microcode/radeon/Makefile:1.8 Sun Sep 26 15:52:40 2021 +++ src/sys/dev/microcode/radeon/Makefile Mon Jan 10 01:47:49 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2021/09/26 15:52:40 maya Exp $ +# $NetBSD: Makefile,v 1.9 2022/01/10 01:47:49 khorben Exp $ NOMAN= # defined @@ -65,7 +65,7 @@ FILES= \ VERDE_ce.bin VERDE_mc.bin VERDE_mc2.bin VERDE_me.bin VERDE_pfp.bin \ VERDE_rlc.bin VERDE_smc.bin -# radeondrmks needs these after mountroot, but before starting init. +# radeondrmkms needs these after mountroot, but before starting init. FIRMWAREDIR= /libdata/firmware .endif
CVS commit: src/sys/dev/microcode/radeon
Module Name:src Committed By: khorben Date: Mon Jan 10 01:47:49 UTC 2022 Modified Files: src/sys/dev/microcode/radeon: Makefile Log Message: Typo in a comment To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/microcode/radeon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.bin/make
Am 09.01.2022 um 23:04 schrieb Joerg Sonnenberger: On Fri, Jan 07, 2022 at 08:04:49PM +, Roland Illig wrote: Module Name:src Committed By: rillig Date: Fri Jan 7 20:04:49 UTC 2022 Modified Files: src/usr.bin/make: for.c Log Message: make: use simpler code for handling .for loops This seems backwards to me. For simpler logic I would expect computing the var length first and then skipping variables that don't have the same length, falling back to memcmp otherwise. As it is now, the body of the .for loop is a simple string. As such, there are no markers where variables start and end, therefore "the same length" is not known in advance. It would be possible to parse the body of the .for loop first, so that each part is either: * a plain string that is copied verbatim * '$' + a one-character variable name * '$' + (brace or parenthesis) + variable name After preparing the .for loop in this way, the lengths of the variable names in the body would be known, and it would make sense to match them with the variable names from the .for loop. This would have to be done only once though since the names of the iteration variables don't change. Then again, I don't see why it would be beneficial to compute the length of a variable name in advance. If I missed a point here, please tell me. :) It's definitely an interesting idea to avoid parsing the loop body on each iteration. I will experiment on that idea to see whether it makes a noticeable difference. Since everything else in makefiles is parsed and evaluated only once, I don't see an immediate benefit of first parsing constructs other than .for loops into data structures and then evaluating them. Another possible optimization is multiple-inclusion guards. That's completely independent though.
Re: CVS commit: src/usr.bin/make
On Fri, Jan 07, 2022 at 08:04:49PM +, Roland Illig wrote: > Module Name: src > Committed By: rillig > Date: Fri Jan 7 20:04:49 UTC 2022 > > Modified Files: > src/usr.bin/make: for.c > > Log Message: > make: use simpler code for handling .for loops This seems backwards to me. For simpler logic I would expect computing the var length first and then skipping variables that don't have the same length, falling back to memcmp otherwise. De facto inlining a memcmp loop is not an improvement. Joerg
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Jan 9 20:53:54 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: Makefile directive-for-escape.exp
opt-debug-parse.exp
Log Message:
tests/make: add placeholders for .PARSEDIR and .INCLUDEDFROMDIR
When run via 'cd usr.bin/make/unit-tests && make test', the tests are in
the current directory. When run via ATF, the tests are in
/usr/tests/usr.bin/make/unit-tests, while the current directory is a
temporary directory. Allow both variants, plus others that may occur in
the bmake distribution.
To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 src/usr.bin/make/unit-tests/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/usr.bin/make/unit-tests/directive-for-escape.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/opt-debug-parse.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/Makefile
diff -u src/usr.bin/make/unit-tests/Makefile:1.293 src/usr.bin/make/unit-tests/Makefile:1.294
--- src/usr.bin/make/unit-tests/Makefile:1.293 Tue Dec 28 01:04:03 2021
+++ src/usr.bin/make/unit-tests/Makefile Sun Jan 9 20:53:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.293 2021/12/28 01:04:03 rillig Exp $
+# $NetBSD: Makefile,v 1.294 2022/01/09 20:53:53 rillig Exp $
#
# Unit tests for make(1)
#
@@ -693,6 +693,9 @@ _SED_CMDS+= -e 's,${TEST_MAKE:T:S,.,\\.,
_SED_CMDS+= -e 's,^usage: ${TEST_MAKE:T:S,.,\\.,g} ,usage: make ,'
# replace anything after 'stopped in' with unit-tests
_SED_CMDS+= -e '/stopped/s, /.*, unit-tests,'
+# Allow the test files to be placed anywhere.
+_SED_CMDS+= -e 's,\(\.PARSEDIR}\) = `'"/[^']*'"',\1 = ,'
+_SED_CMDS+= -e 's,\(\.INCLUDEDFROMDIR}\) = `'"/[^']*'"',\1 = ,'
_SED_CMDS+= -e 's,${TMPDIR},TMPDIR,g'
# canonicalize ${.OBJDIR} and ${.CURDIR}
.if ${.OBJDIR} != ${.CURDIR}
Index: src/usr.bin/make/unit-tests/directive-for-escape.exp
diff -u src/usr.bin/make/unit-tests/directive-for-escape.exp:1.13 src/usr.bin/make/unit-tests/directive-for-escape.exp:1.14
--- src/usr.bin/make/unit-tests/directive-for-escape.exp:1.13 Sun Jan 9 14:06:00 2022
+++ src/usr.bin/make/unit-tests/directive-for-escape.exp Sun Jan 9 20:53:53 2022
@@ -96,11 +96,11 @@ make: "directive-for-escape.mk" line 152
"
For: loop body:
: ${:U" "}
-SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `directive-for-escape.mk'
+SetFilenameVars: ${.PARSEDIR} = ${.PARSEFILE} = `directive-for-escape.mk'
Parsing line 153: : ${:U" "}
ParseDependency(: " ")
ParseEOF: returning to file directive-for-escape.mk, line 155
-SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `directive-for-escape.mk'
+SetFilenameVars: ${.PARSEDIR} = ${.PARSEFILE} = `directive-for-escape.mk'
Parsing line 155: .MAKEFLAGS: -d0
ParseDependency(.MAKEFLAGS: -d0)
make: Fatal errors encountered -- cannot continue
Index: src/usr.bin/make/unit-tests/opt-debug-parse.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-parse.exp:1.8 src/usr.bin/make/unit-tests/opt-debug-parse.exp:1.9
--- src/usr.bin/make/unit-tests/opt-debug-parse.exp:1.8 Sun Jan 9 11:43:58 2022
+++ src/usr.bin/make/unit-tests/opt-debug-parse.exp Sun Jan 9 20:53:53 2022
@@ -1,18 +1,18 @@
Parse_PushInput: .for loop in opt-debug-parse.mk, line 16
-SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `opt-debug-parse.mk'
+SetFilenameVars: ${.PARSEDIR} = ${.PARSEFILE} = `opt-debug-parse.mk'
Parsing line 20: .info trace with multi-line .for loop head
make: "opt-debug-parse.mk" line 20: trace with multi-line .for loop head
in .for loop from opt-debug-parse.mk:16 with var = value
ParseEOF: returning to file opt-debug-parse.mk, line 22
-SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `opt-debug-parse.mk'
+SetFilenameVars: ${.PARSEDIR} = ${.PARSEFILE} = `opt-debug-parse.mk'
Parsing line 25: .include "/dev/null"
Parse_PushInput: file /dev/null, line 1
-SetFilenameVars: ${.PARSEDIR} = `/dev' ${.PARSEFILE} = `null'
-SetFilenameVars: ${.INCLUDEDFROMDIR} = `' ${.INCLUDEDFROMFILE} = `opt-debug-parse.mk'
+SetFilenameVars: ${.PARSEDIR} = ${.PARSEFILE} = `null'
+SetFilenameVars: ${.INCLUDEDFROMDIR} = ${.INCLUDEDFROMFILE} = `opt-debug-parse.mk'
ParseEOF: returning to file opt-debug-parse.mk, line 26
-SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `opt-debug-parse.mk'
+SetFilenameVars: ${.PARSEDIR} = ${.PARSEFILE} = `opt-debug-parse.mk'
Parse_PushInput: .for loop in opt-debug-parse.mk, line 30
-SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `opt-debug-parse.mk'
+SetFilenameVars: ${.PARSEDIR} = ${.PARSEFILE} = `opt-debug-parse.mk'
Parsing line 31: .info trace
make: "opt-debug-parse.mk" line 31: trace
in .for loop from opt-debug-parse.mk:30 with a = 1, b = 2, c = 3
@@ -20,7 +20,7 @@ Parsing line 31: .info trace
make: "opt-debug-parse.mk" line 31: trace
in .for loop from opt-debug-parse.mk:30 with a = 4, b = 5, c = 6
ParseEOF: returning to file opt-debug-parse.mk, line 3
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sun Jan 9 20:53:54 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: Makefile directive-for-escape.exp opt-debug-parse.exp Log Message: tests/make: add placeholders for .PARSEDIR and .INCLUDEDFROMDIR When run via 'cd usr.bin/make/unit-tests && make test', the tests are in the current directory. When run via ATF, the tests are in /usr/tests/usr.bin/make/unit-tests, while the current directory is a temporary directory. Allow both variants, plus others that may occur in the bmake distribution. To generate a diff of this commit: cvs rdiff -u -r1.293 -r1.294 src/usr.bin/make/unit-tests/Makefile cvs rdiff -u -r1.13 -r1.14 \ src/usr.bin/make/unit-tests/directive-for-escape.exp cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/opt-debug-parse.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Sun Jan 9 20:30:04 UTC 2022 Modified Files: src/sys/arch/sparc64/sparc64: intr.c Log Message: sun4v: enable sun4v_intr_xxx() function previously imported from OpenBSD. Note that the sun4v_intr_devino_to_sysino() function is adapted to match OpenBSD version 1.57 (the introduction of INTR_DEVINO is done in revision 1.58) To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sparc64/sparc64/intr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: palle
Date: Sun Jan 9 20:30:04 UTC 2022
Modified Files:
src/sys/arch/sparc64/sparc64: intr.c
Log Message:
sun4v: enable sun4v_intr_xxx() function previously imported from OpenBSD. Note
that the sun4v_intr_devino_to_sysino() function is adapted to match OpenBSD
version 1.57 (the introduction of INTR_DEVINO is done in revision 1.58)
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/sparc64/sparc64/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/sparc64/sparc64/intr.c
diff -u src/sys/arch/sparc64/sparc64/intr.c:1.70 src/sys/arch/sparc64/sparc64/intr.c:1.71
--- src/sys/arch/sparc64/sparc64/intr.c:1.70 Sat Jul 3 19:18:55 2021
+++ src/sys/arch/sparc64/sparc64/intr.c Sun Jan 9 20:30:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.70 2021/07/03 19:18:55 palle Exp $ */
+/* $NetBSD: intr.c,v 1.71 2022/01/09 20:30:04 palle Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.70 2021/07/03 19:18:55 palle Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.71 2022/01/09 20:30:04 palle Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -368,22 +368,16 @@ softint_trigger(uintptr_t machdep)
uint64_t sun4v_group_interrupt_major;
-#if 0
-XXX notyet
-wint64_t
+int64_t
sun4v_intr_devino_to_sysino(uint64_t devhandle, uint64_t devino, uint64_t *ino)
{
if (sun4v_group_interrupt_major < 3)
return hv_intr_devino_to_sysino(devhandle, devino, ino);
- KASSERT(INTVEC(devino) == devino);
- *ino = devino | INTR_DEVINO;
+ *ino = devino;
return H_EOK;
}
-#endif
-#if 0
-XXX notyet
int64_t
sun4v_intr_setcookie(uint64_t devhandle, uint64_t ino, uint64_t cookie_value)
{
@@ -392,10 +386,7 @@ sun4v_intr_setcookie(uint64_t devhandle,
return hv_vintr_setcookie(devhandle, ino, cookie_value);
}
-#endif
-#if 0
-XXX notyet
int64_t
sun4v_intr_setenabled(uint64_t devhandle, uint64_t ino, uint64_t intr_enabled)
{
@@ -404,10 +395,7 @@ sun4v_intr_setenabled(uint64_t devhandle
return hv_vintr_setenabled(devhandle, ino, intr_enabled);
}
-#endif
-#if 0
-XXX notyet
int64_t
sun4v_intr_setstate(uint64_t devhandle, uint64_t ino, uint64_t intr_state)
{
@@ -416,10 +404,7 @@ sun4v_intr_setstate(uint64_t devhandle,
return hv_vintr_setstate(devhandle, ino, intr_state);
}
-#endif
-#if 0
-XXX notyet
int64_t
sun4v_intr_settarget(uint64_t devhandle, uint64_t ino, uint64_t cpuid)
{
@@ -428,6 +413,5 @@ sun4v_intr_settarget(uint64_t devhandle,
return hv_vintr_settarget(devhandle, ino, cpuid);
}
-#endif
#endif
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sun Jan 9 20:21:44 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: directive-if.exp directive-if.mk Log Message: tests/make: ensure that '.ifn' is an unknown directive Due to the way DetermineKindOfConditional works, it could have been that '.ifn' is treated like the negation of the plain '.if'. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/directive-if.exp cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/directive-if.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sun Jan 9 20:21:44 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: directive-if.exp directive-if.mk Log Message: tests/make: ensure that '.ifn' is an unknown directive Due to the way DetermineKindOfConditional works, it could have been that '.ifn' is treated like the negation of the plain '.if'. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/directive-if.exp cvs rdiff -u -r1.9 -r1.10 src/usr.bin/make/unit-tests/directive-if.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/directive-if.exp diff -u src/usr.bin/make/unit-tests/directive-if.exp:1.8 src/usr.bin/make/unit-tests/directive-if.exp:1.9 --- src/usr.bin/make/unit-tests/directive-if.exp:1.8 Sat Dec 19 22:33:11 2020 +++ src/usr.bin/make/unit-tests/directive-if.exp Sun Jan 9 20:21:44 2022 @@ -12,6 +12,7 @@ make: "directive-if.mk" line 70: Don't d make: "directive-if.mk" line 76: Don't do this, always put a space around comparison operators. make: "directive-if.mk" line 82: Don't do this, always put a space after a directive. make: "directive-if.mk" line 86: Don't do this, always put a space after a directive. +make: "directive-if.mk" line 94: Unknown directive "ifn" make: Fatal errors encountered -- cannot continue make: stopped in unit-tests exit status 1 Index: src/usr.bin/make/unit-tests/directive-if.mk diff -u src/usr.bin/make/unit-tests/directive-if.mk:1.9 src/usr.bin/make/unit-tests/directive-if.mk:1.10 --- src/usr.bin/make/unit-tests/directive-if.mk:1.9 Sat Dec 19 22:33:11 2020 +++ src/usr.bin/make/unit-tests/directive-if.mk Sun Jan 9 20:21:44 2022 @@ -1,4 +1,4 @@ -# $NetBSD: directive-if.mk,v 1.9 2020/12/19 22:33:11 rillig Exp $ +# $NetBSD: directive-if.mk,v 1.10 2022/01/09 20:21:44 rillig Exp $ # # Tests for the .if directive. # @@ -86,4 +86,9 @@ . info Don't do this, always put a space after a directive. .endif -all: + +# The directives '.ifdef' and '.ifmake' can be negated by inserting an 'n'. +# This doesn't work for a plain '.if' though. +# +# expect+1: Unknown directive "ifn" +.ifn 0
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jan 9 19:57:14 UTC 2022
Modified Files:
src/usr.bin/make: parse.c
Log Message:
make: add missing printflike annotations to parse.c
Clang is stricter than GCC in checking format string inconsistencies.
Reported by Tobias Nygren.
To generate a diff of this commit:
cvs rdiff -u -r1.648 -r1.649 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.648 src/usr.bin/make/parse.c:1.649
--- src/usr.bin/make/parse.c:1.648 Sun Jan 9 18:49:28 2022
+++ src/usr.bin/make/parse.c Sun Jan 9 19:57:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.648 2022/01/09 18:49:28 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.649 2022/01/09 19:57:14 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -106,7 +106,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.648 2022/01/09 18:49:28 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.649 2022/01/09 19:57:14 rillig Exp $");
/*
* A file being read.
@@ -439,7 +439,7 @@ PrintLocation(FILE *f, const char *fname
FStr_Done(&dir);
}
-static void
+static void MAKE_ATTR_PRINTFLIKE(5, 0)
ParseVErrorInternal(FILE *f, const char *fname, size_t lineno,
ParseErrorLevel type, const char *fmt, va_list ap)
{
@@ -469,7 +469,7 @@ ParseVErrorInternal(FILE *f, const char
PrintStackTrace();
}
-static void
+static void MAKE_ATTR_PRINTFLIKE(4, 5)
ParseErrorInternal(const char *fname, size_t lineno,
ParseErrorLevel type, const char *fmt, ...)
{
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jan 9 19:57:14 UTC 2022 Modified Files: src/usr.bin/make: parse.c Log Message: make: add missing printflike annotations to parse.c Clang is stricter than GCC in checking format string inconsistencies. Reported by Tobias Nygren. To generate a diff of this commit: cvs rdiff -u -r1.648 -r1.649 src/usr.bin/make/parse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jan 9 18:59:27 UTC 2022 Modified Files: src/usr.bin/make: for.c make.h Log Message: make: extract low-level character operations into utility function Suggested by nia. https://mail-index.netbsd.org/source-changes-d/2022/01/09/msg013564.html No functional change. To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/usr.bin/make/for.c cvs rdiff -u -r1.287 -r1.288 src/usr.bin/make/make.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jan 9 18:59:27 UTC 2022
Modified Files:
src/usr.bin/make: for.c make.h
Log Message:
make: extract low-level character operations into utility function
Suggested by nia.
https://mail-index.netbsd.org/source-changes-d/2022/01/09/msg013564.html
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/usr.bin/make/for.c
cvs rdiff -u -r1.287 -r1.288 src/usr.bin/make/make.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.164 src/usr.bin/make/for.c:1.165
--- src/usr.bin/make/for.c:1.164 Sun Jan 9 14:06:00 2022
+++ src/usr.bin/make/for.c Sun Jan 9 18:59:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.164 2022/01/09 14:06:00 rillig Exp $ */
+/* $NetBSD: for.c,v 1.165 2022/01/09 18:59:27 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -58,7 +58,7 @@
#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.164 2022/01/09 14:06:00 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.165 2022/01/09 18:59:27 rillig Exp $");
typedef struct ForLoop {
@@ -376,11 +376,8 @@ ForLoop_SubstVarLong(ForLoop *f, unsigne
for (i = 0; i < f->vars.len; i++) {
const char *p = start;
- const char *varname = vars[i];
- while (*varname != '\0' && *p == *varname)
- p++, varname++;
- if (*varname != '\0')
+ if (!cpp_skip_string(&p, vars[i]))
continue;
/* XXX: why test for backslash here? */
if (*p != ':' && *p != endc && *p != '\\')
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.287 src/usr.bin/make/make.h:1.288
--- src/usr.bin/make/make.h:1.287 Fri Jan 7 20:50:35 2022
+++ src/usr.bin/make/make.h Sun Jan 9 18:59:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.287 2022/01/07 20:50:35 rillig Exp $ */
+/* $NetBSD: make.h,v 1.288 2022/01/09 18:59:27 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -896,6 +896,17 @@ cpp_skip_hspace(const char **pp)
(*pp)++;
}
+MAKE_INLINE bool
+cpp_skip_string(const char **pp, const char *s)
+{
+ const char *p = *pp;
+ while (*p == *s && *s != '\0')
+ p++, s++;
+ if (*s == '\0')
+ *pp = p;
+ return *s == '\0';
+}
+
MAKE_INLINE void
pp_skip_whitespace(char **pp)
{
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jan 9 18:49:28 UTC 2022
Modified Files:
src/usr.bin/make: Makefile main.c nonints.h parse.c var.c
Log Message:
make: in Cmd_Exec, return error message instead of format string
This change leaves only literal format strings in parse.c. It allows
for more detailed error messages than the current "non-zero status" or
"exited on a signal".
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/usr.bin/make/Makefile
cvs rdiff -u -r1.567 -r1.568 src/usr.bin/make/main.c
cvs rdiff -u -r1.236 -r1.237 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.647 -r1.648 src/usr.bin/make/parse.c
cvs rdiff -u -r1.999 -r1.1000 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.119 src/usr.bin/make/Makefile:1.120
--- src/usr.bin/make/Makefile:1.119 Sun Dec 12 10:53:37 2021
+++ src/usr.bin/make/Makefile Sun Jan 9 18:49:28 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2021/12/12 10:53:37 rillig Exp $
+# $NetBSD: Makefile,v 1.120 2022/01/09 18:49:28 rillig Exp $
# @(#)Makefile 5.2 (Berkeley) 12/28/90
PROG= make
@@ -122,11 +122,10 @@ CLEANFILES+= *.o # for filemon objects
COPTS.arch.c+= ${GCC_NO_FORMAT_TRUNCATION}
COPTS.dir.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.job.c+= -Wno-format-nonliteral
+COPTS.job.c+= -Wno-format-nonliteral # custom shell templates
COPTS.main.c+= ${GCC_NO_FORMAT_TRUNCATION} ${GCC_NO_STRINGOP_TRUNCATION}
COPTS.meta.c+= ${GCC_NO_FORMAT_TRUNCATION}
-COPTS.parse.c+= -Wno-format-nonliteral
-COPTS.var.c+= -Wno-format-nonliteral
+COPTS.var.c+= -Wno-format-nonliteral # strftime
CPPFLAGS+= -DMAKE_NATIVE
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.567 src/usr.bin/make/main.c:1.568
--- src/usr.bin/make/main.c:1.567 Fri Jan 7 21:00:49 2022
+++ src/usr.bin/make/main.c Sun Jan 9 18:49:28 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.567 2022/01/07 21:00:49 rillig Exp $ */
+/* $NetBSD: main.c,v 1.568 2022/01/09 18:49:28 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.567 2022/01/07 21:00:49 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.568 2022/01/09 18:49:28 rillig Exp $");
#if defined(MAKE_NATIVE) && !defined(lint)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1697,16 +1697,10 @@ found:
/*
* Execute the command in cmd, and return its output (only stdout, not
- * stderr). In the output, replace newlines with spaces.
- *
- * Results:
- * The output of the command, can be empty.
- * *errfmt returns a format string describing the command failure,
- * if any, using a single %s conversion specification.
- * TODO: replace errfmt with an actual error message.
+ * stderr, possibly empty). In the output, replace newlines with spaces.
*/
char *
-Cmd_Exec(const char *cmd, const char **errfmt)
+Cmd_Exec(const char *cmd, char **error)
{
const char *args[4]; /* Arguments for invoking the shell */
int pipefds[2];
@@ -1715,12 +1709,10 @@ Cmd_Exec(const char *cmd, const char **e
int status; /* command exit status */
Buffer buf; /* buffer to store the result */
ssize_t bytes_read;
- char *res; /* result */
+ char *output;
char *cp;
int saved_errno;
- *errfmt = NULL;
-
if (shellName == NULL)
Shell_Init();
@@ -1730,8 +1722,9 @@ Cmd_Exec(const char *cmd, const char **e
args[3] = NULL;
if (pipe(pipefds) == -1) {
- *errfmt = "Couldn't create pipe for \"%s\"";
- return bmake_strdup("");
+ *error = str_concat3(
+ "Couldn't create pipe for \"", cmd, "\"");
+ return bmake_strdup("");;
}
Var_ReexportVars();
@@ -1747,7 +1740,7 @@ Cmd_Exec(const char *cmd, const char **e
/* NOTREACHED */
case -1:
- *errfmt = "Couldn't exec \"%s\"";
+ *error = str_concat3("Couldn't exec \"", cmd, "\"");
return bmake_strdup("");
}
@@ -1772,20 +1765,23 @@ Cmd_Exec(const char *cmd, const char **e
if (Buf_EndsWith(&buf, '\n'))
buf.data[buf.len - 1] = '\0';
- res = Buf_DoneData(&buf);
- for (cp = res; *cp != '\0'; cp++)
+ output = Buf_DoneData(&buf);
+ for (cp = output; *cp != '\0'; cp++)
if (*cp == '\n')
*cp = ' ';
if (WIFSIGNALED(status))
- *errfmt = "\"%s\" exited on a signal";
+ *error = str_concat3("\"", cmd, "\" exited on a signal");
else if (WEXITSTATUS(status) != 0)
- *errfmt = "\"%s\" returned non-zero status";
+ *error = str_concat3(
+ "\"", cmd, "\" returned non-zero status");
else if (saved_errno != 0)
- *errfmt = "Couldn't read shell's output for \"%s\"";
-
- return res;
+ *error = str_concat3(
+ "Couldn't read shell's output for \"", cmd, "\"");
+ else
+ *error = NULL;
+ return output;
}
/*
Index: src/usr.bin/make/nonints.h
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jan 9 18:49:28 UTC 2022 Modified Files: src/usr.bin/make: Makefile main.c nonints.h parse.c var.c Log Message: make: in Cmd_Exec, return error message instead of format string This change leaves only literal format strings in parse.c. It allows for more detailed error messages than the current "non-zero status" or "exited on a signal". No functional change. To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/usr.bin/make/Makefile cvs rdiff -u -r1.567 -r1.568 src/usr.bin/make/main.c cvs rdiff -u -r1.236 -r1.237 src/usr.bin/make/nonints.h cvs rdiff -u -r1.647 -r1.648 src/usr.bin/make/parse.c cvs rdiff -u -r1.999 -r1.1000 src/usr.bin/make/var.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Sun Jan 9 18:27:23 UTC 2022
Modified Files:
src/sys/dev/usb: uvideo.c
Log Message:
uvideo(4): Fix USB interface numbering.
Don't try to be clever and count -- just use bInterfaceNumber.
The previous logic to count interface descriptors failed to consider
interfaces with alternate settings, which led it to pass an invalid
interface number to usbd_device2interface_handle.
It is simpler to just use the recorded bInterfaceNumber, which is
guaranteed by the USB spec to be zero-indexed and below
bNumInterfaces as we need.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/uvideo.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/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.63 src/sys/dev/usb/uvideo.c:1.64
--- src/sys/dev/usb/uvideo.c:1.63 Sun Nov 14 08:32:07 2021
+++ src/sys/dev/usb/uvideo.c Sun Jan 9 18:27:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.63 2021/11/14 08:32:07 andvar Exp $ */
+/* $NetBSD: uvideo.c,v 1.64 2022/01/09 18:27:23 riastradh Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.63 2021/11/14 08:32:07 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.64 2022/01/09 18:27:23 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -328,8 +328,7 @@ static struct uvideo_stream * uvideo_str
static usbd_status uvideo_stream_init(
struct uvideo_stream *,
struct uvideo_softc *,
- const usb_interface_descriptor_t *,
- uint8_t);
+ const usb_interface_descriptor_t *);
static usbd_status uvideo_stream_init_desc(
struct uvideo_stream *,
const usb_interface_descriptor_t *,
@@ -490,7 +489,6 @@ uvideo_attach(device_t parent, device_t
const usb_interface_descriptor_t *ifdesc;
struct uvideo_stream *vs;
usbd_status err;
- uint8_t ifaceidx;
sc->sc_dev = self;
@@ -522,10 +520,7 @@ uvideo_attach(device_t parent, device_t
/* iterate through interface descriptors and initialize softc */
usb_desc_iter_init(sc->sc_udev, &iter);
- for (ifaceidx = 0;
- (ifdesc = usb_desc_iter_next_interface(&iter)) != NULL;
- ++ifaceidx)
- {
+ while ((ifdesc = usb_desc_iter_next_interface(&iter)) != NULL) {
if (ifdesc->bLength < USB_INTERFACE_DESCRIPTOR_SIZE) {
DPRINTFN(50, ("uvideo_attach: "
"ignoring incorrect descriptor len=%d\n",
@@ -562,8 +557,7 @@ uvideo_attach(device_t parent, device_t
vs = uvideo_find_stream(sc, ifdesc->bInterfaceNumber);
if (vs == NULL) {
vs = uvideo_stream_alloc();
-err = uvideo_stream_init(vs, sc, ifdesc,
- ifaceidx);
+err = uvideo_stream_init(vs, sc, ifdesc);
if (err != USBD_NORMAL_COMPLETION) {
DPRINTF(("uvideo_attach: "
"error initializing stream: "
@@ -1026,8 +1020,7 @@ uvideo_unit_free_controls(struct uvideo_
static usbd_status
uvideo_stream_init(struct uvideo_stream *vs,
struct uvideo_softc *sc,
- const usb_interface_descriptor_t *ifdesc,
- uint8_t idx)
+ const usb_interface_descriptor_t *ifdesc)
{
uWord len;
usbd_status err;
@@ -1043,7 +1036,8 @@ uvideo_stream_init(struct uvideo_stream
vs->vs_current_format.priv = -1;
vs->vs_xfer_type = 0;
- err = usbd_device2interface_handle(sc->sc_udev, idx, &vs->vs_iface);
+ err = usbd_device2interface_handle(sc->sc_udev, vs->vs_ifaceno,
+ &vs->vs_iface);
if (err != USBD_NORMAL_COMPLETION) {
DPRINTF(("uvideo_stream_init: "
"error getting vs interface: "
CVS commit: src/sys/dev/usb
Module Name:src Committed By: riastradh Date: Sun Jan 9 18:27:23 UTC 2022 Modified Files: src/sys/dev/usb: uvideo.c Log Message: uvideo(4): Fix USB interface numbering. Don't try to be clever and count -- just use bInterfaceNumber. The previous logic to count interface descriptors failed to consider interfaces with alternate settings, which led it to pass an invalid interface number to usbd_device2interface_handle. It is simpler to just use the recorded bInterfaceNumber, which is guaranteed by the USB spec to be zero-indexed and below bNumInterfaces as we need. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/uvideo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Jan 9 18:22:32 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: var-op-shell.exp var-op-shell.mk
varmod-assign-shell.exp varmod-assign-shell.mk
Log Message:
tests/make: demonstrate inconsistencies in Cmd_Exec callers
The assignment 'VAR != cmd' generates a warning, the others generate an
error message. That error message is ignored for backwards
compatibility though.
The assignment via the expression ${VAR::!=cmd} only uses the output of
the command if there was no error, the other places use the output
nevertheless.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/var-op-shell.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/var-op-shell.mk
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/varmod-assign-shell.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-assign-shell.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/var-op-shell.exp
diff -u src/usr.bin/make/unit-tests/var-op-shell.exp:1.3 src/usr.bin/make/unit-tests/var-op-shell.exp:1.4
--- src/usr.bin/make/unit-tests/var-op-shell.exp:1.3 Sat Feb 6 04:55:08 2021
+++ src/usr.bin/make/unit-tests/var-op-shell.exp Sun Jan 9 18:22:31 2022
@@ -1,7 +1,7 @@
-make: "var-op-shell.mk" line 28: warning: "echo "failed"; false" returned non-zero status
-make: "var-op-shell.mk" line 34: warning: "false" returned non-zero status
-make: "var-op-shell.mk" line 56: warning: "kill $$" exited on a signal
+make: "var-op-shell.mk" line 31: warning: "echo "failed"; false" returned non-zero status
+make: "var-op-shell.mk" line 37: warning: "false" returned non-zero status
+make: "var-op-shell.mk" line 59: warning: "kill $$" exited on a signal
/bin/no/such/command: not found
-make: "var-op-shell.mk" line 62: warning: "/bin/no/such/command" returned non-zero status
+make: "var-op-shell.mk" line 65: warning: "/bin/no/such/command" returned non-zero status
stderr
exit status 0
Index: src/usr.bin/make/unit-tests/var-op-shell.mk
diff -u src/usr.bin/make/unit-tests/var-op-shell.mk:1.4 src/usr.bin/make/unit-tests/var-op-shell.mk:1.5
--- src/usr.bin/make/unit-tests/var-op-shell.mk:1.4 Sat Feb 6 04:55:08 2021
+++ src/usr.bin/make/unit-tests/var-op-shell.mk Sun Jan 9 18:22:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: var-op-shell.mk,v 1.4 2021/02/06 04:55:08 sjg Exp $
+# $NetBSD: var-op-shell.mk,v 1.5 2022/01/09 18:22:31 rillig Exp $
#
# Tests for the != variable assignment operator, which runs its right-hand
# side through the shell.
@@ -15,7 +15,7 @@ OUTPUT!= echo "success"'ful'
# an empty output produced the error message "Couldn't read shell's output
# for \"%s\"".
#
-# The error message is still there but reserved for technical errors.
+# The error message is still in Cmd_Exec but reserved for technical errors.
# It may be possible to trigger the error message by killing the shell after
# reading part of its output.
OUTPUT!= true
@@ -24,7 +24,10 @@ OUTPUT!= true
.endif
# The output of a shell command that failed is processed nevertheless.
-# TODO: Make this an error in lint mode.
+# Unlike the other places that run external commands (expression modifier
+# '::!=', expression modifier ':!...!'), a failed command generates only a
+# warning, not an "error". These "errors" are ignored in default mode, for
+# compatibility, but not in lint mode (-dL).
OUTPUT!= echo "failed"; false
.if ${OUTPUT} != "failed"
. error
Index: src/usr.bin/make/unit-tests/varmod-assign-shell.exp
diff -u src/usr.bin/make/unit-tests/varmod-assign-shell.exp:1.1 src/usr.bin/make/unit-tests/varmod-assign-shell.exp:1.2
--- src/usr.bin/make/unit-tests/varmod-assign-shell.exp:1.1 Tue Dec 28 00:56:17 2021
+++ src/usr.bin/make/unit-tests/varmod-assign-shell.exp Sun Jan 9 18:22:31 2022
@@ -1,4 +1,4 @@
-make: "varmod-assign-shell.mk" line 25: warning: "echo output; false" returned non-zero status
+make: "varmod-assign-shell.mk" line 27: warning: "echo output; false" returned non-zero status
make: "echo output; false" returned non-zero status
DIRECT=output
ASSIGNED=previous
Index: src/usr.bin/make/unit-tests/varmod-assign-shell.mk
diff -u src/usr.bin/make/unit-tests/varmod-assign-shell.mk:1.2 src/usr.bin/make/unit-tests/varmod-assign-shell.mk:1.3
--- src/usr.bin/make/unit-tests/varmod-assign-shell.mk:1.2 Tue Dec 28 10:47:00 2021
+++ src/usr.bin/make/unit-tests/varmod-assign-shell.mk Sun Jan 9 18:22:31 2022
@@ -1,9 +1,11 @@
-# $NetBSD: varmod-assign-shell.mk,v 1.2 2021/12/28 10:47:00 rillig Exp $
+# $NetBSD: varmod-assign-shell.mk,v 1.3 2022/01/09 18:22:31 rillig Exp $
#
# Tests for the variable modifier '::!=', which assigns the output of a shell
# command to the variable, but only if the command exited successfully. This
-# is different from the variable assignment operator '!=', which also assigns
-# when the shell comm
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Jan 9 18:22:32 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: var-op-shell.exp var-op-shell.mk
varmod-assign-shell.exp varmod-assign-shell.mk
Log Message:
tests/make: demonstrate inconsistencies in Cmd_Exec callers
The assignment 'VAR != cmd' generates a warning, the others generate an
error message. That error message is ignored for backwards
compatibility though.
The assignment via the expression ${VAR::!=cmd} only uses the output of
the command if there was no error, the other places use the output
nevertheless.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/var-op-shell.exp
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/var-op-shell.mk
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/make/unit-tests/varmod-assign-shell.exp
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/unit-tests/varmod-assign-shell.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: martin Date: Sun Jan 9 18:11:09 UTC 2022 Modified Files: src/distrib/sets/lists/base: md.alpha md.amd64 md.amiga md.bebox md.emips md.hpcmips md.hppa md.i386 md.landisk md.mac68k md.macppc md.mipsco md.news68k md.newsmips md.next68k md.ofppc md.pmax md.prep md.rs6000 md.sandpoint md.sbmips md.sgimips md.sparc md.sparc64 md.sun2 md.sun3 md.vax Log Message: First try (certainly wrong for many builds) to add sysinst catalog files. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/base/md.alpha cvs rdiff -u -r1.286 -r1.287 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/base/md.amiga cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/base/md.bebox cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base/md.emips \ src/distrib/sets/lists/base/md.hppa src/distrib/sets/lists/base/md.rs6000 cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/base/md.hpcmips \ src/distrib/sets/lists/base/md.next68k \ src/distrib/sets/lists/base/md.sgimips cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/lists/base/md.i386 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base/md.landisk \ src/distrib/sets/lists/base/md.mipsco cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/base/md.mac68k cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/base/md.macppc cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base/md.news68k \ src/distrib/sets/lists/base/md.newsmips cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/base/md.ofppc cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/base/md.pmax cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/base/md.prep cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base/md.sandpoint cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base/md.sbmips cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/base/md.sparc cvs rdiff -u -r1.255 -r1.256 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/base/md.sun2 cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/base/md.sun3 cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/base/md.vax Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: martin Date: Sun Jan 9 18:11:09 UTC 2022 Modified Files: src/distrib/sets/lists/base: md.alpha md.amd64 md.amiga md.bebox md.emips md.hpcmips md.hppa md.i386 md.landisk md.mac68k md.macppc md.mipsco md.news68k md.newsmips md.next68k md.ofppc md.pmax md.prep md.rs6000 md.sandpoint md.sbmips md.sgimips md.sparc md.sparc64 md.sun2 md.sun3 md.vax Log Message: First try (certainly wrong for many builds) to add sysinst catalog files. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/base/md.alpha cvs rdiff -u -r1.286 -r1.287 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/base/md.amiga cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/base/md.bebox cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/base/md.emips \ src/distrib/sets/lists/base/md.hppa src/distrib/sets/lists/base/md.rs6000 cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/base/md.hpcmips \ src/distrib/sets/lists/base/md.next68k \ src/distrib/sets/lists/base/md.sgimips cvs rdiff -u -r1.155 -r1.156 src/distrib/sets/lists/base/md.i386 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/base/md.landisk \ src/distrib/sets/lists/base/md.mipsco cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/base/md.mac68k cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/base/md.macppc cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/base/md.news68k \ src/distrib/sets/lists/base/md.newsmips cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/base/md.ofppc cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/base/md.pmax cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/base/md.prep cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base/md.sandpoint cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/base/md.sbmips cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/base/md.sparc cvs rdiff -u -r1.255 -r1.256 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/base/md.sun2 cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/base/md.sun3 cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/base/md.vax 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/base/md.alpha diff -u src/distrib/sets/lists/base/md.alpha:1.42 src/distrib/sets/lists/base/md.alpha:1.43 --- src/distrib/sets/lists/base/md.alpha:1.42 Wed Aug 6 12:15:01 2014 +++ src/distrib/sets/lists/base/md.alpha Sun Jan 9 18:11:09 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.alpha,v 1.42 2014/08/06 12:15:01 martin Exp $ +# $NetBSD: md.alpha,v 1.43 2022/01/09 18:11:09 martin Exp $ ./usr/bin/fdformatbase-util-bin ./usr/lib/libalpha.sobase-sys-shlib ./usr/lib/libalpha.so.0base-sys-shlib @@ -19,3 +19,7 @@ ./usr/mdec/setnetbootinfo base-sysutil-bin ./usr/mdec/ustarbootbase-sysutil-bin ./usr/sbin/bad144base-sysutil-bin +./usr/share/sysinst/catalog/sysinstmsgs.de base-util-share share +./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share share +./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share share +./usr/share/sysinst/catalog/sysinstmsgs.pl base-util-share share Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.286 src/distrib/sets/lists/base/md.amd64:1.287 --- src/distrib/sets/lists/base/md.amd64:1.286 Sat Oct 16 07:01:02 2021 +++ src/distrib/sets/lists/base/md.amd64 Sun Jan 9 18:11:09 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.286 2021/10/16 07:01:02 skrll Exp $ +# $NetBSD: md.amd64,v 1.287 2022/01/09 18:11:09 martin Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -72,3 +72,7 @@ ./usr/mdec/prekernbase-sysutil-bin ./usr/mdec/pxeboot_ia32.bin base-sysutil-bin ./usr/mdec/pxeboot_ia32_com0.bin base-obsolete obsolete +./usr/share/sysinst/catalog/sysinstmsgs.de base-util-share +./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share +./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share +./usr/share/sysinst/catalog/sysinstmsgs.pl base-util-share Index: src/distrib/sets/lists/base/md.amiga diff -u src/distrib/sets/lists/base/md.amiga:1.57 src/distrib/sets/lists/base/md.amiga:1.58 --- src/distrib/sets/lists/base/md.amiga:1.57 Thu Feb 25 03:42:59 2021 +++ src/distrib/sets/lists/base/md.amiga Sun Jan 9 18:11:09 2022 @@ -1,4 +1,4 @@ -# $NetBSD: md.amiga,v 1.57 2021/02/25 03:42:59 rin Exp $ +# $NetBSD: md.amiga,v 1.58 2022/01/09 18:11:09 martin Exp $ ./sbin/binpatch base-sysutil-root ./usr/mdec/boot.amigabase-sysutil-bin ./usr/mdec/bootxx_fdbase-sysutil-bin @@ -19,3 +19,5 @@ ./usr/share/keymaps/amiga/pl_us.map base-sys-share ./usr/share/keymaps/amiga/sw.map base-sys-share ./usr/share/keymaps/amiga/us.map base-sys-share +./usr/share/sysinst/catalog/sysinstmsgs.de base-util-share +./usr/share/sysins
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jan 9 16:56:08 UTC 2022
Modified Files:
src/usr.bin/make: var.c
Log Message:
make: shorten ApplyModifier_Assign
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.998 -r1.999 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.998 src/usr.bin/make/var.c:1.999
--- src/usr.bin/make/var.c:1.998 Sat Jan 8 17:25:19 2022
+++ src/usr.bin/make/var.c Sun Jan 9 16:56:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.998 2022/01/08 17:25:19 rillig Exp $ */
+/* $NetBSD: var.c,v 1.999 2022/01/09 16:56:08 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -140,7 +140,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.998 2022/01/08 17:25:19 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.999 2022/01/09 16:56:08 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -3539,11 +3539,9 @@ found_op:
VarFreeShortLived(gv);
}
- switch (op[0]) {
- case '+':
+ if (op[0] == '+')
Var_Append(scope, expr->name, val.str);
- break;
- case '!': {
+ else if (op[0] == '!') {
const char *errfmt;
char *cmd_output = Cmd_Exec(val.str, &errfmt);
if (errfmt != NULL)
@@ -3551,16 +3549,11 @@ found_op:
else
Var_Set(scope, expr->name, cmd_output);
free(cmd_output);
- break;
- }
- case '?':
- if (expr->defined == DEF_REGULAR)
- break;
- /* FALLTHROUGH */
- default:
+ } else if (op[0] == '?' && expr->defined == DEF_REGULAR) {
+ /* Do nothing. */
+ } else
Var_Set(scope, expr->name, val.str);
- break;
- }
+
Expr_SetValueRefer(expr, "");
done:
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jan 9 16:56:08 UTC 2022 Modified Files: src/usr.bin/make: var.c Log Message: make: shorten ApplyModifier_Assign No functional change. To generate a diff of this commit: cvs rdiff -u -r1.998 -r1.999 src/usr.bin/make/var.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Jan 9 16:39:50 UTC 2022 Modified Files: src/usr.sbin/sysinst: Makefile.inc Log Message: Install sysinst message catalogs. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/sysinst/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Jan 9 16:39:50 UTC 2022
Modified Files:
src/usr.sbin/sysinst: Makefile.inc
Log Message:
Install sysinst message catalogs.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/usr.sbin/sysinst/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/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.44 src/usr.sbin/sysinst/Makefile.inc:1.45
--- src/usr.sbin/sysinst/Makefile.inc:1.44 Fri Oct 8 15:59:55 2021
+++ src/usr.sbin/sysinst/Makefile.inc Sun Jan 9 16:39:50 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.44 2021/10/08 15:59:55 martin Exp $
+# $NetBSD: Makefile.inc,v 1.45 2022/01/09 16:39:50 martin Exp $
#
# Makefile for sysinst
@@ -242,8 +242,8 @@ sysinstmsgs.${LANG}: msg.mi.${LANG} ${MS
${HOST_SH} ${MSG_XLAT_SH} -f sysinstmsgs.fmtcnt > ${.TARGET}
DPSRCS+= sysinstmsgs.${LANG}
-# FILES+= sysinstmsgs.${LANG}
-# FILESDIR_sysinstmsgs.${LANG}= ${CATALOGDIR}
+FILES+= sysinstmsgs.${LANG}
+FILESDIR_sysinstmsgs.${LANG}= ${CATALOGDIR}
.endfor
.PHONY: check-lang
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jan 9 15:48:30 UTC 2022
Modified Files:
src/usr.bin/make: make.c
Log Message:
make: use consistent variable names for varargs
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 src/usr.bin/make/make.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.251 src/usr.bin/make/make.c:1.252
--- src/usr.bin/make/make.c:1.251 Sat Jan 8 09:53:44 2022
+++ src/usr.bin/make/make.c Sun Jan 9 15:48:30 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: make.c,v 1.251 2022/01/08 09:53:44 rillig Exp $ */
+/* $NetBSD: make.c,v 1.252 2022/01/09 15:48:30 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -104,7 +104,7 @@
#include "job.h"
/* "@(#)make.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: make.c,v 1.251 2022/01/08 09:53:44 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.252 2022/01/09 15:48:30 rillig Exp $");
/* Sequence # to detect recursion. */
static unsigned int checked_seqno = 1;
@@ -120,11 +120,11 @@ static GNodeList toBeMade = LST_INIT;
void
debug_printf(const char *fmt, ...)
{
- va_list args;
+ va_list ap;
- va_start(args, fmt);
- vfprintf(opts.debug_file, fmt, args);
- va_end(args);
+ va_start(ap, fmt);
+ vfprintf(opts.debug_file, fmt, ap);
+ va_end(ap);
}
MAKE_ATTR_DEAD static void
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jan 9 15:48:30 UTC 2022 Modified Files: src/usr.bin/make: make.c Log Message: make: use consistent variable names for varargs No binary change. To generate a diff of this commit: cvs rdiff -u -r1.251 -r1.252 src/usr.bin/make/make.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Jan 9 15:05:21 UTC 2022
Modified Files:
src/usr.bin/make/unit-tests: opt-debug-file.exp opt-debug-file.mk
Log Message:
tests/make: test output channels for parse errors and other errors
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-debug-file.exp
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt-debug-file.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/opt-debug-file.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-file.exp:1.3 src/usr.bin/make/unit-tests/opt-debug-file.exp:1.4
--- src/usr.bin/make/unit-tests/opt-debug-file.exp:1.3 Mon Dec 27 22:22:48 2021
+++ src/usr.bin/make/unit-tests/opt-debug-file.exp Sun Jan 9 15:05:21 2022
@@ -1,2 +1,12 @@
+make: "opt-debug-file.mk" line 43: This goes to stderr only, once.
+make: "opt-debug-file.mk" line 45: This goes to stderr only, once.
+make: "opt-debug-file.mk" line 47: This goes to stderr, and in addition to the debug log.
+CondParser_Eval: ${:!cat opt-debug-file.debuglog!:Maddition:[#]} != 1
+lhs = 1.00, rhs = 1.00, op = !=
+make: Missing delimiter for modifier ':S'
+make: Missing delimiter for modifier ':S'
+make: Missing delimiter for modifier ':S'
+CondParser_Eval: ${:!cat opt-debug-file.debuglog!:Mdelimiter:[#]} != 1
+lhs = 1.00, rhs = 1.00, op = !=
Cannot open debug file "opt-debug-file.debuglog/file"
exit status 2
Index: src/usr.bin/make/unit-tests/opt-debug-file.mk
diff -u src/usr.bin/make/unit-tests/opt-debug-file.mk:1.6 src/usr.bin/make/unit-tests/opt-debug-file.mk:1.7
--- src/usr.bin/make/unit-tests/opt-debug-file.mk:1.6 Tue Dec 28 01:04:04 2021
+++ src/usr.bin/make/unit-tests/opt-debug-file.mk Sun Jan 9 15:05:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: opt-debug-file.mk,v 1.6 2021/12/28 01:04:04 rillig Exp $
+# $NetBSD: opt-debug-file.mk,v 1.7 2022/01/09 15:05:21 rillig Exp $
#
# Tests for the -dF command line option, which redirects the debug log
# to a file instead of writing it to stderr.
@@ -11,14 +11,16 @@
VAR= value ${:Uexpanded}
# Hide the logging output for the remaining actions.
-# As of 2020-10-03, it is not possible to disable debug logging again.
+# Before main.c 1.362 from 2020-10-03, it was not possible to disable debug
+# logging again. Since then, an easier way is the undocumented option '-d0'.
.MAKEFLAGS: -dF/dev/null
# Make sure that the debug logging file contains some logging.
DEBUG_OUTPUT:= ${:!cat opt-debug-file.debuglog!}
# Grmbl. Because of the := operator in the above line, the variable
# value contains ${:Uexpanded}. This variable expression is expanded
-# upon further processing. Therefore, don't read from untrusted input.
+# when it is used in the condition below. Therefore, be careful when storing
+# untrusted input in variables.
#.MAKEFLAGS: -dc -dFstderr
.if !${DEBUG_OUTPUT:tW:M*VAR = value expanded*}
. error ${DEBUG_OUTPUT}
@@ -26,11 +28,41 @@ DEBUG_OUTPUT:= ${:!cat opt-debug-file.de
# To get the unexpanded text that was actually written to the debug log
# file, the content of that log file must not be stored in a variable.
-# XXX: In the :M modifier, a dollar is escaped as '$$', not '\$'.
+#
+# XXX: In the :M modifier, a dollar is escaped using '$$', not '\$'. This
+# escaping scheme unnecessarily differs from all other modifiers.
.if !${:!cat opt-debug-file.debuglog!:tW:M*VAR = value $${:Uexpanded}*}
. error
.endif
+.MAKEFLAGS: -d0
+
+
+# See Parse_Error.
+.MAKEFLAGS: -dFstdout
+. info This goes to stderr only, once.
+.MAKEFLAGS: -dFstderr
+. info This goes to stderr only, once.
+.MAKEFLAGS: -dFopt-debug-file.debuglog
+. info This goes to stderr, and in addition to the debug log.
+.MAKEFLAGS: -dFstderr -d0c
+.if ${:!cat opt-debug-file.debuglog!:Maddition:[#]} != 1
+. error
+.endif
+
+
+# See ApplyModifier_Subst, which calls Error.
+.MAKEFLAGS: -dFstdout
+: This goes to stderr only, once. ${:U:S
+.MAKEFLAGS: -dFstderr
+: This goes to stderr only, once. ${:U:S
+.MAKEFLAGS: -dFopt-debug-file.debuglog
+: This goes to stderr, and in addition to the debug log. ${:U:S
+.MAKEFLAGS: -dFstderr -d0c
+.if ${:!cat opt-debug-file.debuglog!:Mdelimiter:[#]} != 1
+. error
+.endif
+
# If the debug log file cannot be opened, make prints an error message and
# exits immediately since the debug log file is usually selected from the
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sun Jan 9 15:05:21 UTC 2022 Modified Files: src/usr.bin/make/unit-tests: opt-debug-file.exp opt-debug-file.mk Log Message: tests/make: test output channels for parse errors and other errors To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/make/unit-tests/opt-debug-file.exp cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/opt-debug-file.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: jmcneill
Date: Sun Jan 9 15:05:16 UTC 2022
Modified Files:
src/sys/arch/evbarm/conf: GENERIC64
src/sys/dev/acpi: files.acpi
Added Files:
src/sys/dev/acpi: dwcmmc_acpi.c
Log Message:
dwcmmc: Add ACPI attach support
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/arch/evbarm/conf/GENERIC64
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/dwcmmc_acpi.c
cvs rdiff -u -r1.122 -r1.123 src/sys/dev/acpi/files.acpi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.190 src/sys/arch/evbarm/conf/GENERIC64:1.191
--- src/sys/arch/evbarm/conf/GENERIC64:1.190 Mon Jan 3 17:19:41 2022
+++ src/sys/arch/evbarm/conf/GENERIC64 Sun Jan 9 15:05:16 2022
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.190 2022/01/03 17:19:41 jmcneill Exp $
+# $NetBSD: GENERIC64,v 1.191 2022/01/09 15:05:16 jmcneill Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -375,7 +375,8 @@ tegrartc* at fdt? # NVIDIA Tegra RTC
# SDMMC
bcmsdhost* at fdt? # Broadcom BCM283x SD Host Interface
-dwcmmc* at fdt? # Designware SD/MMC
+dwcmmc* at acpi? # DesignWare SD/MMC
+dwcmmc* at fdt?
mesongxmmc* at fdt? # Amlogic Meson GX eMMC/SD/SDIO controller
mmcpwrseq* at fdt? pass 5 # Simple MMC power sequence provider
rkemmcphy* at fdt? # Rockchip eMMC PHY
Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.122 src/sys/dev/acpi/files.acpi:1.123
--- src/sys/dev/acpi/files.acpi:1.122 Mon Jan 3 17:19:41 2022
+++ src/sys/dev/acpi/files.acpi Sun Jan 9 15:05:16 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.122 2022/01/03 17:19:41 jmcneill Exp $
+# $NetBSD: files.acpi,v 1.123 2022/01/09 15:05:16 jmcneill Exp $
include "dev/acpi/acpica/files.acpica"
@@ -302,4 +302,8 @@ file dev/acpi/genet_acpi.c genet_acpi
attach eqos at acpinodebus with eqos_acpi
file dev/acpi/eqos_acpi.c eqos_acpi
+# DesignWare Mobile Storage Host Controller
+attach dwcmmc at acpinodebus with dwcmmc_acpi
+file dev/acpi/dwcmmc_acpi.c dwcmmc_acpi
+
include "dev/acpi/wmi/files.wmi"
Added files:
Index: src/sys/dev/acpi/dwcmmc_acpi.c
diff -u /dev/null src/sys/dev/acpi/dwcmmc_acpi.c:1.1
--- /dev/null Sun Jan 9 15:05:16 2022
+++ src/sys/dev/acpi/dwcmmc_acpi.c Sun Jan 9 15:05:16 2022
@@ -0,0 +1,175 @@
+/* $NetBSD: dwcmmc_acpi.c,v 1.1 2022/01/09 15:05:16 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2022 Jared McNeill
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_acpi.c,v 1.1 2022/01/09 15:05:16 jmcneill Exp $");
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+/*
+ * FIXME: Remove separate compat_data arrays once acpi_compatible_lookup
+ * grows support for DT link devices.
+ */
+static const struct device_compatible_entry rockchip_compat_data[] = {
+ { .compat = "rockchip,rk3288-dw-mshc" },
+ DEVICE_COMPAT_EOL
+};
+static const struct device_compatible_entry compat_data[] = {
+ { .compat = "snps,dw-mshc" },
+ DEVICE_COMPAT_EOL
+};
+
+static int dwcmmc_acpi_match(device_t, cfdata_t, void *);
+static void dwcmmc_acpi_attach(device_t, device_t, void *);
+
+static int dwcmmc_acpi_init_props(struct dwc_mmc_softc *, ACPI_HANDLE);
+
+CFATTACH_DECL_NEW(dwcmmc_acpi, sizeof(struct dwc_mmc_softc),
+dwcmmc_acpi_match, dwcmmc_acpi_attach, NULL, NULL);
+
+static int
+dwcmmc_acpi_match(device_t parent, cfdata_t cf, void *aux)
CVS commit: src/sys
Module Name:src Committed By: jmcneill Date: Sun Jan 9 15:05:16 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 src/sys/dev/acpi: files.acpi Added Files: src/sys/dev/acpi: dwcmmc_acpi.c Log Message: dwcmmc: Add ACPI attach support To generate a diff of this commit: cvs rdiff -u -r1.190 -r1.191 src/sys/arch/evbarm/conf/GENERIC64 cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/dwcmmc_acpi.c cvs rdiff -u -r1.122 -r1.123 src/sys/dev/acpi/files.acpi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jmcneill
Date: Sun Jan 9 15:03:43 UTC 2022
Modified Files:
src/sys/dev/ic: dwc_mmc.c dwc_mmc_reg.h dwc_mmc_var.h
Log Message:
dwcmmc: Add support for card detect using SDMMC_CDETECT register
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/dwc_mmc.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/dwc_mmc_reg.h
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/dwc_mmc_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/dev/ic/dwc_mmc.c
diff -u src/sys/dev/ic/dwc_mmc.c:1.28 src/sys/dev/ic/dwc_mmc.c:1.29
--- src/sys/dev/ic/dwc_mmc.c:1.28 Sat Aug 7 16:19:12 2021
+++ src/sys/dev/ic/dwc_mmc.c Sun Jan 9 15:03:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc.c,v 1.28 2021/08/07 16:19:12 thorpej Exp $ */
+/* $NetBSD: dwc_mmc.c,v 1.29 2022/01/09 15:03:43 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.28 2021/08/07 16:19:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.29 2022/01/09 15:03:43 jmcneill Exp $");
#include
#include
@@ -162,6 +162,10 @@ dwc_mmc_attach_i(device_t self)
{
struct dwc_mmc_softc *sc = device_private(self);
struct sdmmcbus_attach_args saa;
+ bool poll_detect;
+
+ poll_detect = sc->sc_card_detect != NULL ||
+ (sc->sc_flags & (DWC_MMC_F_BROKEN_CD|DWC_MMC_F_NON_REMOVABLE)) == 0;
if (sc->sc_pre_power_on)
sc->sc_pre_power_on(sc);
@@ -185,12 +189,15 @@ dwc_mmc_attach_i(device_t self)
SMC_CAPS_AUTO_STOP |
SMC_CAPS_DMA |
SMC_CAPS_MULTI_SEG_DMA;
- if (sc->sc_bus_width == 8)
+ if (sc->sc_bus_width == 8) {
saa.saa_caps |= SMC_CAPS_8BIT_MODE;
- else
+ } else {
saa.saa_caps |= SMC_CAPS_4BIT_MODE;
- if (sc->sc_card_detect)
+ }
+
+ if (poll_detect) {
saa.saa_caps |= SMC_CAPS_POLL_CARD_DET;
+ }
sc->sc_sdmmc_dev = config_found(self, &saa, NULL, CFARGS_NONE);
}
@@ -276,11 +283,21 @@ static int
dwc_mmc_card_detect(sdmmc_chipset_handle_t sch)
{
struct dwc_mmc_softc *sc = sch;
+ int det_n;
+
+ if (sc->sc_card_detect != NULL) {
+ return sc->sc_card_detect(sc);
+ }
+ if ((sc->sc_flags & DWC_MMC_F_BROKEN_CD) != 0) {
+ return 1; /* broken card detect, assume present */
+ }
+ if ((sc->sc_flags & DWC_MMC_F_NON_REMOVABLE) != 0) {
+ return 1; /* non-removable device is always present */
+ }
- if (!sc->sc_card_detect)
- return 1; /* no card detect pin, assume present */
+ det_n = MMC_READ(sc, DWC_MMC_CDETECT) & DWC_MMC_CDETECT_CARD_DETECT_N;
- return sc->sc_card_detect(sc);
+ return !det_n;
}
static int
Index: src/sys/dev/ic/dwc_mmc_reg.h
diff -u src/sys/dev/ic/dwc_mmc_reg.h:1.10 src/sys/dev/ic/dwc_mmc_reg.h:1.11
--- src/sys/dev/ic/dwc_mmc_reg.h:1.10 Fri Mar 20 17:02:16 2020
+++ src/sys/dev/ic/dwc_mmc_reg.h Sun Jan 9 15:03:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc_reg.h,v 1.10 2020/03/20 17:02:16 skrll Exp $ */
+/* $NetBSD: dwc_mmc_reg.h,v 1.11 2022/01/09 15:03:43 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill
@@ -147,6 +147,8 @@
#define DWC_MMC_FIFOTH_RX_WMARK __BITS(27,16)
#define DWC_MMC_FIFOTH_TX_WMARK __BITS(11,0)
+#define DWC_MMC_CDETECT_CARD_DETECT_N __BIT(0)
+
#define DWC_MMC_DMAC_IDMA_ON __BIT(7)
#define DWC_MMC_DMAC_FIX_BURST __BIT(1)
#define DWC_MMC_DMAC_SOFTRESET __BIT(0)
Index: src/sys/dev/ic/dwc_mmc_var.h
diff -u src/sys/dev/ic/dwc_mmc_var.h:1.14 src/sys/dev/ic/dwc_mmc_var.h:1.15
--- src/sys/dev/ic/dwc_mmc_var.h:1.14 Fri Mar 20 17:07:17 2020
+++ src/sys/dev/ic/dwc_mmc_var.h Sun Jan 9 15:03:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc_var.h,v 1.14 2020/03/20 17:07:17 skrll Exp $ */
+/* $NetBSD: dwc_mmc_var.h,v 1.15 2022/01/09 15:03:43 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill
@@ -40,6 +40,8 @@ struct dwc_mmc_softc {
#define DWC_MMC_F_DMA __BIT(0)
#define DWC_MMC_F_USE_HOLD_REG __BIT(1)
#define DWC_MMC_F_PWREN_INV __BIT(2)
+#define DWC_MMC_F_BROKEN_CD __BIT(3)
+#define DWC_MMC_F_NON_REMOVABLE __BIT(4)
uint32_t sc_fifo_reg;
uint32_t sc_fifo_depth;
u_int sc_clock_freq;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jmcneill Date: Sun Jan 9 15:03:43 UTC 2022 Modified Files: src/sys/dev/ic: dwc_mmc.c dwc_mmc_reg.h dwc_mmc_var.h Log Message: dwcmmc: Add support for card detect using SDMMC_CDETECT register To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/dwc_mmc.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/dwc_mmc_reg.h cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/dwc_mmc_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jmcneill Date: Sun Jan 9 14:28:23 UTC 2022 Modified Files: src/sys/dev/acpi: acpi_util.c acpi_util.h Log Message: acpi: Add acpi_dsd_bool helper To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/acpi_util.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/acpi_util.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jmcneill
Date: Sun Jan 9 14:28:23 UTC 2022
Modified Files:
src/sys/dev/acpi: acpi_util.c acpi_util.h
Log Message:
acpi: Add acpi_dsd_bool helper
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/acpi_util.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/acpi_util.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/acpi/acpi_util.c
diff -u src/sys/dev/acpi/acpi_util.c:1.29 src/sys/dev/acpi/acpi_util.c:1.30
--- src/sys/dev/acpi/acpi_util.c:1.29 Fri Dec 31 13:15:00 2021
+++ src/sys/dev/acpi/acpi_util.c Sun Jan 9 14:28:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_util.c,v 1.29 2021/12/31 13:15:00 jmcneill Exp $ */
+/* $NetBSD: acpi_util.c,v 1.30 2022/01/09 14:28:23 jmcneill Exp $ */
/*-
* Copyright (c) 2003, 2007, 2021 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.29 2021/12/31 13:15:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_util.c,v 1.30 2022/01/09 14:28:23 jmcneill Exp $");
#include
#include
@@ -1018,6 +1018,19 @@ acpi_dsd_string(ACPI_HANDLE handle, cons
return rv;
}
+ACPI_STATUS
+acpi_dsd_bool(ACPI_HANDLE handle, const char *prop, bool *val)
+{
+ ACPI_STATUS rv;
+ ACPI_INTEGER ival;
+
+ rv = acpi_dsd_integer(handle, prop, &ival);
+ if (ACPI_SUCCESS(rv)) {
+ *val = ival != 0;
+ }
+
+ return rv;
+}
/*
Index: src/sys/dev/acpi/acpi_util.h
diff -u src/sys/dev/acpi/acpi_util.h:1.11 src/sys/dev/acpi/acpi_util.h:1.12
--- src/sys/dev/acpi/acpi_util.h:1.11 Fri Feb 5 17:12:43 2021
+++ src/sys/dev/acpi/acpi_util.h Sun Jan 9 14:28:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_util.h,v 1.11 2021/02/05 17:12:43 thorpej Exp $ */
+/* $NetBSD: acpi_util.h,v 1.12 2022/01/09 14:28:23 jmcneill Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -98,6 +98,7 @@ char *acpi_pack_compat_list(ACPI_DEVICE
ACPI_STATUS acpi_dsd_integer(ACPI_HANDLE, const char *, ACPI_INTEGER *);
ACPI_STATUS acpi_dsd_string(ACPI_HANDLE, const char *, char **);
+ACPI_STATUS acpi_dsd_bool(ACPI_HANDLE, const char *, bool *);
ACPI_STATUS acpi_dsm(ACPI_HANDLE, uint8_t *, ACPI_INTEGER,
ACPI_INTEGER, const ACPI_OBJECT *, ACPI_OBJECT **);
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jan 9 14:06:00 UTC 2022
Modified Files:
src/usr.bin/make: for.c
src/usr.bin/make/unit-tests: directive-for-escape.exp
directive-for-escape.mk
Log Message:
make: fix crash for newline in .for value in -dp mode (since yesterday)
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/usr.bin/make/for.c
cvs rdiff -u -r1.12 -r1.13 \
src/usr.bin/make/unit-tests/directive-for-escape.exp \
src/usr.bin/make/unit-tests/directive-for-escape.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.163 src/usr.bin/make/for.c:1.164
--- src/usr.bin/make/for.c:1.163 Sun Jan 9 12:43:52 2022
+++ src/usr.bin/make/for.c Sun Jan 9 14:06:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.163 2022/01/09 12:43:52 rillig Exp $ */
+/* $NetBSD: for.c,v 1.164 2022/01/09 14:06:00 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -58,7 +58,7 @@
#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.163 2022/01/09 12:43:52 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.164 2022/01/09 14:06:00 rillig Exp $");
typedef struct ForLoop {
@@ -367,8 +367,8 @@ AddEscaped(Buffer *cmds, Substring item,
* expression like ${i} or ${i:...} or $(i) or $(i:...) with ":Uvalue".
*/
static void
-ForLoop_SubstVarLong(ForLoop *f, Buffer *body, const char **pp,
- char endc, const char **inout_mark)
+ForLoop_SubstVarLong(ForLoop *f, unsigned int firstItem, Buffer *body,
+ const char **pp, char endc, const char **inout_mark)
{
size_t i;
const char *start = *pp;
@@ -392,7 +392,7 @@ ForLoop_SubstVarLong(ForLoop *f, Buffer
*/
Buf_AddBytesBetween(body, *inout_mark, start);
Buf_AddStr(body, ":U");
- AddEscaped(body, f->items.words[f->nextItem + i], endc);
+ AddEscaped(body, f->items.words[firstItem + i], endc);
*inout_mark = p;
*pp = p;
@@ -405,7 +405,7 @@ ForLoop_SubstVarLong(ForLoop *f, Buffer
* variable expressions like $i with their ${:U...} expansion.
*/
static void
-ForLoop_SubstVarShort(ForLoop *f, Buffer *body,
+ForLoop_SubstVarShort(ForLoop *f, unsigned int firstItem, Buffer *body,
const char *p, const char **inout_mark)
{
const char ch = *p;
@@ -430,7 +430,7 @@ found:
/* Replace $ with ${:U} */
Buf_AddStr(body, "{:U");
- AddEscaped(body, f->items.words[f->nextItem + i], '}');
+ AddEscaped(body, f->items.words[firstItem + i], '}');
Buf_AddByte(body, '}');
}
@@ -448,7 +448,7 @@ found:
* possible to contrive a makefile where an unwanted substitution happens.
*/
static void
-ForLoop_SubstBody(ForLoop *f, Buffer *body)
+ForLoop_SubstBody(ForLoop *f, unsigned int firstItem, Buffer *body)
{
const char *p, *end;
const char *mark; /* where the last substitution left off */
@@ -461,9 +461,11 @@ ForLoop_SubstBody(ForLoop *f, Buffer *bo
if (p[1] == '{' || p[1] == '(') {
char endc = p[1] == '{' ? '}' : ')';
p += 2;
- ForLoop_SubstVarLong(f, body, &p, endc, &mark);
+ ForLoop_SubstVarLong(f, firstItem, body,
+ &p, endc, &mark);
} else if (p[1] != '\0') {
- ForLoop_SubstVarShort(f, body, p + 1, &mark);
+ ForLoop_SubstVarShort(f, firstItem, body,
+ p + 1, &mark);
p += 2;
} else
break;
@@ -482,9 +484,9 @@ For_NextIteration(ForLoop *f, Buffer *bo
if (f->nextItem == f->items.len)
return false;
- ForLoop_SubstBody(f, body);
- DEBUG1(FOR, "For: loop body:\n%s", body->data);
f->nextItem += (unsigned int)f->vars.len;
+ ForLoop_SubstBody(f, f->nextItem - (unsigned int)f->vars.len, body);
+ DEBUG1(FOR, "For: loop body:\n%s", body->data);
return true;
}
Index: src/usr.bin/make/unit-tests/directive-for-escape.exp
diff -u src/usr.bin/make/unit-tests/directive-for-escape.exp:1.12 src/usr.bin/make/unit-tests/directive-for-escape.exp:1.13
--- src/usr.bin/make/unit-tests/directive-for-escape.exp:1.12 Thu Sep 2 07:02:08 2021
+++ src/usr.bin/make/unit-tests/directive-for-escape.exp Sun Jan 9 14:06:00 2022
@@ -87,6 +87,22 @@ For: loop body:
. info long: ${:U" "}
make: "directive-for-escape.mk" line 138: short: " "
make: "directive-for-escape.mk" line 139: long: " "
+For: end for 1
+For: loop body:
+For: end for 1
+Parse_PushInput: .for loop in directive-for-escape.mk, line 152
+make: "directive-for-escape.mk" line 152: newline in .for value
+ in .for loop from directive-for-escape.mk:152 with i = "
+"
+For: loop body:
+: ${:U" "}
+SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `directive-for-escape.mk'
+Parsing line 153: : ${:U" "}
+ParseDependency(: " ")
+ParseEOF: returning to file directive-for-escape.mk, line 155
+SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `directive-for-escape.mk'
+Parsing line 155: .MAKEFLAGS: -d0
+ParseDependency(.MAKEFLAGS: -d0)
make: Fatal errors encountered -- cannot c
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jan 9 14:06:00 UTC 2022 Modified Files: src/usr.bin/make: for.c src/usr.bin/make/unit-tests: directive-for-escape.exp directive-for-escape.mk Log Message: make: fix crash for newline in .for value in -dp mode (since yesterday) To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/usr.bin/make/for.c cvs rdiff -u -r1.12 -r1.13 \ src/usr.bin/make/unit-tests/directive-for-escape.exp \ src/usr.bin/make/unit-tests/directive-for-escape.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Jan 9 13:54:16 UTC 2022 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: updates for xkeyboard-config 2.34. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.16 -r1.17 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev 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/lib/xkeyboard-config/xkeyboard-config.man diff -u src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.9 src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.10 --- src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man:1.9 Tue Apr 27 03:58:55 2021 +++ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man Sun Jan 9 13:54:16 2022 @@ -1,11 +1,11 @@ .\" WARNING: this man page is autogenerated. Do not edit or you will lose all your changes. -.TH XKEYBOARD-CONFIG 7 "xkeyboard-config 2.32" "X Version 11" +.TH XKEYBOARD-CONFIG @miscmansuffix@ @vendorversion@ .SH NAME xkeyboard-config \- XKB data description files .SH DESCRIPTION xkeyboard-config provides the description files for the X Keyboard Extension (XKB). The configuration options below are usually applied with -setxkbmap(1). +setxkbmap(@appmansuffix@). .SH MODELS .TS left,box; @@ -32,7 +32,7 @@ a4techKB21 A4Tech KB-21 a4techKBS8 A4Tech KBS-8 a4_rfkb23 A4Tech Wireless Desktop RFKB-23 airkey Acer AirKey V -azonaRF2300 Azona RF2300 wireless Internet +azonaRF2300 Azona RF2300 Wireless Internet scorpius Advance Scorpius KI brother Brother Internet btc5113rf BTC 5113RF Multimedia @@ -220,6 +220,7 @@ us(intl) English (US, intl., with dead k us(alt-intl) English (US, alt. intl.) us(colemak) English (Colemak) us(colemak_dh) English (Colemak-DH) +us(colemak_dh_iso) English (Colemak-DH ISO) us(dvorak) English (Dvorak) us(dvorak-intl) English (Dvorak, intl., with dead keys) us(dvorak-alt-intl) English (Dvorak, alt. intl.) @@ -227,6 +228,7 @@ us(dvorak-l) English (Dvorak, left-hande us(dvorak-r) English (Dvorak, right-handed) us(dvorak-classic) English (classic Dvorak) us(dvp) English (programmer Dvorak) +us(dvorak-mac) English (Dvorak, Macintosh) us(symbolic) English (US, Symbolic) us(rus) Russian (US, phonetic) us(mac) English (Macintosh) @@ -307,7 +309,7 @@ in(ben_probhat) Bangla (India, Probhat) in(ben_baishakhi) Bangla (India, Baishakhi) in(ben_bornona) Bangla (India, Bornona) in(ben_gitanjali) Bangla (India, Gitanjali) -in(ben_inscript) Bangla (India, Baishakhi Inscript) +in(ben_inscript) Bangla (India, Baishakhi InScript) in(eeyek) Manipuri (Eeyek) in(guj) Gujarati in(guru) Punjabi (Gurmukhi) @@ -316,14 +318,16 @@ in(kan) Kannada in(kan-kagapa) Kannada (KaGaPa, phonetic) in(mal) Malayalam in(mal_lalitha) Malayalam (Lalitha) -in(mal_enhanced) Malayalam (enhanced Inscript, with rupee) +in(mal_enhanced) Malayalam (enhanced InScript, with rupee) in(ori) Oriya +in(ori-bolnagri) Oriya (Bolnagri) +in(ori-wx) Oriya (Wx) in(olck) Ol Chiki in(tam_tamilnet) Tamil (TamilNet '99) in(tam_tamilnet_with_tam_nums) Tamil (TamilNet '99 with Tamil numerals) in(tam_tamilnet_TAB) Tamil (TamilNet '99, TAB encoding) in(tam_tamilnet_TSCII) Tamil (TamilNet '99, TSCII encoding) -in(tam) Tamil (Inscript) +in(tam) Tamil (InScript) in(tel) Telugu in(tel-kagapa) Telugu (KaGaPa, phonetic) in(tel-sarala) Telugu (Sarala) @@ -337,7 +341,7 @@ in(san-kagapa) Sanskrit (KaGaPa, phoneti in(mar-kagapa) Marathi (KaGaPa, phonetic) in(eng) English (India, with rupee) in(iipa) Indic IPA -in(marathi) Marathi (enhanced Inscript) +in(marathi) Marathi (enhanced InScript) _ ba Bosnian @@ -363,9 +367,9 @@ bg(bekl) Bulgarian (enhanced) _ dz Berber (Algeria, Latin) -dz(azerty-deadkeys) Kabyle (azerty layout, dead keys) -dz(qwerty-gb-deadkeys) Kabyle (qwerty-gb layout, dead keys) -dz(qwerty-us-deadkeys) Kabyle (qwerty-us layout, dead keys) +dz(azerty-deadkeys) Kabyle (AZERTY, with dead keys) +dz(qwerty-gb-deadkeys) Kabyle (QWERTY, UK, with dead keys) +dz(qwerty-us-deadkeys) Kabyle (QWERTY, US, with dead keys) dz(ber) Berber (Algeria, Tifinagh) dz(ar) Arabic (Algeria) @@ -445,6 +449,7 @@ dk(dvorak) Danish (Dvorak) _ nl Dutch +nl(us) Dutch (US) nl(mac) Dutch (Macintosh) nl(std) Dutch (standard) @@ -516,7 +521,7 @@ gh(avn) Avatime gh(gillbt) English (Ghana, GILLBT) _ -gn N'Ko (azerty) +gn N'Ko (AZERTY) _ ge Georgian @@ -673,7 +678,7 @@ mk(nodeadkeys) Macedonian (no dead keys) _ mt Maltese mt(u
CVS commit: src/external/mit/xorg/lib/xkeyboard-config
Module Name:src Committed By: mrg Date: Sun Jan 9 13:54:16 UTC 2022 Modified Files: src/external/mit/xorg/lib/xkeyboard-config: xkeyboard-config.man src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: updates for xkeyboard-config 2.34. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/mit/xorg/lib/xkeyboard-config/xkeyboard-config.man cvs rdiff -u -r1.16 -r1.17 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst cvs rdiff -u -r1.15 -r1.16 \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/usr.bin/make
On Sun, Jan 09, 2022 at 01:18:32AM +0100, Roland Illig wrote: > If I were to extract the newly added code into a function call > cpp_skip_string(&p, varname), would that help? That function could be > used in var.c as well, for example in ModMatch and ModMatchEq. Yes, it should be a utility function IMO.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jan 9 12:43:52 UTC 2022
Modified Files:
src/usr.bin/make: for.c nonints.h parse.c
Log Message:
make: fix use-after-free in -dp mode (since yesterday)
In a .for loop that contains an unclosed .if directive,
Cond_restore_depth generates an error message. If stack traces are
enabled using the option '-dp', the details of the .for loop are added
to the stack trace, but at that point, the ForLoop had already been
freed. To reproduce:
make-2022.01.09.00.33.57 -r -f unit-tests/directive-for.mk -dp
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/usr.bin/make/for.c
cvs rdiff -u -r1.235 -r1.236 src/usr.bin/make/nonints.h
cvs rdiff -u -r1.646 -r1.647 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/for.c
diff -u src/usr.bin/make/for.c:1.162 src/usr.bin/make/for.c:1.163
--- src/usr.bin/make/for.c:1.162 Sun Jan 9 00:33:57 2022
+++ src/usr.bin/make/for.c Sun Jan 9 12:43:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: for.c,v 1.162 2022/01/09 00:33:57 rillig Exp $ */
+/* $NetBSD: for.c,v 1.163 2022/01/09 12:43:52 rillig Exp $ */
/*
* Copyright (c) 1992, The Regents of the University of California.
@@ -58,7 +58,7 @@
#include "make.h"
/* "@(#)for.c 8.1 (Berkeley) 6/6/93" */
-MAKE_RCSID("$NetBSD: for.c,v 1.162 2022/01/09 00:33:57 rillig Exp $");
+MAKE_RCSID("$NetBSD: for.c,v 1.163 2022/01/09 12:43:52 rillig Exp $");
typedef struct ForLoop {
@@ -85,7 +85,7 @@ ForLoop_New(void)
return f;
}
-static void
+void
ForLoop_Free(ForLoop *f)
{
while (f->vars.len > 0)
@@ -101,11 +101,16 @@ ForLoop_Free(ForLoop *f)
char *
ForLoop_Details(ForLoop *f)
{
- size_t i, n = f->vars.len;
- const char **vars = f->vars.items;
- const Substring *items = f->items.words + f->nextItem - n;
+ size_t i, n;
+ const char **vars;
+ const Substring *items;
Buffer buf;
+ n = f->vars.len;
+ vars = f->vars.items;
+ assert(f->nextItem >= n);
+ items = f->items.words + f->nextItem - n;
+
Buf_Init(&buf);
for (i = 0; i < n; i++) {
if (i > 0)
@@ -474,11 +479,8 @@ ForLoop_SubstBody(ForLoop *f, Buffer *bo
bool
For_NextIteration(ForLoop *f, Buffer *body)
{
- if (f->nextItem == f->items.len) {
- /* No more iterations */
- ForLoop_Free(f);
+ if (f->nextItem == f->items.len)
return false;
- }
ForLoop_SubstBody(f, body);
DEBUG1(FOR, "For: loop body:\n%s", body->data);
Index: src/usr.bin/make/nonints.h
diff -u src/usr.bin/make/nonints.h:1.235 src/usr.bin/make/nonints.h:1.236
--- src/usr.bin/make/nonints.h:1.235 Sat Jan 8 23:52:26 2022
+++ src/usr.bin/make/nonints.h Sun Jan 9 12:43:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nonints.h,v 1.235 2022/01/08 23:52:26 rillig Exp $ */
+/* $NetBSD: nonints.h,v 1.236 2022/01/09 12:43:52 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -122,6 +122,7 @@ bool For_Accum(const char *, int *) MAKE
void For_Run(int, int);
bool For_NextIteration(struct ForLoop *, Buffer *);
char *ForLoop_Details(struct ForLoop *);
+void ForLoop_Free(struct ForLoop *);
/* job.c */
void JobReapChild(pid_t, int, bool);
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.646 src/usr.bin/make/parse.c:1.647
--- src/usr.bin/make/parse.c:1.646 Sun Jan 9 11:43:58 2022
+++ src/usr.bin/make/parse.c Sun Jan 9 12:43:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.646 2022/01/09 11:43:58 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.647 2022/01/09 12:43:52 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -106,7 +106,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.646 2022/01/09 11:43:58 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.647 2022/01/09 12:43:52 rillig Exp $");
/*
* A file being read.
@@ -2253,6 +2253,8 @@ ParseEOF(void)
FStr_Done(&curFile->name);
Buf_Done(&curFile->buf);
+ if (curFile->forLoop != NULL)
+ ForLoop_Free(curFile->forLoop);
Vector_Pop(&includes);
if (includes.len == 0) {
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jan 9 12:43:52 UTC 2022 Modified Files: src/usr.bin/make: for.c nonints.h parse.c Log Message: make: fix use-after-free in -dp mode (since yesterday) In a .for loop that contains an unclosed .if directive, Cond_restore_depth generates an error message. If stack traces are enabled using the option '-dp', the details of the .for loop are added to the stack trace, but at that point, the ForLoop had already been freed. To reproduce: make-2022.01.09.00.33.57 -r -f unit-tests/directive-for.mk -dp To generate a diff of this commit: cvs rdiff -u -r1.162 -r1.163 src/usr.bin/make/for.c cvs rdiff -u -r1.235 -r1.236 src/usr.bin/make/nonints.h cvs rdiff -u -r1.646 -r1.647 src/usr.bin/make/parse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jan 9 11:43:58 UTC 2022 Modified Files: src/usr.bin/make: parse.c src/usr.bin/make/unit-tests: include-main.exp opt-debug-parse.exp Log Message: make: remove redundant lines from stack traces These lines repeated the information from the .for loop line above them. To generate a diff of this commit: cvs rdiff -u -r1.645 -r1.646 src/usr.bin/make/parse.c cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/include-main.exp cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/opt-debug-parse.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jan 9 11:43:58 UTC 2022
Modified Files:
src/usr.bin/make: parse.c
src/usr.bin/make/unit-tests: include-main.exp opt-debug-parse.exp
Log Message:
make: remove redundant lines from stack traces
These lines repeated the information from the .for loop line above them.
To generate a diff of this commit:
cvs rdiff -u -r1.645 -r1.646 src/usr.bin/make/parse.c
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/include-main.exp
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/opt-debug-parse.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.645 src/usr.bin/make/parse.c:1.646
--- src/usr.bin/make/parse.c:1.645 Sun Jan 9 11:28:04 2022
+++ src/usr.bin/make/parse.c Sun Jan 9 11:43:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.645 2022/01/09 11:28:04 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.646 2022/01/09 11:43:58 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -106,7 +106,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.645 2022/01/09 11:28:04 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.646 2022/01/09 11:43:58 rillig Exp $");
/*
* A file being read.
@@ -357,13 +357,10 @@ PrintStackTrace(void)
debug_printf("\tin .for loop from %s:%d with %s\n",
fname, entry->forHeadLineno, details);
free(details);
- } else {
- int lineno =
- i + 1 < n && entries[i + 1].forLoop != NULL
-? entries[i + 1].forHeadLineno
-: entry->lineno;
- debug_printf("\tin %s:%d\n", fname, lineno);
- }
+ } else if (i + 1 < n && entries[i + 1].forLoop != NULL) {
+ /* entry->lineno is not a useful line number */
+ } else
+ debug_printf("\tin %s:%d\n", fname, entry->lineno);
}
}
Index: src/usr.bin/make/unit-tests/include-main.exp
diff -u src/usr.bin/make/unit-tests/include-main.exp:1.10 src/usr.bin/make/unit-tests/include-main.exp:1.11
--- src/usr.bin/make/unit-tests/include-main.exp:1.10 Sat Jan 8 23:52:26 2022
+++ src/usr.bin/make/unit-tests/include-main.exp Sun Jan 9 11:43:58 2022
@@ -7,7 +7,6 @@ make: "include-subsub.mk" line 5: subsub
in .for loop from include-sub.mk:31 with i = include
in .for loop from include-sub.mk:30 with i = nested
in .for loop from include-sub.mk:29 with i = deeply
- in include-sub.mk:29
in include-main.mk:27
Parsing line 6: .MAKEFLAGS: -d0
ParseDependency(.MAKEFLAGS: -d0)
Index: src/usr.bin/make/unit-tests/opt-debug-parse.exp
diff -u src/usr.bin/make/unit-tests/opt-debug-parse.exp:1.7 src/usr.bin/make/unit-tests/opt-debug-parse.exp:1.8
--- src/usr.bin/make/unit-tests/opt-debug-parse.exp:1.7 Sat Jan 8 23:52:26 2022
+++ src/usr.bin/make/unit-tests/opt-debug-parse.exp Sun Jan 9 11:43:58 2022
@@ -3,7 +3,6 @@ SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `opt-debug-parse.mk'
Parsing line 25: .include "/dev/null"
@@ -17,11 +16,9 @@ SetFilenameVars: ${.PARSEDIR} = `' ${.PARSEFILE} = `opt-debug-parse.mk'
Parsing line 35: .MAKEFLAGS: -d0
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sun Jan 9 11:28:04 UTC 2022
Modified Files:
src/usr.bin/make: parse.c
Log Message:
make: in ApplyDependencySourceWait, align variable type with %u
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.644 -r1.645 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.644 src/usr.bin/make/parse.c:1.645
--- src/usr.bin/make/parse.c:1.644 Sat Jan 8 23:52:26 2022
+++ src/usr.bin/make/parse.c Sun Jan 9 11:28:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.644 2022/01/08 23:52:26 rillig Exp $ */
+/* $NetBSD: parse.c,v 1.645 2022/01/09 11:28:04 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -106,7 +106,7 @@
#include "pathnames.h"
/* "@(#)parse.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: parse.c,v 1.644 2022/01/08 23:52:26 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.645 2022/01/09 11:28:04 rillig Exp $");
/*
* A file being read.
@@ -677,7 +677,7 @@ ApplyDependencyOperator(GNodeType op)
static void
ApplyDependencySourceWait(bool isSpecial)
{
- static int wait_number = 0;
+ static unsigned wait_number = 0;
char wait_src[16];
GNode *gn;
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sun Jan 9 11:28:04 UTC 2022 Modified Files: src/usr.bin/make: parse.c Log Message: make: in ApplyDependencySourceWait, align variable type with %u No binary change. To generate a diff of this commit: cvs rdiff -u -r1.644 -r1.645 src/usr.bin/make/parse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:50:53 UTC 2022 Modified Files: xsrc/external/mit/xkeyboard-config/dist: configure xsrc/external/mit/xkeyboard-config/dist/symbols: pl Log Message: merge xkeyboard-config 2.34. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/xkeyboard-config/dist/configure cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc
Committed By: mrg
Date: Sun Jan 9 09:50:53 UTC 2022
Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: pl
Log Message:
merge xkeyboard-config 2.34.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xkeyboard-config/dist/symbols/pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.21 xsrc/external/mit/xkeyboard-config/dist/configure:1.22
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.21 Sun Jul 11 00:13:26 2021
+++ xsrc/external/mit/xkeyboard-config/dist/configure Sun Jan 9 09:50:52 2022
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.33.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.34.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xkeyboard-config'
PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.33'
-PACKAGE_STRING='xkeyboard-config 2.33'
+PACKAGE_VERSION='2.34'
+PACKAGE_STRING='xkeyboard-config 2.34'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1320,7 +1320,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xkeyboard-config 2.33 to adapt to many kinds of systems.
+\`configure' configures xkeyboard-config 2.34 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1392,7 +1392,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xkeyboard-config 2.33:";;
+ short | recursive ) echo "Configuration of xkeyboard-config 2.34:";;
esac
cat <<\_ACEOF
@@ -1509,7 +1509,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xkeyboard-config configure 2.33
+xkeyboard-config configure 2.34
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1689,7 +1689,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xkeyboard-config $as_me 2.33, which was
+It was created by xkeyboard-config $as_me 2.34, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2554,7 +2554,7 @@ fi
# Define the identity of the package.
PACKAGE='xkeyboard-config'
- VERSION='2.33'
+ VERSION='2.34'
cat >>confdefs.h <<_ACEOF
@@ -7646,7 +7646,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xkeyboard-config $as_me 2.33, which was
+This file was extended by xkeyboard-config $as_me 2.34, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES= $CONFIG_FILES
@@ -7703,7 +7703,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/&/g'`"
ac_cs_version="\\
-xkeyboard-config config.status 2.33
+xkeyboard-config config.status 2.34
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Index: xsrc/external/mit/xkeyboard-config/dist/symbols/pl
diff -u xsrc/external/mit/xkeyboard-config/dist/symbols/pl:1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/pl:1.5
--- xsrc/external/mit/xkeyboard-config/dist/symbols/pl:1.4 Sun Jul 11 00:13:26 2021
+++ xsrc/external/mit/xkeyboard-config/dist/symbols/pl Sun Jan 9 09:50:53 2022
@@ -69,6 +69,8 @@ xkb_symbols "legacy" {
key { [ z, Z,zabovedot,Zabovedot ] };
key { [ x, X, zacute, Zacute ] };
key { [ c, C, cacute, Cacute ] };
+key { [ v, V, doublelowquotemark, leftsinglequotemark ] };
+key { [ b, B, rightdoublequotemark, leftdoublequotemark ] };
key { [ n, N, nacute, Nacute ] };
include "kpdl(comma)"
@@ -77,6 +79,20 @@ xkb_symbols "legacy" {
};
partial alphanumeric_keys
+xkb_symbols "lefty" {
+// 2020 by Simon Zelazny.
+// Places Ó, Ł, and Ń under the left typing hand.
+// For description and rationale, see: https://pzel.name/pl-lefty.html
+include "pl(basic)"
+
+name[Group1]="Polish (lefty)";
+key { [ q, Q, oacute,Oacute ] };
+
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:50:21 UTC 2022 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3705 Log Message: initial import of xkeyboard-config-2.34 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-34 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/meson.build U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/compile U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/AUTHORS C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/config.guess U xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/meson_options.txt U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/symbols/gb U xsrc/external/mit/xkeyboard-config/dist/symbols/eu U xsrc/external/mit/xkeyboard-config/dist/symbols/trans U xsrc/external/mit/xkeyboard-config/dist/symbols/tw U xsrc/external/mit/xkeyboard-config/dist/symbols/uz U xsrc/external/mit/xkeyboard-config/dist/symbols/tg U xsrc/external/mit/xkeyboard-config/dist/symbols/ara U xsrc/external/mit/xkeyboard-config/dist/symbols/capslock U xsrc/external/mit/xkeyboard-config/dist/symbols/inet U xsrc/external/mit/xkeyboard-config/dist/symbols/se U xsrc/external/mit/xkeyboard-config/dist/symbols/fr U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/by U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/br U xsrc/external/mit/xkeyboard-config/dist/symbols/cm U xsrc/external/mit/xkeyboard-config/dist/symbols/eg U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/tj U xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/symbols/level3 U xsrc/external/mit/xkeyboard-config/dist/symbols/us U xsrc/external/mit/xkeyboard-config/dist/symbols/es U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/apl U xsrc/external/mit/xkeyboard-config/dist/symbols/ph U xsrc/external/mit/xkeyboard-config/dist/symbols/it U xsrc/external/mit/xkeyboard-config/dist/symbols/bd U xsrc/external/mit/xkeyboard-config/dist/symbols/tr U xsrc/external/mit/xkeyboard-config/dist/symbols/cn U xsrc/external/mit/xkeyboard-config/dist/symbols/gh U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/empty U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/kg U xsrc/external/mit/xkeyboard-config/dist/symbols/is U xsrc/external/mit/xkeyboard-config/dist/symbols/ee U xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/si U xsrc/external/mit/xkeyboard-config/dist/symbols/ge U xsrc/external/mit/xkeyboard-config/dist/symbols/id U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/za U xsrc/external/mit/xkeyboard-config/dist/symbols/au U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad U xsrc/external/mit/xkeyboard-config/dist/symbols/ca U xsrc/external/mit/xkeyboard-config/dist/symbols/shift U xsrc/external/mit/xkeyboard-config/dist/symbols/mt U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/ru U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/fi U xsrc/external/mit/xkeyboard-config/dist/symbols/level2 U xsrc/external/mit/xkeyboard-config/dist/symbols/jv U xsrc/external/mit/xkeyboard-config/dist/symbols/af U xsrc/external/mit/xkeyboard-confi
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:50:21 UTC 2022 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3705 Log Message: initial import of xkeyboard-config-2.34 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-34 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/meson.build U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/compile U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/AUTHORS C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/config.guess U xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/meson_options.txt U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/symbols/gb U xsrc/external/mit/xkeyboard-config/dist/symbols/eu U xsrc/external/mit/xkeyboard-config/dist/symbols/trans U xsrc/external/mit/xkeyboard-config/dist/symbols/tw U xsrc/external/mit/xkeyboard-config/dist/symbols/uz U xsrc/external/mit/xkeyboard-config/dist/symbols/tg U xsrc/external/mit/xkeyboard-config/dist/symbols/ara U xsrc/external/mit/xkeyboard-config/dist/symbols/capslock U xsrc/external/mit/xkeyboard-config/dist/symbols/inet U xsrc/external/mit/xkeyboard-config/dist/symbols/se U xsrc/external/mit/xkeyboard-config/dist/symbols/fr U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/by U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/br U xsrc/external/mit/xkeyboard-config/dist/symbols/cm U xsrc/external/mit/xkeyboard-config/dist/symbols/eg U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/tj U xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/symbols/level3 U xsrc/external/mit/xkeyboard-config/dist/symbols/us U xsrc/external/mit/xkeyboard-config/dist/symbols/es U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/apl U xsrc/external/mit/xkeyboard-config/dist/symbols/ph U xsrc/external/mit/xkeyboard-config/dist/symbols/it U xsrc/external/mit/xkeyboard-config/dist/symbols/bd U xsrc/external/mit/xkeyboard-config/dist/symbols/tr U xsrc/external/mit/xkeyboard-config/dist/symbols/cn U xsrc/external/mit/xkeyboard-config/dist/symbols/gh U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/empty U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/kg U xsrc/external/mit/xkeyboard-config/dist/symbols/is U xsrc/external/mit/xkeyboard-config/dist/symbols/ee U xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/si U xsrc/external/mit/xkeyboard-config/dist/symbols/ge U xsrc/external/mit/xkeyboard-config/dist/symbols/id U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/za U xsrc/external/mit/xkeyboard-config/dist/symbols/au U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad U xsrc/external/mit/xkeyboard-config/dist/symbols/ca U xsrc/external/mit/xkeyboard-config/dist/symbols/shift U xsrc/external/mit/xkeyboard-config/dist/symbols/mt U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/ru U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/fi U xsrc/external/mit/xkeyboard-config/dist/symbols/level2 U xsrc/external/mit/xkeyboard-config/dist/symbols/jv U xsrc/external/mit/xkeyboard-config/dist/symbols/af U xsrc/external/mit/xkeyboard-confi
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Jan 9 09:17:32 UTC 2022
Modified Files:
xsrc/external/mit/xauth/dist: process.c
xsrc/external/mit/xterm/dist: fontutils.c linedata.c misc.c ptyx.h
xterm.h xterm.man
xsrc/external/mit/xterm/include: xtermcfg.h
Log Message:
merge xauth 1.1.1 and xterm 370.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xauth/dist/process.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xterm/dist/linedata.c
cvs rdiff -u -r1.22 -r1.23 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xterm/dist/xterm.man
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/include/xtermcfg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xauth/dist/process.c
diff -u xsrc/external/mit/xauth/dist/process.c:1.7 xsrc/external/mit/xauth/dist/process.c:1.8
--- xsrc/external/mit/xauth/dist/process.c:1.7 Mon Jul 15 06:01:53 2019
+++ xsrc/external/mit/xauth/dist/process.c Sun Jan 9 09:17:31 2022
@@ -37,6 +37,7 @@ from The Open Group.
#include "xauth.h"
#include
#include
+#include
#include
#ifndef WIN32
#include
@@ -251,6 +252,18 @@ skip_nonspace(register char *s)
return s;
}
+#ifndef HAVE_REALLOCARRAY
+static inline void *
+reallocarray(void *optr, size_t nmemb, size_t size)
+{
+if ((nmemb > 0) && (SIZE_MAX / nmemb < size)) {
+errno = ENOMEM;
+return NULL;
+}
+return realloc(optr, size * nmemb);
+}
+#endif
+
static const char **
split_into_words(char *src, int *argcp) /* argvify string */
{
@@ -278,9 +291,15 @@ split_into_words(char *src, int *argcp)
savec = *src;
*src = '\0';
if (cur == total) {
+ const char **new_argv;
total += WORDSTOALLOC;
- argv = realloc (argv, total * sizeof (char *));
- if (!argv) return NULL;
+ new_argv = reallocarray (argv, total, sizeof (char *));
+ if (new_argv != NULL) {
+ argv = new_argv;
+ } else {
+ free(argv);
+ return NULL;
+ }
}
argv[cur++] = jword;
if (savec) src++; /* if not last on line advance */
@@ -633,7 +652,7 @@ static Bool xauth_modified = False; /* i
static Bool xauth_allowed = True; /* if allowed to write auth file */
static Bool xauth_locked = False; /* if has been locked */
static const char *xauth_filename = NULL;
-static volatile Bool dieing = False;
+static volatile Bool dying = False;
/* poor man's puts(), for under signal handlers,
@@ -645,7 +664,7 @@ _X_NORETURN
static void
die(int sig)
{
-dieing = True;
+dying = True;
_exit (auth_finalize ());
/* NOTREACHED */
}
@@ -697,6 +716,10 @@ auth_initialize(const char *authfilename
FILE *authfp;
Bool exists;
+if (strlen(authfilename) > 1022) {
+ fprintf (stderr, "%s: authority file name \"%s\" too long\n",
+ ProgramName, authfilename);
+}
xauth_filename = authfilename;/* used in cleanup, prevent race with
signals */
register_signals ();
@@ -854,10 +877,10 @@ write_auth_file(char *tmp_nam)
int
auth_finalize(void)
{
-char temp_name[1024]; /* large filename size */
+char temp_name[1025]; /* large filename size */
if (xauth_modified) {
- if (dieing) {
+ if (dying) {
if (verbose) {
/*
* called from a signal handler -- printf is *not* reentrant; also
@@ -1614,13 +1637,22 @@ do_add(const char *inputfilename, int li
hexkey = argv[3];
len = strlen(hexkey);
-if (hexkey[0] == '"' && hexkey[len-1] == '"') {
+if (len > 1 && hexkey[0] == '"' && hexkey[len-1] == '"') {
key = malloc(len-1);
+ if (!key) {
+ fprintf(stderr, "unable to allocate memory\n");
+ return 1;
+ }
strncpy(key, hexkey+1, len-2);
+ key[len-1] = '\0';
len -= 2;
} else if (!strcmp(protoname, SECURERPC) ||
!strcmp(protoname, K5AUTH)) {
key = malloc(len+1);
+ if (!key) {
+ fprintf(stderr, "unable to allocate memory\n");
+ return 1;
+ }
strcpy(key, hexkey);
} else {
len = cvthexkey (hexkey, &key);
@@ -1859,10 +1891,10 @@ do_generate(const char *inputfilename, i
const char *displayname;
int major_version, minor_version;
XSecurityAuthorization id_return;
-Xauth *auth_in, *auth_return;
+Xauth *auth_in = NULL, *auth_return = NULL;
XSecurityAuthorizationAttributes attributes;
unsigned long attrmask = 0;
-Display *dpy;
+Display *dpy = NULL;
int status;
const char *args[4];
const char *protoname = ".";
@@ -1870,7 +1902,7 @@ do_generate(const char *inputfilename, i
int authdatalen = 0;
const char *hexdata;
char *authdata = NULL;
-char *hex;
+char *hex = NULL;
if (argc < 2
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:17:32 UTC 2022 Modified Files: xsrc/external/mit/xauth/dist: process.c xsrc/external/mit/xterm/dist: fontutils.c linedata.c misc.c ptyx.h xterm.h xterm.man xsrc/external/mit/xterm/include: xtermcfg.h Log Message: merge xauth 1.1.1 and xterm 370. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xauth/dist/process.c cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xterm/dist/fontutils.c cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xterm/dist/linedata.c cvs rdiff -u -r1.22 -r1.23 xsrc/external/mit/xterm/dist/misc.c cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xterm/dist/ptyx.h cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xterm/dist/xterm.h cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xterm/dist/xterm.man cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/include/xtermcfg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:15:31 UTC 2022 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2106 Log Message: initial import of xterm-370 Status: Vendor Tag: xorg Release Tags: xterm-370 U xsrc/external/mit/xterm/dist/testxmc.c C xsrc/external/mit/xterm/dist/misc.c U xsrc/external/mit/xterm/dist/trace.h U xsrc/external/mit/xterm/dist/graphics_sixel.c C xsrc/external/mit/xterm/dist/xterm.man U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/graphics.h U xsrc/external/mit/xterm/dist/Makefile.in U xsrc/external/mit/xterm/dist/sinstall.sh C xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/cachedGCs.c U xsrc/external/mit/xterm/dist/XTerm.ad U xsrc/external/mit/xterm/dist/main.c U xsrc/external/mit/xterm/dist/MANIFEST U xsrc/external/mit/xterm/dist/resize.man U xsrc/external/mit/xterm/dist/precompose.h U xsrc/external/mit/xterm/dist/configure.in U xsrc/external/mit/xterm/dist/charclass.h U xsrc/external/mit/xterm/dist/config.guess U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/main.h U xsrc/external/mit/xterm/dist/88colres.pl U xsrc/external/mit/xterm/dist/gen-charsets.pl U xsrc/external/mit/xterm/dist/graphics_regis.c U xsrc/external/mit/xterm/dist/VTparse.def U xsrc/external/mit/xterm/dist/df-install.in U xsrc/external/mit/xterm/dist/UXTerm.ad C xsrc/external/mit/xterm/dist/linedata.c U xsrc/external/mit/xterm/dist/TekPrsTbl.c C xsrc/external/mit/xterm/dist/ptyx.h U xsrc/external/mit/xterm/dist/xterm.desktop U xsrc/external/mit/xterm/dist/version.h U xsrc/external/mit/xterm/dist/configure U xsrc/external/mit/xterm/dist/graphics.c U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/doublechr.c U xsrc/external/mit/xterm/dist/ptydata.c U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/make.com U xsrc/external/mit/xterm/dist/data.c U xsrc/external/mit/xterm/dist/minstall.in U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/charproc.c U xsrc/external/mit/xterm/dist/fontutils.h U xsrc/external/mit/xterm/dist/graphics_regis.h U xsrc/external/mit/xterm/dist/screen.c U xsrc/external/mit/xterm/dist/config.sub U xsrc/external/mit/xterm/dist/vms.c U xsrc/external/mit/xterm/dist/xterm.log.html U xsrc/external/mit/xterm/dist/COPYING U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/html.c U xsrc/external/mit/xterm/dist/README.os390 U xsrc/external/mit/xterm/dist/scrollbar.c U xsrc/external/mit/xterm/dist/uxterm.desktop U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/precompose.c U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/NEWS U xsrc/external/mit/xterm/dist/plink.sh U xsrc/external/mit/xterm/dist/graphics_sixel.h U xsrc/external/mit/xterm/dist/scrollback.c U xsrc/external/mit/xterm/dist/INSTALL U xsrc/external/mit/xterm/dist/resize.c U xsrc/external/mit/xterm/dist/run-tic.sh U xsrc/external/mit/xterm/dist/charsets.c U xsrc/external/mit/xterm/dist/xstrings.h U xsrc/external/mit/xterm/dist/xtermcap.h U xsrc/external/mit/xterm/dist/svg.c U xsrc/external/mit/xterm/dist/charclass.c U xsrc/external/mit/xterm/dist/Tests U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/XTerm-col.ad U xsrc/external/mit/xterm/dist/xutf8.c U xsrc/external/mit/xterm/dist/Imakefile U xsrc/external/mit/xterm/dist/wcwidth.h U xsrc/external/mit/xterm/dist/koi8rxterm U xsrc/external/mit/xterm/dist/VTparse.h U xsrc/external/mit/xterm/dist/menu.h U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl U xsrc/external/mit/xterm/dist/xstrings.c U xsrc/external/mit/xterm/dist/xtermcap.c U xsrc/external/mit/xterm/dist/tabs.c U xsrc/external/mit/xterm/dist/keysym2ucs.c U xsrc/external/mit/xterm/dist/menu.c U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/termcap U xsrc/external/mit/xterm/dist/aclocal.m4 U xsrc/external/mit/xterm/dist/version.c U xsrc/external/mit/xterm/dist/install-sh U xsrc/external/mit/xterm/dist/koi8rxterm.man U xsrc/external/mit/xterm/dist/256colres.pl U xsrc/external/mit/xterm/dist/Tekparse.def U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/uxterm C xsrc/external/mit/xterm/dist/fontutils.c U xsrc/external/mit/xterm/dist/README U xsrc/external/mit/xterm/dist/xterm.appdata.xml U xsrc/external/mit/xterm/dist/xterm_io.h U xsrc/external/mit/xterm/dist/xtermcfg.hin U xsrc/external/mit/xterm/dist/xterm.dat U xsrc/external/mit/xterm/dist/data.h U xsrc/external/mit/xterm/dist/uxterm.man U xsrc/external/mit/xterm/dist/Tekparse.h U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/keysym2ucs.h U xsrc/external/mit/xterm/dist/VTPrsTbl.c U xsrc/external/m
CVS import: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:15:31 UTC 2022 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv2106 Log Message: initial import of xterm-370 Status: Vendor Tag: xorg Release Tags: xterm-370 U xsrc/external/mit/xterm/dist/testxmc.c C xsrc/external/mit/xterm/dist/misc.c U xsrc/external/mit/xterm/dist/trace.h U xsrc/external/mit/xterm/dist/graphics_sixel.c C xsrc/external/mit/xterm/dist/xterm.man U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/graphics.h U xsrc/external/mit/xterm/dist/Makefile.in U xsrc/external/mit/xterm/dist/sinstall.sh C xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/cachedGCs.c U xsrc/external/mit/xterm/dist/XTerm.ad U xsrc/external/mit/xterm/dist/main.c U xsrc/external/mit/xterm/dist/MANIFEST U xsrc/external/mit/xterm/dist/resize.man U xsrc/external/mit/xterm/dist/precompose.h U xsrc/external/mit/xterm/dist/configure.in U xsrc/external/mit/xterm/dist/charclass.h U xsrc/external/mit/xterm/dist/config.guess U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/main.h U xsrc/external/mit/xterm/dist/88colres.pl U xsrc/external/mit/xterm/dist/gen-charsets.pl U xsrc/external/mit/xterm/dist/graphics_regis.c U xsrc/external/mit/xterm/dist/VTparse.def U xsrc/external/mit/xterm/dist/df-install.in U xsrc/external/mit/xterm/dist/UXTerm.ad C xsrc/external/mit/xterm/dist/linedata.c U xsrc/external/mit/xterm/dist/TekPrsTbl.c C xsrc/external/mit/xterm/dist/ptyx.h U xsrc/external/mit/xterm/dist/xterm.desktop U xsrc/external/mit/xterm/dist/version.h U xsrc/external/mit/xterm/dist/configure U xsrc/external/mit/xterm/dist/graphics.c U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/doublechr.c U xsrc/external/mit/xterm/dist/ptydata.c U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/make.com U xsrc/external/mit/xterm/dist/data.c U xsrc/external/mit/xterm/dist/minstall.in U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/charproc.c U xsrc/external/mit/xterm/dist/fontutils.h U xsrc/external/mit/xterm/dist/graphics_regis.h U xsrc/external/mit/xterm/dist/screen.c U xsrc/external/mit/xterm/dist/config.sub U xsrc/external/mit/xterm/dist/vms.c U xsrc/external/mit/xterm/dist/xterm.log.html U xsrc/external/mit/xterm/dist/COPYING U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/html.c U xsrc/external/mit/xterm/dist/README.os390 U xsrc/external/mit/xterm/dist/scrollbar.c U xsrc/external/mit/xterm/dist/uxterm.desktop U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/precompose.c U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/NEWS U xsrc/external/mit/xterm/dist/plink.sh U xsrc/external/mit/xterm/dist/graphics_sixel.h U xsrc/external/mit/xterm/dist/scrollback.c U xsrc/external/mit/xterm/dist/INSTALL U xsrc/external/mit/xterm/dist/resize.c U xsrc/external/mit/xterm/dist/run-tic.sh U xsrc/external/mit/xterm/dist/charsets.c U xsrc/external/mit/xterm/dist/xstrings.h U xsrc/external/mit/xterm/dist/xtermcap.h U xsrc/external/mit/xterm/dist/svg.c U xsrc/external/mit/xterm/dist/charclass.c U xsrc/external/mit/xterm/dist/Tests U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/XTerm-col.ad U xsrc/external/mit/xterm/dist/xutf8.c U xsrc/external/mit/xterm/dist/Imakefile U xsrc/external/mit/xterm/dist/wcwidth.h U xsrc/external/mit/xterm/dist/koi8rxterm U xsrc/external/mit/xterm/dist/VTparse.h U xsrc/external/mit/xterm/dist/menu.h U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl U xsrc/external/mit/xterm/dist/xstrings.c U xsrc/external/mit/xterm/dist/xtermcap.c U xsrc/external/mit/xterm/dist/tabs.c U xsrc/external/mit/xterm/dist/keysym2ucs.c U xsrc/external/mit/xterm/dist/menu.c U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/termcap U xsrc/external/mit/xterm/dist/aclocal.m4 U xsrc/external/mit/xterm/dist/version.c U xsrc/external/mit/xterm/dist/install-sh U xsrc/external/mit/xterm/dist/koi8rxterm.man U xsrc/external/mit/xterm/dist/256colres.pl U xsrc/external/mit/xterm/dist/Tekparse.def U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/uxterm C xsrc/external/mit/xterm/dist/fontutils.c U xsrc/external/mit/xterm/dist/README U xsrc/external/mit/xterm/dist/xterm.appdata.xml U xsrc/external/mit/xterm/dist/xterm_io.h U xsrc/external/mit/xterm/dist/xtermcfg.hin U xsrc/external/mit/xterm/dist/xterm.dat U xsrc/external/mit/xterm/dist/data.h U xsrc/external/mit/xterm/dist/uxterm.man U xsrc/external/mit/xterm/dist/Tekparse.h U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/keysym2ucs.h U xsrc/external/mit/xterm/dist/VTPrsTbl.c U xsrc/external/m
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:15:25 UTC 2022 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1512 Log Message: initial import of xauth-1.1.1 Status: Vendor Tag: xorg Release Tags: xauth-1-1-1 U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/xauth.h U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/test-driver U xsrc/external/mit/xauth/dist/compile U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/configure U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/xauth.c C xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/parsedpy.c U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/README.md U xsrc/external/mit/xauth/dist/tests/setup-sourced U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script U xsrc/external/mit/xauth/dist/tests/Makefile.in U xsrc/external/mit/xauth/dist/tests/040-xauth-source.script U xsrc/external/mit/xauth/dist/tests/test_xauth.c U xsrc/external/mit/xauth/dist/tests/Makefile.am U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script U xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout U xsrc/external/mit/xauth/dist/man/xauth.man U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xauth/dist
CVS import: xsrc/external/mit/xauth/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:15:25 UTC 2022 Update of /cvsroot/xsrc/external/mit/xauth/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1512 Log Message: initial import of xauth-1.1.1 Status: Vendor Tag: xorg Release Tags: xauth-1-1-1 U xsrc/external/mit/xauth/dist/INSTALL U xsrc/external/mit/xauth/dist/Makefile.in U xsrc/external/mit/xauth/dist/depcomp U xsrc/external/mit/xauth/dist/missing U xsrc/external/mit/xauth/dist/config.sub U xsrc/external/mit/xauth/dist/config.guess U xsrc/external/mit/xauth/dist/install-sh U xsrc/external/mit/xauth/dist/xauth.h U xsrc/external/mit/xauth/dist/Makefile.am U xsrc/external/mit/xauth/dist/configure.ac U xsrc/external/mit/xauth/dist/test-driver U xsrc/external/mit/xauth/dist/compile U xsrc/external/mit/xauth/dist/ChangeLog U xsrc/external/mit/xauth/dist/configure U xsrc/external/mit/xauth/dist/gethost.c U xsrc/external/mit/xauth/dist/xauth.c C xsrc/external/mit/xauth/dist/process.c U xsrc/external/mit/xauth/dist/parsedpy.c U xsrc/external/mit/xauth/dist/COPYING U xsrc/external/mit/xauth/dist/config.h.in U xsrc/external/mit/xauth/dist/aclocal.m4 U xsrc/external/mit/xauth/dist/README.md U xsrc/external/mit/xauth/dist/tests/setup-sourced U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.script U xsrc/external/mit/xauth/dist/tests/Makefile.in U xsrc/external/mit/xauth/dist/tests/040-xauth-source.script U xsrc/external/mit/xauth/dist/tests/test_xauth.c U xsrc/external/mit/xauth/dist/tests/Makefile.am U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.script U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.stdout U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stderr U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.script U xsrc/external/mit/xauth/dist/tests/040-xauth-source.stdout U xsrc/external/mit/xauth/dist/tests/010-xauth-add-inet.stdout U xsrc/external/mit/xauth/dist/tests/090-xauth-bad-usage.stdout U xsrc/external/mit/xauth/dist/tests/020-xauth-add-local.script U xsrc/external/mit/xauth/dist/tests/030-xauth-extract.stdout U xsrc/external/mit/xauth/dist/man/xauth.man U xsrc/external/mit/xauth/dist/man/Makefile.am U xsrc/external/mit/xauth/dist/man/Makefile.in 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xauth/dist
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Jan 9 09:05:35 UTC 2022
Modified Files:
xsrc/external/mit/libXi/dist/src: XIPassiveGrab.c
xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h xf86drmMode.c
xf86drmMode.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h amdgpu_bo.c
xsrc/external/mit/libdrm/dist/include/drm: drm.h
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/radeon: radeon_bo_gem.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/libdrm/include: generated_static_table_fourcc.h
Log Message:
merge libXi 1.8 and libdrm 2.4.109.
updated generated_static_table_fourcc.h generated with:
python3.9 gen_table_fourcc.py include/drm/drm_fourcc.h
../include/generated_static_table_fourcc.h
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c
cvs rdiff -u -r1.29 -r1.30 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/xf86drmMode.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/include/drm/drm.h
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c
diff -u xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c:1.6 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c:1.7
--- xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c:1.6 Mon Jul 8 22:59:17 2019
+++ xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c Sun Jan 9 09:05:34 2022
@@ -177,6 +177,37 @@ XIGrabTouchBegin(Display *dpy, int devic
num_modifiers, modifiers_inout, CurrentTime);
}
+int XIGrabPinchGestureBegin(Display* dpy, int deviceid, Window grab_window, int grab_mode,
+int paired_device_mode, int owner_events,
+XIEventMask *mask, int num_modifiers, XIGrabModifiers *modifiers_inout)
+{
+XExtDisplayInfo *extinfo = XInput_find_display(dpy);
+
+LockDisplay(dpy);
+if (_XiCheckExtInit(dpy, XInput_2_4, extinfo) == -1)
+return -1;
+UnlockDisplay(dpy);
+
+return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeGesturePinchBegin, 0,
+grab_window, None, grab_mode, paired_device_mode,
+owner_events, mask, num_modifiers, modifiers_inout, CurrentTime);
+}
+
+int XIGrabSwipeGestureBegin(Display* dpy, int deviceid, Window grab_window, int grab_mode,
+int paired_device_mode, int owner_events,
+XIEventMask *mask, int num_modifiers, XIGrabModifiers *modifiers_inout)
+{
+XExtDisplayInfo *extinfo = XInput_find_display(dpy);
+
+LockDisplay(dpy);
+if (_XiCheckExtInit(dpy, XInput_2_4, extinfo) == -1)
+return -1;
+UnlockDisplay(dpy);
+
+return _XIPassiveGrabDevice(dpy, deviceid, XIGrabtypeGestureSwipeBegin, 0,
+grab_window, None, grab_mode, paired_device_mode,
+owner_events, mask, num_modifiers, modifiers_inout, CurrentTime);
+}
static int
_XIPassiveUngrabDevice(Display* dpy, int deviceid, int grabtype, int detail,
@@ -256,3 +287,31 @@ XIUngrabTouchBegin(Display* display, int
return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeTouchBegin, 0,
grab_window, num_modifiers, modifiers);
}
+
+int XIUngrabPinchGestureBegin(Display* display, int deviceid, Window grab_window,
+ int num_modifiers, XIGrabModifiers *modifiers)
+{
+XExtDisplayInfo *extinfo = XInput_find_display(display);
+
+LockDisplay(display);
+if (_XiCheckExtInit(display, XInput_2_4, extinfo) == -1)
+return -1;
+UnlockDisplay(display);
+
+return _XIPassiveUngrabDevice(display, deviceid, XIGrabtypeGesturePinchBegin, 0,
+ grab_window, num_modifiers, modifiers);
+}
+
+int XIUngrabSwipeGestureBegin(Display* display, int deviceid, Window grab_window,
+ int num_modifiers, XIGrabModifiers *modifiers)
+{
+XExtDisplayInfo *extinfo = XInput_find_display(display);
+
+LockDisplay(display);
+if (_XiCheckExtInit(
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:05:35 UTC 2022 Modified Files: xsrc/external/mit/libXi/dist/src: XIPassiveGrab.c xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h xf86drmMode.c xf86drmMode.h xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h amdgpu_bo.c xsrc/external/mit/libdrm/dist/include/drm: drm.h xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c xsrc/external/mit/libdrm/dist/radeon: radeon_bo_gem.c xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c xsrc/external/mit/libdrm/include: generated_static_table_fourcc.h Log Message: merge libXi 1.8 and libdrm 2.4.109. updated generated_static_table_fourcc.h generated with: python3.9 gen_table_fourcc.py include/drm/drm_fourcc.h ../include/generated_static_table_fourcc.h To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c cvs rdiff -u -r1.29 -r1.30 xsrc/external/mit/libdrm/dist/xf86drm.c cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/libdrm/dist/xf86drm.h cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/libdrm/dist/xf86drmMode.c cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/libdrm/dist/xf86drmMode.h cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/include/drm/drm.h cvs rdiff -u -r1.20 -r1.21 \ xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c cvs rdiff -u -r1.16 -r1.17 \ xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c cvs rdiff -u -r1.1 -r1.2 \ xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:02:00 UTC 2022 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv744 Log Message: initial import of libdrm-2.4.109 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-109 U xsrc/external/mit/libdrm/dist/.editorconfig N xsrc/external/mit/libdrm/dist/.gitlab-ci.yml U xsrc/external/mit/libdrm/dist/Android.common.mk U xsrc/external/mit/libdrm/dist/Android.mk U xsrc/external/mit/libdrm/dist/CONTRIBUTING.rst U xsrc/external/mit/libdrm/dist/CleanSpec.mk U xsrc/external/mit/libdrm/dist/Makefile.sources U xsrc/external/mit/libdrm/dist/README.rst U xsrc/external/mit/libdrm/dist/RELEASING U xsrc/external/mit/libdrm/dist/core-symbols.txt U xsrc/external/mit/libdrm/dist/gen_table_fourcc.py U xsrc/external/mit/libdrm/dist/libdrm.pc.in U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/libdrm_macros.h U xsrc/external/mit/libdrm/dist/libsync.h U xsrc/external/mit/libdrm/dist/meson.build U xsrc/external/mit/libdrm/dist/meson_options.txt U xsrc/external/mit/libdrm/dist/symbols-check.py U xsrc/external/mit/libdrm/dist/util_double_list.h U xsrc/external/mit/libdrm/dist/util_math.h U xsrc/external/mit/libdrm/dist/xf86atomic.h C xsrc/external/mit/libdrm/dist/xf86drm.c C xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/xf86drmHash.h C xsrc/external/mit/libdrm/dist/xf86drmMode.c C xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/xf86drmRandom.h U xsrc/external/mit/libdrm/dist/xf86drmSL.c N xsrc/external/mit/libdrm/dist/.gitlab-ci/debian-install.sh U xsrc/external/mit/libdrm/dist/amdgpu/.editorconfig U xsrc/external/mit/libdrm/dist/amdgpu/Android.mk U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbols.txt C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in U xsrc/external/mit/libdrm/dist/amdgpu/meson.build U xsrc/external/mit/libdrm/dist/android/gralloc_handle.h U xsrc/external/mit/libdrm/dist/data/Android.mk U xsrc/external/mit/libdrm/dist/data/amdgpu.ids U xsrc/external/mit/libdrm/dist/data/meson.build U xsrc/external/mit/libdrm/dist/etnaviv/Android.mk U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.sources U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv-symbols.txt U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_device.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drm.h U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drmif.h U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_priv.h U xsrc/external/mit/libdrm/dist/etnaviv/libdrm_etnaviv.pc.in U xsrc/external/mit/libdrm/dist/etnaviv/meson.build U xsrc/external/mit/libdrm/dist/exynos/exynos-symbols.txt U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in U xsrc/external/mit/libdrm/dist/exynos/meson.build U xsrc/external/mit/libdrm/dist/freedreno/Android.mk U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbols.txt U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in U xsrc/external/mit/libdrm/dist/freedreno/meson.build U xsrc/
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:02:00 UTC 2022 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv744 Log Message: initial import of libdrm-2.4.109 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-109 U xsrc/external/mit/libdrm/dist/.editorconfig N xsrc/external/mit/libdrm/dist/.gitlab-ci.yml U xsrc/external/mit/libdrm/dist/Android.common.mk U xsrc/external/mit/libdrm/dist/Android.mk U xsrc/external/mit/libdrm/dist/CONTRIBUTING.rst U xsrc/external/mit/libdrm/dist/CleanSpec.mk U xsrc/external/mit/libdrm/dist/Makefile.sources U xsrc/external/mit/libdrm/dist/README.rst U xsrc/external/mit/libdrm/dist/RELEASING U xsrc/external/mit/libdrm/dist/core-symbols.txt U xsrc/external/mit/libdrm/dist/gen_table_fourcc.py U xsrc/external/mit/libdrm/dist/libdrm.pc.in U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/libdrm_macros.h U xsrc/external/mit/libdrm/dist/libsync.h U xsrc/external/mit/libdrm/dist/meson.build U xsrc/external/mit/libdrm/dist/meson_options.txt U xsrc/external/mit/libdrm/dist/symbols-check.py U xsrc/external/mit/libdrm/dist/util_double_list.h U xsrc/external/mit/libdrm/dist/util_math.h U xsrc/external/mit/libdrm/dist/xf86atomic.h C xsrc/external/mit/libdrm/dist/xf86drm.c C xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/xf86drmHash.h C xsrc/external/mit/libdrm/dist/xf86drmMode.c C xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/xf86drmRandom.h U xsrc/external/mit/libdrm/dist/xf86drmSL.c N xsrc/external/mit/libdrm/dist/.gitlab-ci/debian-install.sh U xsrc/external/mit/libdrm/dist/amdgpu/.editorconfig U xsrc/external/mit/libdrm/dist/amdgpu/Android.mk U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbols.txt C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in U xsrc/external/mit/libdrm/dist/amdgpu/meson.build U xsrc/external/mit/libdrm/dist/android/gralloc_handle.h U xsrc/external/mit/libdrm/dist/data/Android.mk U xsrc/external/mit/libdrm/dist/data/amdgpu.ids U xsrc/external/mit/libdrm/dist/data/meson.build U xsrc/external/mit/libdrm/dist/etnaviv/Android.mk U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.sources U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv-symbols.txt U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_device.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drm.h U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drmif.h U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_priv.h U xsrc/external/mit/libdrm/dist/etnaviv/libdrm_etnaviv.pc.in U xsrc/external/mit/libdrm/dist/etnaviv/meson.build U xsrc/external/mit/libdrm/dist/exynos/exynos-symbols.txt U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in U xsrc/external/mit/libdrm/dist/exynos/meson.build U xsrc/external/mit/libdrm/dist/freedreno/Android.mk U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbols.txt U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in U xsrc/external/mit/libdrm/dist/freedreno/meson.build U xsrc/
CVS import: xsrc/external/mit/libXi/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:01:57 UTC 2022 Update of /cvsroot/xsrc/external/mit/libXi/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1904 Log Message: initial import of libXi-1.8 Status: Vendor Tag: xorg Release Tags: libXi-1-8 U xsrc/external/mit/libXi/dist/missing U xsrc/external/mit/libXi/dist/depcomp U xsrc/external/mit/libXi/dist/ChangeLog U xsrc/external/mit/libXi/dist/configure U xsrc/external/mit/libXi/dist/README.md U xsrc/external/mit/libXi/dist/config.guess U xsrc/external/mit/libXi/dist/compile U xsrc/external/mit/libXi/dist/config.sub U xsrc/external/mit/libXi/dist/COPYING U xsrc/external/mit/libXi/dist/ltmain.sh U xsrc/external/mit/libXi/dist/docbook.am U xsrc/external/mit/libXi/dist/Makefile.in U xsrc/external/mit/libXi/dist/configure.ac U xsrc/external/mit/libXi/dist/INSTALL U xsrc/external/mit/libXi/dist/xi.pc.in U xsrc/external/mit/libXi/dist/install-sh U xsrc/external/mit/libXi/dist/aclocal.m4 U xsrc/external/mit/libXi/dist/Makefile.am U xsrc/external/mit/libXi/dist/src/XChDProp.c U xsrc/external/mit/libXi/dist/src/XIGetDevFocus.c U xsrc/external/mit/libXi/dist/src/XCloseDev.c U xsrc/external/mit/libXi/dist/src/XChgPnt.c U xsrc/external/mit/libXi/dist/src/XUngrDvB.c U xsrc/external/mit/libXi/dist/src/XGetBMap.c U xsrc/external/mit/libXi/dist/src/XGetProp.c U xsrc/external/mit/libXi/dist/src/XFreeLst.c U xsrc/external/mit/libXi/dist/src/Makefile.am U xsrc/external/mit/libXi/dist/src/XSetBMap.c U xsrc/external/mit/libXi/dist/src/XSelect.c U xsrc/external/mit/libXi/dist/src/XChgKbd.c U xsrc/external/mit/libXi/dist/src/XExtToWire.c U xsrc/external/mit/libXi/dist/src/XIProperties.c U xsrc/external/mit/libXi/dist/src/XGrabDev.c U xsrc/external/mit/libXi/dist/src/XISelEv.c U xsrc/external/mit/libXi/dist/src/XUngrDvK.c U xsrc/external/mit/libXi/dist/src/XGetCPtr.c U xsrc/external/mit/libXi/dist/src/XIint.h U xsrc/external/mit/libXi/dist/src/XGetFCtl.c U xsrc/external/mit/libXi/dist/src/XListDProp.c U xsrc/external/mit/libXi/dist/src/XGetDProp.c U xsrc/external/mit/libXi/dist/src/XUngrDev.c U xsrc/external/mit/libXi/dist/src/XGrDvBut.c U xsrc/external/mit/libXi/dist/src/XIQueryVersion.c C xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c U xsrc/external/mit/libXi/dist/src/Makefile.in U xsrc/external/mit/libXi/dist/src/XStFocus.c U xsrc/external/mit/libXi/dist/src/XListDev.c U xsrc/external/mit/libXi/dist/src/XChgDCtl.c U xsrc/external/mit/libXi/dist/src/XIQueryDevice.c U xsrc/external/mit/libXi/dist/src/XGetKMap.c U xsrc/external/mit/libXi/dist/src/XGtFocus.c U xsrc/external/mit/libXi/dist/src/XISetDevFocus.c U xsrc/external/mit/libXi/dist/src/XDevBell.c U xsrc/external/mit/libXi/dist/src/XChgKMap.c U xsrc/external/mit/libXi/dist/src/XGetDCtl.c U xsrc/external/mit/libXi/dist/src/XGrDvKey.c U xsrc/external/mit/libXi/dist/src/XGMotion.c U xsrc/external/mit/libXi/dist/src/XDelDProp.c U xsrc/external/mit/libXi/dist/src/XAllowDv.c U xsrc/external/mit/libXi/dist/src/XIBarrier.c U xsrc/external/mit/libXi/dist/src/XSetMMap.c U xsrc/external/mit/libXi/dist/src/XSetMode.c U xsrc/external/mit/libXi/dist/src/XGetMMap.c U xsrc/external/mit/libXi/dist/src/XExtInt.c U xsrc/external/mit/libXi/dist/src/XIHierarchy.c U xsrc/external/mit/libXi/dist/src/XIQueryPointer.c U xsrc/external/mit/libXi/dist/src/XIWarpPointer.c U xsrc/external/mit/libXi/dist/src/XSetDVal.c U xsrc/external/mit/libXi/dist/src/XIGrabDevice.c U xsrc/external/mit/libXi/dist/src/XChgFCtl.c U xsrc/external/mit/libXi/dist/src/XChgProp.c U xsrc/external/mit/libXi/dist/src/XGetVers.c U xsrc/external/mit/libXi/dist/src/XSndExEv.c U xsrc/external/mit/libXi/dist/src/XGtSelect.c U xsrc/external/mit/libXi/dist/src/XOpenDev.c U xsrc/external/mit/libXi/dist/src/config.h.in U xsrc/external/mit/libXi/dist/src/XIDefineCursor.c U xsrc/external/mit/libXi/dist/src/XQueryDv.c U xsrc/external/mit/libXi/dist/src/XISetCPtr.c U xsrc/external/mit/libXi/dist/src/XIAllowEvents.c U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput2.h U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput.h U xsrc/external/mit/libXi/dist/specs/library.xml U xsrc/external/mit/libXi/dist/specs/Makefile.am U xsrc/external/mit/libXi/dist/specs/encoding.xml U xsrc/external/mit/libXi/dist/specs/inputlib.xml U xsrc/external/mit/libXi/dist/specs/Makefile.in U xsrc/external/mit/libXi/dist/man/XIChangeHierarchy.man U xsrc/external/mit/libXi/dist/man/XIBarrierReleasePointer.man U xsrc/external/mit/libXi/dist/man/XISetFocus.txt U xsrc/external/mit/libXi/dist/man/XOpenDevice.txt U xsrc/external/mit/libXi/dist/man/XGetSelectedExtensionEvents.man U xsrc/external/mit/libXi/dist/man/XAllowDeviceEvents.txt U xsrc/external/mit/libXi/dist/man/XGetDeviceMotionEvents.man U xsrc/external/mit/libXi/dist/man/XIUngrabButton.man U xsrc/external/mit/libXi/dist/man/XGrabDeviceButton.man N xsrc/external/mit/libXi/dist/man/XIAllowEvents.man U xsrc/external/mit/libXi/dist/man/XIGetProperty.man U xsrc/external/mit/libXi/dist/man/XQueryD
CVS import: xsrc/external/mit/libXi/dist
Module Name:xsrc Committed By: mrg Date: Sun Jan 9 09:01:57 UTC 2022 Update of /cvsroot/xsrc/external/mit/libXi/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1904 Log Message: initial import of libXi-1.8 Status: Vendor Tag: xorg Release Tags: libXi-1-8 U xsrc/external/mit/libXi/dist/missing U xsrc/external/mit/libXi/dist/depcomp U xsrc/external/mit/libXi/dist/ChangeLog U xsrc/external/mit/libXi/dist/configure U xsrc/external/mit/libXi/dist/README.md U xsrc/external/mit/libXi/dist/config.guess U xsrc/external/mit/libXi/dist/compile U xsrc/external/mit/libXi/dist/config.sub U xsrc/external/mit/libXi/dist/COPYING U xsrc/external/mit/libXi/dist/ltmain.sh U xsrc/external/mit/libXi/dist/docbook.am U xsrc/external/mit/libXi/dist/Makefile.in U xsrc/external/mit/libXi/dist/configure.ac U xsrc/external/mit/libXi/dist/INSTALL U xsrc/external/mit/libXi/dist/xi.pc.in U xsrc/external/mit/libXi/dist/install-sh U xsrc/external/mit/libXi/dist/aclocal.m4 U xsrc/external/mit/libXi/dist/Makefile.am U xsrc/external/mit/libXi/dist/src/XChDProp.c U xsrc/external/mit/libXi/dist/src/XIGetDevFocus.c U xsrc/external/mit/libXi/dist/src/XCloseDev.c U xsrc/external/mit/libXi/dist/src/XChgPnt.c U xsrc/external/mit/libXi/dist/src/XUngrDvB.c U xsrc/external/mit/libXi/dist/src/XGetBMap.c U xsrc/external/mit/libXi/dist/src/XGetProp.c U xsrc/external/mit/libXi/dist/src/XFreeLst.c U xsrc/external/mit/libXi/dist/src/Makefile.am U xsrc/external/mit/libXi/dist/src/XSetBMap.c U xsrc/external/mit/libXi/dist/src/XSelect.c U xsrc/external/mit/libXi/dist/src/XChgKbd.c U xsrc/external/mit/libXi/dist/src/XExtToWire.c U xsrc/external/mit/libXi/dist/src/XIProperties.c U xsrc/external/mit/libXi/dist/src/XGrabDev.c U xsrc/external/mit/libXi/dist/src/XISelEv.c U xsrc/external/mit/libXi/dist/src/XUngrDvK.c U xsrc/external/mit/libXi/dist/src/XGetCPtr.c U xsrc/external/mit/libXi/dist/src/XIint.h U xsrc/external/mit/libXi/dist/src/XGetFCtl.c U xsrc/external/mit/libXi/dist/src/XListDProp.c U xsrc/external/mit/libXi/dist/src/XGetDProp.c U xsrc/external/mit/libXi/dist/src/XUngrDev.c U xsrc/external/mit/libXi/dist/src/XGrDvBut.c U xsrc/external/mit/libXi/dist/src/XIQueryVersion.c C xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c U xsrc/external/mit/libXi/dist/src/Makefile.in U xsrc/external/mit/libXi/dist/src/XStFocus.c U xsrc/external/mit/libXi/dist/src/XListDev.c U xsrc/external/mit/libXi/dist/src/XChgDCtl.c U xsrc/external/mit/libXi/dist/src/XIQueryDevice.c U xsrc/external/mit/libXi/dist/src/XGetKMap.c U xsrc/external/mit/libXi/dist/src/XGtFocus.c U xsrc/external/mit/libXi/dist/src/XISetDevFocus.c U xsrc/external/mit/libXi/dist/src/XDevBell.c U xsrc/external/mit/libXi/dist/src/XChgKMap.c U xsrc/external/mit/libXi/dist/src/XGetDCtl.c U xsrc/external/mit/libXi/dist/src/XGrDvKey.c U xsrc/external/mit/libXi/dist/src/XGMotion.c U xsrc/external/mit/libXi/dist/src/XDelDProp.c U xsrc/external/mit/libXi/dist/src/XAllowDv.c U xsrc/external/mit/libXi/dist/src/XIBarrier.c U xsrc/external/mit/libXi/dist/src/XSetMMap.c U xsrc/external/mit/libXi/dist/src/XSetMode.c U xsrc/external/mit/libXi/dist/src/XGetMMap.c U xsrc/external/mit/libXi/dist/src/XExtInt.c U xsrc/external/mit/libXi/dist/src/XIHierarchy.c U xsrc/external/mit/libXi/dist/src/XIQueryPointer.c U xsrc/external/mit/libXi/dist/src/XIWarpPointer.c U xsrc/external/mit/libXi/dist/src/XSetDVal.c U xsrc/external/mit/libXi/dist/src/XIGrabDevice.c U xsrc/external/mit/libXi/dist/src/XChgFCtl.c U xsrc/external/mit/libXi/dist/src/XChgProp.c U xsrc/external/mit/libXi/dist/src/XGetVers.c U xsrc/external/mit/libXi/dist/src/XSndExEv.c U xsrc/external/mit/libXi/dist/src/XGtSelect.c U xsrc/external/mit/libXi/dist/src/XOpenDev.c U xsrc/external/mit/libXi/dist/src/config.h.in U xsrc/external/mit/libXi/dist/src/XIDefineCursor.c U xsrc/external/mit/libXi/dist/src/XQueryDv.c U xsrc/external/mit/libXi/dist/src/XISetCPtr.c U xsrc/external/mit/libXi/dist/src/XIAllowEvents.c U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput2.h U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput.h U xsrc/external/mit/libXi/dist/specs/library.xml U xsrc/external/mit/libXi/dist/specs/Makefile.am U xsrc/external/mit/libXi/dist/specs/encoding.xml U xsrc/external/mit/libXi/dist/specs/inputlib.xml U xsrc/external/mit/libXi/dist/specs/Makefile.in U xsrc/external/mit/libXi/dist/man/XIChangeHierarchy.man U xsrc/external/mit/libXi/dist/man/XIBarrierReleasePointer.man U xsrc/external/mit/libXi/dist/man/XISetFocus.txt U xsrc/external/mit/libXi/dist/man/XOpenDevice.txt U xsrc/external/mit/libXi/dist/man/XGetSelectedExtensionEvents.man U xsrc/external/mit/libXi/dist/man/XAllowDeviceEvents.txt U xsrc/external/mit/libXi/dist/man/XGetDeviceMotionEvents.man U xsrc/external/mit/libXi/dist/man/XIUngrabButton.man U xsrc/external/mit/libXi/dist/man/XGrabDeviceButton.man N xsrc/external/mit/libXi/dist/man/XIAllowEvents.man U xsrc/external/mit/libXi/dist/man/XIGetProperty.man U xsrc/external/mit/libXi/dist/man/XQueryD
