[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/, sys-apps/attr/files/

2024-04-28 Thread Andreas K. Hüttel
commit: 4b0abe03311391d346cd1c5a80f1b96318585d64
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Apr 28 12:10:42 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Apr 28 12:11:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b0abe03

sys-apps/attr: Add musl-1.2.5 build fix

Closes: https://bugs.gentoo.org/926294
Signed-off-by: Andreas K. Hüttel  gentoo.org>

 sys-apps/attr/attr-2.5.2-r1.ebuild |  4 
 sys-apps/attr/attr-.ebuild |  4 
 sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch | 23 ++
 3 files changed, 31 insertions(+)

diff --git a/sys-apps/attr/attr-2.5.2-r1.ebuild 
b/sys-apps/attr/attr-2.5.2-r1.ebuild
index 850befff79d5..2ba543d8d0e8 100644
--- a/sys-apps/attr/attr-2.5.2-r1.ebuild
+++ b/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/sys-apps/attr/attr-.ebuild b/sys-apps/attr/attr-.ebuild
index 8aac35056b3e..f240734877d9 100644
--- a/sys-apps/attr/attr-.ebuild
+++ b/sys-apps/attr/attr-.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/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch 
b/sys-apps/attr/files/attr-2.5.2-r1-musl-1.2.5.patch
new file mode 100644
index ..6a1200ad2f17
--- /dev/null
+++ b/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   REMOVEOP3   /* do a REMOVE operation */



[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/, sys-apps/attr/files/

2022-10-28 Thread Sam James
commit: 87c23fadcace07803f0afbf9c2ec25b8cf0bfa2e
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 28 19:41:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 28 19:50:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c23fad

sys-apps/attr: drop 2.5.1, 2.5.1-r1

Signed-off-by: Sam James  gentoo.org>

 sys-apps/attr/attr-2.5.1-r1.ebuild  | 109 ---
 sys-apps/attr/attr-2.5.1.ebuild | 101 --
 sys-apps/attr/files/attr-2.5.1-fix-symver.patch | 173 
 3 files changed, 383 deletions(-)

diff --git a/sys-apps/attr/attr-2.5.1-r1.ebuild 
b/sys-apps/attr/attr-2.5.1-r1.ebuild
deleted file mode 100644
index c8051fdd82e4..
--- a/sys-apps/attr/attr-2.5.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# autotools inherit only needed for 2.5.1-r1 patch for symvers
-# hopefully in next release
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} ==  ]] ; 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-fix-symver.patch
-)
-
-src_prepare() {
-   default
-
-   if [[ ${PV} ==  ]] ; then
-   po/update-potfiles || die
-   eautopoint
-   eautoreconf
-   else
-   # bug #580792
-   #elibtoolize
-
-   # Temporarily for 2.5.1-r1 for symver patch
-   eautoreconf
-   fi
-}
-
-src_configure() {
-   # bug #760857
-   append-lfs-flags
-
-   multilib-minimal_src_configure
-}
-
-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/sys-apps/attr/attr-2.5.1.ebuild b/sys-apps/attr/attr-2.5.1.ebuild
deleted file mode 100644
index 0d212005d512..
--- a/sys-apps/attr/attr-2.5.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} ==  ]] ; then
-   EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git;
-
-   inherit autotools git-r3
-else
-   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"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/, sys-apps/attr/files/

2022-06-30 Thread Sam James
commit: a745219c1cabe91c6df157cc89d5689b985a2cb9
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 30 20:00:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 30 20:01:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a745219c

sys-apps/attr: provide generated autotools patch

for bootstrapping

Signed-off-by: Sam James  gentoo.org>

 sys-apps/attr/attr-2.5.1-r2.ebuild | 104 +++
 sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch | 206 +
 2 files changed, 310 insertions(+)

diff --git a/sys-apps/attr/attr-2.5.1-r2.ebuild 
b/sys-apps/attr/attr-2.5.1-r2.ebuild
new file mode 100644
index ..2046677daddd
--- /dev/null
+++ b/sys-apps/attr/attr-2.5.1-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
+
+if [[ ${PV} ==  ]] ; 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} ==  ]] ; then
+   po/update-potfiles || die
+   eautopoint
+   eautoreconf
+   else
+   # bug #580792
+   elibtoolize
+   fi
+}
+
+src_configure() {
+   # bug #760857
+   append-lfs-flags
+
+   multilib-minimal_src_configure
+}
+
+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/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch 
b/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch
new file mode 100644
index ..ee25b13166ff
--- /dev/null
+++ b/sys-apps/attr/files/attr-2.5.1-r2-fix-symver.patch
@@ -0,0 +1,206 @@
+https://lists.nongnu.org/archive/html/acl-devel/2022-05/msg0.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:  0 NOTYPE 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/, sys-apps/attr/files/

2022-06-20 Thread Sam James
commit: 89b02b4b145ab489734ebcee4d111657473ba560
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun 20 15:25:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun 20 15:28:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89b02b4b

sys-apps/attr: update EAPI 7 -> 8; use real symbol versioning (fix lld, etc)

This should finally let us fix compatibility with LLD and.. pretty much
anything other than gcc + bfd + -fno-lto (and even then it wasn't
technically correct).

Big thanks to Alexander Miller for sorting it out.

Closes: https://bugs.gentoo.org/644048
Closes: https://bugs.gentoo.org/700116
Thanks-to: Alexander Miller  gmx.de>
Signed-off-by: Sam James  gentoo.org>

 .../{attr-.ebuild => attr-2.5.1-r1.ebuild} |  44 +++---
 sys-apps/attr/attr-.ebuild |  44 +++---
 sys-apps/attr/files/attr-2.5.1-fix-symver.patch| 173 +
 3 files changed, 225 insertions(+), 36 deletions(-)

diff --git a/sys-apps/attr/attr-.ebuild b/sys-apps/attr/attr-2.5.1-r1.ebuild
similarity index 74%
copy from sys-apps/attr/attr-.ebuild
copy to sys-apps/attr/attr-2.5.1-r1.ebuild
index 58d5e41c2738..c8051fdd82e4 100644
--- a/sys-apps/attr/attr-.ebuild
+++ b/sys-apps/attr/attr-2.5.1-r1.ebuild
@@ -1,30 +1,34 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
+# autotools inherit only needed for 2.5.1-r1 patch for symvers
+# hopefully in next release
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
 
 if [[ ${PV} ==  ]] ; 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="
