From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 27022158090 for ; Tue, 24 May 2022 17:19:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BED5E0802; Tue, 24 May 2022 17:19:36 +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 4C15FE0802 for ; Tue, 24 May 2022 17:19:36 +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 0BA2B341981 for ; Tue, 24 May 2022 17:19:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65B1B1E for ; Tue, 24 May 2022 17:19:33 +0000 (UTC) From: "Sam James" 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" Message-ID: <1653412766.0bea576460def7e195e79059ed74e8725b884f9c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/acl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/acl/acl-2.3.1-r1.ebuild X-VCS-Directories: sys-apps/acl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0bea576460def7e195e79059ed74e8725b884f9c X-VCS-Branch: master Date: Tue, 24 May 2022 17:19:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 28d099a8-9b51-41d2-a832-69a2da47062c X-Archives-Hash: 9cdfbb4372e6c16741f1b3b6e66c1153 commit: 0bea576460def7e195e79059ed74e8725b884f9c Author: Sam James gentoo org> AuthorDate: Tue May 24 17:19:05 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 24 17:19:26 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bea5764 sys-apps/acl: disable FORTIFY_SOURCE=3 Known broken, bug in ACL, and reported upstream. Do as e.g. opensuse have done and disable it for this package for now. Closes: https://bugs.gentoo.org/847280 Signed-off-by: Sam James gentoo.org> sys-apps/acl/acl-2.3.1-r1.ebuild | 78 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/sys-apps/acl/acl-2.3.1-r1.ebuild b/sys-apps/acl/acl-2.3.1-r1.ebuild new file mode 100644 index 000000000000..d08cc9068341 --- /dev/null +++ b/sys-apps/acl/acl-2.3.1-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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.xz" + +LICENSE="LGPL-2.1" +SLOT="0" +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=" + >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] +" +DEPEND="${RDEPEND}" +BDEPEND="nls? ( sys-devel/gettext )" + +src_prepare() { + default + + # bug #580792 + elibtoolize +} + +multilib_src_configure() { + # Filter out -flto flags as they break getfacl/setfacl binaries + # 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. + append-flags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 + fi + + local myeconfargs=( + --bindir="${EPREFIX}"/bin + $(use_enable static-libs static) + --libexecdir="${EPREFIX}"/usr/$(get_libdir) + $(use_enable nls) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_test() { + # Tests call native binaries with an LD_PRELOAD wrapper + # bug #772356 + multilib_is_native_abi && default +} + +multilib_src_install() { + default + + # Move shared libs to / + gen_usr_ldscript -a acl +} + +multilib_src_install_all() { + if ! use static-libs ; then + find "${ED}" -type f -name "*.la" -delete || die + fi +}