From a09a0d0d3fda01e708b2389e16e2106c242fd213 Mon Sep 17 00:00:00 2001
From: Jeremi Piotrowski <jpiotrowski@microsoft.com>
Date: Wed, 10 May 2023 10:00:35 +0000
Subject: [PATCH] sys-apps/acl: Sync with Gentoo

getacl is currently failing with a buffer overflow:

  $ getfacl /
  getfacl: Removing leading '/' from absolute path names
  # file: .
  # owner: root
  # group: root
  *** buffer overflow detected ***: terminated
  Aborted (core dumped)

This has been addressed upstream in acl-2.3.1-r1 by lowering
FORTIFY_SOURCE level.

Upstream commit 6273f7c0c37bc0fae7071ec6237654796bdcca55.

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
---
 .../portage-stable/sys-apps/acl/Manifest      |  2 +-
 .../{acl-2.3.1.ebuild => acl-2.3.1-r1.ebuild} | 23 ++++++++++++++++---
 .../portage-stable/sys-apps/acl/metadata.xml  |  1 +
 3 files changed, 22 insertions(+), 4 deletions(-)
 rename sdk_container/src/third_party/portage-stable/sys-apps/acl/{acl-2.3.1.ebuild => acl-2.3.1-r1.ebuild} (58%)

diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/acl/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/acl/Manifest
index 8b70f08471..9ae0f62f37 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/acl/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/Manifest
@@ -1 +1 @@
-DIST acl-2.3.1.tar.gz 518292 BLAKE2B 82f88b1b2cafa81efa277ea9d1b4872864a9eb259839cf39a429fad8b702dc7158c24e62ca7dd0e72b028e63951798997caca7de9aa40e73f8adc462e7a31bdd SHA512 f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892
+DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r1.ebuild
similarity index 58%
rename from sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1.ebuild
rename to sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r1.ebuild
index 5ab955ac83..02aac43963 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,11 +7,11 @@ inherit flag-o-matic libtool multilib-minimal usr-ldscript
 
 DESCRIPTION="Access control list utilities, libraries, and headers"
 HOMEPAGE="https://savannah.nongnu.org/projects/acl"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
@@ -32,6 +32,23 @@ multilib_src_configure() {
 	# bug #667372
 	filter-flags -flto*
 
+	# Broken with FORTIFY_SOURCE=3
+	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
+	# to unset F_S first, then explicitly set 2, to negate any default
+	# and anything set by the user if they're choosing 3 (or if they've
+	# modified GCC to set 3).
+	#
+	# Refs:
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104964
+	# https://savannah.nongnu.org/bugs/index.php?62519
+	# bug #847280
+	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
+		# We can't unconditionally do this b/c we fortify needs
+		# some level of optimisation.
+		filter-flags -D_FORTIFY_SOURCE=3
+		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
+	fi
+
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/bin
 		$(use_enable static-libs static)
diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/acl/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-apps/acl/metadata.xml
index 8817932e4a..80877575ba 100644
--- a/sdk_container/src/third_party/portage-stable/sys-apps/acl/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/metadata.xml
@@ -6,5 +6,6 @@
 </maintainer>
 <upstream>
 	<remote-id type="cpe">cpe:/a:xfs:acl</remote-id>
+	<remote-id type="savannah-nongnu">acl</remote-id>
 </upstream>
 </pkgmetadata>