From owner-svn-src-releng@freebsd.org Tue Jun 9 16:10:58 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 15D13331B18; Tue, 9 Jun 2020 16:10:58 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hFTs6p93z3gjr; Tue, 9 Jun 2020 16:10:57 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E4ACA17FE8; Tue, 9 Jun 2020 16:10:57 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 059GAv9M084942; Tue, 9 Jun 2020 16:10:57 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 059GAv1w084940; Tue, 9 Jun 2020 16:10:57 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202006091610.059GAv1w084940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 9 Jun 2020 16:10:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r361970 - releng/12.1/sys/dev/ena X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: releng/12.1/sys/dev/ena X-SVN-Commit-Revision: 361970 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 16:10:58 -0000 Author: gordon Date: Tue Jun 9 16:10:57 2020 New Revision: 361970 URL: https://svnweb.freebsd.org/changeset/base/361970 Log: Fix stability issues in ena(4) driver. Approved by: so Security: FreeBSD-EN-20:11.ena Modified: releng/12.1/sys/dev/ena/ena.c releng/12.1/sys/dev/ena/ena.h Modified: releng/12.1/sys/dev/ena/ena.c ============================================================================== --- releng/12.1/sys/dev/ena/ena.c Tue Jun 9 16:06:10 2020 (r361969) +++ releng/12.1/sys/dev/ena/ena.c Tue Jun 9 16:10:57 2020 (r361970) @@ -200,6 +200,19 @@ int ena_log_level = ENA_ALERT | ENA_WARNING; SYSCTL_INT(_hw_ena, OID_AUTO, log_level, CTLFLAG_RWTUN, &ena_log_level, 0, "Logging level indicating verbosity of the logs"); +/* + * Use 9k mbufs for the Rx buffers. Default to 0 (use page size mbufs instead). + * Using 9k mbufs in low memory conditions might cause allocation to take a lot + * of time and lead to the OS instability as it needs to look for the contiguous + * pages. + * However, page size mbufs has a bit smaller throughput than 9k mbufs, so if + * the network performance is the priority, the 9k mbufs can be used. + */ +int ena_enable_9k_mbufs = 0; +SYSCTL_INT(_hw_ena, OID_AUTO, enable_9k_mbufs, CTLFLAG_RDTUN, + &ena_enable_9k_mbufs, 0, "Use 9 kB mbufs for Rx descriptors"); +#define ena_mbuf_sz (ena_enable_9k_mbufs ? MJUM9BYTES : MJUMPAGESIZE) + static ena_vendor_info_t ena_vendor_info_array[] = { { PCI_VENDOR_ID_AMAZON, PCI_DEV_ID_ENA_PF, 0}, { PCI_VENDOR_ID_AMAZON, PCI_DEV_ID_ENA_LLQ_PF, 0}, @@ -470,6 +483,7 @@ ena_init_io_rings(struct ena_adapter *adapter) rxr->que = que; rxr->empty_rx_queue = 0; + rxr->rx_mbuf_sz = ena_mbuf_sz; } } @@ -548,9 +562,9 @@ ena_setup_rx_dma_tag(struct ena_adapter *adapter) ENA_DMA_BIT_MASK(adapter->dma_width), /* lowaddr of excl window */ BUS_SPACE_MAXADDR, /* highaddr of excl window */ NULL, NULL, /* filter, filterarg */ - MJUM16BYTES, /* maxsize */ + ena_mbuf_sz, /* maxsize */ adapter->max_rx_sgl_size, /* nsegments */ - MJUM16BYTES, /* maxsegsize */ + ena_mbuf_sz, /* maxsegsize */ 0, /* flags */ NULL, /* lockfunc */ NULL, /* lockarg */ @@ -957,7 +971,8 @@ ena_alloc_rx_mbuf(struct ena_adapter *adapter, return (0); /* Get mbuf using UMA allocator */ - rx_info->mbuf = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, MJUM16BYTES); + rx_info->mbuf = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, + rx_ring->rx_mbuf_sz); if (unlikely(rx_info->mbuf == NULL)) { counter_u64_add(rx_ring->rx_stats.mjum_alloc_fail, 1); @@ -968,7 +983,7 @@ ena_alloc_rx_mbuf(struct ena_adapter *adapter, } mlen = MCLBYTES; } else { - mlen = MJUM16BYTES; + mlen = rx_ring->rx_mbuf_sz; } /* Set mbuf length*/ rx_info->mbuf->m_pkthdr.len = rx_info->mbuf->m_len = mlen; Modified: releng/12.1/sys/dev/ena/ena.h ============================================================================== --- releng/12.1/sys/dev/ena/ena.h Tue Jun 9 16:06:10 2020 (r361969) +++ releng/12.1/sys/dev/ena/ena.h Tue Jun 9 16:10:57 2020 (r361970) @@ -41,7 +41,7 @@ #define DRV_MODULE_VER_MAJOR 0 #define DRV_MODULE_VER_MINOR 8 -#define DRV_MODULE_VER_SUBMINOR 4 +#define DRV_MODULE_VER_SUBMINOR 5 #define DRV_MODULE_NAME "ena" @@ -238,8 +238,12 @@ struct ena_ring { /* Determines if device will use LLQ or normal mode for TX */ enum ena_admin_placement_policy_type tx_mem_queue_type; - /* The maximum length the driver can push to the device (For LLQ) */ - uint8_t tx_max_header_size; + union { + /* The maximum length the driver can push to the device (For LLQ) */ + uint8_t tx_max_header_size; + /* The maximum (and default) mbuf size for the Rx descriptor. */ + uint16_t rx_mbuf_sz; + }; struct ena_com_rx_buf_info ena_bufs[ENA_PKT_MAX_BUFS]; From owner-svn-src-releng@freebsd.org Tue Jun 9 16:11:54 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B99C4331B78; Tue, 9 Jun 2020 16:11:54 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hFVy4Xs3z3xBj; Tue, 9 Jun 2020 16:11:54 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 972DC1864E; Tue, 9 Jun 2020 16:11:54 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 059GBsUd087368; Tue, 9 Jun 2020 16:11:54 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 059GBsLG087367; Tue, 9 Jun 2020 16:11:54 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202006091611.059GBsLG087367@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 9 Jun 2020 16:11:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r361971 - releng/12.1/sys/net X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: releng/12.1/sys/net X-SVN-Commit-Revision: 361971 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 16:11:54 -0000 Author: gordon Date: Tue Jun 9 16:11:54 2020 New Revision: 361971 URL: https://svnweb.freebsd.org/changeset/base/361971 Log: Fix iflib watchdog timeout resetting idle queues. Approved by: so Security: FreeBSD-EN-20:12.iflib Modified: releng/12.1/sys/net/iflib.c Modified: releng/12.1/sys/net/iflib.c ============================================================================== --- releng/12.1/sys/net/iflib.c Tue Jun 9 16:10:57 2020 (r361970) +++ releng/12.1/sys/net/iflib.c Tue Jun 9 16:11:54 2020 (r361971) @@ -2294,8 +2294,11 @@ iflib_timer(void *arg) (sctx->isc_pause_frames == 0))) goto hung; - if (ifmp_ring_is_stalled(txq->ift_br)) + if (txq->ift_qstatus != IFLIB_QUEUE_IDLE && + ifmp_ring_is_stalled(txq->ift_br)) { + KASSERT(ctx->ifc_link_state == LINK_STATE_UP, ("queue can't be marked as hung if interface is down")); txq->ift_qstatus = IFLIB_QUEUE_HUNG; + } txq->ift_cleaned_prev = txq->ift_cleaned; } #ifdef DEV_NETMAP From owner-svn-src-releng@freebsd.org Tue Jun 9 16:13:56 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4C23D331D75; Tue, 9 Jun 2020 16:13:56 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hFYJ1MJjz3yXt; Tue, 9 Jun 2020 16:13:56 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2A055182F0; Tue, 9 Jun 2020 16:13:56 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 059GDu2k089114; Tue, 9 Jun 2020 16:13:56 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 059GDssL089108; Tue, 9 Jun 2020 16:13:54 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202006091613.059GDssL089108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 9 Jun 2020 16:13:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r361972 - in releng: 11.3/lib/libusbhid 11.3/sys/dev/usb 11.4/lib/libusbhid 11.4/sys/dev/usb 12.1/lib/libusbhid 12.1/sys/dev/usb X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3/lib/libusbhid 11.3/sys/dev/usb 11.4/lib/libusbhid 11.4/sys/dev/usb 12.1/lib/libusbhid 12.1/sys/dev/usb X-SVN-Commit-Revision: 361972 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 16:13:56 -0000 Author: gordon Date: Tue Jun 9 16:13:54 2020 New Revision: 361972 URL: https://svnweb.freebsd.org/changeset/base/361972 Log: Fix USB HID descriptor parsing error. Approved by: so Approved by: re (implicit) Security: FreeBSD-SA-20:17.usb Security: CVE-2020-7456 Modified: releng/11.3/lib/libusbhid/parse.c releng/11.3/sys/dev/usb/usb_hid.c releng/11.4/lib/libusbhid/parse.c releng/11.4/sys/dev/usb/usb_hid.c releng/12.1/lib/libusbhid/parse.c releng/12.1/sys/dev/usb/usb_hid.c Modified: releng/11.3/lib/libusbhid/parse.c ============================================================================== --- releng/11.3/lib/libusbhid/parse.c Tue Jun 9 16:11:54 2020 (r361971) +++ releng/11.3/lib/libusbhid/parse.c Tue Jun 9 16:13:54 2020 (r361972) @@ -401,26 +401,28 @@ hid_get_item_raw(hid_data_t s, hid_item_t *h) s->loc_count = dval & mask; break; case 10: /* Push */ + /* stop parsing, if invalid push level */ + if ((s->pushlevel + 1) >= MAXPUSH) + return (0); s->pushlevel ++; - if (s->pushlevel < MAXPUSH) { - s->cur[s->pushlevel] = *c; - /* store size and count */ - c->report_size = s->loc_size; - c->report_count = s->loc_count; - /* update current item pointer */ - c = &s->cur[s->pushlevel]; - } + s->cur[s->pushlevel] = *c; + /* store size and count */ + c->report_size = s->loc_size; + c->report_count = s->loc_count; + /* update current item pointer */ + c = &s->cur[s->pushlevel]; break; case 11: /* Pop */ + /* stop parsing, if invalid push level */ + if (s->pushlevel == 0) + return (0); s->pushlevel --; - if (s->pushlevel < MAXPUSH) { - c = &s->cur[s->pushlevel]; - /* restore size and count */ - s->loc_size = c->report_size; - s->loc_count = c->report_count; - c->report_size = 0; - c->report_count = 0; - } + c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->report_size; + s->loc_count = c->report_count; + c->report_size = 0; + c->report_count = 0; break; default: break; Modified: releng/11.3/sys/dev/usb/usb_hid.c ============================================================================== --- releng/11.3/sys/dev/usb/usb_hid.c Tue Jun 9 16:11:54 2020 (r361971) +++ releng/11.3/sys/dev/usb/usb_hid.c Tue Jun 9 16:13:54 2020 (r361972) @@ -434,36 +434,36 @@ hid_get_item(struct hid_data *s, struct hid_item *h) s->loc_count = dval & mask; break; case 10: /* Push */ - s->pushlevel ++; - if (s->pushlevel < MAXPUSH) { - s->cur[s->pushlevel] = *c; - /* store size and count */ - c->loc.size = s->loc_size; - c->loc.count = s->loc_count; - /* update current item pointer */ - c = &s->cur[s->pushlevel]; - } else { - DPRINTFN(0, "Cannot push " - "item @ %d\n", s->pushlevel); + /* stop parsing, if invalid push level */ + if ((s->pushlevel + 1) >= MAXPUSH) { + DPRINTFN(0, "Cannot push item @ %d\n", s->pushlevel); + return (0); } + s->pushlevel ++; + s->cur[s->pushlevel] = *c; + /* store size and count */ + c->loc.size = s->loc_size; + c->loc.count = s->loc_count; + /* update current item pointer */ + c = &s->cur[s->pushlevel]; break; case 11: /* Pop */ - s->pushlevel --; - if (s->pushlevel < MAXPUSH) { - /* preserve position */ - oldpos = c->loc.pos; - c = &s->cur[s->pushlevel]; - /* restore size and count */ - s->loc_size = c->loc.size; - s->loc_count = c->loc.count; - /* set default item location */ - c->loc.pos = oldpos; - c->loc.size = 0; - c->loc.count = 0; - } else { - DPRINTFN(0, "Cannot pop " - "item @ %d\n", s->pushlevel); + /* stop parsing, if invalid push level */ + if (s->pushlevel == 0) { + DPRINTFN(0, "Cannot pop item @ 0\n"); + return (0); } + s->pushlevel --; + /* preserve position */ + oldpos = c->loc.pos; + c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->loc.size; + s->loc_count = c->loc.count; + /* set default item location */ + c->loc.pos = oldpos; + c->loc.size = 0; + c->loc.count = 0; break; default: DPRINTFN(0, "Global bTag=%d\n", bTag); Modified: releng/11.4/lib/libusbhid/parse.c ============================================================================== --- releng/11.4/lib/libusbhid/parse.c Tue Jun 9 16:11:54 2020 (r361971) +++ releng/11.4/lib/libusbhid/parse.c Tue Jun 9 16:13:54 2020 (r361972) @@ -401,26 +401,28 @@ hid_get_item_raw(hid_data_t s, hid_item_t *h) s->loc_count = dval & mask; break; case 10: /* Push */ + /* stop parsing, if invalid push level */ + if ((s->pushlevel + 1) >= MAXPUSH) + return (0); s->pushlevel ++; - if (s->pushlevel < MAXPUSH) { - s->cur[s->pushlevel] = *c; - /* store size and count */ - c->report_size = s->loc_size; - c->report_count = s->loc_count; - /* update current item pointer */ - c = &s->cur[s->pushlevel]; - } + s->cur[s->pushlevel] = *c; + /* store size and count */ + c->report_size = s->loc_size; + c->report_count = s->loc_count; + /* update current item pointer */ + c = &s->cur[s->pushlevel]; break; case 11: /* Pop */ + /* stop parsing, if invalid push level */ + if (s->pushlevel == 0) + return (0); s->pushlevel --; - if (s->pushlevel < MAXPUSH) { - c = &s->cur[s->pushlevel]; - /* restore size and count */ - s->loc_size = c->report_size; - s->loc_count = c->report_count; - c->report_size = 0; - c->report_count = 0; - } + c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->report_size; + s->loc_count = c->report_count; + c->report_size = 0; + c->report_count = 0; break; default: break; Modified: releng/11.4/sys/dev/usb/usb_hid.c ============================================================================== --- releng/11.4/sys/dev/usb/usb_hid.c Tue Jun 9 16:11:54 2020 (r361971) +++ releng/11.4/sys/dev/usb/usb_hid.c Tue Jun 9 16:13:54 2020 (r361972) @@ -434,36 +434,36 @@ hid_get_item(struct hid_data *s, struct hid_item *h) s->loc_count = dval & mask; break; case 10: /* Push */ - s->pushlevel ++; - if (s->pushlevel < MAXPUSH) { - s->cur[s->pushlevel] = *c; - /* store size and count */ - c->loc.size = s->loc_size; - c->loc.count = s->loc_count; - /* update current item pointer */ - c = &s->cur[s->pushlevel]; - } else { - DPRINTFN(0, "Cannot push " - "item @ %d\n", s->pushlevel); + /* stop parsing, if invalid push level */ + if ((s->pushlevel + 1) >= MAXPUSH) { + DPRINTFN(0, "Cannot push item @ %d\n", s->pushlevel); + return (0); } + s->pushlevel ++; + s->cur[s->pushlevel] = *c; + /* store size and count */ + c->loc.size = s->loc_size; + c->loc.count = s->loc_count; + /* update current item pointer */ + c = &s->cur[s->pushlevel]; break; case 11: /* Pop */ - s->pushlevel --; - if (s->pushlevel < MAXPUSH) { - /* preserve position */ - oldpos = c->loc.pos; - c = &s->cur[s->pushlevel]; - /* restore size and count */ - s->loc_size = c->loc.size; - s->loc_count = c->loc.count; - /* set default item location */ - c->loc.pos = oldpos; - c->loc.size = 0; - c->loc.count = 0; - } else { - DPRINTFN(0, "Cannot pop " - "item @ %d\n", s->pushlevel); + /* stop parsing, if invalid push level */ + if (s->pushlevel == 0) { + DPRINTFN(0, "Cannot pop item @ 0\n"); + return (0); } + s->pushlevel --; + /* preserve position */ + oldpos = c->loc.pos; + c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->loc.size; + s->loc_count = c->loc.count; + /* set default item location */ + c->loc.pos = oldpos; + c->loc.size = 0; + c->loc.count = 0; break; default: DPRINTFN(0, "Global bTag=%d\n", bTag); Modified: releng/12.1/lib/libusbhid/parse.c ============================================================================== --- releng/12.1/lib/libusbhid/parse.c Tue Jun 9 16:11:54 2020 (r361971) +++ releng/12.1/lib/libusbhid/parse.c Tue Jun 9 16:13:54 2020 (r361972) @@ -403,26 +403,28 @@ hid_get_item_raw(hid_data_t s, hid_item_t *h) s->loc_count = dval & mask; break; case 10: /* Push */ + /* stop parsing, if invalid push level */ + if ((s->pushlevel + 1) >= MAXPUSH) + return (0); s->pushlevel ++; - if (s->pushlevel < MAXPUSH) { - s->cur[s->pushlevel] = *c; - /* store size and count */ - c->report_size = s->loc_size; - c->report_count = s->loc_count; - /* update current item pointer */ - c = &s->cur[s->pushlevel]; - } + s->cur[s->pushlevel] = *c; + /* store size and count */ + c->report_size = s->loc_size; + c->report_count = s->loc_count; + /* update current item pointer */ + c = &s->cur[s->pushlevel]; break; case 11: /* Pop */ + /* stop parsing, if invalid push level */ + if (s->pushlevel == 0) + return (0); s->pushlevel --; - if (s->pushlevel < MAXPUSH) { - c = &s->cur[s->pushlevel]; - /* restore size and count */ - s->loc_size = c->report_size; - s->loc_count = c->report_count; - c->report_size = 0; - c->report_count = 0; - } + c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->report_size; + s->loc_count = c->report_count; + c->report_size = 0; + c->report_count = 0; break; default: break; Modified: releng/12.1/sys/dev/usb/usb_hid.c ============================================================================== --- releng/12.1/sys/dev/usb/usb_hid.c Tue Jun 9 16:11:54 2020 (r361971) +++ releng/12.1/sys/dev/usb/usb_hid.c Tue Jun 9 16:13:54 2020 (r361972) @@ -436,36 +436,36 @@ hid_get_item(struct hid_data *s, struct hid_item *h) s->loc_count = dval & mask; break; case 10: /* Push */ - s->pushlevel ++; - if (s->pushlevel < MAXPUSH) { - s->cur[s->pushlevel] = *c; - /* store size and count */ - c->loc.size = s->loc_size; - c->loc.count = s->loc_count; - /* update current item pointer */ - c = &s->cur[s->pushlevel]; - } else { - DPRINTFN(0, "Cannot push " - "item @ %d\n", s->pushlevel); + /* stop parsing, if invalid push level */ + if ((s->pushlevel + 1) >= MAXPUSH) { + DPRINTFN(0, "Cannot push item @ %d\n", s->pushlevel); + return (0); } + s->pushlevel ++; + s->cur[s->pushlevel] = *c; + /* store size and count */ + c->loc.size = s->loc_size; + c->loc.count = s->loc_count; + /* update current item pointer */ + c = &s->cur[s->pushlevel]; break; case 11: /* Pop */ - s->pushlevel --; - if (s->pushlevel < MAXPUSH) { - /* preserve position */ - oldpos = c->loc.pos; - c = &s->cur[s->pushlevel]; - /* restore size and count */ - s->loc_size = c->loc.size; - s->loc_count = c->loc.count; - /* set default item location */ - c->loc.pos = oldpos; - c->loc.size = 0; - c->loc.count = 0; - } else { - DPRINTFN(0, "Cannot pop " - "item @ %d\n", s->pushlevel); + /* stop parsing, if invalid push level */ + if (s->pushlevel == 0) { + DPRINTFN(0, "Cannot pop item @ 0\n"); + return (0); } + s->pushlevel --; + /* preserve position */ + oldpos = c->loc.pos; + c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->loc.size; + s->loc_count = c->loc.count; + /* set default item location */ + c->loc.pos = oldpos; + c->loc.size = 0; + c->loc.count = 0; break; default: DPRINTFN(0, "Global bTag=%d\n", bTag); From owner-svn-src-releng@freebsd.org Tue Jun 9 16:15:09 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 13AE5331E99; Tue, 9 Jun 2020 16:15:09 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hFZh6sLyz3yqM; Tue, 9 Jun 2020 16:15:08 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5FCC18783; Tue, 9 Jun 2020 16:15:08 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 059GF8w1089233; Tue, 9 Jun 2020 16:15:08 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 059GF7au089227; Tue, 9 Jun 2020 16:15:07 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <202006091615.059GF7au089227@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 9 Jun 2020 16:15:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r361973 - in releng: 11.3 11.3/sys/conf 11.4 11.4/sys/conf 12.1 12.1/sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng: 11.3 11.3/sys/conf 11.4 11.4/sys/conf 12.1 12.1/sys/conf X-SVN-Commit-Revision: 361973 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 16:15:09 -0000 Author: gordon Date: Tue Jun 9 16:15:07 2020 New Revision: 361973 URL: https://svnweb.freebsd.org/changeset/base/361973 Log: Add UPDATING entries and bump version. Approved by: so Approved by: re (implicit) Modified: releng/11.3/UPDATING releng/11.3/sys/conf/newvers.sh releng/11.4/UPDATING releng/11.4/sys/conf/newvers.sh releng/12.1/UPDATING releng/12.1/sys/conf/newvers.sh Modified: releng/11.3/UPDATING ============================================================================== --- releng/11.3/UPDATING Tue Jun 9 16:13:54 2020 (r361972) +++ releng/11.3/UPDATING Tue Jun 9 16:15:07 2020 (r361973) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20200609 p10 FreeBSD-SA-20:17.usb + + Fix USB HID descriptor parsing error. [SA-20:17.usb] + 20200512 p9 FreeBSD-EN-20:08.tzdata FreeBSD-EN-20:10.build FreeBSD-SA-20:12.libalias Modified: releng/11.3/sys/conf/newvers.sh ============================================================================== --- releng/11.3/sys/conf/newvers.sh Tue Jun 9 16:13:54 2020 (r361972) +++ releng/11.3/sys/conf/newvers.sh Tue Jun 9 16:15:07 2020 (r361973) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.3" -BRANCH="RELEASE-p9" +BRANCH="RELEASE-p10" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/11.4/UPDATING ============================================================================== --- releng/11.4/UPDATING Tue Jun 9 16:13:54 2020 (r361972) +++ releng/11.4/UPDATING Tue Jun 9 16:15:07 2020 (r361973) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20200609: 11.4-RC2-p1 FreeBSD-SA-20:17.usb + + Fix USB HID descriptor parsing error. [SA-20:17.usb] + 20200512: 11.4-BETA1-p1 FreeBSD-SA-20:12.libalias FreeBSD-SA-20:13.libalias Modified: releng/11.4/sys/conf/newvers.sh ============================================================================== --- releng/11.4/sys/conf/newvers.sh Tue Jun 9 16:13:54 2020 (r361972) +++ releng/11.4/sys/conf/newvers.sh Tue Jun 9 16:15:07 2020 (r361973) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.4" -BRANCH="RC2" +BRANCH="RC2-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/12.1/UPDATING ============================================================================== --- releng/12.1/UPDATING Tue Jun 9 16:13:54 2020 (r361972) +++ releng/12.1/UPDATING Tue Jun 9 16:15:07 2020 (r361973) @@ -16,6 +16,16 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20200609 p6 FreeBSD-EN-20:11.ena + FreeBSD-EN-20:12.iflib + FreeBSD-SA-20:17.usb + + Fix stability issues in ena(4) driver. [EN-20:11.ena] + + Fix iflib watchdog timeout resetting idle queues. [EN-20:12.iflib] + + Fix USB HID descriptor parsing error. [SA-20:17.usb] + 20200512 p5 FreeBSD-EN-20:08.tzdata FreeBSD-EN-20:09.igb FreeBSD-EN-20:10.build Modified: releng/12.1/sys/conf/newvers.sh ============================================================================== --- releng/12.1/sys/conf/newvers.sh Tue Jun 9 16:13:54 2020 (r361972) +++ releng/12.1/sys/conf/newvers.sh Tue Jun 9 16:15:07 2020 (r361973) @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.1" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Tue Jun 9 17:35:15 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 16EAE337B9A; Tue, 9 Jun 2020 17:35:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hHM66HDfz4Cld; Tue, 9 Jun 2020 17:35:14 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2B0019568; Tue, 9 Jun 2020 17:35:14 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 059HZEHh039167; Tue, 9 Jun 2020 17:35:14 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 059HZE4D039166; Tue, 9 Jun 2020 17:35:14 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006091735.059HZE4D039166@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 9 Jun 2020 17:35:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r361979 - releng/11.4/release/doc/share/xml X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/share/xml X-SVN-Commit-Revision: 361979 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 17:35:15 -0000 Author: gjb Date: Tue Jun 9 17:35:14 2020 New Revision: 361979 URL: https://svnweb.freebsd.org/changeset/base/361979 Log: Document SA-20:17. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/share/xml/security.xml Modified: releng/11.4/release/doc/share/xml/security.xml ============================================================================== --- releng/11.4/release/doc/share/xml/security.xml Tue Jun 9 17:34:29 2020 (r361978) +++ releng/11.4/release/doc/share/xml/security.xml Tue Jun 9 17:35:14 2020 (r361979) @@ -200,6 +200,14 @@ 12 May 2020 Memory disclosure vulnerability + + + FreeBSD-SA-20:17.usb + 9 June 2020 + HID descripter parsing + error + From owner-svn-src-releng@freebsd.org Tue Jun 9 19:07:45 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 12C2933998C; Tue, 9 Jun 2020 19:07:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hKPr6rTmz4Pd4; Tue, 9 Jun 2020 19:07:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E1B771A7EB; Tue, 9 Jun 2020 19:07:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 059J7iLl095336; Tue, 9 Jun 2020 19:07:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 059J7imq095335; Tue, 9 Jun 2020 19:07:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006091907.059J7imq095335@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Tue, 9 Jun 2020 19:07:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r361981 - releng/11.4/release/doc/share/xml stable/11/release/doc/share/xml X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/share/xml stable/11/release/doc/share/xml X-SVN-Commit-Revision: 361981 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 19:07:45 -0000 Author: gjb Date: Tue Jun 9 19:07:44 2020 New Revision: 361981 URL: https://svnweb.freebsd.org/changeset/base/361981 Log: Fix a typo. Submitted by: yuripv Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/share/xml/security.xml Changes in other areas also in this revision: Modified: stable/11/release/doc/share/xml/security.xml Modified: releng/11.4/release/doc/share/xml/security.xml ============================================================================== --- releng/11.4/release/doc/share/xml/security.xml Tue Jun 9 18:13:52 2020 (r361980) +++ releng/11.4/release/doc/share/xml/security.xml Tue Jun 9 19:07:44 2020 (r361981) @@ -205,7 +205,7 @@ FreeBSD-SA-20:17.usb 9 June 2020 - HID descripter parsing + HID descriptor parsing error From owner-svn-src-releng@freebsd.org Thu Jun 11 15:17:12 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C4ABC3355BC; Thu, 11 Jun 2020 15:17:12 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jSBw4sFWz3b4c; Thu, 11 Jun 2020 15:17:12 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A19E61A235; Thu, 11 Jun 2020 15:17:12 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BFHCet044557; Thu, 11 Jun 2020 15:17:12 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BFHCBe044555; Thu, 11 Jun 2020 15:17:12 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006111517.05BFHCBe044555@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 11 Jun 2020 15:17:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362061 - in releng/11.4/release/doc: en_US.ISO8859-1/relnotes share/xml X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/11.4/release/doc: en_US.ISO8859-1/relnotes share/xml X-SVN-Commit-Revision: 362061 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 15:17:12 -0000 Author: gjb Date: Thu Jun 11 15:17:12 2020 New Revision: 362061 URL: https://svnweb.freebsd.org/changeset/base/362061 Log: Release notes documentation: - r361217: lld fix for ports using DTrace. - r351694: YPMAXRECORD increased. - r361049: ubsec(4) driver deprecation in 13.0. - r361539: ena(4) version 2.2.0. - r359971: JMicron JMB582/JMB585 AHCI support. - r359258: D-Link DWM-222 LTE dongle support. - r359114: Cannon Lake PCH support in snd_hda(4). - r354965: aacraid(4) version 3.2.10. - r351246: crypto(4) deprecated algorithms. - r359698: ng_nat(4) can attach to ethernet interface. - r351243: Kerberos GSS algorithm deprecation (RFC 6649, 8429). - r358903: netatalk removed from /etc/services. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml releng/11.4/release/doc/share/xml/sponsor.ent Modified: releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 11 15:14:39 2020 (r362060) +++ releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 11 15:17:12 2020 (r362061) @@ -159,7 +159,8 @@ Userland Configuration Changes -   + The netatalk protocol has been removed + from &man.services.5;. @@ -174,6 +175,11 @@ updated to support block descriptors with the modepage subcommand. + The &man.yp.8; subsystem has been updated + to increase the value of YPMAXRECORD from + 1M to 16M for compatibility with &linux;. + The &man.usbconfig.8; utility has been updated to include the detach_kernel_driver command. @@ -274,6 +280,10 @@ compiler-rt utilities and libc++ have been updated to version 10.0.0. + + A fix to correctly link DTrace-enabled + ports with lld has been + added. @@ -362,19 +372,43 @@ Device Drivers -   + The Kerberos + GSS API has been updated + to emit deprecation warnings for algorithms marked as + "SHOULD NOT" be used in RFCs 6649 and 8429. + + The &man.crypto.4; driver has been + updated to emit deprecation warnings when the ARC4, Blowfish, + CAST128, DES, 3DES, MD5-HMAC, and Skipjack algorithms are + used. + + The &man.ubsec.4; driver has been marked + as deprecated, and will be removed in &os; 13.0. Storage Drivers -   + The &man.aacraid.4; driver has been + updated to version 3.2.10. + + Support for JMicron® JMB582 and + JMB585 AHCI controllers has been + added. Network Drivers -   + Support for the D-Link® DWM-222 + LTE dongle has been added. + + The &man.ng.nat.4; driver has been + updated to allow attaching to an ethernet interface. + + The + &man.ena.4; driver has been updated to version + 2.2.0. @@ -389,7 +423,8 @@ Hardware Support -   + Support for &intel; Cannon Lake PCH has + been added to &man.snd.hda.4;. Modified: releng/11.4/release/doc/share/xml/sponsor.ent ============================================================================== --- releng/11.4/release/doc/share/xml/sponsor.ent Thu Jun 11 15:14:39 2020 (r362060) +++ releng/11.4/release/doc/share/xml/sponsor.ent Thu Jun 11 15:17:12 2020 (r362061) @@ -10,6 +10,7 @@ + From owner-svn-src-releng@freebsd.org Thu Jun 11 15:17:14 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 470C93356C2; Thu, 11 Jun 2020 15:17:14 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jSBy1Dmpz3bHy; Thu, 11 Jun 2020 15:17:14 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 23A071A2A5; Thu, 11 Jun 2020 15:17:14 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BFHEMZ044600; Thu, 11 Jun 2020 15:17:14 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BFHEdW044599; Thu, 11 Jun 2020 15:17:14 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006111517.05BFHEdW044599@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 11 Jun 2020 15:17:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362062 - releng/11.4/release/doc/en_US.ISO8859-1/errata X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/en_US.ISO8859-1/errata X-SVN-Commit-Revision: 362062 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 15:17:14 -0000 Author: gjb Date: Thu Jun 11 15:17:13 2020 New Revision: 362062 URL: https://svnweb.freebsd.org/changeset/base/362062 Log: Add a note about i386 source-based upgrade issues noted in PR 246274. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/en_US.ISO8859-1/errata/article.xml Modified: releng/11.4/release/doc/en_US.ISO8859-1/errata/article.xml ============================================================================== --- releng/11.4/release/doc/en_US.ISO8859-1/errata/article.xml Thu Jun 11 15:17:12 2020 (r362061) +++ releng/11.4/release/doc/en_US.ISO8859-1/errata/article.xml Thu Jun 11 15:17:13 2020 (r362062) @@ -96,7 +96,20 @@ - No open issues. + [2020-06-11] Source-based upgrades from &os; 11.2 on the + &arch.i386; architecture may fail to compile + clang due to the amount of + RAM consumed. + + Adding CFLAGS+=-O1 to + /etc/make.conf or + /etc/src.conf has been observed to work + around the compile-time RAM exhaustion. + + See + PR + 246274 for additional details. From owner-svn-src-releng@freebsd.org Thu Jun 11 17:26:51 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B7F2133AC14; Thu, 11 Jun 2020 17:26:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jW4W4PfPz45qf; Thu, 11 Jun 2020 17:26:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 926121BD93; Thu, 11 Jun 2020 17:26:51 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BHQpGD026808; Thu, 11 Jun 2020 17:26:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BHQpph026807; Thu, 11 Jun 2020 17:26:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006111726.05BHQpph026807@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 11 Jun 2020 17:26:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362066 - releng/11.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 362066 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 17:26:51 -0000 Author: gjb Date: Thu Jun 11 17:26:51 2020 New Revision: 362066 URL: https://svnweb.freebsd.org/changeset/base/362066 Log: Release notes documentation: - r353583: synchronous 128KB write latency improvements. - r353759: ZFS bookmark renaming support. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 11 17:25:20 2020 (r362065) +++ releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 11 17:26:51 2020 (r362066) @@ -461,6 +461,12 @@ ZFS + Latency of synchronous 128KB writes has + been improved. + + Support for renaming + ZFS bookmarks has been added. + The ZFS ZIL (ZFS intent log) maximum block size is now tunable. From owner-svn-src-releng@freebsd.org Thu Jun 11 17:26:52 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E3D2333AC15; Thu, 11 Jun 2020 17:26:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jW4X5kwcz45qh; Thu, 11 Jun 2020 17:26:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BFF1B1B969; Thu, 11 Jun 2020 17:26:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BHQqWG026851; Thu, 11 Jun 2020 17:26:52 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BHQqa3026850; Thu, 11 Jun 2020 17:26:52 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006111726.05BHQqa3026850@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 11 Jun 2020 17:26:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362067 - releng/11.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 362067 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 17:26:53 -0000 Author: gjb Date: Thu Jun 11 17:26:52 2020 New Revision: 362067 URL: https://svnweb.freebsd.org/changeset/base/362067 Log: Release notes documentation: - pkg 1.13.2. - GNOME 3.28. - KDE 5.8.4.1.19.12.3. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 11 17:26:51 2020 (r362066) +++ releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 11 17:26:52 2020 (r362067) @@ -536,7 +536,14 @@ Packaging Changes -   + The &man.pkg.8; utility has been updated to version + 1.13.2. + + The GNOME desktop environment + has been updated to version 3.28. + + The KDE desktop environment has + been updated to version 5.8.4.1.19.12.3. From owner-svn-src-releng@freebsd.org Thu Jun 11 17:26:57 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 212C533AC29; Thu, 11 Jun 2020 17:26:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jW4Z6N1xz45tP; Thu, 11 Jun 2020 17:26:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1AEE61B96A; Thu, 11 Jun 2020 17:26:54 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BHQroJ026894; Thu, 11 Jun 2020 17:26:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BHQrIX026893; Thu, 11 Jun 2020 17:26:53 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006111726.05BHQrIX026893@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 11 Jun 2020 17:26:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362068 - releng/11.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 362068 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 17:26:59 -0000 Author: gjb Date: Thu Jun 11 17:26:53 2020 New Revision: 362068 URL: https://svnweb.freebsd.org/changeset/base/362068 Log: Release notes documentation: - Trim empty sections. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 11 17:26:52 2020 (r362067) +++ releng/11.4/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jun 11 17:26:53 2020 (r362068) @@ -285,84 +285,8 @@ ports with lld has been added. - - - Installation and Configuration Tools - -   - - - - <filename class="directory">/etc/rc.d</filename> - Scripts - -   - - - - <filename class="directory">/etc/periodic</filename> - Scripts - -   - - - - Runtime Libraries and API - -   - - - - ABI Compatibility - -   - - - - Userland Debugging - -   - - - Kernel - - This section covers changes to kernel configurations, system - tuning, and system control parameters that are not otherwise - categorized. - - - General Kernel Changes - -   - - - - Kernel Bug Fixes - -   - - - - Kernel Configuration - -   - - - - Kernel Modules - -   - - - - System Tuning and Controls - -   - - - Devices and Drivers @@ -426,18 +350,6 @@ Support for &intel; Cannon Lake PCH has been added to &man.snd.hda.4;. - - - Virtualization Support - -   - - - - ARM Support - -   - @@ -446,18 +358,6 @@ This section covers changes and additions to file systems and other storage subsystems, both local and networked. - - General Storage - -   - - - - Networked Storage - -   - - ZFS @@ -471,45 +371,14 @@ ZIL (ZFS intent log) maximum block size is now tunable. - - - <literal>geom(4)</literal> - -   - - - Boot Loader Changes - - This section covers the boot loader, boot menu, and other - boot-related changes. - - - Boot Loader Changes - -   - - - - Boot Menu Changes - -   - - - Networking This section describes changes that affect networking in &os;. - - General Network Changes - -   - - Network Protocols @@ -527,12 +396,6 @@ Collection, package infrastructure, and package maintenance and installation tools. - - Infrastructure Changes - -   - - Packaging Changes @@ -544,38 +407,6 @@ The KDE desktop environment has been updated to version 5.8.4.1.19.12.3. - - - - - Documentation - - This section covers changes to the &os; Documentation - Project sources and toolchain. - - - Documentation Source Changes - -   - - - - Documentation Toolchain Changes - -   - - - - - Release Engineering and Integration - - This section convers changes that are specific to the - &os; Release Engineering processes. - - - Integration Changes - -   From owner-svn-src-releng@freebsd.org Thu Jun 11 17:36:56 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1FCC733B0CF; Thu, 11 Jun 2020 17:36:56 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jWJ801rVz46hm; Thu, 11 Jun 2020 17:36:56 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F02051BEA5; Thu, 11 Jun 2020 17:36:55 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BHatLh033458; Thu, 11 Jun 2020 17:36:55 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BHatIC033457; Thu, 11 Jun 2020 17:36:55 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006111736.05BHatIC033457@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 11 Jun 2020 17:36:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362069 - releng/11.4/release/doc/en_US.ISO8859-1/readme X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/en_US.ISO8859-1/readme X-SVN-Commit-Revision: 362069 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 17:36:56 -0000 Author: gjb Date: Thu Jun 11 17:36:55 2020 New Revision: 362069 URL: https://svnweb.freebsd.org/changeset/base/362069 Log: Fix a URL in the readme page. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/en_US.ISO8859-1/readme/article.xml Modified: releng/11.4/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- releng/11.4/release/doc/en_US.ISO8859-1/readme/article.xml Thu Jun 11 17:26:53 2020 (r362068) +++ releng/11.4/release/doc/en_US.ISO8859-1/readme/article.xml Thu Jun 11 17:36:55 2020 (r362069) @@ -366,8 +366,9 @@ other copies are kept updated on the Internet and should be consulted as the current errata for this release. These other copies of the errata are located at + the &url.base;/releases/ + xlink:href="&url.base;/releases/">releases page (as well as any sites which keep up-to-date mirrors of this location). From owner-svn-src-releng@freebsd.org Thu Jun 11 17:42:20 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3D78633B894; Thu, 11 Jun 2020 17:42:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jWQN0zdSz47Wx; Thu, 11 Jun 2020 17:42:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1CD471BE78; Thu, 11 Jun 2020 17:42:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BHgJMA038598; Thu, 11 Jun 2020 17:42:19 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BHgJUu038597; Thu, 11 Jun 2020 17:42:19 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006111742.05BHgJUu038597@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 11 Jun 2020 17:42:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362070 - releng/11.4/release/doc/share/xml X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/share/xml X-SVN-Commit-Revision: 362070 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 17:42:20 -0000 Author: gjb Date: Thu Jun 11 17:42:19 2020 New Revision: 362070 URL: https://svnweb.freebsd.org/changeset/base/362070 Log: Fix a URL in an included ENTITY. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/share/xml/release.ent Modified: releng/11.4/release/doc/share/xml/release.ent ============================================================================== --- releng/11.4/release/doc/share/xml/release.ent Thu Jun 11 17:36:55 2020 (r362069) +++ releng/11.4/release/doc/share/xml/release.ent Thu Jun 11 17:42:19 2020 (r362070) @@ -25,7 +25,7 @@ - + From owner-svn-src-releng@freebsd.org Thu Jun 11 19:54:45 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2ED8133FD59; Thu, 11 Jun 2020 19:54:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jZM90VZQz4KDH; Thu, 11 Jun 2020 19:54:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0C7AA1DB17; Thu, 11 Jun 2020 19:54:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05BJsiss022441; Thu, 11 Jun 2020 19:54:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05BJsiG3022440; Thu, 11 Jun 2020 19:54:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006111954.05BJsiG3022440@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 11 Jun 2020 19:54:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362074 - releng/11.4/release/doc/en_US.ISO8859-1 X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/en_US.ISO8859-1 X-SVN-Commit-Revision: 362074 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Jun 2020 19:54:45 -0000 Author: gjb Date: Thu Jun 11 19:54:44 2020 New Revision: 362074 URL: https://svnweb.freebsd.org/changeset/base/362074 Log: Disconnect the errata page from the build, and switch to the version built from stable/11. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/en_US.ISO8859-1/Makefile Modified: releng/11.4/release/doc/en_US.ISO8859-1/Makefile ============================================================================== --- releng/11.4/release/doc/en_US.ISO8859-1/Makefile Thu Jun 11 19:52:48 2020 (r362073) +++ releng/11.4/release/doc/en_US.ISO8859-1/Makefile Thu Jun 11 19:54:44 2020 (r362074) @@ -6,7 +6,7 @@ SUBDIR = relnotes SUBDIR+= hardware SUBDIR+= installation SUBDIR+= readme -SUBDIR+= errata +#SUBDIR+= errata COMPAT_SYMLINK = en From owner-svn-src-releng@freebsd.org Fri Jun 12 00:01:16 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4B848345A1A; Fri, 12 Jun 2020 00:01:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jgqc1Mc5z4bSB; Fri, 12 Jun 2020 00:01:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 27AB920A66; Fri, 12 Jun 2020 00:01:16 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05C01G96074061; Fri, 12 Jun 2020 00:01:16 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05C01FiP074058; Fri, 12 Jun 2020 00:01:15 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006120001.05C01FiP074058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 12 Jun 2020 00:01:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362079 - in releng/11.4: . lib/csu/common sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/11.4: . lib/csu/common sys/conf X-SVN-Commit-Revision: 362079 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2020 00:01:16 -0000 Author: gjb Date: Fri Jun 12 00:01:15 2020 New Revision: 362079 URL: https://svnweb.freebsd.org/changeset/base/362079 Log: - Switch releng/11.4 to -RELEASE. - Add the anticipated 11.4-RELEASE date to UPDATING. - Set a static __FreeBSD_version. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/UPDATING releng/11.4/lib/csu/common/crtbrand.c releng/11.4/sys/conf/newvers.sh Modified: releng/11.4/UPDATING ============================================================================== --- releng/11.4/UPDATING Thu Jun 11 22:46:08 2020 (r362078) +++ releng/11.4/UPDATING Fri Jun 12 00:01:15 2020 (r362079) @@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20200616: + 11.4-RELEASE. + 20200609: 11.4-RC2-p1 FreeBSD-SA-20:17.usb Fix USB HID descriptor parsing error. [SA-20:17.usb] Modified: releng/11.4/lib/csu/common/crtbrand.c ============================================================================== --- releng/11.4/lib/csu/common/crtbrand.c Thu Jun 11 22:46:08 2020 (r362078) +++ releng/11.4/lib/csu/common/crtbrand.c Fri Jun 12 00:01:15 2020 (r362079) @@ -63,5 +63,5 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = __FreeBSD_version + .desc = 1104001 }; Modified: releng/11.4/sys/conf/newvers.sh ============================================================================== --- releng/11.4/sys/conf/newvers.sh Thu Jun 11 22:46:08 2020 (r362078) +++ releng/11.4/sys/conf/newvers.sh Fri Jun 12 00:01:15 2020 (r362079) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.4" -BRANCH="RC2-p1" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Fri Jun 12 11:41:40 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9D989337F7C; Fri, 12 Jun 2020 11:41:40 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jzMm3jNqz4NVq; Fri, 12 Jun 2020 11:41:40 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A9198BED; Fri, 12 Jun 2020 11:41:40 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05CBfesB011816; Fri, 12 Jun 2020 11:41:40 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05CBfdJU011814; Fri, 12 Jun 2020 11:41:39 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006121141.05CBfdJU011814@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 12 Jun 2020 11:41:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362092 - in releng/11.4: . lib/csu/common sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/11.4: . lib/csu/common sys/conf X-SVN-Commit-Revision: 362092 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2020 11:41:40 -0000 Author: gjb Date: Fri Jun 12 11:41:39 2020 New Revision: 362092 URL: https://svnweb.freebsd.org/changeset/base/362092 Log: Revert r362079 in order to correct an issue that triggered a build failure in 11.4-RELEASE builds. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/UPDATING releng/11.4/lib/csu/common/crtbrand.c releng/11.4/sys/conf/newvers.sh Modified: releng/11.4/UPDATING ============================================================================== --- releng/11.4/UPDATING Fri Jun 12 10:43:21 2020 (r362091) +++ releng/11.4/UPDATING Fri Jun 12 11:41:39 2020 (r362092) @@ -16,9 +16,6 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. -20200616: - 11.4-RELEASE. - 20200609: 11.4-RC2-p1 FreeBSD-SA-20:17.usb Fix USB HID descriptor parsing error. [SA-20:17.usb] Modified: releng/11.4/lib/csu/common/crtbrand.c ============================================================================== --- releng/11.4/lib/csu/common/crtbrand.c Fri Jun 12 10:43:21 2020 (r362091) +++ releng/11.4/lib/csu/common/crtbrand.c Fri Jun 12 11:41:39 2020 (r362092) @@ -63,5 +63,5 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = 1104001 + .desc = __FreeBSD_version }; Modified: releng/11.4/sys/conf/newvers.sh ============================================================================== --- releng/11.4/sys/conf/newvers.sh Fri Jun 12 10:43:21 2020 (r362091) +++ releng/11.4/sys/conf/newvers.sh Fri Jun 12 11:41:39 2020 (r362092) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.4" -BRANCH="RELEASE" +BRANCH="RC2-p1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Fri Jun 12 11:42:49 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3E005337D38; Fri, 12 Jun 2020 11:42:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jzP50zCbz4Nfw; Fri, 12 Jun 2020 11:42:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1CD8E8A77; Fri, 12 Jun 2020 11:42:49 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05CBgncc013757; Fri, 12 Jun 2020 11:42:49 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05CBgmma013756; Fri, 12 Jun 2020 11:42:49 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006121142.05CBgmma013756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 12 Jun 2020 11:42:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362093 - releng/11.4/release/doc/en_US.ISO8859-1 X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.4/release/doc/en_US.ISO8859-1 X-SVN-Commit-Revision: 362093 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2020 11:42:49 -0000 Author: gjb Date: Fri Jun 12 11:42:48 2020 New Revision: 362093 URL: https://svnweb.freebsd.org/changeset/base/362093 Log: Revert r362074, reconnecting the errata page back to the build. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/release/doc/en_US.ISO8859-1/Makefile Modified: releng/11.4/release/doc/en_US.ISO8859-1/Makefile ============================================================================== --- releng/11.4/release/doc/en_US.ISO8859-1/Makefile Fri Jun 12 11:41:39 2020 (r362092) +++ releng/11.4/release/doc/en_US.ISO8859-1/Makefile Fri Jun 12 11:42:48 2020 (r362093) @@ -6,7 +6,7 @@ SUBDIR = relnotes SUBDIR+= hardware SUBDIR+= installation SUBDIR+= readme -#SUBDIR+= errata +SUBDIR+= errata COMPAT_SYMLINK = en From owner-svn-src-releng@freebsd.org Fri Jun 12 11:44:31 2020 Return-Path: Delivered-To: svn-src-releng@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9DCFA338120; Fri, 12 Jun 2020 11:44:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jzR33jM1z4P0M; Fri, 12 Jun 2020 11:44:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A832911A; Fri, 12 Jun 2020 11:44:31 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05CBiVZu013922; Fri, 12 Jun 2020 11:44:31 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05CBiUNd013919; Fri, 12 Jun 2020 11:44:30 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202006121144.05CBiUNd013919@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 12 Jun 2020 11:44:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r362094 - in releng/11.4: . lib/csu/common sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/11.4: . lib/csu/common sys/conf X-SVN-Commit-Revision: 362094 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2020 11:44:31 -0000 Author: gjb Date: Fri Jun 12 11:44:30 2020 New Revision: 362094 URL: https://svnweb.freebsd.org/changeset/base/362094 Log: Re-apply r362079, renaming releng/11.4 to -RELEASE, in preparation for restarting 11.4-RELEASE builds. Approved by: re (implicit) Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: releng/11.4/UPDATING releng/11.4/lib/csu/common/crtbrand.c releng/11.4/sys/conf/newvers.sh Modified: releng/11.4/UPDATING ============================================================================== --- releng/11.4/UPDATING Fri Jun 12 11:42:48 2020 (r362093) +++ releng/11.4/UPDATING Fri Jun 12 11:44:30 2020 (r362094) @@ -16,6 +16,9 @@ from older versions of FreeBSD, try WITHOUT_CLANG and the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20200616: + 11.4-RELEASE. + 20200609: 11.4-RC2-p1 FreeBSD-SA-20:17.usb Fix USB HID descriptor parsing error. [SA-20:17.usb] Modified: releng/11.4/lib/csu/common/crtbrand.c ============================================================================== --- releng/11.4/lib/csu/common/crtbrand.c Fri Jun 12 11:42:48 2020 (r362093) +++ releng/11.4/lib/csu/common/crtbrand.c Fri Jun 12 11:44:30 2020 (r362094) @@ -63,5 +63,5 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = __FreeBSD_version + .desc = 1104001 }; Modified: releng/11.4/sys/conf/newvers.sh ============================================================================== --- releng/11.4/sys/conf/newvers.sh Fri Jun 12 11:42:48 2020 (r362093) +++ releng/11.4/sys/conf/newvers.sh Fri Jun 12 11:44:30 2020 (r362094) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.4" -BRANCH="RC2-p1" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi