mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-08 10:52:03 +01:00
bump(app-arch/cpio): sync with upstream for arm64
Signed-off-by: Geoff Levand <geoff@infradead.org>
This commit is contained in:
Geoff Levand
parent
4adb3e33be
commit
55588c3a21
@ -1,6 +1,78 @@
|
||||
# ChangeLog for app-arch/cpio
|
||||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.118 2013/02/17 20:32:53 zmedico Exp $
|
||||
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/ChangeLog,v 1.139 2015/01/16 08:08:14 ago Exp $
|
||||
|
||||
16 Jan 2015; Agostino Sarubbo <ago@gentoo.org> cpio-2.11-r3.ebuild:
|
||||
Stable for ia64, wrt bug #530512
|
||||
|
||||
14 Jan 2015; Sergey Popov <pinkbyte@gentoo.org> cpio-2.11-r3.ebuild:
|
||||
Stable on ppc/ppc64/s390, wrt bug #530512
|
||||
|
||||
13 Jan 2015; Agostino Sarubbo <ago@gentoo.org> cpio-2.11-r3.ebuild:
|
||||
Stable for sparc, wrt bug #530512
|
||||
|
||||
12 Jan 2015; Agostino Sarubbo <ago@gentoo.org> cpio-2.11-r3.ebuild:
|
||||
Stable for amd64, wrt bug #530512
|
||||
|
||||
11 Jan 2015; Markus Meier <maekke@gentoo.org> cpio-2.11-r3.ebuild:
|
||||
arm stable, bug #530512
|
||||
|
||||
09 Jan 2015; Jeroen Roovers <jer@gentoo.org> cpio-2.11-r3.ebuild:
|
||||
Stable for HPPA (bug #530512).
|
||||
|
||||
*cpio-2.11-r3 (09 Jan 2015)
|
||||
|
||||
09 Jan 2015; Tony Vroon <chainsaw@gentoo.org> -cpio-2.11-r2.ebuild,
|
||||
+cpio-2.11-r3.ebuild:
|
||||
Run eautoreconf at the appropriate moment, as per Jeroen Roovers in bug
|
||||
#536112. Stable keywords transferred for alpha & x86.
|
||||
|
||||
09 Jan 2015; Tobias Klausmann <klausman@gentoo.org> cpio-2.11-r2.ebuild:
|
||||
Stable on alpha, bug 530512
|
||||
|
||||
09 Jan 2015; Andreas Schuerch <nativemad@gentoo.org> cpio-2.11-r2.ebuild:
|
||||
x86 stable, see bug 530512
|
||||
|
||||
*cpio-2.11-r2 (09 Jan 2015)
|
||||
|
||||
09 Jan 2015; Tony Vroon <chainsaw@gentoo.org> +cpio-2.11-r2.ebuild,
|
||||
+files/cpio-2.11-security.patch:
|
||||
Scavenge upstream bug fixes for heap-based buffer overflow and directory
|
||||
traversal through symlinks. For security bugs #530512 and #536010.
|
||||
|
||||
12 Aug 2014; Mike Frysinger <vapier@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
Mark arm64/m68k/s390/sh stable.
|
||||
|
||||
19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
Stable for alpha, wrt bug #471402
|
||||
|
||||
14 Mar 2014; Agostino Sarubbo <ago@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
Stable for ppc64, wrt bug #471402
|
||||
|
||||
12 Mar 2014; Agostino Sarubbo <ago@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
Stable for sparc, wrt bug #471402
|
||||
|
||||
23 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
Stable for ppc, wrt bug #471402
|
||||
|
||||
22 Feb 2014; Agostino Sarubbo <ago@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
Stable for x86, wrt bug #471402
|
||||
|
||||
14 Feb 2014; Markus Meier <maekke@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
arm stable, bug #471402
|
||||
|
||||
11 Feb 2014; Akinori Hattori <hattya@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
ia64 stable wrt bug #471402
|
||||
|
||||
09 Feb 2014; Chema Alonso <nimiux@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
Stable for amd64 wrt bug #471402
|
||||
|
||||
08 Feb 2014; Jeroen Roovers <jer@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
Stable for HPPA (bug #471402).
|
||||
|
||||
18 Jan 2014; Mike Frysinger <vapier@gentoo.org> cpio-2.11-r1.ebuild,
|
||||
cpio-2.11.ebuild:
|
||||
Add arm64 love.
|
||||
|
||||
17 Feb 2013; Zac Medico <zmedico@gentoo.org> cpio-2.11-r1.ebuild:
|
||||
Add ~arm-linux keyword.
|
||||
|
||||
@ -3,16 +3,28 @@ Hash: SHA256
|
||||
|
||||
AUX cpio-2.11-no-gets.patch 811 SHA256 4d5a8cfcc43167ef9ee4b3d463a9c7aedcbd7f89e7bd54d821f8c6c577e6ad6c SHA512 686f25306369017508dba1442c8d4fa671df5f68252861790ec8be68d2c91dce786c5b7069efb07c9bd5dd4d863d3c53d61b3b919f5b7d95f77c90efc9b6532e WHIRLPOOL a5b4f932d83f6e2e92c238995e62e3ac728d34a7a0ff665824d3de47664616cff1833a19ded7032c12ad18992a4217898305f3fc3f76ffd17b7de389dbaf413d
|
||||
AUX cpio-2.11-non-gnu-compilers.patch 415 SHA256 f05e154c11fb13932daae25e323f538ae1cee38bf0e7b7a5f3aabc38abc63d46 SHA512 0071b89aca67a65b5675e23b9fe9c8198db5b84634d3437cae752d4b07371b2c0a14bfcf5fa093af478a23c0679bf44f0571fdd1391c13fd6cd457b8ada19029 WHIRLPOOL 3f9656d4227fd0ce4dceac585004a0dfe679f7d52e395b377215d54707825a3a48fe97324b74f12093c9d27e2a89b8c7895c8d718976e19334040f64d9e02c6f
|
||||
AUX cpio-2.11-security.patch 9090 SHA256 972c1a804adffe053f2a640b6fd9f2fa6b48c4e41eb60483734065a2261bff9b SHA512 060696d4bc55ec560e8ca53332677f51f1c3a5b99bb61c3a8a2e9d9754e09134b87c1852a02a9611961fd1f9eb5760787c3b30e06ee2e42da9733e0fa252a565 WHIRLPOOL 78da44864536f5a87701eedd9f18485afb03a2e0b2b379d32afed79d631924f0d53669e7c825f9eab1ebf91ae1866dd442fc3a25086875b8d14673df936642f2
|
||||
AUX cpio-2.11-stat.patch 575 SHA256 b3d317e3c5705d7f9e503f56540baf3cb6dd1d0e9be0261151a5b08378c2d98c SHA512 87fd17c24e53d2286147239a1f588face81290ab6d93c68f8a7e704394c454880972d03a9b24f2d6898bfc9805945566be71b693254863e95469f836d224bba5 WHIRLPOOL 35bac9ac5fb84bb9586357bd74b695f2648e2e00faf6cce6f1f9a086b80ddcdfcabdd1fabda1c03397345f9705d41c0407b77604896250a03e317d0432166e09
|
||||
DIST cpio-2.11.tar.bz2 1018483 SHA256 bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd SHA512 b6ccb3e121ea29780219d21c9cd6267c2f7b7ae72fb899bb80e1c54cc33e9eac5363443d93dbfbe37e8e8d295dad2724ac607f0543cc62797919605f68c396aa WHIRLPOOL 3e19212f8d5c16de0d531d189fa9fc288ff90d6299c1f3f98f61e182bb0ec278705ae5021c85c7aaeab869ad36b2b3bcd11327a746cde0bf5a596049d711d9cd
|
||||
EBUILD cpio-2.11-r1.ebuild 1190 SHA256 0117392cbe4e1dcebf860e8d53d27c70b6c59e80abcec9b0f0383a3caa9d77aa SHA512 d9da3e7135ead554366d73c82abc329afacd020627ef17956e35fdeea60dd4b1fc2d092bff114a7591cf0ae30f6d74f782e74b40345ec9554718831b97d8f245 WHIRLPOOL 3f13de31605b9740718b7fc57b05ed35544a732610f9fdf071cc0536f0d1843fa1a5dd6d8e5702538139bea8970e7a081fb7a7df3e1ef8ae3df0d1ce104934a2
|
||||
EBUILD cpio-2.11.ebuild 928 SHA256 a5bab21d16cde9854d5b9ff4c24da7a5e959c00aa6d42b61cf5602dcb11165e1 SHA512 5579d51407191bd7badffa1a746f934b914034ffa7c3787f9d789d630e8e0910b835db31cbceea7a0e5a56045a1b6bcacd063e7b2102818f12cdbdcc6e3349f6 WHIRLPOOL c7ed8b1adf98715fe5217bf9bc19200a7a94ed0189b987728223ebfffc73a39f00766e2c272bf55f6fc5ce5e1ec4dbcd02a246031eac4840b6862dfcb0179142
|
||||
MISC ChangeLog 15912 SHA256 3259ab47e6f96be5397aea2ba60b9e19409889bc5ac78545f6af7006870fced2 SHA512 1363bfdfd82741a78c57456202d0f2e500b1aa8caa6c36e3d00c4a2189d054527773c875e31cc892b5747380830c7426f3702ceac4c34352c35c088bee7ec31b WHIRLPOOL 7603127af7093528ad74ca5c22b414fe7e26cf31335f0f1b66a329b02187b5dc0aadc82d0f22b74822825c9dc0df4c7d556876e3d4d6ed0aa9ddd3e72501ff07
|
||||
EBUILD cpio-2.11-r1.ebuild 1184 SHA256 0edab3c3c41c06d227f8af438484440fbc41eafe99934201bd52c374d831a74c SHA512 49c7b36093df3942ad3c14baf2522f3aa204d98e1bb7d459f1da86aa8f71c779d71aed47c9b5481f5a7e6715708e5dfd799846b18c466b832200553fc26e09bf WHIRLPOOL 7d0d9a75fa733df34b901d8cf7ce32c6b244de89917f561b8c4ba19896c87525eb54574df6b7fa36e61a9455ef5fa09d5eabb4bea4423ce172e16a782b9db9ab
|
||||
EBUILD cpio-2.11-r3.ebuild 1230 SHA256 05ff0c720cadb39adc5b79d0ee2ab055e7240e84c68da81898e6b1dd0a90bc18 SHA512 48a24686bcf7b330b9f13e61307483b7332de20a667644918b2fea3c2e356c61ad6c2a375aa33b3ef86fed36e6087ae433233895f2d2e5dc09ecd993e8230f04 WHIRLPOOL e69efdeabf12630603d5e684d4cbb8eb2a4efb348471fa6bc44ba35de31fe19151902128ab50133fe02f79f9123b4d846e30754087757f23422aa530e307e7b8
|
||||
EBUILD cpio-2.11.ebuild 934 SHA256 7f497a2cd1b7bd7f331670e20703c3bc50d15ef9091b0178f5a43c1ebb3a0520 SHA512 653b672e74cf1e644009a058480ee770209aeb9d53dee16a253c7b9e65dc91223b8eb1ef48466bae0f969c146a893305cbc11883af37dead93ae8b25019c1006 WHIRLPOOL 9e18e13f0f5ea066a3e08958890f38c28f4ed224209e9064cd33afb32b57226e963621ca7c3169f357a478d41197baac5b739230c04a6feeb7e322e6d23ac80c
|
||||
MISC ChangeLog 18440 SHA256 94ebd0f69a0d63e636064bfc7a20915f3f13aa6a5c74cb0ef308f1ae1d83893e SHA512 5d05ce3971c456b975bf1fb0ed70cdf1049d90138c46e3980f6365500190428c7a94850999862684a1e4b6498a5302717e9f36cc7dbaf82b4a09682a663e1c12 WHIRLPOOL 1e3d90d55fdbb354b2ed1f7da2690befaafe779945484e0e9861533630589f5be550409dcbaae15c0de47a7da4de9cf3fb0a608401d3694189b5c6080541857a
|
||||
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
||||
Version: GnuPG v2
|
||||
|
||||
iEYEAREIAAYFAlEhPncACgkQ/ejvha5XGaMAvgCgokOH+BaHCt3z2FdbjTJKvuC7
|
||||
7WcAnRR9iurxE4ftLs/Uyb5WN/eitsVG
|
||||
=3IGK
|
||||
iQIcBAEBCAAGBQJUuMbvAAoJELp701BxlEWfv30P+gJEOsDwN2Y9CKPqFoltpmYE
|
||||
W4Hd8X/oW0n2LeUsNvcfM6o4HDm6mBxiVVb07TN5Mak4khyf3RVuEuoJbvdEEAg0
|
||||
+nWHbHJDC1hCC4/yE2Ot5GTOyNkOe9iJo9/y8Cocg/wNRMmRVUJlHzIDfU6vTOXF
|
||||
/n/y/koutu+US5mYhJ+tw3pWLwdLp4YG7ExeTUaVmhNpgw5k4mZkimULLQBkFQd6
|
||||
pLaWmR0P1eWL95PLJvCsjwbxM9ipcV1+FONSKA26Ig5R6EoNTt7hXjPZn14rSGPE
|
||||
06NMAfqnuhurJnyQfbs7+w2RcHOw0LDPGWaiejc4BlnC2mlUEazFctDiXKjdzJj4
|
||||
2s81o/Z/22Q6Fx3crFM91+bFrCw8Gr3+H6kte/YQ+dGpClWD+lhy5Y5eR2DVPArG
|
||||
jko4ZF7OfU5PGHmmaYmpYCXjzcVRyfodz6EUbOycNZG89bkdqXzfnBfz1hdQdsIr
|
||||
CY+KipML04XiW+FQBkuiFoPuxzma1sniiDCPAQqnLpxFl1tN6+OXiCS7UvYh10hG
|
||||
6pWl3CY0YtZL+yPmikuoLxOIjAv55KnS3jPpZAPTt4tZhr6eM5IrvcwL9YEI31VY
|
||||
F22+TybHVPGWB15oys0pJp2Sopb80zZW+Ehopp8KOMaVS+Sz3ya6uJwKli03FkjV
|
||||
xi5Mlvx+V457Gbvo1Qh5
|
||||
=g4kR
|
||||
-----END PGP SIGNATURE-----
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11-r1.ebuild,v 1.2 2013/02/17 20:32:53 zmedico Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11-r1.ebuild,v 1.13 2014/08/12 12:18:29 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
|
||||
@ -12,7 +12,7 @@ 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 ~ppc-aix ~amd64-fbsd ~arm-linux ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="nls"
|
||||
|
||||
src_prepare() {
|
||||
|
||||
36
sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.11-r3.ebuild
vendored
Normal file
36
sdk_container/src/third_party/portage-stable/app-arch/cpio/cpio-2.11-r3.ebuild
vendored
Normal file
@ -0,0 +1,36 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11-r3.ebuild,v 1.7 2015/01/16 08:08:14 ago Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit autotools 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 ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="nls"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-stat.patch #328531
|
||||
epatch "${FILESDIR}"/${P}-no-gets.patch #424974
|
||||
epatch "${FILESDIR}"/${P}-non-gnu-compilers.patch #275295
|
||||
epatch "${FILESDIR}"/${P}-security.patch #530512 #536010
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable nls) \
|
||||
--bindir="${EPREFIX}"/bin \
|
||||
--with-rmt="${EPREFIX}"/usr/sbin/rmt
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
rm "${ED}"/usr/share/man/man1/mt.1 || die
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Copyright 1999-2014 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.10 2012/07/06 04:17:46 vapier Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/cpio/cpio-2.11.ebuild,v 1.11 2014/01/18 01:18:03 vapier Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
@ -12,7 +12,7 @@ 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
|
||||
IUSE="nls"
|
||||
|
||||
src_prepare() {
|
||||
|
||||
266
sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.11-security.patch
vendored
Normal file
266
sdk_container/src/third_party/portage-stable/app-arch/cpio/files/cpio-2.11-security.patch
vendored
Normal file
@ -0,0 +1,266 @@
|
||||
diff -uNr cpio-2.11.ORIG/src/copyin.c cpio-2.11/src/copyin.c
|
||||
--- cpio-2.11.ORIG/src/copyin.c 2015-01-09 11:31:49.017090090 +0000
|
||||
+++ cpio-2.11/src/copyin.c 2015-01-09 11:35:37.723092293 +0000
|
||||
@@ -124,10 +124,30 @@
|
||||
if (pad != 0)
|
||||
tape_toss_input (in_file_des, pad);
|
||||
}
|
||||
-
|
||||
+
|
||||
+static char *
|
||||
+get_link_name (struct cpio_file_stat *file_hdr, int in_file_des)
|
||||
+{
|
||||
+ char *link_name;
|
||||
+
|
||||
+ if (file_hdr->c_filesize < 0 || file_hdr->c_filesize > SIZE_MAX-1)
|
||||
+ {
|
||||
+ error (0, 0, _("%s: stored filename length is out of range"),
|
||||
+ file_hdr->c_name);
|
||||
+ link_name = NULL;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ link_name = xmalloc (file_hdr->c_filesize + 1);
|
||||
+ tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize);
|
||||
+ link_name[file_hdr->c_filesize] = '\0';
|
||||
+ tape_skip_padding (in_file_des, file_hdr->c_filesize);
|
||||
+ }
|
||||
+ return link_name;
|
||||
+}
|
||||
|
||||
static void
|
||||
-list_file(struct cpio_file_stat* file_hdr, int in_file_des)
|
||||
+list_file (struct cpio_file_stat* file_hdr, int in_file_des)
|
||||
{
|
||||
if (verbose_flag)
|
||||
{
|
||||
@@ -136,21 +156,16 @@
|
||||
{
|
||||
if (archive_format != arf_tar && archive_format != arf_ustar)
|
||||
{
|
||||
- char *link_name = NULL; /* Name of hard and symbolic links. */
|
||||
-
|
||||
- link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1);
|
||||
- link_name[file_hdr->c_filesize] = '\0';
|
||||
- tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize);
|
||||
- long_format (file_hdr, link_name);
|
||||
- free (link_name);
|
||||
- tape_skip_padding (in_file_des, file_hdr->c_filesize);
|
||||
- return;
|
||||
+ char *link_name = get_link_name (file_hdr, in_file_des);
|
||||
+ if (link_name)
|
||||
+ {
|
||||
+ long_format (file_hdr, link_name);
|
||||
+ free (link_name);
|
||||
+ }
|
||||
}
|
||||
else
|
||||
- {
|
||||
- long_format (file_hdr, file_hdr->c_tar_linkname);
|
||||
- return;
|
||||
- }
|
||||
+ long_format (file_hdr, file_hdr->c_tar_linkname);
|
||||
+ return;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
@@ -640,7 +655,7 @@
|
||||
}
|
||||
|
||||
static void
|
||||
-copyin_link(struct cpio_file_stat *file_hdr, int in_file_des)
|
||||
+copyin_link (struct cpio_file_stat *file_hdr, int in_file_des)
|
||||
{
|
||||
char *link_name = NULL; /* Name of hard and symbolic links. */
|
||||
int res; /* Result of various function calls. */
|
||||
@@ -650,10 +665,9 @@
|
||||
|
||||
if (archive_format != arf_tar && archive_format != arf_ustar)
|
||||
{
|
||||
- link_name = (char *) xmalloc ((unsigned int) file_hdr->c_filesize + 1);
|
||||
- link_name[file_hdr->c_filesize] = '\0';
|
||||
- tape_buffered_read (link_name, in_file_des, file_hdr->c_filesize);
|
||||
- tape_skip_padding (in_file_des, file_hdr->c_filesize);
|
||||
+ link_name = get_link_name (file_hdr, in_file_des);
|
||||
+ if (!link_name)
|
||||
+ return;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1005,7 +1019,7 @@
|
||||
|
||||
file_hdr->c_tar_linkname = NULL;
|
||||
|
||||
- tape_buffered_read (magic.str, in_des, 6L);
|
||||
+ tape_buffered_read (magic.str, in_des, sizeof (magic.str));
|
||||
while (1)
|
||||
{
|
||||
if (append_flag)
|
||||
@@ -1050,8 +1064,8 @@
|
||||
break;
|
||||
}
|
||||
bytes_skipped++;
|
||||
- memmove (magic.str, magic.str + 1, 5);
|
||||
- tape_buffered_read (magic.str, in_des, 1L);
|
||||
+ memmove (magic.str, magic.str + 1, sizeof (magic.str) - 1);
|
||||
+ tape_buffered_read (magic.str + sizeof (magic.str) - 1, in_des, 1L);
|
||||
}
|
||||
}
|
||||
|
||||
diff -uNr cpio-2.11.ORIG/src/util.c cpio-2.11/src/util.c
|
||||
--- cpio-2.11.ORIG/src/util.c 2015-01-09 11:31:49.018090090 +0000
|
||||
+++ cpio-2.11/src/util.c 2015-01-09 11:36:55.794093045 +0000
|
||||
@@ -206,10 +206,7 @@
|
||||
if (input_size < 0)
|
||||
error (1, errno, _("read error"));
|
||||
if (input_size == 0)
|
||||
- {
|
||||
- error (0, 0, _("premature end of file"));
|
||||
- exit (1);
|
||||
- }
|
||||
+ error (PAXEXIT_FAILURE, 0, _("premature end of file"));
|
||||
input_bytes += input_size;
|
||||
}
|
||||
|
||||
diff -uNr cpio-2.11.ORIG/tests/Makefile.am cpio-2.11/tests/Makefile.am
|
||||
--- cpio-2.11.ORIG/tests/Makefile.am 2015-01-09 11:31:49.020090090 +0000
|
||||
+++ cpio-2.11/tests/Makefile.am 2015-01-09 11:34:05.121091401 +0000
|
||||
@@ -52,6 +52,8 @@
|
||||
setstat04.at\
|
||||
setstat05.at\
|
||||
symlink.at\
|
||||
+ symlink-bad-length.at\
|
||||
+ symlink-long.at\
|
||||
version.at
|
||||
|
||||
TESTSUITE = $(srcdir)/testsuite
|
||||
diff -uNr cpio-2.11.ORIG/tests/symlink-bad-length.at cpio-2.11/tests/symlink-bad-length.at
|
||||
--- cpio-2.11.ORIG/tests/symlink-bad-length.at 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ cpio-2.11/tests/symlink-bad-length.at 2015-01-09 11:35:52.124092432 +0000
|
||||
@@ -0,0 +1,64 @@
|
||||
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
+# Copyright (C) 2014 Free Software Foundation, Inc.
|
||||
+
|
||||
+# This program is free software; you can redistribute it and/or modify
|
||||
+# it under the terms of the GNU General Public License as published by
|
||||
+# the Free Software Foundation; either version 3, or (at your option)
|
||||
+# any later version.
|
||||
+
|
||||
+# This program is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program; if not, write to the Free Software
|
||||
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
+# 02110-1301 USA.
|
||||
+
|
||||
+# Cpio v2.11 did segfault with badly set symlink length.
|
||||
+# References:
|
||||
+# http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg00007.html
|
||||
+
|
||||
+AT_SETUP([symlink-bad-length])
|
||||
+AT_KEYWORDS([symlink-long copyout])
|
||||
+
|
||||
+AT_DATA([ARCHIVE.base64],
|
||||
+[x3EjAIBAtIEtJy8nAQAAAHRUYW0FAAAADQBGSUxFAABzb21lIGNvbnRlbnQKAMdxIwBgQ/+hLScv
|
||||
+JwEAAAB0VEhuBQD/////TElOSwAARklMRcdxAAAAAAAAAAAAAAEAAAAAAAAACwAAAAAAVFJBSUxF
|
||||
+UiEhIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
|
||||
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
|
||||
+])
|
||||
+
|
||||
+# The exact error message and exit status depend on the host architecture,
|
||||
+# therefore strderr is filtered out and error code is not checked.
|
||||
+
|
||||
+# So far the only case when cpio would exit with code 0 is when it skips
|
||||
+# several bytes and encounters a valid record header. Perhaps it should
|
||||
+# exit with code 2 (non-critical error), if at least one byte was skipped,
|
||||
+# but that could hurt backward compatibility.
|
||||
+
|
||||
+AT_CHECK([
|
||||
+base64 -d ARCHIVE.base64 > ARCHIVE || AT_SKIP_TEST
|
||||
+TZ=UTC cpio -ntv < ARCHIVE 2>stderr
|
||||
+cat stderr | grep -v \
|
||||
+ -e 'stored filename length is out of range' \
|
||||
+ -e 'premature end of file' \
|
||||
+ -e 'archive header has reverse byte-order' \
|
||||
+ -e 'memory exhausted' \
|
||||
+ -e 'skipped [[0-9][0-9]*] bytes of junk' \
|
||||
+ -e '[[0-9][0-9]*] block' \
|
||||
+ >&2
|
||||
+echo >&2 STDERR
|
||||
+],
|
||||
+[0],
|
||||
+[-rw-rw-r-- 1 10029 10031 13 Nov 25 11:52 FILE
|
||||
+],[STDERR
|
||||
+])
|
||||
+
|
||||
+AT_CLEANUP
|
||||
diff -uNr cpio-2.11.ORIG/tests/symlink-long.at cpio-2.11/tests/symlink-long.at
|
||||
--- cpio-2.11.ORIG/tests/symlink-long.at 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ cpio-2.11/tests/symlink-long.at 2015-01-09 11:32:53.908090715 +0000
|
||||
@@ -0,0 +1,46 @@
|
||||
+# Process this file with autom4te to create testsuite. -*- Autotest -*-
|
||||
+# Copyright (C) 2014 Free Software Foundation, Inc.
|
||||
+
|
||||
+# This program is free software; you can redistribute it and/or modify
|
||||
+# it under the terms of the GNU General Public License as published by
|
||||
+# the Free Software Foundation; either version 3, or (at your option)
|
||||
+# any later version.
|
||||
+
|
||||
+# This program is distributed in the hope that it will be useful,
|
||||
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+# GNU General Public License for more details.
|
||||
+
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program; if not, write to the Free Software
|
||||
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
+# 02110-1301 USA.
|
||||
+
|
||||
+# Cpio v2.11.90 changed the way symlink name is read from archive.
|
||||
+# References:
|
||||
+# http://lists.gnu.org/archive/html/bug-cpio/2014-11/msg00007.html
|
||||
+
|
||||
+AT_SETUP([symlink-long])
|
||||
+AT_KEYWORDS([symlink-long copyout])
|
||||
+
|
||||
+AT_CHECK([
|
||||
+
|
||||
+# len(dirname) > READBUFSIZE
|
||||
+dirname=
|
||||
+for i in {1..52}; do
|
||||
+ dirname="xxxxxxxxx/$dirname"
|
||||
+ mkdir "$dirname"
|
||||
+done
|
||||
+ln -s "$dirname" x || AT_SKIP_TEST
|
||||
+
|
||||
+echo x | cpio -o > ar
|
||||
+list=`cpio -tv < ar | sed 's|.*-> ||'`
|
||||
+test "$list" = "$dirname" && echo success || echo fail
|
||||
+],
|
||||
+[0],
|
||||
+[success
|
||||
+],[2 blocks
|
||||
+2 blocks
|
||||
+])
|
||||
+
|
||||
+AT_CLEANUP
|
||||
diff -uNr cpio-2.11.ORIG/tests/testsuite.at cpio-2.11/tests/testsuite.at
|
||||
--- cpio-2.11.ORIG/tests/testsuite.at 2015-01-09 11:31:49.020090090 +0000
|
||||
+++ cpio-2.11/tests/testsuite.at 2015-01-09 11:34:34.386091683 +0000
|
||||
@@ -31,6 +31,8 @@
|
||||
|
||||
m4_include([inout.at])
|
||||
m4_include([symlink.at])
|
||||
+m4_include([symlink-bad-length.at])
|
||||
+m4_include([symlink-long.at])
|
||||
m4_include([interdir.at])
|
||||
|
||||
m4_include([setstat01.at])
|
||||
@ -3,9 +3,9 @@ DESCRIPTION=A file archival tool which can also read and write tar files
|
||||
EAPI=2
|
||||
HOMEPAGE=http://www.gnu.org/software/cpio/cpio.html
|
||||
IUSE=nls
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
|
||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
|
||||
LICENSE=GPL-3
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnu/cpio/cpio-2.11.tar.bz2
|
||||
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92
|
||||
_md5_=98abff240e8b99ff31b235e013cf1964
|
||||
_md5_=a8b05d22d2b432b181c316d2f0c17776
|
||||
|
||||
@ -3,9 +3,9 @@ DESCRIPTION=A file archival tool which can also read and write tar files
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.gnu.org/software/cpio/cpio.html
|
||||
IUSE=nls
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~arm-linux ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=GPL-3
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnu/cpio/cpio-2.11.tar.bz2
|
||||
_eclasses_=eutils 9fb270e417e0e83d64ca52586c4a79de multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92
|
||||
_md5_=0f53540a94c0edd42ce76e30368d9873
|
||||
_md5_=577d39c569777ec54e4d778bffcf3829
|
||||
|
||||
12
sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/cpio-2.11-r3
vendored
Normal file
12
sdk_container/src/third_party/portage-stable/metadata/md5-cache/app-arch/cpio-2.11-r3
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=configure install prepare
|
||||
DEPEND=!<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.13:1.13 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
|
||||
DESCRIPTION=A file archival tool which can also read and write tar files
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.gnu.org/software/cpio/cpio.html
|
||||
IUSE=nls
|
||||
KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=GPL-3
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnu/cpio/cpio-2.11.tar.bz2
|
||||
_eclasses_=autotools 999c8f6cf5d91495cb0779588f20716c eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs c961250d50160cd37d6b7fd9e8429c92
|
||||
_md5_=bfb336de100c09817abd9ec528c6734b
|
||||
Loading…
x
Reference in New Issue
Block a user