CVS commit: othersrc/libexec/tnftpd
Module Name:othersrc Committed By: lukem Date: Sun Jun 2 06:54:55 UTC 2019 Modified Files: othersrc/libexec/tnftpd: ChangeLog NEWS configure configure.ac Log Message: tnftpd 20190602 release Changes in tnftpd from 20130325 to 20190602: * Security fixes to avoid resource exhaustion when globbing paths, traversing directories, or parsing numbers. * Support NetBSD blacklistd(8). * Add -f option to ftpd to stay in foreground with -D. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 othersrc/libexec/tnftpd/ChangeLog cvs rdiff -u -r1.13 -r1.14 othersrc/libexec/tnftpd/NEWS cvs rdiff -u -r1.49 -r1.50 othersrc/libexec/tnftpd/configure cvs rdiff -u -r1.43 -r1.44 othersrc/libexec/tnftpd/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/libexec/tnftpd/ChangeLog diff -u othersrc/libexec/tnftpd/ChangeLog:1.62 othersrc/libexec/tnftpd/ChangeLog:1.63 --- othersrc/libexec/tnftpd/ChangeLog:1.62 Sun Feb 3 06:25:58 2019 +++ othersrc/libexec/tnftpd/ChangeLog Sun Jun 2 06:54:55 2019 @@ -1,5 +1,8 @@ -$NetBSD: ChangeLog,v 1.62 2019/02/03 06:25:58 lukem Exp $ +$NetBSD: ChangeLog,v 1.63 2019/06/02 06:54:55 lukem Exp $ +Sun Jun 2 05:56:12 UTC 2019 lukem + + * Release as "tnftpd 20190602". Tue Jan 29 23:12:52 UTC 2019 lukem Index: othersrc/libexec/tnftpd/NEWS diff -u othersrc/libexec/tnftpd/NEWS:1.13 othersrc/libexec/tnftpd/NEWS:1.14 --- othersrc/libexec/tnftpd/NEWS:1.13 Mon Mar 25 04:29:01 2013 +++ othersrc/libexec/tnftpd/NEWS Sun Jun 2 06:54:55 2019 @@ -1,6 +1,15 @@ -$NetBSD: NEWS,v 1.13 2013/03/25 04:29:01 lukem Exp $ +$NetBSD: NEWS,v 1.14 2019/06/02 06:54:55 lukem Exp $ -This is tnftpd version 20130325. +This is tnftpd version 20190602. + +Changes in tnftpd from 20130325 to 20190602: + + Security fixes to avoid resource exhaustion when globbing paths, + traversing directories, or parsing numbers. + + Support NetBSD blacklistd(8). + + Add -f option to ftpd to stay in foreground with -D. Changes in tnftpd from 20130322 to 20130325: Index: othersrc/libexec/tnftpd/configure diff -u othersrc/libexec/tnftpd/configure:1.49 othersrc/libexec/tnftpd/configure:1.50 --- othersrc/libexec/tnftpd/configure:1.49 Tue Jan 29 23:21:17 2019 +++ othersrc/libexec/tnftpd/configure Sun Jun 2 06:54:55 2019 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Revision: 1.43 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for tnftpd 20130325. +# Generated by GNU Autoconf 2.69 for tnftpd 20190602. # # Report bugs to . # @@ -596,8 +596,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='tnftpd' PACKAGE_TARNAME='tnftpd' -PACKAGE_VERSION='20130325' -PACKAGE_STRING='tnftpd 20130325' +PACKAGE_VERSION='20190602' +PACKAGE_STRING='tnftpd 20190602' PACKAGE_BUGREPORT='lu...@netbsd.org' PACKAGE_URL='' @@ -1335,7 +1335,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 tnftpd 20130325 to adapt to many kinds of systems. +\`configure' configures tnftpd 20190602 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tnftpd 20130325:";; + short | recursive ) echo "Configuration of tnftpd 20190602:";; esac cat <<\_ACEOF @@ -1528,7 +1528,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tnftpd configure 20130325 +tnftpd configure 20190602 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2113,7 +2113,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 tnftpd $as_me 20130325, which was +It was created by tnftpd $as_me 20190602, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3104,7 +3104,7 @@ fi # Define the identity of the package. PACKAGE='tnftpd' - VERSION='20130325' + VERSION='20190602' cat >>confdefs.h <<_ACEOF @@ -16195,7 +16195,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 tnftpd $as_me 20130325, which was +This file was extended by tnftpd $as_me 20190602, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -16261,7 +16261,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="\\ -tnftpd config.status 20130325 +tnftpd config.status
CVS commit: othersrc/libexec/tnftpd
Module Name:othersrc Committed By: lukem Date: Sun Jun 2 06:54:55 UTC 2019 Modified Files: othersrc/libexec/tnftpd: ChangeLog NEWS configure configure.ac Log Message: tnftpd 20190602 release Changes in tnftpd from 20130325 to 20190602: * Security fixes to avoid resource exhaustion when globbing paths, traversing directories, or parsing numbers. * Support NetBSD blacklistd(8). * Add -f option to ftpd to stay in foreground with -D. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 othersrc/libexec/tnftpd/ChangeLog cvs rdiff -u -r1.13 -r1.14 othersrc/libexec/tnftpd/NEWS cvs rdiff -u -r1.49 -r1.50 othersrc/libexec/tnftpd/configure cvs rdiff -u -r1.43 -r1.44 othersrc/libexec/tnftpd/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ddb
Module Name:src Committed By: mrg Date: Sun Jun 2 06:09:17 UTC 2019 Modified Files: src/sys/ddb: db_interface.h Log Message: add two db_stack_print_trace frontends that emit to the system log or the user's terminal. kind of wrong to be called db_*() when they'll typically be used outside of ddb itself, but db_stacktrace() itself is no different. fix this by making the stack trace support separate from ddb? To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/ddb/db_interface.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ddb
Module Name:src Committed By: mrg Date: Sun Jun 2 06:09:17 UTC 2019 Modified Files: src/sys/ddb: db_interface.h Log Message: add two db_stack_print_trace frontends that emit to the system log or the user's terminal. kind of wrong to be called db_*() when they'll typically be used outside of ddb itself, but db_stacktrace() itself is no different. fix this by making the stack trace support separate from ddb? To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/ddb/db_interface.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/ddb/db_interface.h diff -u src/sys/ddb/db_interface.h:1.36 src/sys/ddb/db_interface.h:1.37 --- src/sys/ddb/db_interface.h:1.36 Sun Mar 4 07:14:50 2018 +++ src/sys/ddb/db_interface.h Sun Jun 2 06:09:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: db_interface.h,v 1.36 2018/03/04 07:14:50 mlelstv Exp $ */ +/* $NetBSD: db_interface.h,v 1.37 2019/06/02 06:09:17 mrg Exp $ */ /*- * Copyright (c) 1995 The NetBSD Foundation, Inc. @@ -84,4 +84,12 @@ void db_show_disk(db_expr_t, bool, db_e db_stack_trace_print((db_expr_t)(intptr_t)__builtin_frame_address(0), \ true, 65535, "", printf) +#define db_ustacktrace() \ +db_stack_trace_print((db_expr_t)(intptr_t)__builtin_frame_address(0), \ + true, 65535, "", uprintf) + +#define db_lstacktrace() \ +db_stack_trace_print((db_expr_t)(intptr_t)__builtin_frame_address(0), \ + true, 65535, "", addlog) + #endif /* _DDB_DB_INTERFACE_H_ */
CVS commit: src/tests/kernel
Module Name:src Committed By: kamil Date: Sat Jun 1 22:18:23 UTC 2019 Modified Files: src/tests/kernel: t_proccwd.c Log Message: Fix a mistake in a test for KERN_PROC_CWD Emit properly ENOENT scenario in chroot. For some reason the final patch did not hit the tree. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_proccwd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/kernel/t_proccwd.c diff -u src/tests/kernel/t_proccwd.c:1.1 src/tests/kernel/t_proccwd.c:1.2 --- src/tests/kernel/t_proccwd.c:1.1 Sat Jun 1 19:49:02 2019 +++ src/tests/kernel/t_proccwd.c Sat Jun 1 22:18:23 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: t_proccwd.c,v 1.1 2019/06/01 19:49:02 kamil Exp $ */ +/* $NetBSD: t_proccwd.c,v 1.2 2019/06/01 22:18:23 kamil Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. * All rights reserved. @@ -28,7 +28,7 @@ #include __COPYRIGHT("@(#) Copyright (c) 2019\ The NetBSD Foundation, inc. All rights reserved."); -__RCSID("$NetBSD: t_proccwd.c,v 1.1 2019/06/01 19:49:02 kamil Exp $"); +__RCSID("$NetBSD: t_proccwd.c,v 1.2 2019/06/01 22:18:23 kamil Exp $"); #include #include @@ -84,7 +84,7 @@ ATF_TC_BODY(prompt_pid, tc) ATF_REQUIRE_EQ(strlen(buf) + 1, prompted_len); ATF_REQUIRE(strlen(buf) > 0); - if (t[i] == -1 || t[i] == getpid() || t[i] == getppid()) { + if (t[i] == -1 || t[i] == getpid()) { getcwd(cwdbuf, MAXPATHLEN); ATF_REQUIRE_EQ(strcmp(buf, cwdbuf), 0); ATF_REQUIRE(strlen(buf) > strlen("/")); @@ -133,7 +133,7 @@ ATF_TC_BODY(chroot, tc) ASSERT(chroot(buf) == 0); errno = 0; - rv = getproccwd(NULL, &len, pid_one); + rv = getproccwd(buf, &len, pid_one); ASSERT(rv == -1); ASSERT(errno == ENOENT);
CVS commit: src/tests/kernel
Module Name:src Committed By: kamil Date: Sat Jun 1 22:18:23 UTC 2019 Modified Files: src/tests/kernel: t_proccwd.c Log Message: Fix a mistake in a test for KERN_PROC_CWD Emit properly ENOENT scenario in chroot. For some reason the final patch did not hit the tree. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/t_proccwd.c 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
Module Name:src Committed By: kamil Date: Sat Jun 1 21:42:02 UTC 2019 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi Log Message: Fix CATPAGES entries in distrib files Register CMSG_DATA.0, getcchar.0, acorn32/boot.0. These files were marked as obsolete which is no longer true. To generate a diff of this commit: cvs rdiff -u -r1.2274 -r1.2275 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1645 -r1.1646 src/distrib/sets/lists/man/mi 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
Module Name:src Committed By: kamil Date: Sat Jun 1 21:42:02 UTC 2019 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/man: mi Log Message: Fix CATPAGES entries in distrib files Register CMSG_DATA.0, getcchar.0, acorn32/boot.0. These files were marked as obsolete which is no longer true. To generate a diff of this commit: cvs rdiff -u -r1.2274 -r1.2275 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1645 -r1.1646 src/distrib/sets/lists/man/mi 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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2274 src/distrib/sets/lists/comp/mi:1.2275 --- src/distrib/sets/lists/comp/mi:1.2274 Sat May 18 08:38:00 2019 +++ src/distrib/sets/lists/comp/mi Sat Jun 1 21:42:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2274 2019/05/18 08:38:00 mlelstv Exp $ +# $NetBSD: mi,v 1.2275 2019/06/01 21:42:02 kamil Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -4614,7 +4614,7 @@ ./usr/share/man/cat3/CIRCLEQ_NEXT.0 comp-obsolete obsolete ./usr/share/man/cat3/CIRCLEQ_PREV.0 comp-obsolete obsolete ./usr/share/man/cat3/CIRCLEQ_REMOVE.0 comp-obsolete obsolete -./usr/share/man/cat3/CMSG_DATA.0 comp-obsolete obsolete +./usr/share/man/cat3/CMSG_DATA.0 comp-c-catman .cat ./usr/share/man/cat3/CMSG_FIRSTHDR.0 comp-c-catman .cat ./usr/share/man/cat3/CMSG_LEN.0 comp-c-catman .cat ./usr/share/man/cat3/CMSG_NXTHDR.0 comp-c-catman .cat @@ -7154,7 +7154,7 @@ ./usr/share/man/cat3/getc.0 comp-c-catman .cat ./usr/share/man/cat3/getc_unlocked.0 comp-c-catman .cat ./usr/share/man/cat3/getcap.0 comp-obsolete obsolete -./usr/share/man/cat3/getcchar.0 comp-obsolete obsolete +./usr/share/man/cat3/getcchar.0 comp-c-catman .cat ./usr/share/man/cat3/getch.0 comp-c-catman .cat ./usr/share/man/cat3/getchar.0 comp-c-catman .cat ./usr/share/man/cat3/getchar_unlocked.0 comp-c-catman .cat Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1645 src/distrib/sets/lists/man/mi:1.1646 --- src/distrib/sets/lists/man/mi:1.1645 Sat Jun 1 13:21:27 2019 +++ src/distrib/sets/lists/man/mi Sat Jun 1 21:42:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1645 2019/06/01 13:21:27 jmcneill Exp $ +# $NetBSD: mi,v 1.1646 2019/06/01 21:42:02 kamil Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2346,7 +2346,7 @@ ./usr/share/man/cat8/acorn26/boot26.0 man-obsolete obsolete ./usr/share/man/cat8/acorn26/makedev.0 man-obsolete obsolete ./usr/share/man/cat8/acorn32/MAKEDEV.0 man-obsolete obsolete -./usr/share/man/cat8/acorn32/boot.0 man-obsolete obsolete +./usr/share/man/cat8/acorn32/boot.0 man-sys-catman .cat ./usr/share/man/cat8/acorn32/boot32.0 man-sys-catman .cat ./usr/share/man/cat8/acorn32/makedev.0 man-obsolete obsolete ./usr/share/man/cat8/acorn32/nbfs.0 man-sys-catman .cat
Re: CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan
On 01.06.2019 21:04, Christos Zoulas wrote: > On Jun 1, 8:48pm, n...@gmx.com (Kamil Rytarowski) wrote: > -- Subject: Re: CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan > > | There is some overlap, but not full. > > I understand. > > | https://github.com/llvm-mirror/compiler-rt/blob/master/lib/tsan/rtl/tsan_rt= > | l_amd64.S > | > | Each call of this code was verified and it passed regression suite. > | > | There is also need to handle NetBSD specific renaming of symbols in this > | file and in .c file. > > I also said that the NetBSD symbols are not handled. Newer gcc will fix it. > I just wanted to make it compile. > > christos > I see, thank you! I'm doing it in the way that code flows with new upstream versions into the basesystem. Cherry picking TSan support shouldn't be that difficult probably. signature.asc Description: OpenPGP digital signature
CVS commit: src/share/man/man7
Module Name:src Committed By: kamil Date: Sat Jun 1 19:54:34 UTC 2019 Modified Files: src/share/man/man7: sysctl.7 Log Message: Document KERN_PROC_CWD in sysctl(7) To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src Committed By: kamil Date: Sat Jun 1 19:54:34 UTC 2019 Modified Files: src/share/man/man7: sysctl.7 Log Message: Document KERN_PROC_CWD in sysctl(7) To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.138 src/share/man/man7/sysctl.7:1.139 --- src/share/man/man7/sysctl.7:1.138 Fri Mar 1 03:05:08 2019 +++ src/share/man/man7/sysctl.7 Sat Jun 1 19:54:34 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.138 2019/03/01 03:05:08 christos Exp $ +.\" $NetBSD: sysctl.7,v 1.139 2019/06/01 19:54:34 kamil Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\" -.Dd February 28, 2019 +.Dd June 1, 2019 .Dt SYSCTL 7 .Os .Sh NAME @@ -1026,6 +1026,7 @@ The fourth level name is as follows: .It Dv KERN_PROC_NARGV The number of argv strings .It Dv KERN_PROC_NENV The number of environ strings .It Dv KERN_PROC_PATHNAME The full pathname of the executable +.It Dv KERN_PROC_CWD The current working directory .El .It Li kern.profiling ( Dv KERN_PROF ) Return profiling information about the kernel.
CVS commit: src
Module Name:src Committed By: kamil Date: Sat Jun 1 19:49:03 UTC 2019 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/tests/kernel: Makefile Added Files: src/tests/kernel: t_proccwd.c Log Message: Add ATF KERN_PROC_CWD tests To generate a diff of this commit: cvs rdiff -u -r1.283 -r1.284 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.814 -r1.815 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.58 -r1.59 src/tests/kernel/Makefile cvs rdiff -u -r0 -r1.1 src/tests/kernel/t_proccwd.c 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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.283 src/distrib/sets/lists/debug/mi:1.284 --- src/distrib/sets/lists/debug/mi:1.283 Fri Apr 26 08:52:16 2019 +++ src/distrib/sets/lists/debug/mi Sat Jun 1 19:49:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.283 2019/04/26 08:52:16 maya Exp $ +# $NetBSD: mi,v 1.284 2019/06/01 19:49:02 kamil Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -1742,6 +1742,7 @@ ./usr/libdata/debug/usr/tests/kernel/t_poll3w.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_pollts.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_posix_fadvise.debug tests-obsolete obsolete,compattestfile +./usr/libdata/debug/usr/tests/kernel/t_proccwd.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_ptrace.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_ptrace_wait.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/kernel/t_ptrace_wait3.debug tests-obsolete obsolete,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.814 src/distrib/sets/lists/tests/mi:1.815 --- src/distrib/sets/lists/tests/mi:1.814 Sun May 26 21:04:56 2019 +++ src/distrib/sets/lists/tests/mi Sat Jun 1 19:49:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.814 2019/05/26 21:04:56 christos Exp $ +# $NetBSD: mi,v 1.815 2019/06/01 19:49:02 kamil Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2191,6 +2191,7 @@ ./usr/tests/kernel/t_pollts tests-obsolete obsolete ./usr/tests/kernel/t_posix_fadvise tests-obsolete obsolete ./usr/tests/kernel/t_posix_fallocate tests-obsolete obsolete +./usr/tests/kernel/t_proccwd tests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_procpath tests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_ps_strings tests-kernel-tests compattestfile,atf ./usr/tests/kernel/t_ptrace tests-obsolete obsolete Index: src/tests/kernel/Makefile diff -u src/tests/kernel/Makefile:1.58 src/tests/kernel/Makefile:1.59 --- src/tests/kernel/Makefile:1.58 Mon Feb 4 05:24:18 2019 +++ src/tests/kernel/Makefile Sat Jun 1 19:49:02 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2019/02/04 05:24:18 mrg Exp $ +# $NetBSD: Makefile,v 1.59 2019/06/01 19:49:02 kamil Exp $ NOMAN= # defined @@ -11,6 +11,7 @@ TESTS_C= t_lock TESTS_C+= t_lockf TESTS_C+= t_pty TESTS_C+= t_mqueue +TESTS_C+= t_proccwd TESTS_C+= t_sysv TESTS_C+= t_subr_prf TESTS_C+= t_kauth_pr_47598 Added files: Index: src/tests/kernel/t_proccwd.c diff -u /dev/null src/tests/kernel/t_proccwd.c:1.1 --- /dev/null Sat Jun 1 19:49:03 2019 +++ src/tests/kernel/t_proccwd.c Sat Jun 1 19:49:02 2019 @@ -0,0 +1,154 @@ +/* $NetBSD: t_proccwd.c,v 1.1 2019/06/01 19:49:02 kamil Exp $ */ +/*- + * Copyright (c) 2019 The NetBSD Foundation, Inc. + * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (I
CVS commit: src
Module Name:src Committed By: kamil Date: Sat Jun 1 19:49:03 UTC 2019 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi src/tests/kernel: Makefile Added Files: src/tests/kernel: t_proccwd.c Log Message: Add ATF KERN_PROC_CWD tests To generate a diff of this commit: cvs rdiff -u -r1.283 -r1.284 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.814 -r1.815 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.58 -r1.59 src/tests/kernel/Makefile cvs rdiff -u -r0 -r1.1 src/tests/kernel/t_proccwd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Sat Jun 1 19:48:29 UTC 2019 Modified Files: src/sys/kern: kern_proc.c Log Message: Align the KERN_PROC_CWD interface to semantics closer to KERN_PROC_PATHNAME Allow specifying oldlenp as 0 and return size with success for oldp != NULL To generate a diff of this commit: cvs rdiff -u -r1.231 -r1.232 src/sys/kern/kern_proc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Sat Jun 1 19:48:29 UTC 2019 Modified Files: src/sys/kern: kern_proc.c Log Message: Align the KERN_PROC_CWD interface to semantics closer to KERN_PROC_PATHNAME Allow specifying oldlenp as 0 and return size with success for oldp != NULL To generate a diff of this commit: cvs rdiff -u -r1.231 -r1.232 src/sys/kern/kern_proc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_proc.c diff -u src/sys/kern/kern_proc.c:1.231 src/sys/kern/kern_proc.c:1.232 --- src/sys/kern/kern_proc.c:1.231 Sat Jun 1 00:19:43 2019 +++ src/sys/kern/kern_proc.c Sat Jun 1 19:48:29 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_proc.c,v 1.231 2019/06/01 00:19:43 kamil Exp $ */ +/* $NetBSD: kern_proc.c,v 1.232 2019/06/01 19:48:29 kamil Exp $ */ /*- * Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.231 2019/06/01 00:19:43 kamil Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.232 2019/06/01 19:48:29 kamil Exp $"); #ifdef _KERNEL_OPT #include "opt_kstack.h" @@ -2599,11 +2599,6 @@ fill_cwd(struct lwp *l, pid_t pid, void return error; len = MAXPATHLEN * 4; - if (*oldlenp < 2) { - if (pid != -1) - mutex_exit(p->p_lock); - return ERANGE; - } path = kmem_alloc(len, KM_SLEEP);
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: joerg Date: Sat Jun 1 19:32:19 UTC 2019 Modified Files: src/sys/arch/arm/rockchip: rk_tsadc.c Log Message: Loop variables work better when they are initialized. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/rockchip/rk_tsadc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/rockchip/rk_tsadc.c diff -u src/sys/arch/arm/rockchip/rk_tsadc.c:1.5 src/sys/arch/arm/rockchip/rk_tsadc.c:1.6 --- src/sys/arch/arm/rockchip/rk_tsadc.c:1.5 Wed May 15 01:24:43 2019 +++ src/sys/arch/arm/rockchip/rk_tsadc.c Sat Jun 1 19:32:19 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_tsadc.c,v 1.5 2019/05/15 01:24:43 mrg Exp $ */ +/* $NetBSD: rk_tsadc.c,v 1.6 2019/06/01 19:32:19 joerg Exp $ */ /* * Copyright (c) 2019 Matthew R. Green @@ -30,7 +30,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.5 2019/05/15 01:24:43 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_tsadc.c,v 1.6 2019/06/01 19:32:19 joerg Exp $"); /* * Driver for the TSADC temperature sensor monitor in RK3328 and RK3399. @@ -804,7 +804,7 @@ rk_tsadc_intr(void *arg) /* XXX */ DPRINTF("(%s): interrupted", sc->sc_sme->sme_name); - for (unsigned n; n < __arraycount(rk_tsadc_sensors); n++) { + for (unsigned n = 0; n < __arraycount(rk_tsadc_sensors); n++) { struct rk_tsadc_sensor *rks = &sc->sc_sensors[n]; rk_tsadc_refresh(sc->sc_sme, (envsys_data_t *)rks);
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: joerg Date: Sat Jun 1 19:32:19 UTC 2019 Modified Files: src/sys/arch/arm/rockchip: rk_tsadc.c Log Message: Loop variables work better when they are initialized. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/rockchip/rk_tsadc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: joerg Date: Sat Jun 1 19:13:41 UTC 2019 Modified Files: src/sys/netinet: ip_carp.c Log Message: Define carp6_cksum only when it is used, that is under INET6 To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/netinet/ip_carp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: joerg Date: Sat Jun 1 19:13:41 UTC 2019 Modified Files: src/sys/netinet: ip_carp.c Log Message: Define carp6_cksum only when it is used, that is under INET6 To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/netinet/ip_carp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet/ip_carp.c diff -u src/sys/netinet/ip_carp.c:1.102 src/sys/netinet/ip_carp.c:1.103 --- src/sys/netinet/ip_carp.c:1.102 Thu Mar 14 07:05:07 2019 +++ src/sys/netinet/ip_carp.c Sat Jun 1 19:13:41 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_carp.c,v 1.102 2019/03/14 07:05:07 ozaki-r Exp $ */ +/* $NetBSD: ip_carp.c,v 1.103 2019/06/01 19:13:41 joerg Exp $ */ /* $OpenBSD: ip_carp.c,v 1.113 2005/11/04 08:11:54 mcbride Exp $ */ /* @@ -33,7 +33,7 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.102 2019/03/14 07:05:07 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_carp.c,v 1.103 2019/06/01 19:13:41 joerg Exp $"); /* * TODO: @@ -253,11 +253,13 @@ carp_cksum(struct mbuf *m, int len) return (in_cksum(m, len)); } +#ifdef INET6 static __inline u_int16_t carp6_cksum(struct mbuf *m, uint32_t off, uint32_t len) { return (in6_cksum(m, IPPROTO_CARP, off, len)); } +#endif static void carp_hmac_prepare(struct carp_softc *sc)
Re: CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan
On Jun 1, 8:48pm, n...@gmx.com (Kamil Rytarowski) wrote: -- Subject: Re: CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan | There is some overlap, but not full. I understand. | https://github.com/llvm-mirror/compiler-rt/blob/master/lib/tsan/rtl/tsan_rt= | l_amd64.S | | Each call of this code was verified and it passed regression suite. | | There is also need to handle NetBSD specific renaming of symbols in this | file and in .c file. I also said that the NetBSD symbols are not handled. Newer gcc will fix it. I just wanted to make it compile. christos
Re: CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan
On 01.06.2019 20:38, Christos Zoulas wrote: > I just checked and the offsets are correct (we are the same as FreeBSD). > We are missing support for the the names of the functions __setjmp14 etc. > > Thanks, > There is some overlap, but not full. https://github.com/llvm-mirror/compiler-rt/blob/master/lib/tsan/rtl/tsan_rtl_amd64.S Each call of this code was verified and it passed regression suite. There is also need to handle NetBSD specific renaming of symbols in this .S file and in .c file. > christos > >> On Jun 1, 2019, at 1:52 PM, Kamil Rytarowski wrote: >> >> On 01.06.2019 19:22, Christos Zoulas wrote: >>> Module Name:src >>> Committed By: christos >>> Date: Sat Jun 1 17:22:58 UTC 2019 >>> >>> Modified Files: >>> src/external/gpl3/gcc/dist/libsanitizer/tsan: tsan_rtl_amd64.S >>> >>> Log Message: >>> Do as FreeBSD does now (I have not checked that the offsets are correct) >>> >> >> These values differ on NetBSD. >> >> There is upstreamed support into upstream repository here: >> >> https://github.com/llvm-mirror/compiler-rt/tree/master/lib/tsan/rtl >> >> Please grep for NetBSD specific code. We will get it with GCC9, maybe >> GCC8.. but I would need to check. >> >> > signature.asc Description: OpenPGP digital signature
Re: CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan
I just checked and the offsets are correct (we are the same as FreeBSD). We are missing support for the the names of the functions __setjmp14 etc. Thanks, christos > On Jun 1, 2019, at 1:52 PM, Kamil Rytarowski wrote: > > On 01.06.2019 19:22, Christos Zoulas wrote: >> Module Name: src >> Committed By:christos >> Date:Sat Jun 1 17:22:58 UTC 2019 >> >> Modified Files: >> src/external/gpl3/gcc/dist/libsanitizer/tsan: tsan_rtl_amd64.S >> >> Log Message: >> Do as FreeBSD does now (I have not checked that the offsets are correct) >> > > These values differ on NetBSD. > > There is upstreamed support into upstream repository here: > > https://github.com/llvm-mirror/compiler-rt/tree/master/lib/tsan/rtl > > Please grep for NetBSD specific code. We will get it with GCC9, maybe > GCC8.. but I would need to check. > >
Re: CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan
On 01.06.2019 19:22, Christos Zoulas wrote: > Module Name: src > Committed By: christos > Date: Sat Jun 1 17:22:58 UTC 2019 > > Modified Files: > src/external/gpl3/gcc/dist/libsanitizer/tsan: tsan_rtl_amd64.S > > Log Message: > Do as FreeBSD does now (I have not checked that the offsets are correct) > These values differ on NetBSD. There is upstreamed support into upstream repository here: https://github.com/llvm-mirror/compiler-rt/tree/master/lib/tsan/rtl Please grep for NetBSD specific code. We will get it with GCC9, maybe GCC8.. but I would need to check. signature.asc Description: OpenPGP digital signature
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common
Module Name:src Committed By: christos Date: Sat Jun 1 17:24:20 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common: sanitizer_linux.cc Log Message: Don't require procfs to be mounted with linux so that /task is available and explain why. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 \ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common
Module Name:src Committed By: christos Date: Sat Jun 1 17:24:20 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common: sanitizer_linux.cc Log Message: Don't require procfs to be mounted with linux so that /task is available and explain why. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 \ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.30 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.31 --- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc:1.30 Fri Apr 26 20:23:17 2019 +++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc Sat Jun 1 13:24:20 2019 @@ -854,6 +854,18 @@ ThreadLister::ThreadLister(int pid) error_(true), entry_((struct linux_dirent *)buffer_.data()), bytes_read_(0) { +#if SANITIZER_NETBSD + /* + * netbsd does not have "tasks". Our lwp's are not like processes, + * and this is used to suspend each task by attaching to them and stopping + * them. We do this at the process level, so we hijack the descriptor to + * permanently store our pid (the pid to trace and stop), and bytes_read_ + * to store a copy of it, that we set to -1 once we read it. + */ + descriptor_ = pid; + bytes_read_ = pid; + error_ = false; +#else char task_directory_path[80]; internal_snprintf(task_directory_path, sizeof(task_directory_path), "/proc/%d/task/", pid); @@ -865,9 +877,15 @@ ThreadLister::ThreadLister(int pid) error_ = false; descriptor_ = openrv; } +#endif } int ThreadLister::GetNextTID() { +#if SANITIZER_NETBSD + int tid = bytes_read_; + bytes_read_ = -1; + return tid; +#else int tid = -1; do { if (error_) @@ -882,17 +900,25 @@ int ThreadLister::GetNextTID() { entry_ = (struct linux_dirent *)(((char *)entry_) + entry_->d_reclen); } while (tid < 0); return tid; +#endif } void ThreadLister::Reset() { +#if SANITIZER_NETBSD + bytes_read_ = descriptor_; + error_ = false; +#else if (error_ || descriptor_ < 0) return; internal_lseek(descriptor_, 0, SEEK_SET); +#endif } ThreadLister::~ThreadLister() { +#ifndef SANITIZER_NETBSD if (descriptor_ >= 0) internal_close(descriptor_); +#endif } bool ThreadLister::error() { return error_; }
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan
Module Name:src Committed By: christos Date: Sat Jun 1 17:23:29 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/libsanitizer/tsan: tsan_interceptors.cc Log Message: Add defines so this compiles. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_interceptors.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan
Module Name:src Committed By: christos Date: Sat Jun 1 17:23:29 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/libsanitizer/tsan: tsan_interceptors.cc Log Message: Add defines so this compiles. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_interceptors.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_interceptors.cc diff -u src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_interceptors.cc:1.6 src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_interceptors.cc:1.7 --- src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_interceptors.cc:1.6 Sat Jan 19 07:10:12 2019 +++ src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_interceptors.cc Sat Jun 1 13:23:29 2019 @@ -44,7 +44,7 @@ using namespace __tsan; // NOLINT #define mallopt(a, b) #endif -#if SANITIZER_LINUX || SANITIZER_FREEBSD +#if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD #define PTHREAD_CREATE_DETACHED 1 #elif SANITIZER_MAC #define PTHREAD_CREATE_DETACHED 2 @@ -2020,7 +2020,7 @@ TSAN_INTERCEPTOR(int, sigaction, int sig sigactions[sig].sa_flags = *(volatile int*)&act->sa_flags; internal_memcpy(&sigactions[sig].sa_mask, &act->sa_mask, sizeof(sigactions[sig].sa_mask)); -#if !SANITIZER_FREEBSD && !SANITIZER_MAC +#if !SANITIZER_FREEBSD && !SANITIZER_MAC && !SANITIZER_NETBSD sigactions[sig].sa_restorer = act->sa_restorer; #endif sigaction_t newact;
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan
Module Name:src Committed By: christos Date: Sat Jun 1 17:22:58 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/libsanitizer/tsan: tsan_rtl_amd64.S Log Message: Do as FreeBSD does now (I have not checked that the offsets are correct) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/tsan
Module Name:src Committed By: christos Date: Sat Jun 1 17:22:58 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/libsanitizer/tsan: tsan_rtl_amd64.S Log Message: Do as FreeBSD does now (I have not checked that the offsets are correct) To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S diff -u src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S:1.5 src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S:1.6 --- src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S:1.5 Sat Jan 19 07:10:12 2019 +++ src/external/gpl3/gcc/dist/libsanitizer/tsan/tsan_rtl_amd64.S Sat Jun 1 13:22:58 2019 @@ -186,7 +186,7 @@ ASM_TSAN_SYMBOL_INTERCEPTOR(setjmp): CFI_ADJUST_CFA_OFFSET(8) CFI_REL_OFFSET(%rdi, 0) // obtain %rsp -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) lea 8(%rsp), %rdi mov %rdi, %rsi #elif defined(__APPLE__) @@ -227,7 +227,7 @@ ASM_TSAN_SYMBOL_INTERCEPTOR(_setjmp): CFI_ADJUST_CFA_OFFSET(8) CFI_REL_OFFSET(%rdi, 0) // obtain %rsp -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) lea 8(%rsp), %rdi mov %rdi, %rsi #elif defined(__APPLE__) @@ -275,7 +275,7 @@ ASM_TSAN_SYMBOL_INTERCEPTOR(sigsetjmp): sub $8, %rsp CFI_ADJUST_CFA_OFFSET(8) // obtain %rsp -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) lea 24(%rsp), %rdi mov %rdi, %rsi #elif defined(__APPLE__) @@ -331,7 +331,7 @@ ASM_TSAN_SYMBOL_INTERCEPTOR(__sigsetjmp) sub $8, %rsp CFI_ADJUST_CFA_OFFSET(8) // obtain %rsp -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__NetBSD__) lea 24(%rsp), %rdi mov %rdi, %rsi #else
CVS commit: src/tools/gdb
Module Name:src Committed By: christos Date: Sat Jun 1 17:02:59 UTC 2019 Modified Files: src/tools/gdb: Makefile Log Message: Disable mpfr to make MKCROSSGDB work again. The problem is that the default (auto) finds the mpfr library in tools, but then when it tries to build using the proper headers it does not find it anymore since we don't install it (like the native build does not find it). To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/tools/gdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gdb
Module Name:src Committed By: christos Date: Sat Jun 1 17:02:59 UTC 2019 Modified Files: src/tools/gdb: Makefile Log Message: Disable mpfr to make MKCROSSGDB work again. The problem is that the default (auto) finds the mpfr library in tools, but then when it tries to build using the proper headers it does not find it anymore since we don't install it (like the native build does not find it). To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/tools/gdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/gdb/Makefile diff -u src/tools/gdb/Makefile:1.36 src/tools/gdb/Makefile:1.37 --- src/tools/gdb/Makefile:1.36 Tue May 1 15:59:46 2018 +++ src/tools/gdb/Makefile Sat Jun 1 13:02:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2018/05/01 19:59:46 christos Exp $ +# $NetBSD: Makefile,v 1.37 2019/06/01 17:02:59 christos Exp $ .include @@ -9,7 +9,8 @@ GNUHOSTDIST=${GDBDIR}/dist FIND_ARGS= \! \( -type d -name sim -prune \) CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \ - --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," + --program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \ + --without-mpfr MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Sat Jun 1 15:20:52 UTC 2019 Modified Files: src/sys/kern: uipc_socket.c Log Message: Add XXXs for SCTP bugs. To generate a diff of this commit: cvs rdiff -u -r1.279 -r1.280 src/sys/kern/uipc_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.279 src/sys/kern/uipc_socket.c:1.280 --- src/sys/kern/uipc_socket.c:1.279 Wed May 8 14:05:18 2019 +++ src/sys/kern/uipc_socket.c Sat Jun 1 15:20:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.279 2019/05/08 14:05:18 christos Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.280 2019/06/01 15:20:51 maxv Exp $ */ /* * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.279 2019/05/08 14:05:18 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.280 2019/06/01 15:20:51 maxv Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -1323,6 +1323,7 @@ dontblock: m = m->m_next; } else { sbfree(&so->so_rcv, m); +/* XXX XXX XXX: should set mbuf_removed? */ if (paddr) { *paddr = m; so->so_rcv.sb_mb = m->m_next; @@ -1331,6 +1332,8 @@ dontblock: } else { m = so->so_rcv.sb_mb = m_free(m); } +/* XXX XXX XXX: isn't there an sbsync() + * missing here? */ } } }
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Sat Jun 1 15:20:52 UTC 2019 Modified Files: src/sys/kern: uipc_socket.c Log Message: Add XXXs for SCTP bugs. To generate a diff of this commit: cvs rdiff -u -r1.279 -r1.280 src/sys/kern/uipc_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet
Module Name:src Committed By: kamil Date: Sat Jun 1 15:18:42 UTC 2019 Modified Files: src/sys/netinet: tcp_input.c Log Message: Replace potentially misaligned pointer dereference + htonl() with be32dec() Reported by kUBSan. To generate a diff of this commit: cvs rdiff -u -r1.413 -r1.414 src/sys/netinet/tcp_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/netinet/tcp_input.c diff -u src/sys/netinet/tcp_input.c:1.413 src/sys/netinet/tcp_input.c:1.414 --- src/sys/netinet/tcp_input.c:1.413 Thu Nov 8 06:43:52 2018 +++ src/sys/netinet/tcp_input.c Sat Jun 1 15:18:42 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_input.c,v 1.413 2018/11/08 06:43:52 msaitoh Exp $ */ +/* $NetBSD: tcp_input.c,v 1.414 2019/06/01 15:18:42 kamil Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -148,7 +148,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.413 2018/11/08 06:43:52 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.414 2019/06/01 15:18:42 kamil Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1350,11 +1350,11 @@ tcp_input(struct mbuf *m, int off, int p if ((optlen == TCPOLEN_TSTAMP_APPA || (optlen > TCPOLEN_TSTAMP_APPA && optp[TCPOLEN_TSTAMP_APPA] == TCPOPT_EOL)) && - *(u_int32_t *)optp == htonl(TCPOPT_TSTAMP_HDR) && + be32dec(optp) == TCPOPT_TSTAMP_HDR && (th->th_flags & TH_SYN) == 0) { opti.ts_present = 1; - opti.ts_val = ntohl(*(u_int32_t *)(optp + 4)); - opti.ts_ecr = ntohl(*(u_int32_t *)(optp + 8)); + opti.ts_val = be32dec(optp + 4); + opti.ts_ecr = be32dec(optp + 8); optp = NULL; /* we've parsed the options */ } }
CVS commit: src/sys/netinet
Module Name:src Committed By: kamil Date: Sat Jun 1 15:18:42 UTC 2019 Modified Files: src/sys/netinet: tcp_input.c Log Message: Replace potentially misaligned pointer dereference + htonl() with be32dec() Reported by kUBSan. To generate a diff of this commit: cvs rdiff -u -r1.413 -r1.414 src/sys/netinet/tcp_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
Date:Sat, 1 Jun 2019 14:12:21 +0200 From:"J. Hannken-Illjes" Message-ID: | Problem is sys/kern/kern_proc.c gets loaded into librump while | getcwd_common is in librumpvfs. For the librump-only case | we have to supply stubs to librumpvfs functions. Yes, I expect that would work. | The attached diff should do the job -- unfortunately my | build and test machine is not working aqt the moment. So is mine ... that is, it is working, but my build is setup for MKPIC=no at the minute, and that's not working. I don't see any hurry to change this - the build is back working (which was my objective) and the tests all seem to run the same as they did before. So, when you're able, go ahead and change this. While you're there you might want to find all the similar cases - -lrump is listed 3 times for some builds (explicitly) - which can only be because of interactions between the libraries I would have thought. kre
CVS commit: src
Module Name:src Committed By: jmcneill Date: Sat Jun 1 13:21:28 UTC 2019 Modified Files: src/crypto/external/bsd/openssh/bin: Makefile src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi Added Files: src/crypto/external/bsd/openssh/bin/ssh-copy-id: Makefile ssh-copy-id ssh-copy-id.1 Log Message: Install ssh-copy-id(1) from the OpenSSH 8.0p1 portable distribution. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/Makefile cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/openssh/bin/ssh-copy-id/Makefile \ src/crypto/external/bsd/openssh/bin/ssh-copy-id/ssh-copy-id \ src/crypto/external/bsd/openssh/bin/ssh-copy-id/ssh-copy-id.1 cvs rdiff -u -r1.1204 -r1.1205 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1644 -r1.1645 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jmcneill Date: Sat Jun 1 13:21:28 UTC 2019 Modified Files: src/crypto/external/bsd/openssh/bin: Makefile src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi Added Files: src/crypto/external/bsd/openssh/bin/ssh-copy-id: Makefile ssh-copy-id ssh-copy-id.1 Log Message: Install ssh-copy-id(1) from the OpenSSH 8.0p1 portable distribution. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/bin/Makefile cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/openssh/bin/ssh-copy-id/Makefile \ src/crypto/external/bsd/openssh/bin/ssh-copy-id/ssh-copy-id \ src/crypto/external/bsd/openssh/bin/ssh-copy-id/ssh-copy-id.1 cvs rdiff -u -r1.1204 -r1.1205 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1644 -r1.1645 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssh/bin/Makefile diff -u src/crypto/external/bsd/openssh/bin/Makefile:1.3 src/crypto/external/bsd/openssh/bin/Makefile:1.4 --- src/crypto/external/bsd/openssh/bin/Makefile:1.3 Sun Nov 21 19:19:21 2010 +++ src/crypto/external/bsd/openssh/bin/Makefile Sat Jun 1 13:21:27 2019 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2010/11/21 19:19:21 adam Exp $ +# $NetBSD: Makefile,v 1.4 2019/06/01 13:21:27 jmcneill Exp $ .include SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist -SUBDIR= ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \ - ssh-keysign ssh-keyscan sftp ssh-pkcs11-helper +SUBDIR= ssh sshd ssh-add ssh-copy-id ssh-keygen ssh-agent scp \ + sftp-server ssh-keysign ssh-keyscan sftp ssh-pkcs11-helper .PATH: ${SSHDIST} .MADE: moduli Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1204 src/distrib/sets/lists/base/mi:1.1205 --- src/distrib/sets/lists/base/mi:1.1204 Tue May 7 05:02:41 2019 +++ src/distrib/sets/lists/base/mi Sat Jun 1 13:21:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1204 2019/05/07 05:02:41 thorpej Exp $ +# $NetBSD: mi,v 1.1205 2019/06/01 13:21:27 jmcneill Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -951,6 +951,7 @@ ./usr/bin/ssh base-secsh-bin ./usr/bin/ssh-addbase-secsh-bin ./usr/bin/ssh-agentbase-secsh-bin +./usr/bin/ssh-copy-idbase-secsh-bin ./usr/bin/ssh-keygenbase-secsh-bin ./usr/bin/ssh-keyscanbase-secsh-bin ./usr/bin/stat base-util-bin Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1644 src/distrib/sets/lists/man/mi:1.1645 --- src/distrib/sets/lists/man/mi:1.1644 Wed May 1 06:47:45 2019 +++ src/distrib/sets/lists/man/mi Sat Jun 1 13:21:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1644 2019/05/01 06:47:45 mlelstv Exp $ +# $NetBSD: mi,v 1.1645 2019/06/01 13:21:27 jmcneill Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -540,6 +540,7 @@ ./usr/share/man/cat1/srtconfig.0 man-netutil-catman .cat ./usr/share/man/cat1/ssh-add.0 man-secsh-catman .cat ./usr/share/man/cat1/ssh-agent.0 man-secsh-catman .cat +./usr/share/man/cat1/ssh-copy-id.0 man-secsh-catman .cat ./usr/share/man/cat1/ssh-keygen.0 man-secsh-catman .cat ./usr/share/man/cat1/ssh-keyscan.0 man-secsh-catman .cat ./usr/share/man/cat1/ssh.0 man-secsh-catman .cat @@ -3765,6 +3766,7 @@ ./usr/share/man/html1/srtconfig.html man-netutil-htmlman html ./usr/share/man/html1/ssh-add.html man-secsh-htmlman html ./usr/share/man/html1/ssh-agent.html man-secsh-htmlman html +./usr/share/man/html1/ssh-copy-id.html man-secsh-htmlman html ./usr/share/man/html1/ssh-keygen.html man-secsh-htmlman html ./usr/share/man/html1/ssh-keyscan.html man-secsh-htmlman html ./usr/share/man/html1/ssh.html man-secsh-htmlman html @@ -6642,6 +6644,7 @@ ./usr/share/man/man1/srtconfig.1 man-netutil-man .man ./usr/share/man/man1/ssh-add.1 man-secsh-man .man ./usr/share/man/man1/ssh-agent.1 man-secsh-man .man +./usr/share/man/man1/ssh-copy-id.1 man-secsh-man .man ./usr/share/man/man1/ssh-keygen.1 man-secsh-man .man ./usr/share/man/man1/ssh-keyscan.1 man-secsh-man .man ./usr/share/man/man1/ssh.1 man-secsh-man .man Added files: Index: src/crypto/external/bsd/openssh/bin/ssh-copy-id/Makefile diff -u /dev/null src/crypto/external/bsd/openssh/bin/ssh-copy-id/Makefile:1.1 --- /dev/null Sat Jun 1 13:21:28 2019 +++ src/crypto/external/bsd/openssh/bin/ssh-copy-id/Makefile Sat Jun 1 13:21:27 2019 @@ -0,0 +1,8 @@ +# $NetBSD: Makefile,v 1.1 2019/06/01 13:21:27 jmcneill Exp $ + +BINDIR= /usr/bin + +SCRIPTS= ssh-copy-id +MAN= ssh-copy-id.1 + +.include Index: src/crypto/external/bsd/openssh/bin/ssh-copy-id/ssh-copy-id diff -u /dev/null src/crypto/external/bsd/openssh/bin/ssh-copy-id/ssh-copy-id:1.1 --- /dev/null Sat Jun 1 13:21:28 2019 +++ src/crypto/external/bs
CVS commit: src
Module Name:src Committed By: maxv Date: Sat Jun 1 12:42:28 UTC 2019 Modified Files: src/common/lib/libc/arch/riscv/atomic: Makefile.inc src/sys/arch/riscv/conf: GENERIC Makefile.riscv files.riscv src/sys/arch/riscv/include: cpu.h elf_machdep.h mutex.h param.h pmap.h pte.h vmparam.h src/sys/arch/riscv/riscv: core_machdep.c genassym.cf locore.S pmap_machdep.c src/sys/uvm/pmap: pmap.h Added Files: src/sys/arch/riscv/compile: Makefile Log Message: Misc changes in RISC-V. Start changing the memory layout, too. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/riscv/atomic/Makefile.inc cvs rdiff -u -r0 -r1.1 src/sys/arch/riscv/compile/Makefile cvs rdiff -u -r1.9 -r1.10 src/sys/arch/riscv/conf/GENERIC cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/conf/Makefile.riscv cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/conf/files.riscv cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/cpu.h \ src/sys/arch/riscv/include/vmparam.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/riscv/include/elf_machdep.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/include/mutex.h \ src/sys/arch/riscv/include/pmap.h src/sys/arch/riscv/include/pte.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/param.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/riscv/core_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/riscv/genassym.cf cvs rdiff -u -r1.7 -r1.8 src/sys/arch/riscv/riscv/locore.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/pmap_machdep.c cvs rdiff -u -r1.11 -r1.12 src/sys/uvm/pmap/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maxv Date: Sat Jun 1 12:42:28 UTC 2019 Modified Files: src/common/lib/libc/arch/riscv/atomic: Makefile.inc src/sys/arch/riscv/conf: GENERIC Makefile.riscv files.riscv src/sys/arch/riscv/include: cpu.h elf_machdep.h mutex.h param.h pmap.h pte.h vmparam.h src/sys/arch/riscv/riscv: core_machdep.c genassym.cf locore.S pmap_machdep.c src/sys/uvm/pmap: pmap.h Added Files: src/sys/arch/riscv/compile: Makefile Log Message: Misc changes in RISC-V. Start changing the memory layout, too. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/riscv/atomic/Makefile.inc cvs rdiff -u -r0 -r1.1 src/sys/arch/riscv/compile/Makefile cvs rdiff -u -r1.9 -r1.10 src/sys/arch/riscv/conf/GENERIC cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/conf/Makefile.riscv cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/conf/files.riscv cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/include/cpu.h \ src/sys/arch/riscv/include/vmparam.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/riscv/include/elf_machdep.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/include/mutex.h \ src/sys/arch/riscv/include/pmap.h src/sys/arch/riscv/include/pte.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/include/param.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/riscv/core_machdep.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/riscv/genassym.cf cvs rdiff -u -r1.7 -r1.8 src/sys/arch/riscv/riscv/locore.S cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/pmap_machdep.c cvs rdiff -u -r1.11 -r1.12 src/sys/uvm/pmap/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/riscv/atomic/Makefile.inc diff -u src/common/lib/libc/arch/riscv/atomic/Makefile.inc:1.3 src/common/lib/libc/arch/riscv/atomic/Makefile.inc:1.4 --- src/common/lib/libc/arch/riscv/atomic/Makefile.inc:1.3 Wed Apr 17 07:40:34 2019 +++ src/common/lib/libc/arch/riscv/atomic/Makefile.inc Sat Jun 1 12:42:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2019/04/17 07:40:34 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.4 2019/06/01 12:42:27 maxv Exp $ .for op in add and cas nand or sub swap xor sizes=32 @@ -27,7 +27,7 @@ SRCS.atomic+= atomic_init_cas.c \ .endif #LIB -.if ${LIB} == "c" +.if defined(LIB) && ${LIB} == "c" SRCS.atomic+= atomic_and_16_nv_cas.c atomic_and_8_nv_cas.c .endif Index: src/sys/arch/riscv/conf/GENERIC diff -u src/sys/arch/riscv/conf/GENERIC:1.9 src/sys/arch/riscv/conf/GENERIC:1.10 --- src/sys/arch/riscv/conf/GENERIC:1.9 Wed Aug 1 20:04:13 2018 +++ src/sys/arch/riscv/conf/GENERIC Sat Jun 1 12:42:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.9 2018/08/01 20:04:13 maxv Exp $ +# $NetBSD: GENERIC,v 1.10 2019/06/01 12:42:27 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/riscv/conf/std.riscv64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.9 $" +#ident "GENERIC-$Revision: 1.10 $" maxusers 64 # estimated number of users @@ -74,9 +74,7 @@ options DDB_HISTORY_SIZE=512 # enable h include "conf/compat_netbsd70.config" options COMPAT_OSSAUDIO -options COMPAT_NETBSD32 -#options COMPAT_LINUX -#options COMPAT_LINUX32 # req. COMPAT_LINUX and COMPAT_NETBSD32 +#options COMPAT_NETBSD32 #options EXEC_ELF32 # Wedge support Index: src/sys/arch/riscv/conf/Makefile.riscv diff -u src/sys/arch/riscv/conf/Makefile.riscv:1.3 src/sys/arch/riscv/conf/Makefile.riscv:1.4 --- src/sys/arch/riscv/conf/Makefile.riscv:1.3 Sat Sep 22 12:24:03 2018 +++ src/sys/arch/riscv/conf/Makefile.riscv Sat Jun 1 12:42:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.riscv,v 1.3 2018/09/22 12:24:03 rin Exp $ +# $NetBSD: Makefile.riscv,v 1.4 2019/06/01 12:42:27 maxv Exp $ # Makefile for NetBSD # @@ -39,7 +39,6 @@ GENASSYM_CONF= ${RISCV}/riscv/genassym.c ## CPPFLAGS+= -D${MACHINE} CFLAGS+= -mcmodel=medany -CFLAGS+= -msoft-float .if !defined(LP64) || ${LP64} == "no" CFLAGS+= -m32 AFLAGS+= -m32 @@ -70,7 +69,7 @@ locore.o: ${RISCV}/riscv/locore.S assym. ## (5) link settings ## .if ${MACHINE_ARCH} == "riscv64" && ${LP64:Uyes} == "yes" -TEXTADDR?= 0x80002000 +TEXTADDR?= 0xFFC0 .else TEXTADDR?= 0xC0001000 .endif Index: src/sys/arch/riscv/conf/files.riscv diff -u src/sys/arch/riscv/conf/files.riscv:1.1 src/sys/arch/riscv/conf/files.riscv:1.2 --- src/sys/arch/riscv/conf/files.riscv:1.1 Sat Mar 28 16:13:56 2015 +++ src/sys/arch/riscv/conf/files.riscv Sat Jun 1 12:42:27 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.riscv,v 1.1 2015/03/28 16:13:56 matt Exp $ +# $NetBSD: files.riscv,v 1.2 2019/06/01 12:42:27 maxv Exp $ # maxpartitions 16 @@ -41,7 +41,7 @@ file dev/md_root.cmemory_disk_hooks file kern/subr_disk_mbr.c disk file uvm/pmap/pmap.c -file uvm/pmap/pmap_pv.c +file uvm/pmap/pmap_pvt.c file uvm/pma
Re: CVS commit: src
> On 1. Jun 2019, at 13:44, Robert Elz wrote: > >Date:Sat, 1 Jun 2019 10:34:41 +0200 >From:"J. Hannken-Illjes" >Message-ID: > > | This looks wrong -- you should have added an weak alias to > | sys/rump/librump/rumpkern/emul.c to handle the case where > | librumpvfs is not present. > > I have no idea how that could have fixed things - if librump > wants to call a function that exists in librumpvfs then librumpvfs > needs to be there doesn't it?Perhaps none of the current > functions need that, because they're probably not going to > exercise the new code, but they could. > > Still, if you have a better way that will actually fix things, by > all means, do it. Problem is sys/kern/kern_proc.c gets loaded into librump while getcwd_common is in librumpvfs. For the librump-only case we have to supply stubs to librumpvfs functions. The attached diff should do the job -- unfortunately my build and test machine is not working aqt the moment. -- J. Hannken-Illjes - hann...@eis.cs.tu-bs.de - TU Braunschweig emul.c.diff Description: Binary data signature.asc Description: Message signed with OpenPGP
Re: CVS commit: src
Date:Sat, 1 Jun 2019 10:34:41 +0200 From:"J. Hannken-Illjes" Message-ID: | This looks wrong -- you should have added an weak alias to | sys/rump/librump/rumpkern/emul.c to handle the case where | librumpvfs is not present. I have no idea how that could have fixed things - if librump wants to call a function that exists in librumpvfs then librumpvfs needs to be there doesn't it?Perhaps none of the current functions need that, because they're probably not going to exercise the new code, but they could. Still, if you have a better way that will actually fix things, by all means, do it. kre
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: mrg Date: Sat Jun 1 10:58:12 UTC 2019 Modified Files: src/external/public-domain/sqlite/lib: Makefile Log Message: remove no longer required ppc64 hack. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/sqlite/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/public-domain/sqlite/lib
Module Name:src Committed By: mrg Date: Sat Jun 1 10:58:12 UTC 2019 Modified Files: src/external/public-domain/sqlite/lib: Makefile Log Message: remove no longer required ppc64 hack. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/public-domain/sqlite/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/sqlite/lib/Makefile diff -u src/external/public-domain/sqlite/lib/Makefile:1.8 src/external/public-domain/sqlite/lib/Makefile:1.9 --- src/external/public-domain/sqlite/lib/Makefile:1.8 Tue Oct 4 14:25:02 2016 +++ src/external/public-domain/sqlite/lib/Makefile Sat Jun 1 10:58:12 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2016/10/04 14:25:02 christos Exp $ +# $NetBSD: Makefile,v 1.9 2019/06/01 10:58:12 mrg Exp $ LIB= sqlite3 INCS= sqlite3.h sqlite3ext.h @@ -22,11 +22,6 @@ CLEANFILES+=sqlite3.pc CWARNFLAGS+= -Wa,--warn .endif -.if ${MACHINE_ARCH} == "powerpc64" -# call to `' lacks nop, can't restore toc; recompile with -fPIC -COPTS.sqlite3.c += -O0 -.endif - .include all: sqlite3.pc
Re: CVS commit: src
> On 1. Jun 2019, at 08:59, Robert Elz wrote: > > Module Name: src > Committed By: kre > Date: Sat Jun 1 06:59:18 UTC 2019 > > Modified Files: > src/tests/dev/usb/t_hid: Makefile > src/tests/lib/semaphore/pthread: Makefile > src/tests/net/bpfjit: Makefile > src/tests/net/icmp: Makefile > src/tests/net/if: Makefile > src/tests/net/if_loop: Makefile > src/tests/rump/rumpkern/h_server: Makefile > src/usr.bin/rump_server: Makefile > > Log Message: > Deal with fallout from the addition of > KERN_PROC_CWD in sysctl(3) > That is kern.proc.$$.KERN_PROC_CWD (I think - not that it matters here) > > The effect is that -lrump now requires -lrumpvfs > > This set of changes fixes (I believe) regular dynamic builds, > more might be required for static builds (will be verified soon). > > > To generate a diff of this commit: > cvs rdiff -u -r1.2 -r1.3 src/tests/dev/usb/t_hid/Makefile > cvs rdiff -u -r1.4 -r1.5 src/tests/lib/semaphore/pthread/Makefile > cvs rdiff -u -r1.7 -r1.8 src/tests/net/bpfjit/Makefile > cvs rdiff -u -r1.10 -r1.11 src/tests/net/icmp/Makefile > cvs rdiff -u -r1.8 -r1.9 src/tests/net/if/Makefile > cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_loop/Makefile > cvs rdiff -u -r1.5 -r1.6 src/tests/rump/rumpkern/h_server/Makefile > cvs rdiff -u -r1.12 -r1.13 src/usr.bin/rump_server/Makefile > > Please note that diffs are not public domain; they are subject to the > copyright notices on the relevant files. This looks wrong -- you should have added an weak alias to sys/rump/librump/rumpkern/emul.c to handle the case where librumpvfs is not present. Please revert and fix correctly. -- J. Hannken-Illjes - hann...@eis.cs.tu-bs.de - TU Braunschweig signature.asc Description: Message signed with OpenPGP
CVS commit: src/external/lgpl3/mpfr/lib/libmpfr
Module Name:src Committed By: mrg Date: Sat Jun 1 08:29:16 UTC 2019 Modified Files: src/external/lgpl3/mpfr/lib/libmpfr: Makefile Log Message: remove obsolete comments. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/lgpl3/mpfr/lib/libmpfr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.18 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.19 --- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.18 Tue Sep 4 05:16:25 2018 +++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Sat Jun 1 08:29:16 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2018/09/04 05:16:25 mrg Exp $ +# $NetBSD: Makefile,v 1.19 2019/06/01 08:29:16 mrg Exp $ .include @@ -282,12 +282,6 @@ CPPFLAGS+= -I. \ CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH} CPPFLAGS+= -I${.CURDIR}/../../dist/src -# XXX -# XXX XXX check mips* -# XXX XXX do something more, more ports!! -# XXX -# XXX missing: arm* sparc sh3* m68k/m68000 (powerpc64/ia64) - # IEEE FP support. No VAX here. .if ${MACHINE_ARCH} == "x86_64" || \ ${MACHINE_ARCH} == "i386"
CVS commit: src/external/lgpl3/mpfr/lib/libmpfr
Module Name:src Committed By: mrg Date: Sat Jun 1 08:29:16 UTC 2019 Modified Files: src/external/lgpl3/mpfr/lib/libmpfr: Makefile Log Message: remove obsolete comments. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/lgpl3/mpfr/lib/libmpfr/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdolecek Date: Sat Jun 1 08:20:14 UTC 2019 Modified Files: src/sys/dev/pci: viaide.c Log Message: match VIA Technologies VX800, VX855, and VT8237S in RAID mode patch provided and testing done by Andrius Varanavicius via PR kern/43309 To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/dev/pci/viaide.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/viaide.c diff -u src/sys/dev/pci/viaide.c:1.87 src/sys/dev/pci/viaide.c:1.88 --- src/sys/dev/pci/viaide.c:1.87 Sun Dec 9 11:14:02 2018 +++ src/sys/dev/pci/viaide.c Sat Jun 1 08:20:14 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: viaide.c,v 1.87 2018/12/09 11:14:02 jdolecek Exp $ */ +/* $NetBSD: viaide.c,v 1.88 2019/06/01 08:20:14 jdolecek Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.87 2018/12/09 11:14:02 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.88 2019/06/01 08:20:14 jdolecek Exp $"); #include #include @@ -309,6 +309,16 @@ static const struct pciide_product_desc NULL, via_chip_map, }, + { PCI_PRODUCT_VIATECH_VX800, + 0, + "VIA Technologies VX800 SATA Controller", + via_sata_chip_map_new, + }, + { PCI_PRODUCT_VIATECH_VX855, + 0, + NULL, + via_sata_chip_map_new, + }, { PCI_PRODUCT_VIATECH_VX900_IDE, 0, NULL, @@ -349,6 +359,11 @@ static const struct pciide_product_desc "VIA Technologies VT8237S SATA Controller", via_sata_chip_map_7, }, + { PCI_PRODUCT_VIATECH_VT8237S_SATA_RAID, + 0, + "VIA Technologies VT8237S SATA Controller (RAID mode)", + via_sata_chip_map_7, + }, { 0, 0, NULL, @@ -546,6 +561,14 @@ via_chip_map(struct pciide_softc *sc, co aprint_normal("VT8251 ATA133 controller\n"); sc->sc_wdcdev.sc_atac.atac_udma_cap = 6; break; + case PCI_PRODUCT_VIATECH_VX800: +aprint_normal("VT800 ATA133 controller\n"); +sc->sc_wdcdev.sc_atac.atac_udma_cap = 6; +break; + case PCI_PRODUCT_VIATECH_VX855: +aprint_normal("VT855 ATA133 controller\n"); +sc->sc_wdcdev.sc_atac.atac_udma_cap = 6; +break; default: unknown: aprint_normal("unknown VIA ATA controller\n");
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdolecek Date: Sat Jun 1 08:20:14 UTC 2019 Modified Files: src/sys/dev/pci: viaide.c Log Message: match VIA Technologies VX800, VX855, and VT8237S in RAID mode patch provided and testing done by Andrius Varanavicius via PR kern/43309 To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/dev/pci/viaide.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/pci
Module Name:src Committed By: jdolecek Date: Sat Jun 1 08:15:05 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1361 -r1.1362 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1360 -r1.1361 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.1361 src/sys/dev/pci/pcidevs.h:1.1362 --- src/sys/dev/pci/pcidevs.h:1.1361 Thu May 30 16:04:28 2019 +++ src/sys/dev/pci/pcidevs.h Sat Jun 1 08:15:05 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.1361 2019/05/30 16:04:28 mlelstv Exp $ */ +/* $NetBSD: pcidevs.h,v 1.1362 2019/06/01 08:15:05 jdolecek Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1373 2019/05/30 16:04:04 mlelstv Exp + * NetBSD: pcidevs,v 1.1374 2019/06/01 08:13:31 jdolecek Exp */ /* @@ -7699,7 +7699,6 @@ #define PCI_PRODUCT_VIATECH_VT3351_IOAPIC 0x5351 /* VT3351 I/O APIC Interrupt Controller */ #define PCI_PRODUCT_VIATECH_P4M900_IOAPIC 0x5364 /* CN896/P4M900 IOAPIC */ #define PCI_PRODUCT_VIATECH_VT8237S_SATA 0x5372 /* VT8237S Integrated SATA Controller */ -#define PCI_PRODUCT_VIATECH_VT8237S_SATA_2 0x7372 /* VT8237S Integrated SATA Controller */ #define PCI_PRODUCT_VIATECH_VT86C100A 0x6100 /* VT86C100A (Rhine-II) 10/100 Ethernet */ #define PCI_PRODUCT_VIATECH_VT8251_SATA 0x6287 /* VT8251 Integrated SATA Controller */ #define PCI_PRODUCT_VIATECH_P4M900_6 0x6364 /* CN896/P4M900 Security Device */ @@ -7707,6 +7706,7 @@ #define PCI_PRODUCT_VIATECH_KT880_5 0x7269 /* KT880 CPU to PCI Bridge */ #define PCI_PRODUCT_VIATECH_VT3351_HB_7351 0x7351 /* VT3351 Host Bridge */ #define PCI_PRODUCT_VIATECH_P4M900_7 0x7364 /* CN896/P4M900 Host Bridge */ +#define PCI_PRODUCT_VIATECH_VT8237S_SATA_RAID 0x7372 /* VT8237S Integrated SATA Controller (RAID mode) */ #define PCI_PRODUCT_VIATECH_VT8231 0x8231 /* VT8231 PCI-ISA Bridge */ #define PCI_PRODUCT_VIATECH_VT8231_PWR 0x8235 /* VT8231 Power Management Controller */ #define PCI_PRODUCT_VIATECH_VT8363_PPB 0x8305 /* VT8363 (Apollo KT133) PCI to AGP Bridge */ Index: src/sys/dev/pci/pcidevs_data.h diff -u src/sys/dev/pci/pcidevs_data.h:1.1360 src/sys/dev/pci/pcidevs_data.h:1.1361 --- src/sys/dev/pci/pcidevs_data.h:1.1360 Thu May 30 16:04:28 2019 +++ src/sys/dev/pci/pcidevs_data.h Sat Jun 1 08:15:04 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs_data.h,v 1.1360 2019/05/30 16:04:28 mlelstv Exp $ */ +/* $NetBSD: pcidevs_data.h,v 1.1361 2019/06/01 08:15:04 jdolecek Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1373 2019/05/30 16:04:04 mlelstv Exp + * NetBSD: pcidevs,v 1.1374 2019/06/01 08:13:31 jdolecek Exp */ /* @@ -13521,8 +13521,6 @@ static const uint16_t pci_products[] = { 35741, 8536, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237S_SATA, 36368, 692, 8584, 6384, 0, - PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237S_SATA_2, - 36368, 692, 8584, 6384, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT86C100A, 36402, 36412, 5748, 5646, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8251_SATA, @@ -13537,6 +13535,8 @@ static const uint16_t pci_products[] = { 35734, 6882, 6492, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_P4M900_7, 35741, 6882, 6492, 0, + PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8237S_SATA_RAID, + 36368, 692, 8584, 6384, 14415, 9785, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8231, 36423, 6766, 6492, 0, PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8231_PWR, @@ -15221,7 +15221,7 @@ static const char pci_words[] = { "." "OHCI4\0" /* 1 refs @ 9762 */ "SB700-SB900\0" /* 14 refs @ 9768 */ "(IDE\0" /* 6 refs @ 9780 */ - "mode)\0" /* 13 refs @ 9785 */ + "mode)\0" /* 14 refs @ 9785 */ "(AHCI\0" /* 4 refs @ 9791 */ "RAID5\0" /* 1 refs @ 9797 */ "(Storage\0" /* 1 refs @ 9803 */ @@ -15897,7 +15897,7 @@ static const char pci_words[] = { "." "Parallel\0" /* 14 refs @ 14398 */ "Bus\0" /* 4 refs @ 14407 */ "RAD\0" /* 1 refs @ 14411 */ - "(RAID\0" /* 7 refs @ 14415 */ + "(RAID\0" /* 8 refs @ 14415 */ "acceleration\0" /* 1 refs @ 14421 */ "engine)\0" /* 1 refs @ 14434 */ "ZIP\0" /* 1 refs @ 14442 */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdolecek Date: Sat Jun 1 08:15:05 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.1361 -r1.1362 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1360 -r1.1361 src/sys/dev/pci/pcidevs_data.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/pci
Module Name:src Committed By: jdolecek Date: Sat Jun 1 08:13:31 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: rename VT8237S_SATA_2 to VT8237S_SATA_RAID and update description to have different one to VT8237S_SATA part of PR kern/43309 To generate a diff of this commit: cvs rdiff -u -r1.1373 -r1.1374 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jdolecek Date: Sat Jun 1 08:13:31 UTC 2019 Modified Files: src/sys/dev/pci: pcidevs Log Message: rename VT8237S_SATA_2 to VT8237S_SATA_RAID and update description to have different one to VT8237S_SATA part of PR kern/43309 To generate a diff of this commit: cvs rdiff -u -r1.1373 -r1.1374 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1373 src/sys/dev/pci/pcidevs:1.1374 --- src/sys/dev/pci/pcidevs:1.1373 Thu May 30 16:04:04 2019 +++ src/sys/dev/pci/pcidevs Sat Jun 1 08:13:31 2019 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1373 2019/05/30 16:04:04 mlelstv Exp $ +$NetBSD: pcidevs,v 1.1374 2019/06/01 08:13:31 jdolecek Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -7692,7 +7692,6 @@ product VIATECH VT8237A_SATA_2 0x5337 VT product VIATECH VT3351_IOAPIC 0x5351 VT3351 I/O APIC Interrupt Controller product VIATECH P4M900_IOAPIC 0x5364 CN896/P4M900 IOAPIC product VIATECH VT8237S_SATA 0x5372 VT8237S Integrated SATA Controller -product VIATECH VT8237S_SATA_2 0x7372 VT8237S Integrated SATA Controller product VIATECH VT86C100A 0x6100 VT86C100A (Rhine-II) 10/100 Ethernet product VIATECH VT8251_SATA 0x6287 VT8251 Integrated SATA Controller product VIATECH P4M900_6 0x6364 CN896/P4M900 Security Device @@ -7700,10 +7699,11 @@ product VIATECH VT8378_IG 0x7205 VT8378 product VIATECH KT880_5 0x7269 KT880 CPU to PCI Bridge product VIATECH VT3351_HB_7351 0x7351 VT3351 Host Bridge product VIATECH P4M900_7 0x7364 CN896/P4M900 Host Bridge +product VIATECH VT8237S_SATA_RAID 0x7372 VT8237S Integrated SATA Controller (RAID mode) product VIATECH VT8231 0x8231 VT8231 PCI-ISA Bridge product VIATECH VT8231_PWR 0x8235 VT8231 Power Management Controller product VIATECH VT8363_PPB 0x8305 VT8363 (Apollo KT133) PCI to AGP Bridge -product VIATECH VX855 0x8409 VX855 PCI-LPC Bridge +product VIATECH VX855 0x8409 VX855 PCI-LPC Bridge product VIATECH CX700 0x8324 CX700 PCI-LPC Bridge product VIATECH VX800 0x8353 VX800/VX820 PCI-LPC Bridge product VIATECH VT8371_PPB 0x8391 VT8371 (Apollo KX133) PCI-PCI Bridge
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: maxv Date: Sat Jun 1 08:12:26 UTC 2019 Modified Files: src/sys/arch/x86/x86: pmap.c Log Message: Fix two bugs in pmap_write_protect(): * The mask should be ~PAGE_MASK, not PTE_FRAME. PTE_FRAME eliminates the higher bits, and that's not wanted. * The computation of tva is incorrect: if the VA is in kernel space we must take the canonical hole into account, and here we were not. We've had these bugs basically forever. It meant that uvm_km_protect() would never flush the correct VA, and a stale TLB entry would persist. Fixes PR/54257. Since I added PCID support we execute invpcid in invlpg(), and invpcid triggers a #GP if the address is non canonical, contrary to invlpg. The wrong computation of the VA during a modload happened to hit the canonical hole. To generate a diff of this commit: cvs rdiff -u -r1.333 -r1.334 src/sys/arch/x86/x86/pmap.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/x86/x86
Module Name:src Committed By: maxv Date: Sat Jun 1 08:12:26 UTC 2019 Modified Files: src/sys/arch/x86/x86: pmap.c Log Message: Fix two bugs in pmap_write_protect(): * The mask should be ~PAGE_MASK, not PTE_FRAME. PTE_FRAME eliminates the higher bits, and that's not wanted. * The computation of tva is incorrect: if the VA is in kernel space we must take the canonical hole into account, and here we were not. We've had these bugs basically forever. It meant that uvm_km_protect() would never flush the correct VA, and a stale TLB entry would persist. Fixes PR/54257. Since I added PCID support we execute invpcid in invlpg(), and invpcid triggers a #GP if the address is non canonical, contrary to invlpg. The wrong computation of the VA during a modload happened to hit the canonical hole. To generate a diff of this commit: cvs rdiff -u -r1.333 -r1.334 src/sys/arch/x86/x86/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.333 src/sys/arch/x86/x86/pmap.c:1.334 --- src/sys/arch/x86/x86/pmap.c:1.333 Mon May 27 18:36:37 2019 +++ src/sys/arch/x86/x86/pmap.c Sat Jun 1 08:12:26 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.333 2019/05/27 18:36:37 maxv Exp $ */ +/* $NetBSD: pmap.c,v 1.334 2019/06/01 08:12:26 maxv Exp $ */ /* * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc. @@ -130,7 +130,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.333 2019/05/27 18:36:37 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334 2019/06/01 08:12:26 maxv Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h" @@ -4017,7 +4017,7 @@ pmap_write_protect(struct pmap *pmap, va pt_entry_t * const *pdes; struct pmap *pmap2; vaddr_t blockend, va; - int lvl; + int lvl, i; KASSERT(curlwp->l_md.md_gc_pmap != pmap); @@ -4034,8 +4034,8 @@ pmap_write_protect(struct pmap *pmap, va if (!(prot & VM_PROT_EXECUTE)) bit_put = pmap_pg_nx; - sva &= PTE_FRAME; - eva &= PTE_FRAME; + sva &= ~PAGE_MASK; + eva &= ~PAGE_MASK; /* Acquire pmap. */ kpreempt_disable(); @@ -4058,7 +4058,7 @@ pmap_write_protect(struct pmap *pmap, va spte = &ptes[pl1_i(va)]; epte = &ptes[pl1_i(blockend)]; - for (/* */; spte < epte; spte++) { + for (i = 0; spte < epte; spte++, i++) { pt_entry_t opte, npte; do { @@ -4070,7 +4070,7 @@ pmap_write_protect(struct pmap *pmap, va } while (pmap_pte_cas(spte, opte, npte) != opte); if ((opte & PTE_D) != 0) { -vaddr_t tva = x86_ptob(spte - ptes); +vaddr_t tva = va + x86_ptob(i); pmap_tlb_shootdown(pmap, tva, opte, TLBSHOOT_WRITE_PROTECT); }
CVS commit: xsrc/external/mit/xdm/dist/greeter
Module Name:xsrc Committed By: mlelstv Date: Sat Jun 1 07:54:12 UTC 2019 Modified Files: xsrc/external/mit/xdm/dist/greeter: Login.c Log Message: fix geometry calculations so that entered text doesn't clobber the input field borders. scroll non-empty input when cursor deletes first position so that one character stays visible. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xdm/dist/greeter/Login.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/xdm/dist/greeter
Module Name:xsrc Committed By: mlelstv Date: Sat Jun 1 07:54:12 UTC 2019 Modified Files: xsrc/external/mit/xdm/dist/greeter: Login.c Log Message: fix geometry calculations so that entered text doesn't clobber the input field borders. scroll non-empty input when cursor deletes first position so that one character stays visible. To generate a diff of this commit: cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/external/mit/xdm/dist/greeter/Login.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xdm/dist/greeter/Login.c diff -u xsrc/external/mit/xdm/dist/greeter/Login.c:1.1.1.5 xsrc/external/mit/xdm/dist/greeter/Login.c:1.2 --- xsrc/external/mit/xdm/dist/greeter/Login.c:1.1.1.5 Tue Mar 5 08:26:49 2019 +++ xsrc/external/mit/xdm/dist/greeter/Login.c Sat Jun 1 07:54:12 2019 @@ -244,8 +244,8 @@ static XtResource resources[] = { #define TEXT_X_INC(w) F_MAX_WIDTH(text) #define TEXT_Y_INC(w) (F_ASCENT(text) + F_DESCENT(text)) -#define PROMPT_X_INC(w) F_MAX_WIDTH(prompt) -#define PROMPT_Y_INC(w) (F_ASCENT(prompt) + F_DESCENT(prompt)) +#define PROMPT_X_INC(w) F_MAX_WIDTH(prompt) +#define PROMPT_Y_INC(w) (F_ASCENT(prompt) + F_DESCENT(prompt)) #define GREET_X_INC(w) F_MAX_WIDTH(greet) #define GREET_Y_INC(w) (F_ASCENT(greet) + F_DESCENT(greet)) @@ -253,8 +253,11 @@ static XtResource resources[] = { #define FAIL_X_INC(w) F_MAX_WIDTH(fail) #define FAIL_Y_INC(w) (F_ASCENT(fail) + F_DESCENT(fail)) -#define Y_INC(w) max (TEXT_Y_INC(w), PROMPT_Y_INC(w)) +#define Y_ASCENT(w) max (F_ASCENT(prompt), F_ASCENT(text)) +#define Y_DESCENT(w) max (F_DESCENT(prompt), F_DESCENT(text)) +#define Y_INC(w) (Y_ASCENT(w) + Y_DESCENT(w)) +#define CURSOR_W 5 #define PROMPT_TEXT(w,n) ((w)->login.prompts[n].promptText) #define DEF_PROMPT_TEXT(w,n) ((w)->login.prompts[n].defaultPrompt) @@ -272,13 +275,12 @@ static XtResource resources[] = { #ifdef USE_XFT -# define TEXT_COLOR(f) (w->login.f##color.pixel) - -# define TEXT_WIDTH(f, m, l) XmuXftTextWidth(XtDisplay (w), \ - w->login.f##Face, (FcChar8 *) m, l) static int XmuXftTextWidth(Display *dpy, XftFont *font, FcChar8 *string, int len); +# define TEXT_COLOR(f) (w->login.f##color.pixel) +# define TEXT_WIDTH(f, m, l) XmuXftTextWidth(XtDisplay (w), \ +w->login.f##Face, (FcChar8 *) m, l) # define DRAW_STRING(f, x, y, m, l) \ /* Debug("DRAW_STRING(%s, %d, %d, %s, %d)\n", #f, x, y, m, l); */ \ XftDrawString8 (w->login.draw, &w->login.f##color, w->login.f##Face, \ @@ -287,9 +289,7 @@ XmuXftTextWidth(Display *dpy, XftFont *f #else # define TEXT_COLOR(f) (w->login.f##pixel) - # define TEXT_WIDTH(f, m, l) (XTextWidth (w->login.f##Font, m, l)) - # define DRAW_STRING(f, x, y, m, l) \ XDrawString (XtDisplay (w), XtWindow (w), w->login.f##GC, x, y, m, l) @@ -300,18 +300,19 @@ XmuXftTextWidth(Display *dpy, XftFont *f /* Padded width of logo image, if compiled with XPM support */ #ifdef XPM -# define LOGO_W(w) ((w)->login.logoWidth + ((w)->login.logoPadding * 2)) +# define LOGO_PAD(w) ((w)->login.logoPadding) +# define LOGO_W(w) ((w)->login.logoWidth + (LOGO_PAD(w) * 2)) #else +# define LOGO_PAD(w) 0 # define LOGO_W(w) 0 #endif #define TEXT_PROMPT_W(w, m) (STRING_WIDTH(prompt, m) + w->login.inframeswidth) -#define DEF_PROMPT_W(w,n) TEXT_PROMPT_W(w, w->login.prompts[n].defaultPrompt) -#define CUR_PROMPT_W(w,n) (max(MAX_DEF_PROMPT_W(w), PROMPT_TEXT(w,n) ? \ - TEXT_PROMPT_W(w, PROMPT_TEXT(w,n)) : 0)) - -#define MAX_DEF_PROMPT_W(w) (max(DEF_PROMPT_W(w,0), DEF_PROMPT_W(w,1))) +#define DEF_PROMPT_W(w,n) TEXT_PROMPT_W(w, w->login.prompts[n].defaultPrompt) +#define MAX_DEF_PROMPT_W(w) (max(DEF_PROMPT_W(w,0), DEF_PROMPT_W(w,1))) +#define CUR_PROMPT_W(w,n) (max(MAX_DEF_PROMPT_W(w), PROMPT_TEXT(w,n) ? \ + TEXT_PROMPT_W(w, PROMPT_TEXT(w,n)) : 0)) #define GREETING(w) ((w)->login.secure_session && !(w)->login.allow_access ?\ (w)->login.greeting : (w)->login.unsecure_greet) @@ -319,32 +320,32 @@ XmuXftTextWidth(Display *dpy, XftFont *f STRING_WIDTH (greet, GREETING(w))) / 2)) #define GREET_Y(w) (GREETING(w)[0] ? 2 * GREET_Y_INC (w) : 0) #define GREET_W(w) (max (STRING_WIDTH (greet, w->login.greeting), \ - STRING_WIDTH (greet, w->login.unsecure_greet)) \ - + LOGO_W(w)) + STRING_WIDTH (greet, w->login.unsecure_greet))) + +#define SEP_X(w) ((w)->login.outframewidth + LOGO_PAD(w)) +#define SEP_Y(w) (GREET_Y(w) + GREET_Y_INC(w)) +#define SEP_W(w) ((w)->core.width - 2*(w->login.outframewidth) - LOGO_W(w) - LOGO_PAD(w)) +#define SEP_H(w) ((w)->login.inframeswidth * 2) #define PROMPT_X(w) (2 * PROMPT_X_INC(w)) -#define PROMPT_Y(w,n) ((GREET_Y(w) + GREET_Y_INC(w) +\ - F_ASCENT(greet) + Y_INC(w)) + \ - (n * PROMPT_SPACE_Y(w))) -#define PROMPT_W(w) (w->core.width - (2 * TEXT_X_INC(w))) -#define PROMPT_H(w) (5 * Y_INC(w) / 4) +#define PROMPT_Y(w,n) ((SEP_Y(w) + ((n
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sat Jun 1 07:55:31 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: md.amd64 md.i386 src/distrib/sets/lists/xserver: md.amd64 md.i386 Log Message: radeon_drv major was bumped. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/xserver/md.i386 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/xdebug/md.amd64 diff -u src/distrib/sets/lists/xdebug/md.amd64:1.46 src/distrib/sets/lists/xdebug/md.amd64:1.47 --- src/distrib/sets/lists/xdebug/md.amd64:1.46 Tue Apr 16 21:20:51 2019 +++ src/distrib/sets/lists/xdebug/md.amd64 Sat Jun 1 07:55:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.46 2019/04/16 21:20:51 mrg Exp $ +# $NetBSD: md.amd64,v 1.47 2019/06/01 07:55:31 mrg Exp $ ./usr/X11R7/lib/libI810XvMC_g.a-unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file ./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file @@ -155,7 +155,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug -unknown- xorg,debug,obsolete -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.18.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.19.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xdebug/md.i386 diff -u src/distrib/sets/lists/xdebug/md.i386:1.41 src/distrib/sets/lists/xdebug/md.i386:1.42 --- src/distrib/sets/lists/xdebug/md.i386:1.41 Sun Mar 10 11:18:02 2019 +++ src/distrib/sets/lists/xdebug/md.i386 Sat Jun 1 07:55:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.41 2019/03/10 11:18:02 mrg Exp $ +# $NetBSD: md.i386,v 1.42 2019/06/01 07:55:31 mrg Exp $ ./usr/X11R7/lib/libI810XvMC_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg @@ -168,7 +168,7 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.18.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.19.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug,obsolete ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug Index: src/distrib/sets/lists/xserver/md.amd64 diff -u src/distrib/sets/lists/xserver/md.amd64:1.107 src/distrib/sets/lists/xserver/md.amd64:1.108 --- src/distrib/sets/lists/xserver/md.amd64:1.107 Mon May 13 08:38:45 2019 +++ src/distrib/sets/lists/xserver/md.amd64 Sat Jun 1 07:55:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.107 2019/05/13 08:38:45 uki Exp $ +# $NetBSD: md.amd64,v 1.108 2019/06/01 07:55:31 mrg Exp $ ./usr/X11R7/bin/X -unknown- xorg ./usr/X11R7/bin/Xorg -unknown- xorg ./usr/X11R7/bin/cvt -unknown- xorg @@ -126,7 +126,7 @@ ./usr/X11R7/lib/modules/drivers/r128_drv.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/r128_drv.so.6 -unknown- xorg ./usr/X11R7/lib/modules/drivers/radeon_drv.so -unknown- xorg -./usr/X11R7/lib/modules/drivers/radeon_drv.so.18 -unknown- xorg +./usr/X11R7/lib/modules/drivers/radeon_drv.so.19 -unknown- xorg ./usr/X11R7/lib/modules/drivers/radeon_drv_old.so -unknown- xorg ./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg ./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown- xorg,obsolete Index: src/distrib/sets/lists/xserver/md.i386 diff -u src/distrib/sets/lists/xserver/md.i386:1.124 src/distrib/sets/lists/xserver/md.i386:1.125 --- src/distrib/sets/lists/xserver/md.i386:1.124 Mon May 13 08:38:45 2019 +++ src/distrib/sets/lists/xserver/md.i386 Sat Jun 1 07:55:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.124 2019/05/13 08:38:45 uki Exp $ +# $NetBSD: md.i386,v 1.12
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: mrg Date: Sat Jun 1 07:55:31 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: md.amd64 md.i386 src/distrib/sets/lists/xserver: md.amd64 md.i386 Log Message: radeon_drv major was bumped. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/distrib/sets/lists/xdebug/md.amd64 cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/xserver/md.amd64 cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/lists/xserver/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/MesaLib/dist/src
Module Name:xsrc Committed By: mrg Date: Sat Jun 1 07:53:00 UTC 2019 Modified Files: xsrc/external/mit/MesaLib/dist/src/intel/dev: gen_device_info.c xsrc/external/mit/MesaLib/dist/src/mesa/program: program_parse.tab.c program_parse.tab.h Log Message: merge mesa 18.3.6. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c \ xsrc/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.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/MesaLib/dist/src/intel/dev/gen_device_info.c diff -u xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c:1.2 xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c:1.3 --- xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c:1.2 Sun Mar 10 04:15:51 2019 +++ xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c Sat Jun 1 07:53:00 2019 @@ -777,6 +777,7 @@ static const struct gen_device_info gen_ .num_subslices = { 2, }, .num_eu_per_subslice = 6, .l3_banks = 2, + .urb.size = 192, .simulator_id = 24, }; static const struct gen_device_info gen_device_info_cfl_gt2 = { Index: xsrc/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c diff -u xsrc/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c:1.3 xsrc/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c:1.4 --- xsrc/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c:1.3 Sun Mar 10 04:15:56 2019 +++ xsrc/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c Sat Jun 1 07:53:00 2019 @@ -1,4 +1,4 @@ -/* A Bison parser, made by GNU Bison 3.1. */ +/* A Bison parser, made by GNU Bison 3.2. */ /* Bison implementation for Yacc-like parsers in C @@ -40,11 +40,14 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + /* Identify Bison output. */ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.1" +#define YYBISON_VERSION "3.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -67,8 +70,8 @@ #define yynerrs _mesa_program_nerrs -/* Copy the first part of user declarations. */ -#line 1 "./program/program_parse.y" /* yacc.c:339 */ +/* First part of user prologue. */ +#line 1 "./program/program_parse.y" /* yacc.c:338 */ /* * Copyright © 2009 Intel Corporation @@ -190,13 +193,16 @@ static struct asm_instruction *asm_instr } \ } while(0) -#line 194 "program/program_parse.tab.c" /* yacc.c:339 */ - +#line 197 "program/program_parse.tab.c" /* yacc.c:338 */ # ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# if defined __cplusplus +# if 201103L <= __cplusplus +#define YY_NULLPTR nullptr +# else +#define YY_NULLPTR 0 +# endif # else -# define YY_NULLPTR 0 +# define YY_NULLPTR ((void*)0) # endif # endif @@ -337,7 +343,7 @@ extern int _mesa_program_debug; union YYSTYPE { -#line 129 "./program/program_parse.y" /* yacc.c:355 */ +#line 129 "./program/program_parse.y" /* yacc.c:353 */ struct asm_instruction *inst; struct asm_symbol *sym; @@ -363,7 +369,7 @@ union YYSTYPE unsigned negate:1; } ext_swizzle; -#line 367 "program/program_parse.tab.c" /* yacc.c:355 */ +#line 373 "program/program_parse.tab.c" /* yacc.c:353 */ }; typedef union YYSTYPE YYSTYPE; @@ -391,8 +397,8 @@ int _mesa_program_parse (struct asm_pars #endif /* !YY__MESA_PROGRAM_PROGRAM_PROGRAM_PARSE_TAB_H_INCLUDED */ -/* Copy the second part of user declarations. */ -#line 271 "./program/program_parse.y" /* yacc.c:358 */ +/* Second part of user prologue. */ +#line 271 "./program/program_parse.y" /* yacc.c:355 */ extern int _mesa_program_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param, @@ -405,7 +411,7 @@ yylex(YYSTYPE *yylval_param, YYLTYPE *yy return _mesa_program_lexer_lex(yylval_param, yylloc_param, state->scanner); } -#line 409 "program/program_parse.tab.c" /* yacc.c:358 */ +#line 415 "program/program_parse.tab.c" /* yacc.c:355 */ #ifdef short # undef short @@ -480,15 +486,6 @@ typedef short yytype_int16; # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) #endif -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) -# endif -#endif - /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(
CVS commit: xsrc/external/mit/MesaLib/dist/src
Module Name:xsrc Committed By: mrg Date: Sat Jun 1 07:53:00 UTC 2019 Modified Files: xsrc/external/mit/MesaLib/dist/src/intel/dev: gen_device_info.c xsrc/external/mit/MesaLib/dist/src/mesa/program: program_parse.tab.c program_parse.tab.h Log Message: merge mesa 18.3.6. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/MesaLib/dist/src/intel/dev/gen_device_info.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.c \ xsrc/external/mit/MesaLib/dist/src/mesa/program/program_parse.tab.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati-kms
Module Name:xsrc Committed By: mrg Date: Sat Jun 1 07:25:41 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_bo_helper.c radeon_kms.c xsrc/external/mit/xf86-video-ati-kms/include: config.h Removed Files: xsrc/external/mit/xf86-video-ati-kms/dist: README Log Message: merge xf86-video-ati 19.0.1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xf86-video-ati-kms/dist/README cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xf86-video-ati-kms/include/config.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/xf86-video-ati-kms/dist/src/radeon_bo_helper.c diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.2 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.3 --- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c:1.2 Sun Dec 30 08:35:04 2018 +++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c Sat Jun 1 07:25:41 2019 @@ -39,6 +39,8 @@ radeon_get_gbm_format(int depth, int bit case 8: return GBM_FORMAT_R8; #endif +case 15: + return GBM_FORMAT_ARGB1555; case 16: return GBM_FORMAT_RGB565; case 32: Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.7 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.8 --- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c:1.7 Sun Dec 30 07:34:43 2018 +++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c Sat Jun 1 07:25:41 2019 @@ -202,6 +202,10 @@ static void RADEONFreeRec(ScrnInfoPtr pS if (!pScrn) return; +pEnt = xf86GetEntityInfo(pScrn->entityList[pScrn->numEntities - 1]); +pPriv = xf86GetEntityPrivate(pEnt->index, gRADEONEntityIndex); +pRADEONEnt = pPriv->ptr; + info = RADEONPTR(pScrn); if (info) { if (info->fbcon_pixmap) @@ -217,15 +221,12 @@ static void RADEONFreeRec(ScrnInfoPtr pS gbm_device_destroy(info->gbm); #endif - pEnt = info->pEnt; + pRADEONEnt->scrn[info->instance_id] = NULL; + pRADEONEnt->num_scrns--; free(pScrn->driverPrivate); pScrn->driverPrivate = NULL; -} else { - pEnt = xf86GetEntityInfo(pScrn->entityList[pScrn->numEntities - 1]); } -pPriv = xf86GetEntityPrivate(pEnt->index, gRADEONEntityIndex); -pRADEONEnt = pPriv->ptr; if (pRADEONEnt->fd > 0) { DevUnion *pPriv; RADEONEntPtr pRADEONEnt; @@ -348,13 +349,13 @@ static Bool RADEONCreateScreenResources_ RROutputChanged(rrScrPriv->primaryOutput, FALSE); rrScrPriv->layoutChanged = TRUE; } + + drmmode_uevent_init(pScrn, &info->drmmode); } if (!drmmode_set_desired_modes(pScrn, &info->drmmode, pScreen->isGPU)) return FALSE; -drmmode_uevent_init(pScrn, &info->drmmode); - if (info->r600_shadow_fb) { pixmap = pScreen->GetScreenPixmap(pScreen); @@ -525,10 +526,14 @@ radeon_scanout_flip_abort(xf86CrtcPtr cr { RADEONEntPtr pRADEONEnt = RADEONEntPriv(crtc->scrn); drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; +struct drmmode_fb *fb = event_data; drmmode_crtc->scanout_update_pending = 0; -drmmode_fb_reference(pRADEONEnt->fd, &drmmode_crtc->flip_pending, - NULL); + +if (drmmode_crtc->flip_pending == fb) { + drmmode_fb_reference(pRADEONEnt->fd, &drmmode_crtc->flip_pending, + NULL); +} } static void @@ -537,9 +542,9 @@ radeon_scanout_flip_handler(xf86CrtcPtr { RADEONEntPtr pRADEONEnt = RADEONEntPriv(crtc->scrn); drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; +struct drmmode_fb *fb = event_data; -drmmode_fb_reference(pRADEONEnt->fd, &drmmode_crtc->fb, - drmmode_crtc->flip_pending); +drmmode_fb_reference(pRADEONEnt->fd, &drmmode_crtc->fb, fb); radeon_scanout_flip_abort(crtc, event_data); } @@ -751,6 +756,7 @@ radeon_prime_scanout_update(PixmapDirtyU { ScreenPtr screen = dirty->slave_dst->drawable.pScreen; ScrnInfoPtr scrn = xf86ScreenToScrn(screen); +RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty); drmmode_crtc_private_ptr drmmode_crtc; uintptr_t drm_queue_seq; @@ -768,23 +774,45 @@ radeon_prime_scanout_update(PixmapDirtyU RADEON_DRM_QUEUE_CLIENT_DEFAULT, RADEON_DRM_QUEUE_ID_DEFAULT, NULL, radeon_prime_scanout_update_handler, - radeon_prime_scanout_update_abort); + radeon_prime_scanout_update_abort, + FALSE); if (drm_queue_seq == RADEON_DRM_QUEUE_ERROR) { xf86DrvMsg(scrn->scrnIndex, X_WARNING, "radeon_drm_queue_alloc failed for PRIME upda
CVS commit: xsrc/external/mit/xf86-video-ati-kms
Module Name:xsrc Committed By: mrg Date: Sat Jun 1 07:25:41 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-ati-kms/dist/src: radeon_bo_helper.c radeon_kms.c xsrc/external/mit/xf86-video-ati-kms/include: config.h Removed Files: xsrc/external/mit/xf86-video-ati-kms/dist: README Log Message: merge xf86-video-ati 19.0.1. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xf86-video-ati-kms/dist/README cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_kms.c cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xf86-video-ati-kms/include/config.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/xf86-video-ati-kms/dist
Module Name:xsrc Committed By: mrg Date: Sat Jun 1 07:24:18 UTC 2019 Update of /cvsroot/xsrc/external/mit/xf86-video-ati-kms/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18162 Log Message: initial import of xf86-video-ati-19.0.1 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-19-0-1 U xsrc/external/mit/xf86-video-ati-kms/dist/ChangeLog U xsrc/external/mit/xf86-video-ati-kms/dist/missing U xsrc/external/mit/xf86-video-ati-kms/dist/COPYING N xsrc/external/mit/xf86-video-ati-kms/dist/README.md U xsrc/external/mit/xf86-video-ati-kms/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/install-sh U xsrc/external/mit/xf86-video-ati-kms/dist/configure.ac U xsrc/external/mit/xf86-video-ati-kms/dist/config.h.in U xsrc/external/mit/xf86-video-ati-kms/dist/config.sub U xsrc/external/mit/xf86-video-ati-kms/dist/compile U xsrc/external/mit/xf86-video-ati-kms/dist/configure U xsrc/external/mit/xf86-video-ati-kms/dist/config.guess U xsrc/external/mit/xf86-video-ati-kms/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/depcomp U xsrc/external/mit/xf86-video-ati-kms/dist/INSTALL U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/conf/10-radeon.conf U xsrc/external/mit/xf86-video-ati-kms/dist/conf/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/conf/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/m4/libtool.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltversion.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltsugar.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltoptions.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/m4/lt~obsolete.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/man/ati.man U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/man/radeon.man U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.am C xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_chipset_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri2.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_render.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_reg.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_state.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r6xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_shared.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_sync.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipciids.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_drm_queue.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_misc.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati_pciids_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor_wrappers.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipinfo_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_device_match_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/simple_list.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipset_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.py U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_reg_auto.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri3.c U xsrc/external/mit/xf86-video-ati-kms/dist/
CVS import: xsrc/external/mit/xf86-video-ati-kms/dist
Module Name:xsrc Committed By: mrg Date: Sat Jun 1 07:24:18 UTC 2019 Update of /cvsroot/xsrc/external/mit/xf86-video-ati-kms/dist In directory ivanova.netbsd.org:/tmp/cvs-serv18162 Log Message: initial import of xf86-video-ati-19.0.1 Status: Vendor Tag: xorg Release Tags: xf86-video-ati-19-0-1 U xsrc/external/mit/xf86-video-ati-kms/dist/ChangeLog U xsrc/external/mit/xf86-video-ati-kms/dist/missing U xsrc/external/mit/xf86-video-ati-kms/dist/COPYING N xsrc/external/mit/xf86-video-ati-kms/dist/README.md U xsrc/external/mit/xf86-video-ati-kms/dist/ltmain.sh U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/install-sh U xsrc/external/mit/xf86-video-ati-kms/dist/configure.ac U xsrc/external/mit/xf86-video-ati-kms/dist/config.h.in U xsrc/external/mit/xf86-video-ati-kms/dist/config.sub U xsrc/external/mit/xf86-video-ati-kms/dist/compile U xsrc/external/mit/xf86-video-ati-kms/dist/configure U xsrc/external/mit/xf86-video-ati-kms/dist/config.guess U xsrc/external/mit/xf86-video-ati-kms/dist/aclocal.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/depcomp U xsrc/external/mit/xf86-video-ati-kms/dist/INSTALL U xsrc/external/mit/xf86-video-ati-kms/dist/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/conf/10-radeon.conf U xsrc/external/mit/xf86-video-ati-kms/dist/conf/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/conf/Makefile.am U xsrc/external/mit/xf86-video-ati-kms/dist/m4/libtool.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltversion.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltsugar.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/m4/ltoptions.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/m4/lt~obsolete.m4 U xsrc/external/mit/xf86-video-ati-kms/dist/man/ati.man U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/man/radeon.man U xsrc/external/mit/xf86-video-ati-kms/dist/man/Makefile.am C xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_bo_helper.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_chipset_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_video.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri2.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/drmmode_display.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_render.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_reg.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_state.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r6xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa_shared.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_sync.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg_r7xx.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipcirename.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/atipciids.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_drm_queue.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_exa.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_misc.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati_pciids_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/cayman_shader.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_textured_videofuncs.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor_wrappers.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/Makefile.in U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipinfo_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_pci_device_match_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/simple_list.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_chipset_gen.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.py U xsrc/external/mit/xf86-video-ati-kms/dist/src/bicubic_table.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_glamor.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/ati.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/evergreen_reg_auto.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r600_reg.h U xsrc/external/mit/xf86-video-ati-kms/dist/src/r6xx_accel.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/atimodule.c U xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon_dri3.c U xsrc/external/mit/xf86-video-ati-kms/dist/
CVS commit: src/lib/libpam/modules/pam_ssh
Module Name:src Committed By: mlelstv Date: Sat Jun 1 07:15:39 UTC 2019 Modified Files: src/lib/libpam/modules/pam_ssh: pam_ssh.c Log Message: Fix key loading logic and add log message when rejecting an unencrypted key. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/libpam/modules/pam_ssh/pam_ssh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpam/modules/pam_ssh/pam_ssh.c diff -u src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.26 src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.27 --- src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.26 Sun Aug 26 08:54:03 2018 +++ src/lib/libpam/modules/pam_ssh/pam_ssh.c Sat Jun 1 07:15:39 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pam_ssh.c,v 1.26 2018/08/26 08:54:03 christos Exp $ */ +/* $NetBSD: pam_ssh.c,v 1.27 2019/06/01 07:15:39 mlelstv Exp $ */ /*- * Copyright (c) 2003 Networks Associates Technology, Inc. @@ -38,7 +38,7 @@ #ifdef __FreeBSD__ __FBSDID("$FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40 2004/02/10 10:13:21 des Exp $"); #else -__RCSID("$NetBSD: pam_ssh.c,v 1.26 2018/08/26 08:54:03 christos Exp $"); +__RCSID("$NetBSD: pam_ssh.c,v 1.27 2019/06/01 07:15:39 mlelstv Exp $"); #endif #include @@ -119,13 +119,14 @@ pam_ssh_load_key(const char *dir, const * accept only an empty passphrase. */ r = sshkey_load_private(fn, "", &key, &comment); - if (r && !(*passphrase == '\0' && nullok)) { + if (r == 0 && !(*passphrase == '\0' && nullok)) { + openpam_log(PAM_LOG_DEBUG, "rejected unencrypted key from %s", fn); sshkey_free(key); free(comment); return (NULL); } if (r) - sshkey_load_private(fn, passphrase, &key, &comment); + r = sshkey_load_private(fn, passphrase, &key, &comment); if (r) { openpam_log(PAM_LOG_DEBUG, "failed to load key from %s", fn); if (comment != NULL)
CVS commit: src/lib/libpam/modules/pam_ssh
Module Name:src Committed By: mlelstv Date: Sat Jun 1 07:15:39 UTC 2019 Modified Files: src/lib/libpam/modules/pam_ssh: pam_ssh.c Log Message: Fix key loading logic and add log message when rejecting an unencrypted key. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/libpam/modules/pam_ssh/pam_ssh.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: Sat Jun 1 07:11:54 UTC 2019 Modified Files: xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub configure xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in in xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in Removed Files: xsrc/external/mit/xkeyboard-config/dist: intltool-extract.in intltool-merge.in intltool-update.in xsrc/external/mit/xkeyboard-config/dist/po: POTFILES.skip xsrc/external/mit/xkeyboard-config/dist/rules: base.extras.xml.in base.xml.in evdev.extras.xml.in evdev.xml.in Log Message: merge xkeyboard-config 2.27. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xkeyboard-config/dist/config.guess \ xsrc/external/mit/xkeyboard-config/dist/config.sub cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xkeyboard-config/dist/configure cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in \ xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in \ xsrc/external/mit/xkeyboard-config/dist/intltool-update.in cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xkeyboard-config/dist/po/POTFILES.skip cvs rdiff -u -r1.1.1.15 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/base.extras.xml.in \ xsrc/external/mit/xkeyboard-config/dist/rules/evdev.extras.xml.in cvs rdiff -u -r1.1.1.18 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/base.xml.in cvs rdiff -u -r1.1.1.17 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/evdev.xml.in cvs rdiff -u -r1.17 -r1.18 \ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xkeyboard-config/dist/symbols/in cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in 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: Sat Jun 1 07:11:54 UTC 2019 Modified Files: xsrc/external/mit/xkeyboard-config/dist: config.guess config.sub configure xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in in xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr: Makefile.in Removed Files: xsrc/external/mit/xkeyboard-config/dist: intltool-extract.in intltool-merge.in intltool-update.in xsrc/external/mit/xkeyboard-config/dist/po: POTFILES.skip xsrc/external/mit/xkeyboard-config/dist/rules: base.extras.xml.in base.xml.in evdev.extras.xml.in evdev.xml.in Log Message: merge xkeyboard-config 2.27. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xkeyboard-config/dist/config.guess \ xsrc/external/mit/xkeyboard-config/dist/config.sub cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xkeyboard-config/dist/configure cvs rdiff -u -r1.1.1.2 -r0 \ xsrc/external/mit/xkeyboard-config/dist/intltool-extract.in \ xsrc/external/mit/xkeyboard-config/dist/intltool-merge.in \ xsrc/external/mit/xkeyboard-config/dist/intltool-update.in cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/xkeyboard-config/dist/po/POTFILES.skip cvs rdiff -u -r1.1.1.15 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/base.extras.xml.in \ xsrc/external/mit/xkeyboard-config/dist/rules/evdev.extras.xml.in cvs rdiff -u -r1.1.1.18 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/base.xml.in cvs rdiff -u -r1.1.1.17 -r0 \ xsrc/external/mit/xkeyboard-config/dist/rules/evdev.xml.in cvs rdiff -u -r1.17 -r1.18 \ xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xkeyboard-config/dist/symbols/in cvs rdiff -u -r1.9 -r1.10 \ xsrc/external/mit/xkeyboard-config/dist/symbols/sharp_vndr/Makefile.in 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/config.guess diff -u xsrc/external/mit/xkeyboard-config/dist/config.guess:1.9 xsrc/external/mit/xkeyboard-config/dist/config.guess:1.10 --- xsrc/external/mit/xkeyboard-config/dist/config.guess:1.9 Wed Mar 6 10:58:36 2019 +++ xsrc/external/mit/xkeyboard-config/dist/config.guess Sat Jun 1 07:11:53 2019 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-03-08' +timestamp='2018-08-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -84,8 +84,6 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -96,34 +94,39 @@ trap 'exit 1' 1 2 15 # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,)echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 +trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 + +set_cc_for_build() { +: "${TMPDIR=/tmp}" +# shellcheck disable=SC2039 +{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } +dummy=$tmp/dummy +case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,)echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sat Jun 1 07:11:13 UTC 2019 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10699 Log Message: initial import of xkeyboard-config-2.27 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-27 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/README 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/TODO 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 C xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/missing C 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/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/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/af U xsrc/external/mit/xkeyboard-config/dist/symbols/hr U xsrc/external/mit/xkeyboard-config/dist/symbols/at U xsrc/external/mit/xkeyboard-config/dist/symbols/fo U xsrc/external/mit/xkeyboard-config/dist/symbols/parens U xsrc/external/mit/xkeyboard-config/dist/symbol
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sat Jun 1 07:11:13 UTC 2019 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv10699 Log Message: initial import of xkeyboard-config-2.27 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-27 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/README 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/TODO 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 C xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/missing C 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/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/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/af U xsrc/external/mit/xkeyboard-config/dist/symbols/hr U xsrc/external/mit/xkeyboard-config/dist/symbols/at U xsrc/external/mit/xkeyboard-config/dist/symbols/fo U xsrc/external/mit/xkeyboard-config/dist/symbols/parens U xsrc/external/mit/xkeyboard-config/dist/symbol