From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 52003138454 for ; Fri, 11 Sep 2015 05:34:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B70F021C015; Fri, 11 Sep 2015 05:33:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30ED321C01A for ; Fri, 11 Sep 2015 05:33:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D32C340A1E for ; Fri, 11 Sep 2015 05:33:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D860170 for ; Fri, 11 Sep 2015 05:33:54 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1441949627.34b312a4274fa1fe232cd72f080070fec4b13e9c.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/cpio/, app-arch/cpio/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/cpio/cpio-2.11-r3.ebuild app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch X-VCS-Directories: app-arch/cpio/files/ app-arch/cpio/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 34b312a4274fa1fe232cd72f080070fec4b13e9c X-VCS-Branch: master Date: Fri, 11 Sep 2015 05:33:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: eaaf3315-c24d-4095-be87-d226559f2254 X-Archives-Hash: b50344891065ee7bf6436429ea3cdbab commit: 34b312a4274fa1fe232cd72f080070fec4b13e9c Author: Mike Frysinger gentoo org> AuthorDate: Fri Sep 11 05:32:48 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Sep 11 05:33:47 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b312a4 app-arch/cpio: add upstream fix for symlink-bad-length test failure #554760 app-arch/cpio/cpio-2.11-r3.ebuild | 1 + .../files/cpio-2.11-symlink-bad-length-test.patch | 39 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/app-arch/cpio/cpio-2.11-r3.ebuild b/app-arch/cpio/cpio-2.11-r3.ebuild index d234da8..c389789 100644 --- a/app-arch/cpio/cpio-2.11-r3.ebuild +++ b/app-arch/cpio/cpio-2.11-r3.ebuild @@ -20,6 +20,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}-no-gets.patch #424974 epatch "${FILESDIR}"/${P}-non-gnu-compilers.patch #275295 epatch "${FILESDIR}"/${P}-security.patch #530512 #536010 + epatch "${FILESDIR}"/${P}-symlink-bad-length-test.patch #554760 eautoreconf } diff --git a/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch b/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch new file mode 100644 index 0000000..7af5fe0 --- /dev/null +++ b/app-arch/cpio/files/cpio-2.11-symlink-bad-length-test.patch @@ -0,0 +1,39 @@ +https://lists.gnu.org/archive/html/bug-cpio/2015-06/msg00001.html +https://bugs.gentoo.org/554760 + +this fix is squashed into 0396591026410f91f7a81b4b150bc7285d9f2278 +(as upstream doesn't seem to understand git) + +>From bebf9662c406d1d137a66c567d8748b489d352e7 Mon Sep 17 00:00:00 2001 +From: Pavel Raiskup +Date: Thu, 4 Jun 2015 13:27:42 +0200 +Subject: [PATCH] tests: fix expected output for old file + +Thanks Victor Rodriguez. Upstream thread: +http://lists.gnu.org/archive/html/bug-cpio/2015-06/msg00000.html + +* tests/symlink-bad-length.at (STDOUT): Expect the year string +'2014' is printed and not time because the file in archive is +older than 6 months. +* Thanks: Mention Victor. +--- + THANKS | 1 + + tests/symlink-bad-length.at | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/symlink-bad-length.at b/tests/symlink-bad-length.at +index e1a7093..2cdc692 100644 +--- a/tests/symlink-bad-length.at ++++ b/tests/symlink-bad-length.at +@@ -57,7 +57,7 @@ cat stderr | grep -v \ + echo >&2 STDERR + ], + [0], +-[-rw-rw-r-- 1 10029 10031 13 Nov 25 11:52 FILE ++[-rw-rw-r-- 1 10029 10031 13 Nov 25 2014 FILE + ],[STDERR + ]) + +-- +2.1.0 +