From bf66f696bd7b1492eaa977341e516b98d193c55f Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 1 Jul 2024 07:17:51 +0000 Subject: [PATCH] sys-apps/attr: Sync with Gentoo It's from Gentoo commit 10622747ae6ae73c4a238dd82a5d05745b5267ca. --- .../portage-stable/sys-apps/attr/Manifest | 1 - .../sys-apps/attr/attr-2.5.1-r2.ebuild | 97 --------- .../sys-apps/attr/attr-2.5.2-r1.ebuild | 4 + .../sys-apps/attr/attr-9999.ebuild | 4 + .../attr/files/attr-2.5.1-r2-fix-symver.patch | 206 ------------------ .../attr/files/attr-2.5.2-r1-musl-1.2.5.patch | 23 ++ 6 files changed, 31 insertions(+), 304 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.1-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch create mode 100644 sdk_container/src/third_party/portage-stable/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/Manifest b/sdk_container/src/third_party/portage-stable/sys-apps/attr/Manifest index 0e025eaf23..868c915b77 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/Manifest +++ b/sdk_container/src/third_party/portage-stable/sys-apps/attr/Manifest @@ -1,2 +1 @@ -DIST attr-2.5.1.tar.xz 318188 BLAKE2B 876dcbd802ea79b7851640f208820ffdfb73dc46065af673037c6dd50ad2af158f9f74b34cf45728baf9d0cc5572b40c3f102aa2907245a877db0d3879e38f04 SHA512 9e5555260189bb6ef2440c76700ebb813ff70582eb63d446823874977307d13dfa3a347dfae619f8866943dfa4b24ccf67dadd7e3ea2637239fdb219be5d2932 DIST attr-2.5.2.tar.xz 334180 BLAKE2B cf26348c3a96622e4f62493ac7655e14b6580d36a5784ef4c3750178856eceabd33192fd58516be21c8aa1ad41d56c024ad440ef4bc922bed8f7a4984ea16c63 SHA512 f587ea544effb7cfed63b3027bf14baba2c2dbe3a9b6c0c45fc559f7e8cb477b3e9a4a826eae30f929409468c50d11f3e7dc6d2500f41e1af8662a7e96a30ef3 diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.1-r2.ebuild deleted file mode 100644 index 93dc3a3632..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.1-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit toolchain-funcs multilib-minimal usr-ldscript - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git" - inherit autotools git-r3 -else - inherit libtool - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" - SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" -fi - -DESCRIPTION="Extended attributes tools" -HOMEPAGE="https://savannah.nongnu.org/projects/attr" - -LICENSE="LGPL-2.1+" -SLOT="0" -IUSE="debug nls static-libs" - -BDEPEND="nls? ( sys-devel/gettext )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.1-r2-fix-symver.patch -) - -src_prepare() { - default - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles || die - eautopoint - eautoreconf - else - # bug #580792 - elibtoolize - fi -} - -multilib_src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/bin - --libexecdir="${EPREFIX}"/usr/$(get_libdir) - --enable-shared - $(use_enable static-libs static) - $(use_enable nls) - $(use_enable debug) - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - # Sanity check until we track down why this is happening. bug #644048 - local lib="${ED}/usr/$(get_libdir)/libattr.so.1" - if [[ -e ${lib} ]] ; then - local versions=$($(tc-getREADELF) -V "${lib}") - local symbols=$($(tc-getREADELF) -sW "${lib}") - if [[ "${versions}" != *"ATTR_1.0"* || \ - "${versions}" != *"ATTR_1.1"* || \ - "${versions}" != *"ATTR_1.2"* || \ - "${versions}" != *"ATTR_1.3"* || \ - "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then - echo "# readelf -V ${lib}" - echo "${versions}" - echo "# readelf -sW ${lib}" - echo "${symbols}" - die "Symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048" - else - einfo "${lib} passed symbol checks" - fi - fi - - if multilib_is_native_abi; then - # We install attr into /bin, so we need the shared lib with it - gen_usr_ldscript -a attr - fi - - # Add a wrapper until people upgrade. - # TODO: figure out when this was added & when we can drop it! - insinto /usr/include/attr - newins "${FILESDIR}"/xattr-shim.h xattr.h -} - -multilib_src_install_all() { - if ! use static-libs; then - find "${ED}" -name '*.la' -delete || die - fi - - einstalldocs -} diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2-r1.ebuild index 850befff79..2ba543d8d0 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-2.5.2-r1.ebuild @@ -24,6 +24,10 @@ IUSE="debug nls static-libs" BDEPEND="nls? ( sys-devel/gettext )" +PATCHES=( + "${FILESDIR}/${PN}-2.5.2-r1-musl-1.2.5.patch" +) + src_prepare() { default diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild index 8aac35056b..f240734877 100644 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/sys-apps/attr/attr-9999.ebuild @@ -24,6 +24,10 @@ IUSE="debug nls static-libs" BDEPEND="nls? ( sys-devel/gettext )" +PATCHES=( + "${FILESDIR}/${PN}-2.5.2-r1-musl-1.2.5.patch" +) + src_prepare() { default diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch b/sdk_container/src/third_party/portage-stable/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch deleted file mode 100644 index ee25b13166..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch +++ /dev/null @@ -1,206 +0,0 @@ -https://lists.nongnu.org/archive/html/acl-devel/2022-05/msg00000.html -Bug: https://bugs.gentoo.org/644048 -Bug: https://bugs.gentoo.org/700116 - -From a9ca51afd2b9f68f57de3a4c3d962d1d763572ca Mon Sep 17 00:00:00 2001 -From: Alexander Miller -Date: Thu, 28 Nov 2019 22:17:24 +0100 -Subject: [PATCH] Better supported way to set symbol versions for legacy - syscalls - -Using a linker script to set a symbol versions is an undocumented -hack and doesn't work reliably in many cases. It works (to some -degree) with the bfd linker, but fails with gold or lld. And even -with bfd it can break when using --gc-sections or LTO. - -The result may be a library where the code has been discarded and -the versioned symbols are unusable, e.g. - 23: 00000000 0 NOTYPE GLOBAL DEFAULT ABS getxattr@ATTR_1.0 -instead of - 23: 000033c0 0 FUNC GLOBAL DEFAULT 11 getxattr@ATTR_1.0 - -Remove the linker script entirely and set symbol versions with the -symver attribute if available (in gcc >= 10, but not in clang), -otherwise use the traditional global asm solution with a .symver -directive. -Those are the documented ways to do it and well supported by (almost) -all configurations. (The exception is old gcc with LTO; a workaround -is included, but some versions may still need -flto-partition=none). - -Signed-off-by: Alexander Miller - ---- a/libattr/Makemodule.am -+++ b/libattr/Makemodule.am -@@ -8,7 +8,7 @@ LT_CURRENT = 2 - LT_AGE = 1 - LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) - --libattr_la_DEPENDENCIES = exports libattr/libattr.lds -+libattr_la_DEPENDENCIES = exports - libattr_la_SOURCES = \ - libattr/attr_copy_action.c \ - libattr/attr_copy_check.c \ -@@ -20,7 +20,4 @@ libattr_la_SOURCES = \ - libattr_la_CFLAGS = -include libattr/libattr.h - libattr_la_LDFLAGS = \ - -Wl,--version-script,$(top_srcdir)/exports \ -- -Wl,$(top_srcdir)/libattr/libattr.lds \ - -version-info $(LTVERSION) -- --EXTRA_DIST += libattr/libattr.lds - ---- a/Makefile.in -+++ b/Makefile.in -@@ -647,9 +647,8 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - ACLOCAL_AMFLAGS = -I m4 --EXTRA_DIST = exports examples/copyattr.c examples/Makefile \ -- libattr/libattr.lds test/README test/run \ -- test/sort-getfattr-output $(TESTS) -+EXTRA_DIST = exports examples/copyattr.c examples/Makefile test/README \ -+ test/run test/sort-getfattr-output $(TESTS) - SUBDIRS = po - AM_CPPFLAGS = \ - -I$(top_builddir)/include \ -@@ -689,7 +688,7 @@ LT_CURRENT = 2 - #LT_REVISION = - LT_AGE = 1 - LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) --libattr_la_DEPENDENCIES = exports libattr/libattr.lds -+libattr_la_DEPENDENCIES = exports - libattr_la_SOURCES = \ - libattr/attr_copy_action.c \ - libattr/attr_copy_check.c \ -@@ -702,7 +701,6 @@ libattr_la_SOURCES = \ - libattr_la_CFLAGS = -include libattr/libattr.h - libattr_la_LDFLAGS = \ - -Wl,--version-script,$(top_srcdir)/exports \ -- -Wl,$(top_srcdir)/libattr/libattr.lds \ - -version-info $(LTVERSION) - - libmisc_la_SOURCES = \ ---- a/libattr/libattr.lds -+++ /dev/null -@@ -1,12 +0,0 @@ --"fgetxattr@ATTR_1.0" = libattr_fgetxattr; --"flistxattr@ATTR_1.0" = libattr_flistxattr; --"fremovexattr@ATTR_1.0" = libattr_fremovexattr; --"fsetxattr@ATTR_1.0" = libattr_fsetxattr; --"getxattr@ATTR_1.0" = libattr_getxattr; --"lgetxattr@ATTR_1.0" = libattr_lgetxattr; --"listxattr@ATTR_1.0" = libattr_listxattr; --"llistxattr@ATTR_1.0" = libattr_llistxattr; --"lremovexattr@ATTR_1.0" = libattr_lremovexattr; --"lsetxattr@ATTR_1.0" = libattr_lsetxattr; --"removexattr@ATTR_1.0" = libattr_removexattr; --"setxattr@ATTR_1.0" = libattr_setxattr; ---- a/libattr/syscalls.c -+++ b/libattr/syscalls.c -@@ -26,6 +26,27 @@ - #include - #include - -+/* -+ * Versioning of compat symbols: -+ * prefer symver attribute if available (since gcc 10), -+ * fall back to traditional .symver asm directive otherwise. -+ */ -+#ifdef __has_attribute -+# if __has_attribute(symver) -+# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((symver(vn))) -+# elif __has_attribute(no_reorder) -+ /* -+ * Avoid wrong partitioning with older gcc and LTO. May not work reliably -+ * with all versions; use -flto-partition=none if you encounter problems. -+ */ -+# define SYMVER(cn, vn) __typeof(cn) cn __attribute__((noreorder)); \ -+ __asm__(".symver " #cn "," vn) -+# endif -+#endif -+#ifndef SYMVER -+# define SYMVER(cn, vn) __asm__(".symver " #cn "," vn) -+#endif -+ - #ifdef HAVE_VISIBILITY_ATTRIBUTE - # pragma GCC visibility push(default) - #endif -@@ -35,66 +56,78 @@ int libattr_setxattr(const char *path, const char *name, - { - return syscall(__NR_setxattr, path, name, value, size, flags); - } -+SYMVER(libattr_setxattr, "setxattr@ATTR_1.0"); - - int libattr_lsetxattr(const char *path, const char *name, - void *value, size_t size, int flags) - { - return syscall(__NR_lsetxattr, path, name, value, size, flags); - } -+SYMVER(libattr_lsetxattr, "lsetxattr@ATTR_1.0"); - - int libattr_fsetxattr(int filedes, const char *name, - void *value, size_t size, int flags) - { - return syscall(__NR_fsetxattr, filedes, name, value, size, flags); - } -+SYMVER(libattr_fsetxattr, "fsetxattr@ATTR_1.0"); - - ssize_t libattr_getxattr(const char *path, const char *name, - void *value, size_t size) - { - return syscall(__NR_getxattr, path, name, value, size); - } -+SYMVER(libattr_getxattr, "getxattr@ATTR_1.0"); - - ssize_t libattr_lgetxattr(const char *path, const char *name, - void *value, size_t size) - { - return syscall(__NR_lgetxattr, path, name, value, size); - } -+SYMVER(libattr_lgetxattr, "lgetxattr@ATTR_1.0"); - - ssize_t libattr_fgetxattr(int filedes, const char *name, - void *value, size_t size) - { - return syscall(__NR_fgetxattr, filedes, name, value, size); - } -+SYMVER(libattr_fgetxattr, "fgetxattr@ATTR_1.0"); - - ssize_t libattr_listxattr(const char *path, char *list, size_t size) - { - return syscall(__NR_listxattr, path, list, size); - } -+SYMVER(libattr_listxattr, "listxattr@ATTR_1.0"); - - ssize_t libattr_llistxattr(const char *path, char *list, size_t size) - { - return syscall(__NR_llistxattr, path, list, size); - } -+SYMVER(libattr_llistxattr, "llistxattr@ATTR_1.0"); - - ssize_t libattr_flistxattr(int filedes, char *list, size_t size) - { - return syscall(__NR_flistxattr, filedes, list, size); - } -+SYMVER(libattr_flistxattr, "flistxattr@ATTR_1.0"); - - int libattr_removexattr(const char *path, const char *name) - { - return syscall(__NR_removexattr, path, name); - } -+SYMVER(libattr_removexattr, "removexattr@ATTR_1.0"); - - int libattr_lremovexattr(const char *path, const char *name) - { - return syscall(__NR_lremovexattr, path, name); - } -+SYMVER(libattr_lremovexattr, "lremovexattr@ATTR_1.0"); - - int libattr_fremovexattr(int filedes, const char *name) - { - return syscall(__NR_fremovexattr, filedes, name); - } -+SYMVER(libattr_fremovexattr, "fremovexattr@ATTR_1.0"); - - #ifdef HAVE_VISIBILITY_ATTRIBUTE - # pragma GCC visibility pop diff --git a/sdk_container/src/third_party/portage-stable/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch b/sdk_container/src/third_party/portage-stable/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch new file mode 100644 index 0000000000..6a1200ad2f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch @@ -0,0 +1,23 @@ + +If we're not building with glibc, then add its basename definition manually + +diff --git a/tools/attr.c b/tools/attr.c +index f12e4af..d321b37 100644 +--- a/tools/attr.c ++++ b/tools/attr.c +@@ -33,6 +33,15 @@ + + #include "misc.h" + ++#if !defined(__GLIBC__) ++char * ++basename (const char *filename) ++{ ++ char *p = strrchr (filename, '/'); ++ return p ? p + 1 : (char *) filename; ++} ++#endif ++ + #define SETOP 1 /* do a SET operation */ + #define GETOP 2 /* do a GET operation */ + #define REMOVEOP 3 /* do a REMOVE operation */