-   sys-devel/binutils
-   nls? ( sys-devel/gettext )
-"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.5.1-fix-symver.patch
+)
 
 src_prepare() {
default
@@ -34,35 +38,38 @@ src_prepare() {
eautopoint
eautoreconf
else
-   elibtoolize #580792
+   # bug #580792
+   #elibtoolize
+
+   # Temporarily for 2.5.1-r1 for symver patch
+   eautoreconf
fi
 }
 
 src_configure() {
-   # Remove -flto* from flags as this breaks binaries (bug #644048)
-   filter-flags -flto*
-   append-ldflags "-Wl,--no-gc-sections" #700116
-   tc-ld-force-bfd #644048
-   append-lfs-flags #760857
+   # bug #760857
+   append-lfs-flags
+
multilib-minimal_src_configure
 }
 
 multilib_src_configure() {
local myeconfargs=(
--bindir="${EPREFIX}"/bin
+   --libexecdir="${EPREFIX}"/usr/$(get_libdir)
--enable-shared
$(use_enable static-libs static)
$(use_enable nls)
-   --libexecdir="${EPREFIX}"/usr/$(get_libdir)
$(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. #644048
+   # 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}")
@@ -76,18 +83,19 @@ multilib_src_install() {
echo "${versions}"
echo "# readelf -sW ${lib}"
echo "${symbols}"
-   die "symbol version sanity check failed; please comment 
on https://bugs.gentoo.org/644048;
+   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
+   # 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
 }

diff --git a/sys-apps/attr/attr-.ebuild b/sys-apps/attr/attr-.ebuild
index 58d5e41c2738..c8051fdd82e4 100644
--- 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/, sys-apps/attr/files/

2018-09-01 Thread Thomas Deutschmann
commit: 6ded56cd9ef0b4f86918d9b675bbb87ca143d344
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Sep  1 22:28:38 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Sep  1 22:29:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ded56cd

sys-apps/attr: switch back to syscall

Link: https://lists.nongnu.org/archive/html/acl-devel/2018-08/msg0.html
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 sys-apps/attr/attr-2.4.48-r3.ebuild|  86 ++
 .../files/attr-2.4.48-switch-back-to-syscall.patch | 123 +
 2 files changed, 209 insertions(+)

diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild 
b/sys-apps/attr/attr-2.4.48-r3.ebuild
new file mode 100644
index 000..2e011e44eea
--- /dev/null
+++ b/sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="Extended attributes tools"
+HOMEPAGE="https://savannah.nongnu.org/projects/attr;
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug nls static-libs"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=(
+   "${FILESDIR}/${P}-perl-5.26.patch"
+   "${FILESDIR}/${P}-switch-back-to-syscall.patch"
+)
+
+src_prepare() {
+   default
+   elibtoolize #580792
+}
+
+multilib_src_configure() {
+   unset PLATFORM #184564
+   export OPTIMIZER=${CFLAGS}
+   export DEBUG=-DNDEBUG
+
+   tc-ld-disable-gold #644048
+
+   local myeconfargs=(
+   --bindir="${EPREFIX%/}"/bin
+   --enable-shared
+   $(use_enable static-libs static)
+   $(use_enable nls)
+   --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)
+   $(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. #644048
+   local lib="${ED%/}/usr/$(get_libdir)/libattr.so.1"
+   if [[ -e ${lib} ]] ; then
+   local versions=$(readelf -V "${lib}")
+   local symbols=$(readelf -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.
+   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/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch 
b/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
new file mode 100644
index 000..5691b15420c
--- /dev/null
+++ b/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
@@ -0,0 +1,123 @@
+From 14adc898a36948267bfe5c63b36879e94c98 Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher 
+Date: Fri, 17 Aug 2018 14:07:31 +0200
+Subject: Switch back to syscall()
+
+Switch back to syscall() for the *xattr system calls.  The current
+mechanism of forwarding those calls to glibc breaks libraries like
+libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc
+-fsanitize=address).
+
+Those libraries provide wrappers for functions defined in other shared
+libraries, usually glibc, do their own processing, and forward calls to
+the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name").  In
+our case, dlsym returns the libattr_*xattr wrappers.  However, when our
+wrappers try calling glibc, they end up calling the libfakeroot /
+libasan wrappers instead because those override the original symbols =>
+recursion.
+
+The libattr_*xattr wrappers will only be used when symbols are looked up
+at runtime (dlopen / dlsym).  Programs linking against libattr will
+directly use the glibc provided symbols.  Therefore, the slightly worse

[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/, sys-apps/attr/files/

2018-06-22 Thread Lars Wendler
commit: 67bcfc713c045e2205f7fb3015566f213c623814
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jun 22 13:37:06 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jun 22 13:37:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67bcfc71

sys-apps/attr: Revbump to also define ENOATTR in xattr.h shim file.

Bug: https://bugs.gentoo.org/658744
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/attr/{attr-2.4.48-r1.ebuild => attr-2.4.48-r2.ebuild} | 0
 sys-apps/attr/files/xattr-shim.h   | 3 +++
 2 files changed, 3 insertions(+)

diff --git a/sys-apps/attr/attr-2.4.48-r1.ebuild 
b/sys-apps/attr/attr-2.4.48-r2.ebuild
similarity index 100%
rename from sys-apps/attr/attr-2.4.48-r1.ebuild
rename to sys-apps/attr/attr-2.4.48-r2.ebuild

diff --git a/sys-apps/attr/files/xattr-shim.h b/sys-apps/attr/files/xattr-shim.h
index 818b4c1690c..88a12354318 100644
--- a/sys-apps/attr/files/xattr-shim.h
+++ b/sys-apps/attr/files/xattr-shim.h
@@ -3,4 +3,7 @@
 #define __XATTR_H__
 #include 
 #warning "Please change your  includes to "
+# ifndef ENOATTR
+#  define ENOATTR ENODATA
+# endif /* ENOATTR */
 #endif



[gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/, sys-apps/attr/files/

2018-01-10 Thread Lars Wendler
commit: 7e5b180cb88a4b730af851e326065baf6b9bc2c8
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jan 10 15:42:50 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jan 10 15:43:06 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5b180c

sys-apps/attr: Fixed test suite error with perl-5.26

Closes: https://bugs.gentoo.org/644058
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/attr/attr-2.4.48.ebuild|  4 
 sys-apps/attr/files/attr-2.4.48-perl-5.26.patch | 23 +++
 2 files changed, 27 insertions(+)

diff --git a/sys-apps/attr/attr-2.4.48.ebuild b/sys-apps/attr/attr-2.4.48.ebuild
index b6a1fef64ad..378bc2b6cd4 100644
--- a/sys-apps/attr/attr-2.4.48.ebuild
+++ b/sys-apps/attr/attr-2.4.48.ebuild
@@ -21,6 +21,10 @@ DEPEND="
sys-devel/gettext
 "
 
+PATCHES=(
+   "${FILESDIR}/${P}-perl-5.26.patch"
+)
+
 src_prepare() {
default
elibtoolize #580792

diff --git a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch 
b/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
new file mode 100644
index 000..6f3d2a22c14
--- /dev/null
+++ b/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
@@ -0,0 +1,23 @@
+... to fix test-suite failure with perl-5.26.0
+
+Bug: https://bugzilla.redhat.com/1473853
+Upstream: http://lists.nongnu.org/archive/html/acl-devel/2017-07/msg1.html
+---
+ test/run | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/run b/test/run
+index 4b1f8d0..07e916c 100755
+--- a/test/run
 b/test/run
+@@ -106,7 +106,7 @@ for (;;) {
+   if (defined $line) {
+ # Substitute %VAR and %{VAR} with environment variables.
+ $line =~ s[%(\w+)][$ENV{$1}]eg;
+-$line =~ s[%{(\w+)}][$ENV{$1}]eg;
++$line =~ s[%\{(\w+)}][$ENV{$1}]eg;
+   }
+   if (defined $line) {
+ if ($line =~ s/^\s*< ?//) {
+-- 
+2.13.0
\ No newline at end of file