diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r2.ebuild new file mode 100644 index 0000000000..887d476d91 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1-r2.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2023 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 )" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.1-musl-1.2.4-lfs64-fix.patch" +) + +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. + 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) + --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 +} 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.ebuild new file mode 100644 index 0000000000..517cb13a2f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/acl-2.3.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2023 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 )" + +PATCHES=( + "${FILESDIR}/${PN}-2.3.1-musl-1.2.4-lfs64-fix.patch" +) + +src_prepare() { + default + + # bug #580792 + elibtoolize +} + +multilib_src_configure() { + # Filter out -flto flags as they break getfacl/setfacl binaries + # bug #667372 + filter-flags -flto* + + 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 +} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch b/sdk_container/src/third_party/portage-stable/sys-apps/acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch new file mode 100644 index 0000000000..3b5d2c6bab --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/acl/files/acl-2.3.1-musl-1.2.4-lfs64-fix.patch @@ -0,0 +1,37 @@ +Bug: https://bugs.gentoo.org/905910 +Upstream Bug: https://savannah.nongnu.org/bugs/index.php?64162 + +From a9100afd77fea00b311f114a5a04108283aa681a Mon Sep 17 00:00:00 2001 +From: Violet Purcell +Date: Mon, 8 May 2023 04:17:07 +0000 +Subject: [PATCH] musl 1.2.4 LFS64 removal fixes + +--- + tools/chacl.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/chacl.c b/tools/chacl.c +index 525a7ff..8fff875 100644 +--- a/tools/chacl.c ++++ b/tools/chacl.c +@@ -320,7 +320,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) + { + int failed = 0; + DIR *dir; +- struct dirent64 *d; ++ struct dirent *d; + char *name; + + if ((dir = opendir(fname)) == NULL) { +@@ -332,7 +332,7 @@ walk_dir(acl_t acl, acl_t dacl, const char *fname) + return(0); /* got a file, not an error */ + } + +- while ((d = readdir64(dir)) != NULL) { ++ while ((d = readdir(dir)) != NULL) { + /* skip "." and ".." entries */ + if (strcmp(d->d_name, ".") == 0 || strcmp(d->d_name, "..") == 0) + continue; +-- +2.40.1 +