From f1c01f30d2defce057e096dfce3c1d114eb121d6 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Thu, 22 Dec 2011 00:49:17 -0800 Subject: [PATCH] cpio: import newer version from upstream This primarily pulls in a security fix in that landed in 2.11. BUG=chromium-os:24192 TEST=`emerge cpio` # host only package. Change-Id: Iad6102e80ababd5bce2ecae0da3f48f5daf949e2 Reviewed-on: https://gerrit.chromium.org/gerrit/13401 Tested-by: Brian Harring Reviewed-by: Mike Frysinger Commit-Ready: Brian Harring --- .../portage-stable/app-arch/cpio/Manifest | 1 + .../app-arch/cpio/cpio-2.11.ebuild | 34 +++++++++++++++++++ .../app-arch/cpio/files/cpio-2.11-stat.patch | 25 ++++++++++++++ 3 files changed, 60 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.11.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.11-stat.patch diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest new file mode 100644 index 0000000000..474137aec0 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/Manifest @@ -0,0 +1 @@ +DIST cpio-2.11.tar.bz2 1018483 RMD160 52507b8ba556dca888ce1179cfda10f9549ea9ab SHA1 6f1934b0079dc1e85ddff89cabdf01adb3a74abb SHA256 bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.11.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.11.ebuild new file mode 100644 index 0000000000..48aaa10d15 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.11.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11.ebuild,v 1.8 2010/10/10 00:04:57 vapier Exp $ + +EAPI="2" + +inherit eutils + +DESCRIPTION="A file archival tool which can also read and write tar files" +HOMEPAGE="http://www.gnu.org/software/cpio/cpio.html" +SRC_URI="mirror://gnu/cpio/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" +IUSE="nls" + +src_prepare() { + epatch "${FILESDIR}"/${P}-stat.patch #328531 +} + +src_configure() { + econf \ + $(use_enable nls) \ + --bindir=/bin \ + --with-rmt=/usr/sbin/rmt +} + +src_install() { + emake install DESTDIR="${D}" || die + dodoc ChangeLog NEWS README + rm "${D}"/usr/share/man/man1/mt.1 || die + rmdir "${D}"/usr/libexec || die +} diff --git a/sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.11-stat.patch b/sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.11-stat.patch new file mode 100644 index 0000000000..dcd991e3f2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.11-stat.patch @@ -0,0 +1,25 @@ +http://bugs.gentoo.org/328531 + +From 3a7a1820d4cecbd77c7b74c785af5942510bf080 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff +Date: Thu, 22 Jul 2010 13:13:34 +0300 +Subject: [PATCH] Minor fix. + +* src/filetypes.h: Remove declarations of stat and lstat. +--- + src/filetypes.h | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/filetypes.h b/src/filetypes.h +index f80faab..81f0c32 100644 +--- a/src/filetypes.h ++++ b/src/filetypes.h +@@ -81,5 +81,3 @@ + #ifndef S_ISLNK + #define lstat stat + #endif +-int lstat (); +-int stat (); +-- +1.7.3 +