mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 04:06:33 +02:00
sys-apps/acl: Sync with Gentoo
It's from Gentoo commit 8dd9012826daaa18613c8445e5ab87ea065c1a22.
This commit is contained in:
parent
4400b67434
commit
b0d21aab1c
@ -1,2 +1 @@
|
||||
DIST acl-2.3.1.tar.xz 355676 BLAKE2B 15e81e8159ddb21ef0c262bef3101c0b6fa546738a2ab74c01ccc21fd1c3dc8ab6aaf84a06dee6da22291f3ca4feeffa60c7d11bfac1ab770a6ec28e1f1655e0 SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
|
||||
DIST acl-2.3.2.tar.xz 371680 BLAKE2B 9f2abfddcd403df2c716c05f02a1b52453613d10948dc58a65b9ef41b44e37db6de99fb22dcfc4f6f0fb5d0319c939da61bd4e0fba2cdb5643e8087ecd34eeac SHA512 c2d061dbfd28c00cecbc1ae614d67f3138202bf4d39b383f2df4c6a8b10b830f33acec620fb211f268478737dde4037d338a5823af445253cb088c48a135099b
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
# 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 toolchain-funcs 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 ~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-lto
|
||||
|
||||
# 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 tc-enables-fortify-source ; then
|
||||
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
|
||||
}
|
||||
@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
|
||||
|
||||
LICENSE="LGPL-2.1+ GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="nls static-libs"
|
||||
|
||||
RDEPEND="
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
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 <vimproved@inventati.org>
|
||||
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user