From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1451556-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 91C7D158020
	for <garchives@archives.gentoo.org>; Sun, 30 Oct 2022 09:55:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 947CCE0900;
	Sun, 30 Oct 2022 09:55:07 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 74953E0900
	for <gentoo-commits@lists.gentoo.org>; Sun, 30 Oct 2022 09:55:07 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 907B5340A35
	for <gentoo-commits@lists.gentoo.org>; Sun, 30 Oct 2022 09:55:06 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 0DEC1629
	for <gentoo-commits@lists.gentoo.org>; Sun, 30 Oct 2022 09:55:05 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1667123664.cddeeeb867340fae38dda81d3cb2fd794c1a3c60.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/cpio/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-arch/cpio/cpio-2.13-r3.ebuild
X-VCS-Directories: app-arch/cpio/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: cddeeeb867340fae38dda81d3cb2fd794c1a3c60
X-VCS-Branch: master
Date: Sun, 30 Oct 2022 09:55:05 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 798071a5-540c-4402-a0e3-9130dd1d1f27
X-Archives-Hash: 90b4c25754b6f7ead1432930d4176f23

commit:     cddeeeb867340fae38dda81d3cb2fd794c1a3c60
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 19 12:15:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 09:54:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cddeeeb8

app-arch/cpio: Install as gcpio, make cpio a symlink

Closes: https://bugs.gentoo.org/877645
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/27846
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/cpio/cpio-2.13-r3.ebuild | 50 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/app-arch/cpio/cpio-2.13-r3.ebuild b/app-arch/cpio/cpio-2.13-r3.ebuild
new file mode 100644
index 000000000000..c2b24b09a8a5
--- /dev/null
+++ b/app-arch/cpio/cpio-2.13-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A file archival tool which can also read and write tar files"
+HOMEPAGE="https://www.gnu.org/software/cpio/cpio.html"
+SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021-38185.patch.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.12-non-gnu-compilers.patch #275295
+	"${WORKDIR}"/${P}-CVE-2021-38185.patch
+	"${FILESDIR}"/${PN}-2.13-sysmacros-glibc-2.26.patch
+	"${FILESDIR}"/${PN}-2.13-fix-no-absolute-filenames-revert-CVE-2015-1197-handling.patch
+)
+
+src_prepare() {
+	default
+
+	# Drop after 2.13 (only here for CVE patch)
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		--bindir="${EPREFIX}"/bin
+		--with-rmt="${EPREFIX}"/usr/sbin/rmt
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	# install as gcpio for better compatibility with non-GNU userland
+	# and make cpio as a symlink
+	mv "${ED}"/bin/{,g}cpio || die
+	dosym gcpio /bin/cpio
+	mv "${ED}"/usr/share/man/man1/{,g}cpio.1 || die
+	dosym gcpio.1 /usr/share/man/man1/cpio.1
+}