From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Jun 2018 07:00:28 +0100 Subject: gentoo resync : 23.06.2018 --- sys-apps/attr/Manifest | 7 ++- sys-apps/attr/attr-2.4.48-r2.ebuild | 82 +++++++++++++++++++++++++ sys-apps/attr/attr-2.4.48.ebuild | 61 ------------------ sys-apps/attr/files/attr-2.4.48-perl-5.26.patch | 10 ++- sys-apps/attr/files/xattr-shim.h | 9 +++ 5 files changed, 102 insertions(+), 67 deletions(-) create mode 100644 sys-apps/attr/attr-2.4.48-r2.ebuild delete mode 100644 sys-apps/attr/attr-2.4.48.ebuild create mode 100644 sys-apps/attr/files/xattr-shim.h (limited to 'sys-apps/attr') diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest index b14728106a86..8b7868d02745 100644 --- a/sys-apps/attr/Manifest +++ b/sys-apps/attr/Manifest @@ -1,6 +1,7 @@ -AUX attr-2.4.48-perl-5.26.patch 635 BLAKE2B 474a08f4dc2ebd1f6c234461645985dc1dbe5bbd33d8a073a76a74846a3dbefd27dc6803f3f671c9c143e6dfa840e7f9df2e763026895e12d9ac894b51155453 SHA512 1a04e4e3fd733dd229049c5c1e1300a5fb7bf9ff90d5ac51fd9a636fcf40b833073c9c9adae9df46f492e07933a136faa775b22b351f04ae6afa85332cfd4f45 +AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552004c7b7ce224898ffd8a362342703225e7015f896d2c97013194ea3a8e61768174265b42d6dc565187aaf1712062 SHA512 af131267a4cc22322df8234ce4abf8a27f917aeb801a423696a51f935ee40bf155206cf40b7f510849e1a276808502ab48ade0a520b3f06969c5df2415055fe1 +AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8 DIST attr-2.4.47.src.tar.gz 343692 BLAKE2B af4d509f156cb2e693f0faebf1a6cfb4a27cbdd3fd7f8b436cc01419c905ff9ac36214ada2ca8269e49c2e276917b1178dcda97050cf25cecd65382f22bdf9bb SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 -DIST attr-2.4.48.tar.xz 346292 BLAKE2B eeffc17bf485749b5d0a1fce4ac3702c33a0bacce3ad635400e8b0b52981f14c5e750ef570f8fd19657e460e51e6e09f972134ef8a3e6efc15c2a7203682df75 SHA512 78b8160303aec9e01f63b5cf725a9e16432ff1d4a6e0065ce1a52715ae1266572e0c01f9be25c938c484deea288fdff2ce27981c3aea578753ad854084957e8b +DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923 EBUILD attr-2.4.47-r2.ebuild 1721 BLAKE2B 59cb46b36bdb2ad79feb1fb4249940f05fd9020580db49778cb7c64e3358b7f7480473e17c8527c1c22f4a191a217073393bba98901cf1a8a6f71b401abde6b2 SHA512 8c6415eaf04fc1e2fcc42fef529db9db3536b6e71ac1acb652ca4e2b1b053e1a1f6e7061dd903071ed28e433a21c4939eeda087a5c97d9b490419ac4667b3d9d -EBUILD attr-2.4.48.ebuild 1441 BLAKE2B ec4c81afa4dece6a95f91e3851db45ec99446d0ad57243d4e2f6abb8a9adce2b0908b24b14bb5acc324f0e5eb2c7ac85d5ca0f027786fdb96cf6bf2bfe146316 SHA512 fd786dabba25d3d57f5b66a093e9ab4fabf9a7432c5f9f00653c83827a069bb69d5668d5db8f08abf511119cb6615bb1205141c8e1c340a386468e0fb823604d +EBUILD attr-2.4.48-r2.ebuild 2107 BLAKE2B 30edbd1e955c03f5d4423da4fb81120ac82d0071d92c72b97f2468dd0a4bdd5bea2561412c7d38d1fe3cab49a3fbd3b0c9e53fbc1cb2e92ee6c6dd6f4c7a16da SHA512 1541b465d7a55e730cb81d059fe507df05d3ead02c1322643f22966a844469a2727da1c475ea1f295228bea4bd7e45f1a3bf2480b717eb1cf904e09f2569d82d MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-apps/attr/attr-2.4.48-r2.ebuild b/sys-apps/attr/attr-2.4.48-r2.ebuild new file mode 100644 index 000000000000..0b5b137eba15 --- /dev/null +++ b/sys-apps/attr/attr-2.4.48-r2.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit libtool ltprune 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 ~arm-linux ~x86-linux" +IUSE="debug nls static-libs" + +DEPEND="nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}/${P}-perl-5.26.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() { + use static-libs || prune_libtool_files --all + einstalldocs +} diff --git a/sys-apps/attr/attr-2.4.48.ebuild b/sys-apps/attr/attr-2.4.48.ebuild deleted file mode 100644 index 378bc2b6cd46..000000000000 --- a/sys-apps/attr/attr-2.4.48.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit libtool ltprune toolchain-funcs multilib-minimal - -DESCRIPTION="Extended attributes tools" -HOMEPAGE="https://savannah.nongnu.org/projects/attr" -# Self-hosting as savannah does not provide a tarball on their download -# area and the tarball in their git repo requires autoreconf to be run. -SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -IUSE="debug static-libs" - -DEPEND=" - sys-devel/autoconf - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}/${P}-perl-5.26.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) - --libexecdir="${EPREFIX}"/usr/$(get_libdir) - $(use_enable debug) - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - emake DESTDIR="${D}" install - - 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 -} - -multilib_src_install_all() { - use static-libs || prune_libtool_files --all - einstalldocs -} 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 index 6f3d2a22c140..49b4c1a57665 100644 --- 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 @@ -1,13 +1,17 @@ +From 406eab7aa09da9df787a964d3c152c0bda6e23c4 Mon Sep 17 00:00:00 2001 +From: Troy Dawson +Date: Mon, 24 Jul 2017 14:42:06 +0200 +Subject: [PATCH attr] test: escape left brace in a regex in test/run + ... 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/msg00001.html --- test/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run b/test/run -index 4b1f8d0..07e916c 100755 +index 4b1f8d0d6134..07e916c41947 100755 --- a/test/run +++ b/test/run @@ -106,7 +106,7 @@ for (;;) { @@ -20,4 +24,4 @@ index 4b1f8d0..07e916c 100755 if (defined $line) { if ($line =~ s/^\s*< ?//) { -- -2.13.0 \ No newline at end of file +2.16.1 diff --git a/sys-apps/attr/files/xattr-shim.h b/sys-apps/attr/files/xattr-shim.h new file mode 100644 index 000000000000..88a12354318d --- /dev/null +++ b/sys-apps/attr/files/xattr-shim.h @@ -0,0 +1,9 @@ +/* Small shim until we update all packages. */ +#ifndef __XATTR_H__ +#define __XATTR_H__ +#include +#warning "Please change your includes to " +# ifndef ENOATTR +# define ENOATTR ENODATA +# endif /* ENOATTR */ +#endif -- cgit v1.2.3