diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-05-05 06:38:42 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-05-05 06:38:42 +0000 |
| commit | 4187907a7a44e3cd3e0158ee7048c376f6a5df46 (patch) | |
| tree | 2b68872bf64bd7d73da0162a7b20b4a8247b32e0 /app-arch/tar | |
| parent | Version bump. (diff) | |
| download | gentoo-2-4187907a7a44e3cd3e0158ee7048c376f6a5df46.tar.gz gentoo-2-4187907a7a44e3cd3e0158ee7048c376f6a5df46.tar.bz2 gentoo-2-4187907a7a44e3cd3e0158ee7048c376f6a5df46.zip | |
Pull in upstream fix for building xattrs on Solaris systems #548024#4 by iloveosxzfs.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'app-arch/tar')
| -rw-r--r-- | app-arch/tar/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/tar/files/tar-1.28-xattr.patch | 36 | ||||
| -rw-r--r-- | app-arch/tar/tar-1.28-r1.ebuild | 3 |
3 files changed, 44 insertions, 2 deletions
diff --git a/app-arch/tar/ChangeLog b/app-arch/tar/ChangeLog index da4980595ecc..2fdce9471444 100644 --- a/app-arch/tar/ChangeLog +++ b/app-arch/tar/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/tar # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.211 2015/04/20 16:49:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/ChangeLog,v 1.212 2015/05/05 06:38:42 vapier Exp $ + + 05 May 2015; Mike Frysinger <vapier@gentoo.org> +files/tar-1.28-xattr.patch, + tar-1.28-r1.ebuild: + Pull in upstream fix for building xattrs on Solaris systems #548024#4 by + iloveosxzfs. *tar-1.28-r1 (20 Apr 2015) diff --git a/app-arch/tar/files/tar-1.28-xattr.patch b/app-arch/tar/files/tar-1.28-xattr.patch new file mode 100644 index 000000000000..a8f91fd8b200 --- /dev/null +++ b/app-arch/tar/files/tar-1.28-xattr.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/548024 + +From 9c2b57232e3bc2e5ba85387560bcdd851849a128 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Mon, 5 Jan 2015 20:24:18 -0800 +Subject: [PATCH] tar: port xattr-at.c to Solaris 10 + +* lib/xattr-at.c (setxattrat, lsetxattrat, getxattrat, lgetxattrat) +(listxattrat, llistxattrat): Compile only if HAVE_XATTRS, so that +the code doesn't call functions that are not declared. +--- + lib/xattr-at.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/lib/xattr-at.c b/lib/xattr-at.c +index 443ccae..66427e9 100644 +--- a/lib/xattr-at.c ++++ b/lib/xattr-at.c +@@ -31,6 +31,8 @@ + + #include "openat-priv.h" + ++#ifdef HAVE_XATTRS ++ + /* setxattrat */ + #define AT_FUNC_NAME setxattrat + #define AT_FUNC_F1 setxattr +@@ -108,3 +110,5 @@ + #undef AT_FUNC_RESULT + #undef AT_FUNC_POST_FILE_PARAM_DECLS + #undef AT_FUNC_POST_FILE_ARGS ++ ++#endif /* HAVE_XATTRS */ +-- +2.4.0 + diff --git a/app-arch/tar/tar-1.28-r1.ebuild b/app-arch/tar/tar-1.28-r1.ebuild index 81304686c949..ca3e1376cfce 100644 --- a/app-arch/tar/tar-1.28-r1.ebuild +++ b/app-arch/tar/tar-1.28-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.28-r1.ebuild,v 1.1 2015/04/20 16:49:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/tar/tar-1.28-r1.ebuild,v 1.2 2015/05/05 06:38:42 vapier Exp $ EAPI=4 @@ -30,6 +30,7 @@ src_prepare() { || die "sed non-GNU" fi epatch "${FILESDIR}"/${P}-concat-listed.patch #546294 + epatch "${FILESDIR}"/${P}-xattr.patch #548024 } src_configure() { |