CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 18:47:29 UTC 2021 Modified Files: src/usr.bin/indent: indent.c indent_globs.h io.c lexi.c pr_comment.c Log Message: indent: group global variables for label buffer into struct No functional change. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/usr.bin/indent/indent.c cvs rdiff -u -r1.22 -r1.23 src/usr.bin/indent/indent_globs.h cvs rdiff -u -r1.53 -r1.54 src/usr.bin/indent/io.c cvs rdiff -u -r1.45 -r1.46 src/usr.bin/indent/lexi.c cvs rdiff -u -r1.36 -r1.37 src/usr.bin/indent/pr_comment.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/indent/indent.c diff -u src/usr.bin/indent/indent.c:1.62 src/usr.bin/indent/indent.c:1.63 --- src/usr.bin/indent/indent.c:1.62 Fri Sep 24 18:14:06 2021 +++ src/usr.bin/indent/indent.c Fri Sep 24 18:47:29 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: indent.c,v 1.62 2021/09/24 18:14:06 rillig Exp $ */ +/* $NetBSD: indent.c,v 1.63 2021/09/24 18:47:29 rillig Exp $ */ /*- * SPDX-License-Identifier: BSD-4-Clause @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)indent.c 5.1 #include #ifndef lint #if defined(__NetBSD__) -__RCSID("$NetBSD: indent.c,v 1.62 2021/09/24 18:14:06 rillig Exp $"); +__RCSID("$NetBSD: indent.c,v 1.63 2021/09/24 18:47:29 rillig Exp $"); #elif defined(__FreeBSD__) __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $"); #endif @@ -71,17 +71,14 @@ __FBSDID("$FreeBSD: head/usr.bin/indent/ struct options opt; struct parser_state ps; -char *labbuf; -char *s_lab; -char *e_lab; -char *l_lab; +struct buffer lab; char *codebuf; char *s_code; char *e_code; char *l_code; -struct comment_buffer com; +struct buffer com; char *tokenbuf; char *s_token; @@ -149,17 +146,17 @@ check_size_code(size_t desired_size) static void check_size_label(size_t desired_size) { -if (e_lab + (desired_size) < l_lab) +if (lab.e + (desired_size) < lab.l) return; -size_t nsize = l_lab - s_lab + 400 + desired_size; -size_t label_len = e_lab - s_lab; -labbuf = realloc(labbuf, nsize); -if (labbuf == NULL) +size_t nsize = lab.l - lab.s + 400 + desired_size; +size_t label_len = lab.e - lab.s; +lab.buf = realloc(lab.buf, nsize); +if (lab.buf == NULL) err(1, NULL); -e_lab = labbuf + label_len + 1; -l_lab = labbuf + nsize - 5; -s_lab = labbuf + 1; +lab.e = lab.buf + label_len + 1; +lab.l = lab.buf + nsize - 5; +lab.s = lab.buf + 1; } #if HAVE_CAPSICUM @@ -377,8 +374,8 @@ main_init_globals(void) com.buf = malloc(bufsize); if (com.buf == NULL) err(1, NULL); -labbuf = malloc(bufsize); -if (labbuf == NULL) +lab.buf = malloc(bufsize); +if (lab.buf == NULL) err(1, NULL); codebuf = malloc(bufsize); if (codebuf == NULL) @@ -389,14 +386,14 @@ main_init_globals(void) alloc_typenames(); init_constant_tt(); com.l = com.buf + bufsize - 5; -l_lab = labbuf + bufsize - 5; +lab.l = lab.buf + bufsize - 5; l_code = codebuf + bufsize - 5; l_token = tokenbuf + bufsize - 5; -com.buf[0] = codebuf[0] = labbuf[0] = ' '; /* set up code, label, and +com.buf[0] = codebuf[0] = lab.buf[0] = ' '; /* set up code, label, and * comment buffers */ -com.buf[1] = codebuf[1] = labbuf[1] = tokenbuf[1] = '\0'; +com.buf[1] = codebuf[1] = lab.buf[1] = tokenbuf[1] = '\0'; opt.else_if = 1; /* Default else-if special processing to on */ -s_lab = e_lab = labbuf + 1; +lab.s = lab.e = lab.buf + 1; s_code = e_code = codebuf + 1; com.s = com.e = com.buf + 1; s_token = e_token = tokenbuf + 1; @@ -546,7 +543,7 @@ main_prepare_parsing(void) static void __attribute__((__noreturn__)) process_end_of_file(void) { -if (s_lab != e_lab || s_code != e_code || com.s != com.e) +if (lab.s != lab.e || s_code != e_code || com.s != com.e) dump_line(); if (ps.tos > 1) /* check for balanced braces */ @@ -790,10 +787,10 @@ process_colon(int *inout_squest, int *in size_t len = e_code - s_code; check_size_label(len + 3); - memcpy(e_lab, s_code, len); - e_lab += len; - *e_lab++ = ':'; - *e_lab = '\0'; + memcpy(lab.e, s_code, len); + lab.e += len; + *lab.e++ = ':'; + *lab.e = '\0'; e_code = s_code; } *inout_force_nl = ps.pcase = *inout_scase; /* ps.pcase will be used by @@ -1120,10 +1117,10 @@ process_comma(int dec_ind, int tabs_to_v static void process_preprocessing(void) { -if (com.s != com.e || s_lab != e_lab || s_code != e_code) +if (com.s != com.e || lab.s != lab.e || s_code != e_code) dump_line(); check_size_label(1); -*e_lab++ = '#'; /* move whole line to 'label' buffer */ +*lab.e++ = '#'; /* move whole line to 'label' buffer */ { int in_comment = 0; @@ -1138,13 +1135,13 @@ process_p
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 18:47:29 UTC 2021 Modified Files: src/usr.bin/indent: indent.c indent_globs.h io.c lexi.c pr_comment.c Log Message: indent: group global variables for label buffer into struct No functional change. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/usr.bin/indent/indent.c cvs rdiff -u -r1.22 -r1.23 src/usr.bin/indent/indent_globs.h cvs rdiff -u -r1.53 -r1.54 src/usr.bin/indent/io.c cvs rdiff -u -r1.45 -r1.46 src/usr.bin/indent/lexi.c cvs rdiff -u -r1.36 -r1.37 src/usr.bin/indent/pr_comment.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 18:37:03 UTC 2021 Modified Files: src/usr.bin/indent: io.c Log Message: indent: extract parse_indent_comment from fill_buffer No functional change. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/usr.bin/indent/io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/indent/io.c diff -u src/usr.bin/indent/io.c:1.52 src/usr.bin/indent/io.c:1.53 --- src/usr.bin/indent/io.c:1.52 Fri Sep 24 18:14:06 2021 +++ src/usr.bin/indent/io.c Fri Sep 24 18:37:03 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: io.c,v 1.52 2021/09/24 18:14:06 rillig Exp $ */ +/* $NetBSD: io.c,v 1.53 2021/09/24 18:37:03 rillig Exp $ */ /*- * SPDX-License-Identifier: BSD-4-Clause @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)io.c 8.1 (Be #include #ifndef lint #if defined(__NetBSD__) -__RCSID("$NetBSD: io.c,v 1.52 2021/09/24 18:14:06 rillig Exp $"); +__RCSID("$NetBSD: io.c,v 1.53 2021/09/24 18:37:03 rillig Exp $"); #elif defined(__FreeBSD__) __FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $"); #endif @@ -330,6 +330,61 @@ compute_label_indent(void) return opt.indent_size * (ps.ind_level - label_offset); } +static void +skip_hspace(const char **pp) +{ +while (**pp == ' ' || **pp == '\t') + (*pp)++; +} + +static void +parse_indent_comment(void) +{ +int on_off = 0; /* 0 = keep, 1 = ON, 2 = OFF */ + +const char *p = in_buffer; + +skip_hspace(&p); + +if (!(*p == '/' && p[1] == '*')) + return; +p += 2; + +skip_hspace(&p); + +if (!(p[0] == 'I' && p[1] == 'N' && p[2] == 'D' + && p[3] == 'E' && p[4] == 'N' && p[5] == 'T')) + return; +p += 6; + +skip_hspace(&p); + +if (*p == '*') + on_off = 1; +else if (*p == 'O') { + if (*++p == 'N') + p++, on_off = 1; + else if (*p == 'F' && *++p == 'F') + p++, on_off = 2; +} +if (on_off == 0) + return; + +skip_hspace(&p); + +if (!(p[0] == '*' && p[1] == '/' && p[2] == '\n')) + return; + +if (com.s != com.e || s_lab != e_lab || s_code != e_code) + dump_line(); + +if (!(inhibit_formatting = on_off - 1)) { + n_real_blanklines = 0; + postfix_blankline_requested = 0; + prefix_blankline_requested = 0; + suppress_blanklines = 1; +} +} /* * Copyright (C) 1976 by the Board of Trustees of the University of Illinois @@ -380,44 +435,8 @@ fill_buffer(void) if (p - in_buffer > 2 && p[-2] == '/' && p[-3] == '*') { if (in_buffer[3] == 'I' && strncmp(in_buffer, "/**INDENT**", 11) == 0) fill_buffer(); /* flush indent error message */ - else { - int comena = 0; /* 1 = ON, 2 = OFF */ - - p = in_buffer; - while (*p == ' ' || *p == '\t') - p++; - if (*p == '/' && p[1] == '*') { - p += 2; - while (*p == ' ' || *p == '\t') - p++; - if (p[0] == 'I' && p[1] == 'N' && p[2] == 'D' && p[3] == 'E' - && p[4] == 'N' && p[5] == 'T') { - p += 6; - while (*p == ' ' || *p == '\t') - p++; - if (*p == '*') - comena = 1; - else if (*p == 'O') { - if (*++p == 'N') - p++, comena = 1; - else if (*p == 'F' && *++p == 'F') - p++, comena = 2; - } - while (*p == ' ' || *p == '\t') - p++; - if (p[0] == '*' && p[1] == '/' && p[2] == '\n' && comena) { - if (com.s != com.e || s_lab != e_lab || s_code != e_code) - dump_line(); - if (!(inhibit_formatting = comena - 1)) { - n_real_blanklines = 0; - postfix_blankline_requested = 0; - prefix_blankline_requested = 0; - suppress_blanklines = 1; - } - } - } - } - } + else + parse_indent_comment(); } if (inhibit_formatting) { p = in_buffer;
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 18:37:03 UTC 2021 Modified Files: src/usr.bin/indent: io.c Log Message: indent: extract parse_indent_comment from fill_buffer No functional change. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/usr.bin/indent/io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 18:14:06 UTC 2021 Modified Files: src/usr.bin/indent: indent.c indent_globs.h io.c lexi.c pr_comment.c Log Message: indent: group global variables for the comment buffer No functional change. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/usr.bin/indent/indent.c cvs rdiff -u -r1.21 -r1.22 src/usr.bin/indent/indent_globs.h cvs rdiff -u -r1.51 -r1.52 src/usr.bin/indent/io.c cvs rdiff -u -r1.44 -r1.45 src/usr.bin/indent/lexi.c cvs rdiff -u -r1.35 -r1.36 src/usr.bin/indent/pr_comment.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/indent/indent.c diff -u src/usr.bin/indent/indent.c:1.61 src/usr.bin/indent/indent.c:1.62 --- src/usr.bin/indent/indent.c:1.61 Wed Aug 25 22:26:30 2021 +++ src/usr.bin/indent/indent.c Fri Sep 24 18:14:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: indent.c,v 1.61 2021/08/25 22:26:30 rillig Exp $ */ +/* $NetBSD: indent.c,v 1.62 2021/09/24 18:14:06 rillig Exp $ */ /*- * SPDX-License-Identifier: BSD-4-Clause @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)indent.c 5.1 #include #ifndef lint #if defined(__NetBSD__) -__RCSID("$NetBSD: indent.c,v 1.61 2021/08/25 22:26:30 rillig Exp $"); +__RCSID("$NetBSD: indent.c,v 1.62 2021/09/24 18:14:06 rillig Exp $"); #elif defined(__FreeBSD__) __FBSDID("$FreeBSD: head/usr.bin/indent/indent.c 340138 2018-11-04 19:24:49Z oshogbo $"); #endif @@ -81,10 +81,7 @@ char *s_code; char *e_code; char *l_code; -char *combuf; -char *s_com; -char *e_com; -char *l_com; +struct comment_buffer com; char *tokenbuf; char *s_token; @@ -377,8 +374,8 @@ main_init_globals(void) ps.last_nl = true; /* this is true if the last thing scanned was * a newline */ ps.last_token = semicolon; -combuf = malloc(bufsize); -if (combuf == NULL) +com.buf = malloc(bufsize); +if (com.buf == NULL) err(1, NULL); labbuf = malloc(bufsize); if (labbuf == NULL) @@ -391,17 +388,17 @@ main_init_globals(void) err(1, NULL); alloc_typenames(); init_constant_tt(); -l_com = combuf + bufsize - 5; +com.l = com.buf + bufsize - 5; l_lab = labbuf + bufsize - 5; l_code = codebuf + bufsize - 5; l_token = tokenbuf + bufsize - 5; -combuf[0] = codebuf[0] = labbuf[0] = ' '; /* set up code, label, and +com.buf[0] = codebuf[0] = labbuf[0] = ' '; /* set up code, label, and * comment buffers */ -combuf[1] = codebuf[1] = labbuf[1] = tokenbuf[1] = '\0'; +com.buf[1] = codebuf[1] = labbuf[1] = tokenbuf[1] = '\0'; opt.else_if = 1; /* Default else-if special processing to on */ s_lab = e_lab = labbuf + 1; s_code = e_code = codebuf + 1; -s_com = e_com = combuf + 1; +com.s = com.e = com.buf + 1; s_token = e_token = tokenbuf + 1; in_buffer = malloc(10); @@ -549,7 +546,7 @@ main_prepare_parsing(void) static void __attribute__((__noreturn__)) process_end_of_file(void) { -if (s_lab != e_lab || s_code != e_code || s_com != e_com) +if (s_lab != e_lab || s_code != e_code || com.s != com.e) dump_line(); if (ps.tos > 1) /* check for balanced braces */ @@ -584,18 +581,18 @@ process_comment_in_code(token_type type_ ps.in_stmt = true; /* turn on flag which causes an extra level of * indentation. this is turned off by a ; or * '}' */ -if (s_com != e_com) { /* the turkey has embedded a comment +if (com.s != com.e) { /* the turkey has embedded a comment * in a line. fix it */ - size_t len = e_com - s_com; + size_t len = com.e - com.s; check_size_code(len + 3); *e_code++ = ' '; - memcpy(e_code, s_com, len); + memcpy(e_code, com.s, len); e_code += len; *e_code++ = ' '; *e_code = '\0'; /* null terminate code sect */ ps.want_blank = false; - e_com = s_com; + com.e = com.s; } } @@ -611,7 +608,7 @@ static void process_newline(void) { if (ps.last_token != comma || ps.p_l_follow > 0 - || !opt.leave_comma || ps.block_init || !break_comma || s_com != e_com) { + || !opt.leave_comma || ps.block_init || !break_comma || com.s != com.e) { dump_line(); ps.want_blank = false; } @@ -1123,7 +1120,7 @@ process_comma(int dec_ind, int tabs_to_v static void process_preprocessing(void) { -if (s_com != e_com || s_lab != e_lab || s_code != e_code) +if (com.s != com.e || s_lab != e_lab || s_code != e_code) dump_line(); check_size_label(1); *e_lab++ = '#'; /* move whole line to 'label' buffer */ Index: src/usr.bin/indent/indent_globs.h diff -u src/usr.bin/indent/indent_globs.h:1.21 src/usr.bin/indent/indent_globs.h:1.22 --- src/usr.bin/indent/indent_globs.h:1.21 Sat Mar 13 23:36:10 2021 +++ src/usr.bin/indent/indent_globs.h Fri Sep 24 18:14:06 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: indent_globs.h,v 1.21 2021/03/13 23:36:10 rillig Exp $ */ +/* $NetBSD: indent_globs
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 18:14:06 UTC 2021 Modified Files: src/usr.bin/indent: indent.c indent_globs.h io.c lexi.c pr_comment.c Log Message: indent: group global variables for the comment buffer No functional change. To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/usr.bin/indent/indent.c cvs rdiff -u -r1.21 -r1.22 src/usr.bin/indent/indent_globs.h cvs rdiff -u -r1.51 -r1.52 src/usr.bin/indent/io.c cvs rdiff -u -r1.44 -r1.45 src/usr.bin/indent/lexi.c cvs rdiff -u -r1.35 -r1.36 src/usr.bin/indent/pr_comment.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 18:00:13 UTC 2021 Modified Files: src/usr.bin/indent: io.c Log Message: indent: rename local variable in fill_buffer The local variable name 'com' prevented grouping the global variables combuf, s_com, e_com and l_com into a struct named 'com'. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/usr.bin/indent/io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/indent/io.c diff -u src/usr.bin/indent/io.c:1.50 src/usr.bin/indent/io.c:1.51 --- src/usr.bin/indent/io.c:1.50 Fri Sep 24 16:29:31 2021 +++ src/usr.bin/indent/io.c Fri Sep 24 18:00:13 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: io.c,v 1.50 2021/09/24 16:29:31 rillig Exp $ */ +/* $NetBSD: io.c,v 1.51 2021/09/24 18:00:13 rillig Exp $ */ /*- * SPDX-License-Identifier: BSD-4-Clause @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)io.c 8.1 (Be #include #ifndef lint #if defined(__NetBSD__) -__RCSID("$NetBSD: io.c,v 1.50 2021/09/24 16:29:31 rillig Exp $"); +__RCSID("$NetBSD: io.c,v 1.51 2021/09/24 18:00:13 rillig Exp $"); #elif defined(__FreeBSD__) __FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $"); #endif @@ -381,7 +381,7 @@ fill_buffer(void) if (in_buffer[3] == 'I' && strncmp(in_buffer, "/**INDENT**", 11) == 0) fill_buffer(); /* flush indent error message */ else { - int com = 0; + int comena = 0; /* 1 = ON, 2 = OFF */ p = in_buffer; while (*p == ' ' || *p == '\t') @@ -396,19 +396,19 @@ fill_buffer(void) while (*p == ' ' || *p == '\t') p++; if (*p == '*') - com = 1; + comena = 1; else if (*p == 'O') { if (*++p == 'N') - p++, com = 1; + p++, comena = 1; else if (*p == 'F' && *++p == 'F') - p++, com = 2; + p++, comena = 2; } while (*p == ' ' || *p == '\t') p++; - if (p[0] == '*' && p[1] == '/' && p[2] == '\n' && com) { + if (p[0] == '*' && p[1] == '/' && p[2] == '\n' && comena) { if (s_com != e_com || s_lab != e_lab || s_code != e_code) dump_line(); - if (!(inhibit_formatting = com - 1)) { + if (!(inhibit_formatting = comena - 1)) { n_real_blanklines = 0; postfix_blankline_requested = 0; prefix_blankline_requested = 0;
CVS commit: src/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 18:00:13 UTC 2021 Modified Files: src/usr.bin/indent: io.c Log Message: indent: rename local variable in fill_buffer The local variable name 'com' prevented grouping the global variables combuf, s_com, e_com and l_com into a struct named 'com'. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/usr.bin/indent/io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 17:37:55 UTC 2021 Modified Files: src/tests/usr.bin/indent: comments.0 comments.0.stdout opt-fc1.0 opt-fc1.0.stdout opt-nfc1.0 opt-nfc1.0.stdout Log Message: tests/indent: demonstrate inconsistent formatting of comments To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/indent/comments.0 \ src/tests/usr.bin/indent/comments.0.stdout \ src/tests/usr.bin/indent/opt-fc1.0 \ src/tests/usr.bin/indent/opt-fc1.0.stdout \ src/tests/usr.bin/indent/opt-nfc1.0 \ src/tests/usr.bin/indent/opt-nfc1.0.stdout Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/indent/comments.0 diff -u src/tests/usr.bin/indent/comments.0:1.2 src/tests/usr.bin/indent/comments.0:1.3 --- src/tests/usr.bin/indent/comments.0:1.2 Sun Mar 14 01:34:13 2021 +++ src/tests/usr.bin/indent/comments.0 Fri Sep 24 17:37:55 2021 @@ -1,5 +1,6 @@ -/* $NetBSD: comments.0,v 1.2 2021/03/14 01:34:13 rillig Exp $ */ +/* $NetBSD: comments.0,v 1.3 2021/09/24 17:37:55 rillig Exp $ */ /* $FreeBSD: head/usr.bin/indent/tests/comments.0 321383 2017-07-23 15:07:52Z pstef $ */ + typedef enum x { aa = 1 << 0, /* test a */ b = 1 << 1, /* test b */ @@ -14,22 +15,22 @@ void t(void) { * * https://www.freebsd.org/cgi/man.cgi?query=indent&apropos=0&sektion=0&manpath=FreeBSD+12-current&arch=default&format=html */ - + /* * The default maximum line length for comments is 78, and the 'kk' at * the end makes the line exactly 78 bytes long. * * aa bb cc dd ee ff g h i kk */ - + /* * Old indent unnecessarily removed the star comment continuation on the next line. - * + * * *test* */ - + /* r309219 Go through linked list, freeing from the malloced (t[-1]) address. */ - + /* r309343 */ } Index: src/tests/usr.bin/indent/comments.0.stdout diff -u src/tests/usr.bin/indent/comments.0.stdout:1.2 src/tests/usr.bin/indent/comments.0.stdout:1.3 --- src/tests/usr.bin/indent/comments.0.stdout:1.2 Sun Mar 14 01:34:13 2021 +++ src/tests/usr.bin/indent/comments.0.stdout Fri Sep 24 17:37:55 2021 @@ -1,5 +1,6 @@ -/* $NetBSD: comments.0.stdout,v 1.2 2021/03/14 01:34:13 rillig Exp $ */ +/* $NetBSD: comments.0.stdout,v 1.3 2021/09/24 17:37:55 rillig Exp $ */ /* $FreeBSD: head/usr.bin/indent/tests/comments.0.stdout 334563 2018-06-03 15:28:55Z pstef $ */ + typedef enum x { aa = 1 << 0, /* test a */ b = 1 << 1, /* test b */ Index: src/tests/usr.bin/indent/opt-fc1.0 diff -u src/tests/usr.bin/indent/opt-fc1.0:1.2 src/tests/usr.bin/indent/opt-fc1.0:1.3 --- src/tests/usr.bin/indent/opt-fc1.0:1.2 Sat Mar 6 21:27:39 2021 +++ src/tests/usr.bin/indent/opt-fc1.0 Fri Sep 24 17:37:55 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: opt-fc1.0,v 1.2 2021/03/06 21:27:39 rillig Exp $ */ +/* $NetBSD: opt-fc1.0,v 1.3 2021/09/24 17:37:55 rillig Exp $ */ /* $FreeBSD$ */ /* @@ -8,3 +8,18 @@ * * */ + +/* $ Neither indentation nor surrounding spaces. */ +/*narrow*/ + +/* $ Indented by a single space, single spaces around the text. */ + /* space */ + +/* $ Indented by a single tab, single tabs around the text. */ + /* tab */ + +/* $ The space between these comments gets removed. */ +/* block1 */ /* block2 */ + +/* $ Both comment texts get surrounded by spaces. */ +/*block1*//*block2*/ Index: src/tests/usr.bin/indent/opt-fc1.0.stdout diff -u src/tests/usr.bin/indent/opt-fc1.0.stdout:1.2 src/tests/usr.bin/indent/opt-fc1.0.stdout:1.3 --- src/tests/usr.bin/indent/opt-fc1.0.stdout:1.2 Sat Mar 6 21:27:39 2021 +++ src/tests/usr.bin/indent/opt-fc1.0.stdout Fri Sep 24 17:37:55 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: opt-fc1.0.stdout,v 1.2 2021/03/06 21:27:39 rillig Exp $ */ +/* $NetBSD: opt-fc1.0.stdout,v 1.3 2021/09/24 17:37:55 rillig Exp $ */ /* $FreeBSD$ */ /* @@ -7,3 +7,18 @@ * * */ + +/* $ The comment text got surrounded by spaces. */ +/* narrow */ + +/* $ The indentation got removed. */ +/* space */ + +/* $ The indentation got removed, only the leading tab got replaced by a space. */ +/* tab */ + +/* $ The space between these comments got removed. */ +/* block1 *//* block2 */ + +/* $ Both comment texts got surrounded by spaces. */ +/* block1 *//* block2 */ Index: src/tests/usr.bin/indent/opt-nfc1.0 diff -u src/tests/usr.bin/indent/opt-nfc1.0:1.2 src/tests/usr.bin/indent/opt-nfc1.0:1.3 --- src/tests/usr.bin/indent/opt-nfc1.0:1.2 Sat Mar 6 21:27:39 2021 +++ src/tests/usr.bin/indent/opt-nfc1.0 Fri Sep 24 17:37:55 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: opt-nfc1.0,v 1.2 2021/03/06 21:27:39 rillig Exp $ */ +/* $NetBSD: opt-nfc1.0,v 1.3 2021/09/24 17:37:55 rillig Exp $ */ /* $FreeBSD$ */ /* @@ -8,3 +8,18 @@ * * */ + +/* $ Neither indentation nor surrounding spaces. */ +/*narrow*/ + +/* $ Indented by a single space, singl
CVS commit: src/tests/usr.bin/indent
Module Name:src Committed By: rillig Date: Fri Sep 24 17:37:55 UTC 2021 Modified Files: src/tests/usr.bin/indent: comments.0 comments.0.stdout opt-fc1.0 opt-fc1.0.stdout opt-nfc1.0 opt-nfc1.0.stdout Log Message: tests/indent: demonstrate inconsistent formatting of comments To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/indent/comments.0 \ src/tests/usr.bin/indent/comments.0.stdout \ src/tests/usr.bin/indent/opt-fc1.0 \ src/tests/usr.bin/indent/opt-fc1.0.stdout \ src/tests/usr.bin/indent/opt-nfc1.0 \ src/tests/usr.bin/indent/opt-nfc1.0.stdout 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: rillig Date: Fri Sep 24 16:29:31 UTC 2021 Modified Files: src/tests/usr.bin/indent: comment-line-end.0 comment-line-end.0.stdout src/usr.bin/indent: io.c Log Message: indent: fix token duplication after C99 comment The code that keeps blank lines after C99 comments still looks wrong, but at least it's better than before. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/indent/comment-line-end.0 \ src/tests/usr.bin/indent/comment-line-end.0.stdout cvs rdiff -u -r1.49 -r1.50 src/usr.bin/indent/io.c 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: rillig Date: Fri Sep 24 16:29:31 UTC 2021 Modified Files: src/tests/usr.bin/indent: comment-line-end.0 comment-line-end.0.stdout src/usr.bin/indent: io.c Log Message: indent: fix token duplication after C99 comment The code that keeps blank lines after C99 comments still looks wrong, but at least it's better than before. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/indent/comment-line-end.0 \ src/tests/usr.bin/indent/comment-line-end.0.stdout cvs rdiff -u -r1.49 -r1.50 src/usr.bin/indent/io.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/usr.bin/indent/comment-line-end.0 diff -u src/tests/usr.bin/indent/comment-line-end.0:1.6 src/tests/usr.bin/indent/comment-line-end.0:1.7 --- src/tests/usr.bin/indent/comment-line-end.0:1.6 Fri Sep 24 06:30:02 2021 +++ src/tests/usr.bin/indent/comment-line-end.0 Fri Sep 24 16:29:31 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: comment-line-end.0,v 1.6 2021/09/24 06:30:02 rillig Exp $ */ +/* $NetBSD: comment-line-end.0,v 1.7 2021/09/24 16:29:31 rillig Exp $ */ /* $FreeBSD$ */ /* @@ -27,7 +27,6 @@ main(void) { } -/* FIXME: in the formatted output, the word 'bar' is repeated. */ void c99_comment(void) { foo(); // C++ comment Index: src/tests/usr.bin/indent/comment-line-end.0.stdout diff -u src/tests/usr.bin/indent/comment-line-end.0.stdout:1.6 src/tests/usr.bin/indent/comment-line-end.0.stdout:1.7 --- src/tests/usr.bin/indent/comment-line-end.0.stdout:1.6 Fri Sep 24 06:30:02 2021 +++ src/tests/usr.bin/indent/comment-line-end.0.stdout Fri Sep 24 16:29:31 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: comment-line-end.0.stdout,v 1.6 2021/09/24 06:30:02 rillig Exp $ */ +/* $NetBSD: comment-line-end.0.stdout,v 1.7 2021/09/24 16:29:31 rillig Exp $ */ /* $FreeBSD$ */ /* @@ -30,12 +30,11 @@ main(void) { } -/* FIXME: in the formatted output, the word 'bar' is repeated. */ void c99_comment(void) { foo(); // C++ comment -bar bar(); + bar(); } // end-of-line comment at the end of the file Index: src/usr.bin/indent/io.c diff -u src/usr.bin/indent/io.c:1.49 src/usr.bin/indent/io.c:1.50 --- src/usr.bin/indent/io.c:1.49 Sun Mar 14 01:44:37 2021 +++ src/usr.bin/indent/io.c Fri Sep 24 16:29:31 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: io.c,v 1.49 2021/03/14 01:44:37 rillig Exp $ */ +/* $NetBSD: io.c,v 1.50 2021/09/24 16:29:31 rillig Exp $ */ /*- * SPDX-License-Identifier: BSD-4-Clause @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)io.c 8.1 (Be #include #ifndef lint #if defined(__NetBSD__) -__RCSID("$NetBSD: io.c,v 1.49 2021/03/14 01:44:37 rillig Exp $"); +__RCSID("$NetBSD: io.c,v 1.50 2021/09/24 16:29:31 rillig Exp $"); #elif defined(__FreeBSD__) __FBSDID("$FreeBSD: head/usr.bin/indent/io.c 334927 2018-06-10 16:44:18Z pstef $"); #endif @@ -260,7 +260,8 @@ dump_line(void) } /* keep blank lines after '//' comments */ -if (e_com - s_com > 1 && s_com[1] == '/') +if (e_com - s_com > 1 && s_com[1] == '/' + && s_token < e_token && isspace((unsigned char)s_token[0])) output_range(s_token, e_token); ps.decl_on_line = ps.in_decl; /* if we are in the middle of a declaration,
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Sep 24 15:48:35 UTC 2021 Modified Files: src/doc: 3RDPARTY Log Message: mandoc 1.14.6 out. To generate a diff of this commit: cvs rdiff -u -r1.1814 -r1.1815 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1814 src/doc/3RDPARTY:1.1815 --- src/doc/3RDPARTY:1.1814 Fri Sep 24 13:14:49 2021 +++ src/doc/3RDPARTY Fri Sep 24 15:48:35 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1814 2021/09/24 13:14:49 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1815 2021/09/24 15:48:35 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -888,7 +888,7 @@ Notes: Package: mandoc Version: 1.14.5 -Current Vers: 1.14.5 +Current Vers: 1.14.6 Maintainer: Kristaps Džonsons/Ingo Schwarze Archive Site: http://mandoc.bsd.lv/snapshots/ Home Page: http://mandoc.bsd.lv/
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Sep 24 15:48:35 UTC 2021 Modified Files: src/doc: 3RDPARTY Log Message: mandoc 1.14.6 out. To generate a diff of this commit: cvs rdiff -u -r1.1814 -r1.1815 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Sep 24 13:14:50 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new libfido2, pam-u2f To generate a diff of this commit: cvs rdiff -u -r1.1813 -r1.1814 src/doc/3RDPARTY cvs rdiff -u -r1.2832 -r1.2833 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1813 src/doc/3RDPARTY:1.1814 --- src/doc/3RDPARTY:1.1813 Thu Sep 2 07:27:19 2021 +++ src/doc/3RDPARTY Fri Sep 24 09:14:49 2021 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1813 2021/09/02 11:27:19 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1814 2021/09/24 13:14:49 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -2223,12 +2223,12 @@ Location: external/mit/libcbor Notes: Package: pam-u2f -Version: 1.0.8-73-gd10f843 (d10f84314c55f10d244bc275794e783dc408e45c) -Current Vers: 1.0.8 +Version: 1.2.0 +Current Vers: 1.2.0 Maintainer: Yubico Archive Site: https://github.com/Yubico/pam-u2f Home Page: https://developers.yubico.com/pam-u2f/ -Date: 2020-06-13 +Date: 2021-09-24 Mailing List: Responsible: christos License: bsd @@ -2236,12 +2236,12 @@ Location: external/bsd/pam-u2f Notes: Package: libfido2 -Version: 1.7.0 -Current Vers: 1.7.0 +Version: 1.8.0 +Current Vers: 1.8.0 Maintainer: Yubico Archive Site: https://github.com/Yubico/libfido2 Home Page: https://developers.yubico.com/libfido2/ -Date: 2021-06-16 +Date: 2021-09-24 Mailing List: Responsible: christos License: bsd Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2832 src/doc/CHANGES:1.2833 --- src/doc/CHANGES:1.2832 Thu Sep 23 05:09:34 2021 +++ src/doc/CHANGES Fri Sep 24 09:14:49 2021 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2832 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2833 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -426,3 +426,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: pwritev() system calls to COMPAT_LINUX and COMPAT_LINXU32. [thorpej 20210919] aarch64: Add initial COMPAT_LINUX support. [ryo 20210923] + libfido2: Import 1.8.0 [christos 20210924] + pam-u2f: Import pam u2f 1.2.0 [christos 20210924]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Fri Sep 24 13:14:50 UTC 2021 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new libfido2, pam-u2f To generate a diff of this commit: cvs rdiff -u -r1.1813 -r1.1814 src/doc/3RDPARTY cvs rdiff -u -r1.2832 -r1.2833 src/doc/CHANGES 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: christos Date: Fri Sep 24 13:13:08 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libfido2 To generate a diff of this commit: cvs rdiff -u -r1.926 -r1.927 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.283 -r1.284 src/distrib/sets/lists/debug/shl.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/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.926 src/distrib/sets/lists/base/shl.mi:1.927 --- src/distrib/sets/lists/base/shl.mi:1.926 Sun Sep 19 11:51:27 2021 +++ src/distrib/sets/lists/base/shl.mi Fri Sep 24 09:13:07 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.926 2021/09/19 15:51:27 thorpej Exp $ +# $NetBSD: shl.mi,v 1.927 2021/09/24 13:13:07 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -328,8 +328,8 @@ ./usr/lib/libfetch.so.3base-sys-shlib compatfile ./usr/lib/libfetch.so.3.0 base-sys-shlib compatfile ./usr/lib/libfido2.sobase-sys-shlib compatfile -./usr/lib/libfido2.so.3base-sys-shlib compatfile -./usr/lib/libfido2.so.3.0 base-sys-shlib compatfile +./usr/lib/libfido2.so.4base-sys-shlib compatfile +./usr/lib/libfido2.so.4.0 base-sys-shlib compatfile ./usr/lib/libform.sobase-sys-shlib compatfile ./usr/lib/libform.so.8base-sys-shlib compatfile ./usr/lib/libform.so.8.0 base-sys-shlib compatfile Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.283 src/distrib/sets/lists/debug/shl.mi:1.284 --- src/distrib/sets/lists/debug/shl.mi:1.283 Sun Sep 19 11:51:28 2021 +++ src/distrib/sets/lists/debug/shl.mi Fri Sep 24 09:13:07 2021 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.283 2021/09/19 15:51:28 thorpej Exp $ +# $NetBSD: shl.mi,v 1.284 2021/09/24 13:13:07 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -115,7 +115,7 @@ ./usr/libdata/debug/usr/lib/libexecinfo.so.0.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libexpat.so.2.3.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libfetch.so.3.0.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libfido2.so.3.0.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libfido2.so.4.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libform.so.6.0.debug comp-sys-debug debug,obsolete,compatfile ./usr/libdata/debug/usr/lib/libform.so.7.0.debug comp-sys-debug debug,obsolete,compatfile ./usr/libdata/debug/usr/lib/libform.so.8.0.debug comp-sys-debug debug,compatfile
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Fri Sep 24 13:13:08 UTC 2021 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump libfido2 To generate a diff of this commit: cvs rdiff -u -r1.926 -r1.927 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.283 -r1.284 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pam-u2f/dist
Module Name:src Committed By: christos Date: Fri Sep 24 13:11:39 UTC 2021 Modified Files: src/external/bsd/pam-u2f/dist: b64.c drop_privs.h pam-u2f.c util.h Removed Files: src/external/bsd/pam-u2f/dist: .travis.yml src/external/bsd/pam-u2f/dist/build-aux/ci: build-bionic-clang7.sh build-bionic-clang8.sh build-bionic-gcc7.sh build-bionic-gcc8.sh build-bionic-gcc9.sh build-linux.sh build-osx11-clang.sh build-osx9.4-clang.sh build-xenial-clang7.sh build-xenial-clang8.sh build-xenial-gcc7.sh build-xenial-gcc8.sh build-xenial-gcc9.sh Log Message: merge conflicts between 1.0.8 and 1.2.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pam-u2f/dist/.travis.yml cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pam-u2f/dist/b64.c \ src/external/bsd/pam-u2f/dist/drop_privs.h \ src/external/bsd/pam-u2f/dist/pam-u2f.c \ src/external/bsd/pam-u2f/dist/util.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang7.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang8.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc7.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc8.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc9.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-linux.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-osx11-clang.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-osx9.4-clang.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-clang7.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-clang8.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-gcc7.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-gcc8.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-gcc9.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/pam-u2f/dist/b64.c diff -u src/external/bsd/pam-u2f/dist/b64.c:1.2 src/external/bsd/pam-u2f/dist/b64.c:1.3 --- src/external/bsd/pam-u2f/dist/b64.c:1.2 Mon Mar 2 19:27:31 2020 +++ src/external/bsd/pam-u2f/dist/b64.c Fri Sep 24 09:11:38 2021 @@ -4,6 +4,7 @@ #include #include +#include #include #include Index: src/external/bsd/pam-u2f/dist/drop_privs.h diff -u src/external/bsd/pam-u2f/dist/drop_privs.h:1.2 src/external/bsd/pam-u2f/dist/drop_privs.h:1.3 --- src/external/bsd/pam-u2f/dist/drop_privs.h:1.2 Mon Mar 2 19:27:08 2020 +++ src/external/bsd/pam-u2f/dist/drop_privs.h Fri Sep 24 09:11:38 2021 @@ -31,6 +31,17 @@ #ifdef HAVE_PAM_MODUTIL_DROP_PRIV #include +#elif HAVE_OPENPAM_BORROW_CRED +#include +#include +#include + +#define PAM_MODUTIL_DEF_PRIVS(n) /* noop */ +#define pam_modutil_drop_priv(pamh, privs, pwd)\ + ((openpam_borrow_cred((pamh), (pwd)) == PAM_SUCCESS) ? 0 : -1) +#define pam_modutil_regain_priv(pamh, privs) \ + ((openpam_restore_cred((pamh)) == PAM_SUCCESS) ? 0 : -1) + #else #include @@ -67,5 +78,5 @@ int pam_modutil_drop_priv(pam_handle_t * struct passwd *); int pam_modutil_regain_priv(pam_handle_t *, struct _ykpam_privs *); -#endif -#endif +#endif /* HAVE_PAM_MODUTIL_DROP_PRIV */ +#endif /* __PAM_U2F_DROP_PRIVS_H_INCLUDED__ */ Index: src/external/bsd/pam-u2f/dist/pam-u2f.c diff -u src/external/bsd/pam-u2f/dist/pam-u2f.c:1.2 src/external/bsd/pam-u2f/dist/pam-u2f.c:1.3 --- src/external/bsd/pam-u2f/dist/pam-u2f.c:1.2 Mon Mar 2 19:22:29 2020 +++ src/external/bsd/pam-u2f/dist/pam-u2f.c Fri Sep 24 09:11:38 2021 @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -31,8 +32,10 @@ char *secure_getenv(const char *name) { } #endif -static void parse_cfg(int flags, int argc, const char **argv, cfg_t *cfg) { +static void parse_cfg(int flags __unused, int argc, const char **argv, cfg_t *cfg) { +#ifndef WITH_FUZZING struct stat st; +#endif FILE *file = NULL; int fd = -1; int i; @@ -70,6 +73,8 @@ static void parse_cfg(int flags, int arg sscanf(argv[i], "pinverification=%d", &cfg->pinverification); if (strncmp(argv[i], "authfile=", 9) == 0) cfg->auth_file = argv[i] + 9; +if (strncmp(argv[i], "sshformat", 9) == 0) + cfg->sshformat = 1; if (strncmp(argv[i], "authpending_file=", 17) == 0) cfg->authpending_file = argv[i] + 17; if (strncmp(argv[i], "origin=", 7) == 0) @@ -81,6 +86,10 @@ static void parse_cfg(int flags, int arg if (strncmp(argv[i], "cue_prompt=", 11) == 0) cfg->cue_prompt = argv[i] + 11; if (strncmp(argv[i], "debug_file=", 11) == 0) { + if (cfg->is_custom_debug_file) +fclose(cfg->debug_file); + cfg->debug_file = stderr; + cfg->is_custom_debug_file = 0; const char *filename = argv[i] + 1
CVS commit: src/external/bsd/pam-u2f/dist
Module Name:src Committed By: christos Date: Fri Sep 24 13:11:39 UTC 2021 Modified Files: src/external/bsd/pam-u2f/dist: b64.c drop_privs.h pam-u2f.c util.h Removed Files: src/external/bsd/pam-u2f/dist: .travis.yml src/external/bsd/pam-u2f/dist/build-aux/ci: build-bionic-clang7.sh build-bionic-clang8.sh build-bionic-gcc7.sh build-bionic-gcc8.sh build-bionic-gcc9.sh build-linux.sh build-osx11-clang.sh build-osx9.4-clang.sh build-xenial-clang7.sh build-xenial-clang8.sh build-xenial-gcc7.sh build-xenial-gcc8.sh build-xenial-gcc9.sh Log Message: merge conflicts between 1.0.8 and 1.2.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/pam-u2f/dist/.travis.yml cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pam-u2f/dist/b64.c \ src/external/bsd/pam-u2f/dist/drop_privs.h \ src/external/bsd/pam-u2f/dist/pam-u2f.c \ src/external/bsd/pam-u2f/dist/util.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang7.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang8.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc7.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc8.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc9.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-linux.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-osx11-clang.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-osx9.4-clang.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-clang7.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-clang8.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-gcc7.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-gcc8.sh \ src/external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-gcc9.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pam-u2f/dist
Module Name:src Committed By: christos Date: Fri Sep 24 13:08:16 UTC 2021 Modified Files: src/external/bsd/pam-u2f/dist: util.c Log Message: Merge conflicts, avoid ssp issues To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pam-u2f/dist/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/pam-u2f/dist/util.c diff -u src/external/bsd/pam-u2f/dist/util.c:1.3 src/external/bsd/pam-u2f/dist/util.c:1.4 --- src/external/bsd/pam-u2f/dist/util.c:1.3 Mon Mar 2 19:21:20 2020 +++ src/external/bsd/pam-u2f/dist/util.c Fri Sep 24 09:08:16 2021 @@ -5,11 +5,13 @@ #include #include #include +#include #include #include -#include +#include +#include #include #include #include @@ -19,10 +21,40 @@ #include #include #include +#include #include "b64.h" #include "util.h" +#define SSH_HEADER "-BEGIN OPENSSH PRIVATE KEY-\n" +#define SSH_HEADER_LEN (sizeof(SSH_HEADER) - 1) +#define SSH_TRAILER "-END OPENSSH PRIVATE KEY-\n" +#define SSH_TRAILER_LEN (sizeof(SSH_TRAILER) - 1) +#define SSH_AUTH_MAGIC "openssh-key-v1" +#define SSH_AUTH_MAGIC_LEN (sizeof(SSH_AUTH_MAGIC)) // AUTH_MAGIC includes \0 +#define SSH_ES256 "sk-ecdsa-sha2-nistp...@openssh.com" +#define SSH_ES256_LEN (sizeof(SSH_ES256) - 1) +#define SSH_ES256_POINT_LEN 65 +#define SSH_P256_NAME "nistp256" +#define SSH_P256_NAME_LEN (sizeof(SSH_P256_NAME) - 1) +#define SSH_EDDSA "sk-ssh-ed25...@openssh.com" +#define SSH_EDDSA_LEN (sizeof(SSH_EDDSA) - 1) +#define SSH_EDDSA_POINT_LEN 32 +#define SSH_SK_USER_PRESENCE_REQD 0x01 +#define SSH_SK_USER_VERIFICATION_REQD 0x04 +#define SSH_SK_RESIDENT_KEY 0x20 + +struct opts { + fido_opt_t up; + fido_opt_t uv; + fido_opt_t pin; +}; + +struct pk { + void *ptr; + int type; +}; + static int hex_decode(const char *ascii_hex, unsigned char **blob, size_t *blob_len) { *blob = NULL; @@ -94,13 +126,15 @@ static char *normal_b64(const char *webs return (b64); } -static es256_pk_t *translate_old_format_pubkey(const unsigned char *pk, - size_t pk_len) { - es256_pk_t *es256_pk = NULL; +static int translate_old_format_pubkey(es256_pk_t *es256_pk, + const unsigned char *pk, size_t pk_len) { EC_KEY *ec = NULL; EC_POINT *q = NULL; const EC_GROUP *g = NULL; - int ok = 0; + int r = FIDO_ERR_INTERNAL; + + if (es256_pk == NULL) +goto fail; if ((ec = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1)) == NULL || (g = EC_KEY_get0_group(ec)) == NULL) @@ -111,226 +145,175 @@ static es256_pk_t *translate_old_format_ !EC_KEY_set_public_key(ec, q)) goto fail; - es256_pk = es256_pk_new(); - if (es256_pk == NULL || es256_pk_from_EC_KEY(es256_pk, ec) < 0) -goto fail; + r = es256_pk_from_EC_KEY(es256_pk, ec); - ok = 1; fail: if (ec != NULL) EC_KEY_free(ec); if (q != NULL) EC_POINT_free(q); - if (!ok) -es256_pk_free(&es256_pk); - return (es256_pk); + return r; } -int get_devices_from_authfile(const char *authfile, const char *username, - unsigned max_devs, int verbose, FILE *debug_file, - device_t *devices, unsigned *n_devs) { - - char *buf = NULL; - char *s_user, *s_token; - int retval = 0; - int fd = -1; - struct stat st; - struct passwd *pw = NULL, pw_s; - char buffer[BUFSIZE]; - int gpu_ret; - FILE *opwfile = NULL; - unsigned i; - - /* Ensure we never return uninitialized count. */ - *n_devs = 0; - - fd = open(authfile, O_RDONLY | O_CLOEXEC | O_NOCTTY); - if (fd < 0) { -if (verbose) - D(debug_file, "Cannot open file: %s (%s)", authfile, strerror(errno)); -goto err; - } - - if (fstat(fd, &st) < 0) { -if (verbose) - D(debug_file, "Cannot stat file: %s (%s)", authfile, strerror(errno)); -goto err; - } - - if (!S_ISREG(st.st_mode)) { -if (verbose) - D(debug_file, "%s is not a regular file", authfile); -goto err; - } - - if (st.st_size == 0) { -if (verbose) - D(debug_file, "File %s is empty", authfile); -goto err; - } - - gpu_ret = getpwuid_r(st.st_uid, &pw_s, buffer, sizeof(buffer), &pw); - if (gpu_ret != 0 || pw == NULL) { -D(debug_file, "Unable to retrieve credentials for uid %u, (%s)", st.st_uid, - strerror(errno)); -goto err; - } +static int is_resident(const char *kh) { return strcmp(kh, "*") == 0; } - if (strcmp(pw->pw_name, username) != 0 && strcmp(pw->pw_name, "root") != 0) { -if (strcmp(username, "root") != 0) { - D(debug_file, -"The owner of the authentication file is neither %s nor root", -username); -} else { - D(debug_file, "The owner of the authentication file is not root"); -} -goto err; - } +static void reset_device(device_t *device) { + free(device->keyHandl
CVS commit: src/external/bsd/pam-u2f/dist
Module Name:src Committed By: christos Date: Fri Sep 24 13:08:16 UTC 2021 Modified Files: src/external/bsd/pam-u2f/dist: util.c Log Message: Merge conflicts, avoid ssp issues To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pam-u2f/dist/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/libfido2
Module Name:src Committed By: christos Date: Fri Sep 24 13:07:34 UTC 2021 Modified Files: src/external/bsd/libfido2/dist/tools: util.c src/external/bsd/libfido2/lib: Makefile Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/dist/tools/util.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libfido2/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/bsd/libfido2/dist/tools/util.c diff -u src/external/bsd/libfido2/dist/tools/util.c:1.2 src/external/bsd/libfido2/dist/tools/util.c:1.3 --- src/external/bsd/libfido2/dist/tools/util.c:1.2 Wed Jun 16 21:15:46 2021 +++ src/external/bsd/libfido2/dist/tools/util.c Fri Sep 24 09:07:34 2021 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Yubico AB. All rights reserved. + * Copyright (c) 2018-2021 Yubico AB. All rights reserved. * Use of this source code is governed by a BSD-style * license that can be found in the LICENSE file. */ @@ -576,6 +576,17 @@ plural(size_t x) int should_retry_with_pin(const fido_dev_t *dev, int r) { - return fido_dev_has_pin(dev) && (r == FIDO_ERR_PIN_REQUIRED || - r == FIDO_ERR_UV_INVALID || r == FIDO_ERR_UNAUTHORIZED_PERM); + if (fido_dev_has_pin(dev) == false) { + return 0; + } + + switch (r) { + case FIDO_ERR_PIN_REQUIRED: + case FIDO_ERR_UNAUTHORIZED_PERM: + case FIDO_ERR_UV_BLOCKED: + case FIDO_ERR_UV_INVALID: + return 1; + } + + return 0; } Index: src/external/bsd/libfido2/lib/Makefile diff -u src/external/bsd/libfido2/lib/Makefile:1.7 src/external/bsd/libfido2/lib/Makefile:1.8 --- src/external/bsd/libfido2/lib/Makefile:1.7 Fri Jun 18 09:57:52 2021 +++ src/external/bsd/libfido2/lib/Makefile Fri Sep 24 09:07:34 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2021/06/18 13:57:52 christos Exp $ +# $NetBSD: Makefile,v 1.8 2021/09/24 13:07:34 christos Exp $ NOLINT= .include @@ -96,7 +96,7 @@ fido_init.3 \ fido_strerr.3 \ rs256_pk_new.3 -SHLIB_MAJOR=3 +SHLIB_MAJOR=4 SHLIB_MINOR=0 .SUFFIXES: .in
CVS commit: src/external/bsd/libfido2
Module Name:src Committed By: christos Date: Fri Sep 24 13:07:34 UTC 2021 Modified Files: src/external/bsd/libfido2/dist/tools: util.c src/external/bsd/libfido2/lib: Makefile Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libfido2/dist/tools/util.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libfido2/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/pam-u2f/dist
Module Name:src Committed By: christos Date: Fri Sep 24 12:51:20 UTC 2021 Update of /cvsroot/src/external/bsd/pam-u2f/dist In directory ivanova.netbsd.org:/tmp/cvs-serv115 Log Message: Import version 1.2.0 * Version 1.2.0 (released 2021-09-22) ** Added support for EdDSA keys. ** Added support for SSH ed25519-sk keys. ** Added authenticator filtering based on user verification options. ** Fixed an issue with privilege restoration on MacOS. ** Fixed an issue where credentials created with pamu2fcfg 1.0.8 or earlier were not handled correctly if their origin and appid differed. ** Miscellaneous improvements to the documentation. ** Miscellaneous minor bug fixes found by fuzzing. * Version 1.1.1 (released 2021-05-19) ** Fix an issue where PIN authentication could be bypassed (CVE-2021-31924). ** Fix an issue with nodetect and non-resident credentials. ** Fix build issues with musl libc. ** Add support for self-attestation in pamu2fcfg. ** Fix minor bugs found by fuzzing. * Version 1.1.0 (released 2020-09-17) ** Add support to FIDO2 (move from libu2f-host+libu2f-server to libfido2). ** Add support to User Verification ** Add support to PIN Verification ** Add support to Resident Credentials ** Add support to SSH credential format Status: Vendor Tag: YUBICO Release Tags: pam-u2f-1-2-0 U src/external/bsd/pam-u2f/dist/.clang-format U src/external/bsd/pam-u2f/dist/AUTHORS U src/external/bsd/pam-u2f/dist/COPYING U src/external/bsd/pam-u2f/dist/Makefile.am U src/external/bsd/pam-u2f/dist/NEWS U src/external/bsd/pam-u2f/dist/README U src/external/bsd/pam-u2f/dist/autogen.sh C src/external/bsd/pam-u2f/dist/b64.c U src/external/bsd/pam-u2f/dist/b64.h U src/external/bsd/pam-u2f/dist/configure.ac C src/external/bsd/pam-u2f/dist/drop_privs.h U src/external/bsd/pam-u2f/dist/explicit_bzero.c C src/external/bsd/pam-u2f/dist/pam-u2f.c C src/external/bsd/pam-u2f/dist/util.c C src/external/bsd/pam-u2f/dist/util.h N src/external/bsd/pam-u2f/dist/.github/workflows/alpine_builds.yml N src/external/bsd/pam-u2f/dist/.github/workflows/codeql-analysis.yml N src/external/bsd/pam-u2f/dist/.github/workflows/format.yml N src/external/bsd/pam-u2f/dist/.github/workflows/linux_builds.yml N src/external/bsd/pam-u2f/dist/.github/workflows/linux_fuzz.yml N src/external/bsd/pam-u2f/dist/.github/workflows/macos_builds.yml N src/external/bsd/pam-u2f/dist/.github/workflows/scan.yml N src/external/bsd/pam-u2f/dist/build-aux/ci/build-linux-clang.sh N src/external/bsd/pam-u2f/dist/build-aux/ci/build-linux-gcc.sh U src/external/bsd/pam-u2f/dist/build-aux/ci/build-osx.sh N src/external/bsd/pam-u2f/dist/build-aux/ci/distcheck.sh U src/external/bsd/pam-u2f/dist/build-aux/ci/format-code.sh N src/external/bsd/pam-u2f/dist/build-aux/ci/fuzz-linux-asan.sh N src/external/bsd/pam-u2f/dist/fuzz/Makefile.am N src/external/bsd/pam-u2f/dist/fuzz/authfile.h N src/external/bsd/pam-u2f/dist/fuzz/coverage.sh N src/external/bsd/pam-u2f/dist/fuzz/fuzz.h N src/external/bsd/pam-u2f/dist/fuzz/fuzz_auth.c N src/external/bsd/pam-u2f/dist/fuzz/fuzz_format_parsers.c N src/external/bsd/pam-u2f/dist/fuzz/make_seed.py N src/external/bsd/pam-u2f/dist/fuzz/pack.c N src/external/bsd/pam-u2f/dist/fuzz/wiredata.h N src/external/bsd/pam-u2f/dist/fuzz/wrap.c U src/external/bsd/pam-u2f/dist/m4/ax_check_compile_flag.m4 U src/external/bsd/pam-u2f/dist/m4/lib-ld.m4 U src/external/bsd/pam-u2f/dist/m4/lib-link.m4 U src/external/bsd/pam-u2f/dist/m4/lib-prefix.m4 U src/external/bsd/pam-u2f/dist/man/pam_u2f.8.txt U src/external/bsd/pam-u2f/dist/man/pamu2fcfg.1.txt U src/external/bsd/pam-u2f/dist/pamu2fcfg/Makefile.am U src/external/bsd/pam-u2f/dist/pamu2fcfg/_readpassphrase.h U src/external/bsd/pam-u2f/dist/pamu2fcfg/cmdline.ggo N src/external/bsd/pam-u2f/dist/pamu2fcfg/openbsd-compat.h U src/external/bsd/pam-u2f/dist/pamu2fcfg/pamu2fcfg.c U src/external/bsd/pam-u2f/dist/pamu2fcfg/readpassphrase.c N src/external/bsd/pam-u2f/dist/pamu2fcfg/strlcpy.c U src/external/bsd/pam-u2f/dist/tests/Makefile.am U src/external/bsd/pam-u2f/dist/tests/basic.c N src/external/bsd/pam-u2f/dist/tests/get_devices.c N src/external/bsd/pam-u2f/dist/tests/regenerate_credentials.py U src/external/bsd/pam-u2f/dist/tests/bionic/Dockerfile U src/external/bsd/pam-u2f/dist/tests/bionic/README U src/external/bsd/pam-u2f/dist/tests/bionic/run.sh N src/external/bsd/pam-u2f/dist/tests/credentials/new_-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-P-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-P-V-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-P-V.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-P.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-V-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-V.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-r-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-r-P-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credent
CVS import: src/external/bsd/pam-u2f/dist
Module Name:src Committed By: christos Date: Fri Sep 24 12:51:20 UTC 2021 Update of /cvsroot/src/external/bsd/pam-u2f/dist In directory ivanova.netbsd.org:/tmp/cvs-serv115 Log Message: Import version 1.2.0 * Version 1.2.0 (released 2021-09-22) ** Added support for EdDSA keys. ** Added support for SSH ed25519-sk keys. ** Added authenticator filtering based on user verification options. ** Fixed an issue with privilege restoration on MacOS. ** Fixed an issue where credentials created with pamu2fcfg 1.0.8 or earlier were not handled correctly if their origin and appid differed. ** Miscellaneous improvements to the documentation. ** Miscellaneous minor bug fixes found by fuzzing. * Version 1.1.1 (released 2021-05-19) ** Fix an issue where PIN authentication could be bypassed (CVE-2021-31924). ** Fix an issue with nodetect and non-resident credentials. ** Fix build issues with musl libc. ** Add support for self-attestation in pamu2fcfg. ** Fix minor bugs found by fuzzing. * Version 1.1.0 (released 2020-09-17) ** Add support to FIDO2 (move from libu2f-host+libu2f-server to libfido2). ** Add support to User Verification ** Add support to PIN Verification ** Add support to Resident Credentials ** Add support to SSH credential format Status: Vendor Tag: YUBICO Release Tags: pam-u2f-1-2-0 U src/external/bsd/pam-u2f/dist/.clang-format U src/external/bsd/pam-u2f/dist/AUTHORS U src/external/bsd/pam-u2f/dist/COPYING U src/external/bsd/pam-u2f/dist/Makefile.am U src/external/bsd/pam-u2f/dist/NEWS U src/external/bsd/pam-u2f/dist/README U src/external/bsd/pam-u2f/dist/autogen.sh C src/external/bsd/pam-u2f/dist/b64.c U src/external/bsd/pam-u2f/dist/b64.h U src/external/bsd/pam-u2f/dist/configure.ac C src/external/bsd/pam-u2f/dist/drop_privs.h U src/external/bsd/pam-u2f/dist/explicit_bzero.c C src/external/bsd/pam-u2f/dist/pam-u2f.c C src/external/bsd/pam-u2f/dist/util.c C src/external/bsd/pam-u2f/dist/util.h N src/external/bsd/pam-u2f/dist/.github/workflows/alpine_builds.yml N src/external/bsd/pam-u2f/dist/.github/workflows/codeql-analysis.yml N src/external/bsd/pam-u2f/dist/.github/workflows/format.yml N src/external/bsd/pam-u2f/dist/.github/workflows/linux_builds.yml N src/external/bsd/pam-u2f/dist/.github/workflows/linux_fuzz.yml N src/external/bsd/pam-u2f/dist/.github/workflows/macos_builds.yml N src/external/bsd/pam-u2f/dist/.github/workflows/scan.yml N src/external/bsd/pam-u2f/dist/build-aux/ci/build-linux-clang.sh N src/external/bsd/pam-u2f/dist/build-aux/ci/build-linux-gcc.sh U src/external/bsd/pam-u2f/dist/build-aux/ci/build-osx.sh N src/external/bsd/pam-u2f/dist/build-aux/ci/distcheck.sh U src/external/bsd/pam-u2f/dist/build-aux/ci/format-code.sh N src/external/bsd/pam-u2f/dist/build-aux/ci/fuzz-linux-asan.sh N src/external/bsd/pam-u2f/dist/fuzz/Makefile.am N src/external/bsd/pam-u2f/dist/fuzz/authfile.h N src/external/bsd/pam-u2f/dist/fuzz/coverage.sh N src/external/bsd/pam-u2f/dist/fuzz/fuzz.h N src/external/bsd/pam-u2f/dist/fuzz/fuzz_auth.c N src/external/bsd/pam-u2f/dist/fuzz/fuzz_format_parsers.c N src/external/bsd/pam-u2f/dist/fuzz/make_seed.py N src/external/bsd/pam-u2f/dist/fuzz/pack.c N src/external/bsd/pam-u2f/dist/fuzz/wiredata.h N src/external/bsd/pam-u2f/dist/fuzz/wrap.c U src/external/bsd/pam-u2f/dist/m4/ax_check_compile_flag.m4 U src/external/bsd/pam-u2f/dist/m4/lib-ld.m4 U src/external/bsd/pam-u2f/dist/m4/lib-link.m4 U src/external/bsd/pam-u2f/dist/m4/lib-prefix.m4 U src/external/bsd/pam-u2f/dist/man/pam_u2f.8.txt U src/external/bsd/pam-u2f/dist/man/pamu2fcfg.1.txt U src/external/bsd/pam-u2f/dist/pamu2fcfg/Makefile.am U src/external/bsd/pam-u2f/dist/pamu2fcfg/_readpassphrase.h U src/external/bsd/pam-u2f/dist/pamu2fcfg/cmdline.ggo N src/external/bsd/pam-u2f/dist/pamu2fcfg/openbsd-compat.h U src/external/bsd/pam-u2f/dist/pamu2fcfg/pamu2fcfg.c U src/external/bsd/pam-u2f/dist/pamu2fcfg/readpassphrase.c N src/external/bsd/pam-u2f/dist/pamu2fcfg/strlcpy.c U src/external/bsd/pam-u2f/dist/tests/Makefile.am U src/external/bsd/pam-u2f/dist/tests/basic.c N src/external/bsd/pam-u2f/dist/tests/get_devices.c N src/external/bsd/pam-u2f/dist/tests/regenerate_credentials.py U src/external/bsd/pam-u2f/dist/tests/bionic/Dockerfile U src/external/bsd/pam-u2f/dist/tests/bionic/README U src/external/bsd/pam-u2f/dist/tests/bionic/run.sh N src/external/bsd/pam-u2f/dist/tests/credentials/new_-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-P-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-P-V-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-P-V.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-P.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-V-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-V.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-r-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credentials/new_-r-P-N.cred.in N src/external/bsd/pam-u2f/dist/tests/credent
CVS import: src/external/bsd/libfido2/dist
Module Name:src Committed By: christos Date: Fri Sep 24 12:43:30 UTC 2021 Update of /cvsroot/src/external/bsd/libfido2/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27831 Log Message: Import libfido2 1.8.0 * Version 1.8.0 (2021-07-22) ** Dropped 'Requires.private' entry from pkg-config file. ** Better support for FIDO 2.1 authenticators. ** Support for Windows's native webauthn API. ** Support for attestation format 'none'. ** New API calls: - fido_assert_set_clientdata; - fido_cbor_info_algorithm_cose; - fido_cbor_info_algorithm_count; - fido_cbor_info_algorithm_type; - fido_cbor_info_transports_len; - fido_cbor_info_transports_ptr; - fido_cred_set_clientdata; - fido_cred_set_id; - fido_credman_set_dev_rk; - fido_dev_is_winhello. ** fido2-token: new -Sc option to update a resident credential. ** Documentation and reliability fixes. ** HID access serialisation on Linux. Status: Vendor Tag: YUBICO Release Tags: libfido2-1-8-0 U src/external/bsd/libfido2/dist/CMakeLists.txt U src/external/bsd/libfido2/dist/LICENSE U src/external/bsd/libfido2/dist/NEWS U src/external/bsd/libfido2/dist/README.adoc U src/external/bsd/libfido2/dist/examples/CMakeLists.txt U src/external/bsd/libfido2/dist/examples/README.adoc U src/external/bsd/libfido2/dist/examples/assert.c U src/external/bsd/libfido2/dist/examples/cred.c U src/external/bsd/libfido2/dist/examples/extern.h U src/external/bsd/libfido2/dist/examples/info.c U src/external/bsd/libfido2/dist/examples/manifest.c U src/external/bsd/libfido2/dist/examples/reset.c U src/external/bsd/libfido2/dist/examples/retries.c U src/external/bsd/libfido2/dist/examples/select.c U src/external/bsd/libfido2/dist/examples/setpin.c U src/external/bsd/libfido2/dist/examples/util.c U src/external/bsd/libfido2/dist/fuzz/CMakeLists.txt U src/external/bsd/libfido2/dist/fuzz/Dockerfile U src/external/bsd/libfido2/dist/fuzz/Makefile U src/external/bsd/libfido2/dist/fuzz/README U src/external/bsd/libfido2/dist/fuzz/build-coverage U src/external/bsd/libfido2/dist/fuzz/dummy.h U src/external/bsd/libfido2/dist/fuzz/export.gnu U src/external/bsd/libfido2/dist/fuzz/functions.txt U src/external/bsd/libfido2/dist/fuzz/fuzz_assert.c U src/external/bsd/libfido2/dist/fuzz/fuzz_bio.c U src/external/bsd/libfido2/dist/fuzz/fuzz_cred.c U src/external/bsd/libfido2/dist/fuzz/fuzz_credman.c U src/external/bsd/libfido2/dist/fuzz/fuzz_hid.c U src/external/bsd/libfido2/dist/fuzz/fuzz_largeblob.c U src/external/bsd/libfido2/dist/fuzz/fuzz_mgmt.c U src/external/bsd/libfido2/dist/fuzz/fuzz_netlink.c U src/external/bsd/libfido2/dist/fuzz/libfuzzer.c U src/external/bsd/libfido2/dist/fuzz/mutator_aux.c U src/external/bsd/libfido2/dist/fuzz/mutator_aux.h U src/external/bsd/libfido2/dist/fuzz/preload-fuzz.c U src/external/bsd/libfido2/dist/fuzz/preload-snoop.c U src/external/bsd/libfido2/dist/fuzz/prng.c U src/external/bsd/libfido2/dist/fuzz/report.tgz U src/external/bsd/libfido2/dist/fuzz/summary.txt N src/external/bsd/libfido2/dist/fuzz/udev.c U src/external/bsd/libfido2/dist/fuzz/uniform_random.c U src/external/bsd/libfido2/dist/fuzz/wiredata_fido2.h U src/external/bsd/libfido2/dist/fuzz/wiredata_u2f.h U src/external/bsd/libfido2/dist/fuzz/wrap.c U src/external/bsd/libfido2/dist/fuzz/wrapped.sym U src/external/bsd/libfido2/dist/man/CMakeLists.txt U src/external/bsd/libfido2/dist/man/NOTES U src/external/bsd/libfido2/dist/man/dyc.css U src/external/bsd/libfido2/dist/man/eddsa_pk_new.3 U src/external/bsd/libfido2/dist/man/es256_pk_new.3 U src/external/bsd/libfido2/dist/man/fido2-assert.1 U src/external/bsd/libfido2/dist/man/fido2-cred.1 U src/external/bsd/libfido2/dist/man/fido2-token.1 U src/external/bsd/libfido2/dist/man/fido_assert_allow_cred.3 U src/external/bsd/libfido2/dist/man/fido_assert_new.3 U src/external/bsd/libfido2/dist/man/fido_assert_set_authdata.3 U src/external/bsd/libfido2/dist/man/fido_assert_verify.3 U src/external/bsd/libfido2/dist/man/fido_bio_dev_get_info.3 U src/external/bsd/libfido2/dist/man/fido_bio_enroll_new.3 U src/external/bsd/libfido2/dist/man/fido_bio_info_new.3 U src/external/bsd/libfido2/dist/man/fido_bio_template.3 U src/external/bsd/libfido2/dist/man/fido_cbor_info_new.3 U src/external/bsd/libfido2/dist/man/fido_cred_exclude.3 U src/external/bsd/libfido2/dist/man/fido_cred_new.3 U src/external/bsd/libfido2/dist/man/fido_cred_set_authdata.3 U src/external/bsd/libfido2/dist/man/fido_cred_verify.3 U src/external/bsd/libfido2/dist/man/fido_credman_metadata_new.3 U src/external/bsd/libfido2/dist/man/fido_dev_enable_entattest.3 U src/external/bsd/libfido2/dist/man/fido_dev_get_assert.3 U src/external/bsd/libfido2/dist/man/fido_dev_get_touch_begin.3 U src/external/bsd/libfido2/dist/man/fido_dev_info_manifest.3 U src/external/bsd/libfido2/dist/man/fido_dev_largeblob_get.3 U src/external/bsd/libfido2/dist/man/fido_dev_make_cred.3 U src/external/bsd/libfido2/dist/man/fido_dev_open.3 U src/external/bsd/libfido2/dist/man/f
CVS import: src/external/bsd/libfido2/dist
Module Name:src Committed By: christos Date: Fri Sep 24 12:43:30 UTC 2021 Update of /cvsroot/src/external/bsd/libfido2/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27831 Log Message: Import libfido2 1.8.0 * Version 1.8.0 (2021-07-22) ** Dropped 'Requires.private' entry from pkg-config file. ** Better support for FIDO 2.1 authenticators. ** Support for Windows's native webauthn API. ** Support for attestation format 'none'. ** New API calls: - fido_assert_set_clientdata; - fido_cbor_info_algorithm_cose; - fido_cbor_info_algorithm_count; - fido_cbor_info_algorithm_type; - fido_cbor_info_transports_len; - fido_cbor_info_transports_ptr; - fido_cred_set_clientdata; - fido_cred_set_id; - fido_credman_set_dev_rk; - fido_dev_is_winhello. ** fido2-token: new -Sc option to update a resident credential. ** Documentation and reliability fixes. ** HID access serialisation on Linux. Status: Vendor Tag: YUBICO Release Tags: libfido2-1-8-0 U src/external/bsd/libfido2/dist/CMakeLists.txt U src/external/bsd/libfido2/dist/LICENSE U src/external/bsd/libfido2/dist/NEWS U src/external/bsd/libfido2/dist/README.adoc U src/external/bsd/libfido2/dist/examples/CMakeLists.txt U src/external/bsd/libfido2/dist/examples/README.adoc U src/external/bsd/libfido2/dist/examples/assert.c U src/external/bsd/libfido2/dist/examples/cred.c U src/external/bsd/libfido2/dist/examples/extern.h U src/external/bsd/libfido2/dist/examples/info.c U src/external/bsd/libfido2/dist/examples/manifest.c U src/external/bsd/libfido2/dist/examples/reset.c U src/external/bsd/libfido2/dist/examples/retries.c U src/external/bsd/libfido2/dist/examples/select.c U src/external/bsd/libfido2/dist/examples/setpin.c U src/external/bsd/libfido2/dist/examples/util.c U src/external/bsd/libfido2/dist/fuzz/CMakeLists.txt U src/external/bsd/libfido2/dist/fuzz/Dockerfile U src/external/bsd/libfido2/dist/fuzz/Makefile U src/external/bsd/libfido2/dist/fuzz/README U src/external/bsd/libfido2/dist/fuzz/build-coverage U src/external/bsd/libfido2/dist/fuzz/dummy.h U src/external/bsd/libfido2/dist/fuzz/export.gnu U src/external/bsd/libfido2/dist/fuzz/functions.txt U src/external/bsd/libfido2/dist/fuzz/fuzz_assert.c U src/external/bsd/libfido2/dist/fuzz/fuzz_bio.c U src/external/bsd/libfido2/dist/fuzz/fuzz_cred.c U src/external/bsd/libfido2/dist/fuzz/fuzz_credman.c U src/external/bsd/libfido2/dist/fuzz/fuzz_hid.c U src/external/bsd/libfido2/dist/fuzz/fuzz_largeblob.c U src/external/bsd/libfido2/dist/fuzz/fuzz_mgmt.c U src/external/bsd/libfido2/dist/fuzz/fuzz_netlink.c U src/external/bsd/libfido2/dist/fuzz/libfuzzer.c U src/external/bsd/libfido2/dist/fuzz/mutator_aux.c U src/external/bsd/libfido2/dist/fuzz/mutator_aux.h U src/external/bsd/libfido2/dist/fuzz/preload-fuzz.c U src/external/bsd/libfido2/dist/fuzz/preload-snoop.c U src/external/bsd/libfido2/dist/fuzz/prng.c U src/external/bsd/libfido2/dist/fuzz/report.tgz U src/external/bsd/libfido2/dist/fuzz/summary.txt N src/external/bsd/libfido2/dist/fuzz/udev.c U src/external/bsd/libfido2/dist/fuzz/uniform_random.c U src/external/bsd/libfido2/dist/fuzz/wiredata_fido2.h U src/external/bsd/libfido2/dist/fuzz/wiredata_u2f.h U src/external/bsd/libfido2/dist/fuzz/wrap.c U src/external/bsd/libfido2/dist/fuzz/wrapped.sym U src/external/bsd/libfido2/dist/man/CMakeLists.txt U src/external/bsd/libfido2/dist/man/NOTES U src/external/bsd/libfido2/dist/man/dyc.css U src/external/bsd/libfido2/dist/man/eddsa_pk_new.3 U src/external/bsd/libfido2/dist/man/es256_pk_new.3 U src/external/bsd/libfido2/dist/man/fido2-assert.1 U src/external/bsd/libfido2/dist/man/fido2-cred.1 U src/external/bsd/libfido2/dist/man/fido2-token.1 U src/external/bsd/libfido2/dist/man/fido_assert_allow_cred.3 U src/external/bsd/libfido2/dist/man/fido_assert_new.3 U src/external/bsd/libfido2/dist/man/fido_assert_set_authdata.3 U src/external/bsd/libfido2/dist/man/fido_assert_verify.3 U src/external/bsd/libfido2/dist/man/fido_bio_dev_get_info.3 U src/external/bsd/libfido2/dist/man/fido_bio_enroll_new.3 U src/external/bsd/libfido2/dist/man/fido_bio_info_new.3 U src/external/bsd/libfido2/dist/man/fido_bio_template.3 U src/external/bsd/libfido2/dist/man/fido_cbor_info_new.3 U src/external/bsd/libfido2/dist/man/fido_cred_exclude.3 U src/external/bsd/libfido2/dist/man/fido_cred_new.3 U src/external/bsd/libfido2/dist/man/fido_cred_set_authdata.3 U src/external/bsd/libfido2/dist/man/fido_cred_verify.3 U src/external/bsd/libfido2/dist/man/fido_credman_metadata_new.3 U src/external/bsd/libfido2/dist/man/fido_dev_enable_entattest.3 U src/external/bsd/libfido2/dist/man/fido_dev_get_assert.3 U src/external/bsd/libfido2/dist/man/fido_dev_get_touch_begin.3 U src/external/bsd/libfido2/dist/man/fido_dev_info_manifest.3 U src/external/bsd/libfido2/dist/man/fido_dev_largeblob_get.3 U src/external/bsd/libfido2/dist/man/fido_dev_make_cred.3 U src/external/bsd/libfido2/dist/man/fido_dev_open.3 U src/external/bsd/libfido2/dist/man/f
CVS commit: src/sys/net
Module Name:src Committed By: knakahara Date: Fri Sep 24 08:40:35 UTC 2021 Modified Files: src/sys/net: toeplitz.c Log Message: Add copyright for no-memcpy toeplitz hash, pointed out by wiz@n.o, thanks. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/net/toeplitz.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/net/toeplitz.c diff -u src/sys/net/toeplitz.c:1.3 src/sys/net/toeplitz.c:1.4 --- src/sys/net/toeplitz.c:1.3 Fri Sep 24 04:09:32 2021 +++ src/sys/net/toeplitz.c Fri Sep 24 08:40:35 2021 @@ -51,6 +51,32 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +/*- + * Copyright (c) 2019 Ryo Shimizu + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + #include #include #include
CVS commit: src/sys/net
Module Name:src Committed By: knakahara Date: Fri Sep 24 08:40:35 UTC 2021 Modified Files: src/sys/net: toeplitz.c Log Message: Add copyright for no-memcpy toeplitz hash, pointed out by wiz@n.o, thanks. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/net/toeplitz.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
Module Name:src Committed By: skrll Date: Fri Sep 24 08:07:40 UTC 2021 Modified Files: src/sys/arch/arm/imx: imx31_intr.h imx51_intr.h src/sys/arch/arm/marvell: mvsoc_intr.h src/sys/arch/arm/omap: omap2_intr.h src/sys/arch/epoc32/include: intr.h Log Message: Catch up with spl changes. It's 2021 and ugly is in (with apologies to PWEI) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx31_intr.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx51_intr.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/marvell/mvsoc_intr.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap2_intr.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/include/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/imx/imx31_intr.h diff -u src/sys/arch/arm/imx/imx31_intr.h:1.3 src/sys/arch/arm/imx/imx31_intr.h:1.4 --- src/sys/arch/arm/imx/imx31_intr.h:1.3 Mon Apr 28 20:23:14 2008 +++ src/sys/arch/arm/imx/imx31_intr.h Fri Sep 24 08:07:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: imx31_intr.h,v 1.3 2008/04/28 20:23:14 martin Exp $ */ +/* $NetBSD: imx31_intr.h,v 1.4 2021/09/24 08:07:40 skrll Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. * All rights reserved. @@ -121,11 +121,12 @@ #define PIC_MAXMAXSOURCES (64+3*32+128) +#define _splraise pic_splraise +#define _spllower pic_spllower +#define splx pic_splx + #include -int _splraise(int); -int _spllower(int); -void splx(int); const char * intr_typename(int); Index: src/sys/arch/arm/imx/imx51_intr.h diff -u src/sys/arch/arm/imx/imx51_intr.h:1.1 src/sys/arch/arm/imx/imx51_intr.h:1.2 --- src/sys/arch/arm/imx/imx51_intr.h:1.1 Sat Nov 13 07:11:02 2010 +++ src/sys/arch/arm/imx/imx51_intr.h Fri Sep 24 08:07:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: imx51_intr.h,v 1.1 2010/11/13 07:11:02 bsh Exp $ */ +/* $NetBSD: imx51_intr.h,v 1.2 2021/09/24 08:07:40 skrll Exp $ */ /*- * Copyright (c) 2009 SHIMIZU Ryo * All rights reserved. @@ -290,11 +290,12 @@ #define PIC_MAXSOURCES 128 #define PIC_MAXMAXSOURCES (PIC_MAXSOURCES+128) +#define _splraise pic_splraise +#define _spllower pic_spllower +#define splx pic_splx + #include -int _splraise(int); -int _spllower(int); -void splx(int); const char *intr_typename(int); void imx51_irq_handler(void *); Index: src/sys/arch/arm/marvell/mvsoc_intr.h diff -u src/sys/arch/arm/marvell/mvsoc_intr.h:1.6 src/sys/arch/arm/marvell/mvsoc_intr.h:1.7 --- src/sys/arch/arm/marvell/mvsoc_intr.h:1.6 Wed Jun 3 03:04:21 2015 +++ src/sys/arch/arm/marvell/mvsoc_intr.h Fri Sep 24 08:07:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: mvsoc_intr.h,v 1.6 2015/06/03 03:04:21 hsuenaga Exp $ */ +/* $NetBSD: mvsoc_intr.h,v 1.7 2021/09/24 08:07:40 skrll Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved. @@ -45,6 +45,10 @@ extern int (*find_pending_irqs)(void); void mvsoc_irq_handler(void *); +#define _splraise pic_splraise +#define _spllower pic_spllower +#define splx pic_splx + #include static __inline void * Index: src/sys/arch/arm/omap/omap2_intr.h diff -u src/sys/arch/arm/omap/omap2_intr.h:1.9 src/sys/arch/arm/omap/omap2_intr.h:1.10 --- src/sys/arch/arm/omap/omap2_intr.h:1.9 Sat Jun 15 21:55:09 2013 +++ src/sys/arch/arm/omap/omap2_intr.h Fri Sep 24 08:07:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: omap2_intr.h,v 1.9 2013/06/15 21:55:09 matt Exp $ */ +/* $NetBSD: omap2_intr.h,v 1.10 2021/09/24 08:07:40 skrll Exp $ */ /* * Define the SDP2430 specific information and then include the generic OMAP @@ -49,6 +49,10 @@ #ifndef _LOCORE +#define _splraise pic_splraise +#define _spllower pic_spllower +#define splx pic_splx + #include #endif /* ! _LOCORE */ Index: src/sys/arch/epoc32/include/intr.h diff -u src/sys/arch/epoc32/include/intr.h:1.3 src/sys/arch/epoc32/include/intr.h:1.4 --- src/sys/arch/epoc32/include/intr.h:1.3 Sat Jun 5 21:24:16 2021 +++ src/sys/arch/epoc32/include/intr.h Fri Sep 24 08:07:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.3 2021/06/05 21:24:16 christos Exp $ */ +/* $NetBSD: intr.h,v 1.4 2021/09/24 08:07:40 skrll Exp $ */ /* * Copyright (c) 2001, 2003 Wasabi Systems, Inc. @@ -69,6 +69,10 @@ #define PIC_MAXSOURCES 16 #define PIC_MAXMAXSOURCES 16 +#define _splraise pic_splraise +#define _spllower pic_spllower +#define splx pic_splx + #include typedef uint8_t ipl_t;
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Fri Sep 24 08:07:40 UTC 2021 Modified Files: src/sys/arch/arm/imx: imx31_intr.h imx51_intr.h src/sys/arch/arm/marvell: mvsoc_intr.h src/sys/arch/arm/omap: omap2_intr.h src/sys/arch/epoc32/include: intr.h Log Message: Catch up with spl changes. It's 2021 and ugly is in (with apologies to PWEI) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx31_intr.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx51_intr.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/marvell/mvsoc_intr.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap2_intr.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/include/intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Fri Sep 24 08:04:15 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: std.kobo std.netwalker Log Message: Make the KOBO and NETWALKER kernels compile again. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/std.kobo cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.netwalker Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/std.kobo diff -u src/sys/arch/evbarm/conf/std.kobo:1.5 src/sys/arch/evbarm/conf/std.kobo:1.6 --- src/sys/arch/evbarm/conf/std.kobo:1.5 Sat May 18 08:49:23 2019 +++ src/sys/arch/evbarm/conf/std.kobo Fri Sep 24 08:04:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: std.kobo,v 1.5 2019/05/18 08:49:23 skrll Exp $ +# $NetBSD: std.kobo,v 1.6 2021/09/24 08:04:15 skrll Exp $ # # standard NetBSD/evbarm options for Kobo @@ -27,3 +27,8 @@ options __HAVE_MM_MD_DIRECT_MAPPED_PHYS makeoptions LOADADDRESS_VIRT="0x8010" makeoptions LOADADDRESS="0x7010" makeoptions BOARDMKFRAG="${THISARM}/conf/mk.kobo" + +# Prevent the addition of a command line -DKERNEL_BASE_VOFFSET= as it +# is done at runtime. +makeoptions KERNEL_VOFFSET_RUNTIME=1 + Index: src/sys/arch/evbarm/conf/std.netwalker diff -u src/sys/arch/evbarm/conf/std.netwalker:1.13 src/sys/arch/evbarm/conf/std.netwalker:1.14 --- src/sys/arch/evbarm/conf/std.netwalker:1.13 Thu Jun 13 04:20:23 2019 +++ src/sys/arch/evbarm/conf/std.netwalker Fri Sep 24 08:04:15 2021 @@ -1,4 +1,4 @@ -# $NetBSD: std.netwalker,v 1.13 2019/06/13 04:20:23 hkenken Exp $ +# $NetBSD: std.netwalker,v 1.14 2021/09/24 08:04:15 skrll Exp $ # # standard NetBSD/evbarm options for Sharp NetWalker @@ -30,3 +30,8 @@ makeoptions BOARDMKFRAG="${THISARM}/con makeoptions KERNEL_BASE_PHYS=0x90008000 makeoptions KERNEL_BASE_VIRT=0x80008000 + +# Prevent the addition of a command line -DKERNEL_BASE_VOFFSET= as it +# is done at runtime. +makeoptions KERNEL_VOFFSET_RUNTIME=1 +
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Fri Sep 24 08:04:15 UTC 2021 Modified Files: src/sys/arch/evbarm/conf: std.kobo std.netwalker Log Message: Make the KOBO and NETWALKER kernels compile again. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/std.kobo cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/std.netwalker Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.