From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1557752-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 4D98E158089
	for <garchives@archives.gentoo.org>; Tue, 26 Sep 2023 20:54:18 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6FD512BC02F;
	Tue, 26 Sep 2023 20:54:17 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(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)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 558542BC02F
	for <gentoo-commits@lists.gentoo.org>; Tue, 26 Sep 2023 20:54:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(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)
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5D759335CEC
	for <gentoo-commits@lists.gentoo.org>; Tue, 26 Sep 2023 20:54:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id CE7921269
	for <gentoo-commits@lists.gentoo.org>; Tue, 26 Sep 2023 20:54:14 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1695761652.33e19bb0a3f547f10f49cc281c31cad2f7fea60b.sam@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: /
X-VCS-Repository: proj/portage
X-VCS-Files: NEWS
X-VCS-Directories: /
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 33e19bb0a3f547f10f49cc281c31cad2f7fea60b
X-VCS-Branch: master
Date: Tue, 26 Sep 2023 20:54:14 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5b5c4da2-5a47-48c5-a05e-28d56a1a72de
X-Archives-Hash: 0d40e4a8516f4b980208f292a3e0ea4e

commit:     33e19bb0a3f547f10f49cc281c31cad2f7fea60b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 20:54:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 20:54:12 2023 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=33e19bb0

NEWS: update

Signed-off-by: Sam James <sam <AT> gentoo.org>

 NEWS | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/NEWS b/NEWS
index 31a188e8f6..aa2b39ee9b 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,8 @@ Bug fixes:
 
 * fetch: fix fetching of layout.conf when FEATURES=force-mirror (bug #877793).
 
+* dispatch-conf, etc-update: fix SELinux security labels on merged files.
+
 Cleanups:
 * vartree: Remove unused variables and parameters