sync with OpenBSD -current

This commit is contained in:
purplerain 2023-11-15 11:31:12 +00:00
parent 4574748555
commit a7acbdeab0
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
11 changed files with 50 additions and 29 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: login.conf,v 1.13 2022/02/21 06:38:57 robert Exp $ # $OpenBSD: login.conf,v 1.14 2023/11/14 12:48:46 jsg Exp $
# #
# Sample login.conf file. See login.conf(5) for details. # Sample login.conf file. See login.conf(5) for details.
@ -41,8 +41,8 @@ auth-ftp-defaults:auth-ftp=passwd:
default:\ default:\
:path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\ :path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\
:umask=022:\ :umask=022:\
:datasize-max=768M:\ :datasize-max=1536M:\
:datasize-cur=768M:\ :datasize-cur=1536M:\
:maxproc-max=256:\ :maxproc-max=256:\
:maxproc-cur=128:\ :maxproc-cur=128:\
:openfiles-max=1024:\ :openfiles-max=1024:\

View File

@ -1 +1 @@
# SecBSD 1.4-609421e: Tue Nov 14 10 00:45:01 UTC 2023 (Mictlantecuhtli) # SecBSD 1.4-3174c54: Tue Nov 14 10 00:45:01 UTC 2023 (Mictlantecuhtli)

View File

@ -1,4 +1,4 @@
/* $OpenBSD: gethostnamadr_async.c,v 1.46 2022/11/17 17:39:41 florian Exp $ */ /* $OpenBSD: gethostnamadr_async.c,v 1.47 2023/11/14 08:27:33 florian Exp $ */
/* /*
* Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * Copyright (c) 2012 Eric Faurot <eric@openbsd.org>
* *
@ -202,11 +202,12 @@ gethostnamadr_async_run(struct asr_query *as, struct asr_result *ar)
} }
async_set_state(as, ASR_STATE_HALT); async_set_state(as, ASR_STATE_HALT);
break; break;
} else { }
if (!hnok_lenient(as->as.hostnamadr.name)) {
ar->ar_gai_errno = EAI_FAIL; if (!hnok_lenient(as->as.hostnamadr.name)) {
async_set_state(as, ASR_STATE_HALT); ar->ar_gai_errno = EAI_FAIL;
} async_set_state(as, ASR_STATE_HALT);
break;
} }
} }
async_set_state(as, ASR_STATE_NEXT_DB); async_set_state(as, ASR_STATE_NEXT_DB);

View File

@ -217,6 +217,7 @@ static const struct pci_matchid amdgpu_devices[] = {
{0x1002, 0x7489 }, /* Radeon Pro W7500 */ {0x1002, 0x7489 }, /* Radeon Pro W7500 */
/* GC 11.0.3, DCN 3.2.0, dGPU, "Navi 32" */ /* GC 11.0.3, DCN 3.2.0, dGPU, "Navi 32" */
{0x1002, 0x7470 }, /* Radeon Pro W7700 */
{0x1002, 0x747e }, /* Radeon RX 7700 XT, 7800 XT */ {0x1002, 0x747e }, /* Radeon RX 7700 XT, 7800 XT */
/* GC 11.0.4, DCN 3.1.4, APU, "Phoenix 2" */ /* GC 11.0.4, DCN 3.1.4, APU, "Phoenix 2" */

View File

@ -1,4 +1,4 @@
$OpenBSD: pcidevs,v 1.2052 2023/11/10 12:14:04 jsg Exp $ $OpenBSD: pcidevs,v 1.2053 2023/11/14 02:25:48 jsg Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/* /*
@ -2103,7 +2103,8 @@ product ATI BEIGE_GOBY_6 0x743f Navi 24
product ATI NAVI31_2 0x7448 Navi 31 product ATI NAVI31_2 0x7448 Navi 31
product ATI NAVI31_1 0x744c Navi 31 product ATI NAVI31_1 0x744c Navi 31
product ATI NAVI31_3 0x745e Navi 31 product ATI NAVI31_3 0x745e Navi 31
product ATI NAVI32_1 0x747e Navi 32 product ATI NAVI32_1 0x7470 Navi 32
product ATI NAVI32_2 0x747e Navi 32
product ATI NAVI33_1 0x7480 Navi 33 product ATI NAVI33_1 0x7480 Navi 33
product ATI NAVI33_2 0x7483 Navi 33 product ATI NAVI33_2 0x7483 Navi 33
product ATI NAVI33_3 0x7489 Navi 33 product ATI NAVI33_3 0x7489 Navi 33

View File

@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
* *
* generated from: * generated from:
* OpenBSD: pcidevs,v 1.2052 2023/11/10 12:14:04 jsg Exp * OpenBSD: pcidevs,v 1.2053 2023/11/14 02:25:48 jsg Exp
*/ */
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@ -2108,7 +2108,8 @@
#define PCI_PRODUCT_ATI_NAVI31_2 0x7448 /* Navi 31 */ #define PCI_PRODUCT_ATI_NAVI31_2 0x7448 /* Navi 31 */
#define PCI_PRODUCT_ATI_NAVI31_1 0x744c /* Navi 31 */ #define PCI_PRODUCT_ATI_NAVI31_1 0x744c /* Navi 31 */
#define PCI_PRODUCT_ATI_NAVI31_3 0x745e /* Navi 31 */ #define PCI_PRODUCT_ATI_NAVI31_3 0x745e /* Navi 31 */
#define PCI_PRODUCT_ATI_NAVI32_1 0x747e /* Navi 32 */ #define PCI_PRODUCT_ATI_NAVI32_1 0x7470 /* Navi 32 */
#define PCI_PRODUCT_ATI_NAVI32_2 0x747e /* Navi 32 */
#define PCI_PRODUCT_ATI_NAVI33_1 0x7480 /* Navi 33 */ #define PCI_PRODUCT_ATI_NAVI33_1 0x7480 /* Navi 33 */
#define PCI_PRODUCT_ATI_NAVI33_2 0x7483 /* Navi 33 */ #define PCI_PRODUCT_ATI_NAVI33_2 0x7483 /* Navi 33 */
#define PCI_PRODUCT_ATI_NAVI33_3 0x7489 /* Navi 33 */ #define PCI_PRODUCT_ATI_NAVI33_3 0x7489 /* Navi 33 */

