diff --git a/etc/etc.armv7/login.conf b/etc/etc.armv7/login.conf index 87a9d50e2..0f0982cef 100644 --- a/etc/etc.armv7/login.conf +++ b/etc/etc.armv7/login.conf @@ -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. @@ -41,8 +41,8 @@ auth-ftp-defaults:auth-ftp=passwd: default:\ :path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\ :umask=022:\ - :datasize-max=768M:\ - :datasize-cur=768M:\ + :datasize-max=1536M:\ + :datasize-cur=1536M:\ :maxproc-max=256:\ :maxproc-cur=128:\ :openfiles-max=1024:\ diff --git a/etc/skel/dot.version b/etc/skel/dot.version index 470cfa66a..cab1d12d7 100644 --- a/etc/skel/dot.version +++ b/etc/skel/dot.version @@ -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) diff --git a/lib/libc/asr/gethostnamadr_async.c b/lib/libc/asr/gethostnamadr_async.c index e40811b69..bdc00cbdd 100644 --- a/lib/libc/asr/gethostnamadr_async.c +++ b/lib/libc/asr/gethostnamadr_async.c @@ -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 * @@ -202,11 +202,12 @@ gethostnamadr_async_run(struct asr_query *as, struct asr_result *ar) } async_set_state(as, ASR_STATE_HALT); break; - } else { - if (!hnok_lenient(as->as.hostnamadr.name)) { - ar->ar_gai_errno = EAI_FAIL; - async_set_state(as, ASR_STATE_HALT); - } + } + + if (!hnok_lenient(as->as.hostnamadr.name)) { + ar->ar_gai_errno = EAI_FAIL; + async_set_state(as, ASR_STATE_HALT); + break; } } async_set_state(as, ASR_STATE_NEXT_DB); diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h index 8269cad56..674e56199 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_devlist.h @@ -217,6 +217,7 @@ static const struct pci_matchid amdgpu_devices[] = { {0x1002, 0x7489 }, /* Radeon Pro W7500 */ /* GC 11.0.3, DCN 3.2.0, dGPU, "Navi 32" */ + {0x1002, 0x7470 }, /* Radeon Pro W7700 */ {0x1002, 0x747e }, /* Radeon RX 7700 XT, 7800 XT */ /* GC 11.0.4, DCN 3.1.4, APU, "Phoenix 2" */ diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index adc06f368..7c5734eff 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -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 $ */ /* @@ -2103,7 +2103,8 @@ product ATI BEIGE_GOBY_6 0x743f Navi 24 product ATI NAVI31_2 0x7448 Navi 31 product ATI NAVI31_1 0x744c 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_2 0x7483 Navi 33 product ATI NAVI33_3 0x7489 Navi 33 diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h index e2241ec2c..27120892e 100644 --- a/sys/dev/pci/pcidevs.h +++ b/sys/dev/pci/pcidevs.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * 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 $ */ @@ -2108,7 +2108,8 @@ #define PCI_PRODUCT_ATI_NAVI31_2 0x7448 /* Navi 31 */ #define PCI_PRODUCT_ATI_NAVI31_1 0x744c /* 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_2 0x7483 /* Navi 33 */ #define PCI_PRODUCT_ATI_NAVI33_3 0x7489 /* Navi 33 */ diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h index e3b5ce86e..5804f8260 100644 --- a/sys/dev/pci/pcidevs_data.h +++ b/sys/dev/pci/pcidevs_data.h @@ -2,7 +2,7 @@ * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * 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 $ */ @@ -6555,6 +6555,10 @@ static const struct pci_known_product pci_known_products[] = { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_1, "Navi 32", }, + { + PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI32_2, + "Navi 32", + }, { PCI_VENDOR_ATI, PCI_PRODUCT_ATI_NAVI33_1, "Navi 33", diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index a7c87d2e7..7cd75a286 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -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 $ */ /* @@ -37,6 +37,7 @@ #include #include #define _KERNEL +#include #include #undef _KERNEL #include diff --git a/usr.bin/tmux/arguments.c b/usr.bin/tmux/arguments.c index b62d1f71e..a13965bad 100644 --- a/usr.bin/tmux/arguments.c +++ b/usr.bin/tmux/arguments.c @@ -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 @@ -761,6 +761,7 @@ args_make_commands_prepare(struct cmd *self, struct cmdq_item *item, u_int idx, struct args_value *value; struct args_command_state *state; const char *cmd; + const char *file; 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) 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; if (state->pi.c != NULL) state->pi.c->references++; @@ -842,6 +844,7 @@ args_make_commands_free(struct args_command_state *state) cmd_list_free(state->cmdlist); if (state->pi.c != NULL) server_client_unref(state->pi.c); + free((void *)state->pi.file); free(state->cmd); free(state); } diff --git a/usr.bin/tmux/status.c b/usr.bin/tmux/status.c index 9e7aa2929..1f2138bca 100644 --- a/usr.bin/tmux/status.c +++ b/usr.bin/tmux/status.c @@ -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 @@ -472,17 +472,26 @@ void status_message_set(struct client *c, int delay, int ignore_styles, int ignore_keys, const char *fmt, ...) { - struct timeval tv; - va_list ap; + struct timeval tv; + 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_push_screen(c); - - va_start(ap, fmt); - xvasprintf(&c->message_string, fmt, ap); - va_end(ap); - - server_add_message("%s message: %s", c->name, c->message_string); + c->message_string = s; + server_add_message("%s message: %s", c->name, s); /* * With delay -1, the display-time option is used; zero means wait for diff --git a/usr.bin/tmux/tty-features.c b/usr.bin/tmux/tty-features.c index de6652c6b..6e75ebcf2 100644 --- a/usr.bin/tmux/tty-features.c +++ b/usr.bin/tmux/tty-features.c @@ -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 @@ -216,7 +216,7 @@ static const struct tty_feature tty_feature_strikethrough = { /* Terminal supports synchronized updates. */ static const char *const tty_feature_sync_capabilities[] = { - "Sync=\\EP=%p1%ds\\E\\\\", + "Sync=\\E[?2026%?%p1%{1}%-%tl%eh%;", NULL }; static const struct tty_feature tty_feature_sync = {