View File

@ -2,7 +2,7 @@
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
* *
* generated from: * generated from:
* OpenBSD: pcidevs,v 1.2052 2023/11/10 12:14:04 jsg Exp * OpenBSD: pcidevs,v 1.2053 2023/11/14 02:25:48 jsg Exp
*/ */
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@ -6555,6 +6555,10 @@ static const struct pci_known_product pci_known_products[] = {
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_1, PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_1,
"Navi 32", "Navi 32",
}, },
{
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_2,
"Navi 32",
},
{ {
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI33_1, PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI33_1,
"Navi 33", "Navi 33",

View File

@ -1,4 +1,4 @@
/* $OpenBSD: route.c,v 1.109 2022/06/28 15:17:23 bluhm Exp $ */ /* $OpenBSD: route.c,v 1.110 2023/11/14 10:31:22 claudio Exp $ */
/* $NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $ */ /* $NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $ */
/* /*
@ -37,6 +37,7 @@
#include <net/if.h> #include <net/if.h>
#include <net/if_types.h> #include <net/if_types.h>
#define _KERNEL #define _KERNEL
#include <net/art.h>
#include <net/route.h> #include <net/route.h>
#undef _KERNEL #undef _KERNEL
#include <netinet/ip_ipsp.h> #include <netinet/ip_ipsp.h>

View File

@ -1,4 +1,4 @@
/* $OpenBSD: arguments.c,v 1.60 2023/06/30 21:55:08 nicm Exp $ */ /* $OpenBSD: arguments.c,v 1.61 2023/11/14 15:59:49 nicm Exp $ */
/* /*
* Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2010 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -761,6 +761,7 @@ args_make_commands_prepare(struct cmd *self, struct cmdq_item *item, u_int idx,
struct args_value *value; struct args_value *value;
struct args_command_state *state; struct args_command_state *state;
const char *cmd; const char *cmd;
const char *file;
state = xcalloc(1, sizeof *state); state = xcalloc(1, sizeof *state);
@ -787,7 +788,8 @@ args_make_commands_prepare(struct cmd *self, struct cmdq_item *item, u_int idx,
if (wait) if (wait)
state->pi.item = item; state->pi.item = item;
cmd_get_source(self, &state->pi.file, &state->pi.line); cmd_get_source(self, &file, &state->pi.line);
state->pi.file = xstrdup(file);
state->pi.c = tc; state->pi.c = tc;
if (state->pi.c != NULL) if (state->pi.c != NULL)
state->pi.c->references++; state->pi.c->references++;
@ -842,6 +844,7 @@ args_make_commands_free(struct args_command_state *state)
cmd_list_free(state->cmdlist); cmd_list_free(state->cmdlist);
if (state->pi.c != NULL) if (state->pi.c != NULL)
server_client_unref(state->pi.c); server_client_unref(state->pi.c);
free((void *)state->pi.file);
free(state->cmd); free(state->cmd);
free(state); free(state);
} }

View File

@ -1,4 +1,4 @@
/* $OpenBSD: status.c,v 1.240 2023/08/15 07:01:47 nicm Exp $ */ /* $OpenBSD: status.c,v 1.241 2023/11/14 15:59:49 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -472,17 +472,26 @@ void
status_message_set(struct client *c, int delay, int ignore_styles, status_message_set(struct client *c, int delay, int ignore_styles,
int ignore_keys, const char *fmt, ...) int ignore_keys, const char *fmt, ...)
{ {
struct timeval tv; struct timeval tv;
va_list ap; va_list ap;
char *s;
va_start(ap, fmt);
xvasprintf(&s, fmt, ap);
va_end(ap);
log_debug("%s: %s", __func__, s);
if (c == NULL) {
server_add_message("message: %s", s);
free(s);
return;
}
status_message_clear(c); status_message_clear(c);
status_push_screen(c); status_push_screen(c);
c->message_string = s;
va_start(ap, fmt); server_add_message("%s message: %s", c->name, s);
xvasprintf(&c->message_string, fmt, ap);
va_end(ap);
server_add_message("%s message: %s", c->name, c->message_string);
/* /*
* With delay -1, the display-time option is used; zero means wait for * With delay -1, the display-time option is used; zero means wait for

View File

@ -1,4 +1,4 @@
/* $OpenBSD: tty-features.c,v 1.29 2023/09/02 09:17:23 nicm Exp $ */ /* $OpenBSD: tty-features.c,v 1.30 2023/11/14 15:38:33 nicm Exp $ */
/* /*
* Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2020 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -216,7 +216,7 @@ static const struct tty_feature tty_feature_strikethrough = {
/* Terminal supports synchronized updates. */ /* Terminal supports synchronized updates. */
static const char *const tty_feature_sync_capabilities[] = { static const char *const tty_feature_sync_capabilities[] = {
"Sync=\\EP=%p1%ds\\E\\\\", "Sync=\\E[?2026%?%p1%{1}%-%tl%eh%;",
NULL NULL
}; };
static const struct tty_feature tty_feature_sync = { static const struct tty_feature tty_feature_sync = {