From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 43852138334 for ; Sat, 24 Nov 2018 19:57:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA0E1E0AB4; Sat, 24 Nov 2018 19:54:15 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9ADC4E0AB4 for ; Sat, 24 Nov 2018 19:54:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5C711335D1A for ; Sat, 24 Nov 2018 19:54:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1822642F for ; Sat, 24 Nov 2018 19:54:12 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1543089242.0f69a565612708062ba66583780bb3fb606e503a.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/pax-utils/, app-misc/pax-utils/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild X-VCS-Directories: app-misc/pax-utils/ app-misc/pax-utils/files/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 0f69a565612708062ba66583780bb3fb606e503a X-VCS-Branch: master Date: Sat, 24 Nov 2018 19:54:12 +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: ca708f31-3528-4507-be1a-4cce15c95248 X-Archives-Hash: 18c43e450d08a529217f8a3ff2496a71 commit: 0f69a565612708062ba66583780bb3fb606e503a Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Nov 24 19:53:38 2018 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Nov 24 19:54:02 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f69a565 app-misc/pax-utils: backport python-3.7 support, bug #671522 Fix by Oleksandr Natalenko: lddtree.py: use errno properly os.errno interface is removed [1], thus should not be used. In fact, it is not used in other places of lddtree.py, so fix this one too, because it breaks --copy-to-tree on systems with Python 3.7. [1] https://bugs.python.org/issue33666 Closes: https://bugs.gentoo.org/671522 Signed-off-by: Oleksandr Natalenko natalenko.name> Signed-off-by: Sergei Trofimovich gentoo.org> Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> .../files/pax-utils-1.2.3-python-3.7.patch | 32 ++++++++++ app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild | 74 ++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch b/app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch new file mode 100644 index 00000000000..40fff21c022 --- /dev/null +++ b/app-misc/pax-utils/files/pax-utils-1.2.3-python-3.7.patch @@ -0,0 +1,32 @@ +From 2acc5c3278354f56c70f9f48e66eb0203d5e8370 Mon Sep 17 00:00:00 2001 +From: Oleksandr Natalenko +Date: Sat, 17 Nov 2018 15:43:09 +0100 +Subject: [PATCH] lddtree.py: use errno properly + +os.errno interface is removed [1], thus should not be used. In fact, it +is not used in other places of lddtree.py, so fix this one too, because +it breaks --copy-to-tree on systems with Python 3.7. + +[1] https://bugs.python.org/issue33666 + +Bug: https://bugs.gentoo.org/671522 +Signed-off-by: Oleksandr Natalenko +Signed-off-by: Sergei Trofimovich +--- + lddtree.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lddtree.py ++++ b/lddtree.py +@@ -122,7 +122,7 @@ def makedirs(path): + try: + os.makedirs(path) + except OSError as e: +- if e.errno != os.errno.EEXIST: ++ if e.errno != errno.EEXIST: + raise + + +-- +2.19.2 + diff --git a/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild new file mode 100644 index 00000000000..880abaa929a --- /dev/null +++ b/app-misc/pax-utils/pax-utils-1.2.3-r3.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) + +inherit eutils python-single-r1 toolchain-funcs unpacker + +DESCRIPTION="ELF utils that can check files for security relevant properties" +HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities" +SRC_URI="mirror://gentoo/${P}.tar.xz + https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="caps debug python seccomp" + +RDEPEND="caps? ( >=sys-libs/libcap-2.24 ) + python? ( + ${PYTHON_DEPS} + dev-python/pyelftools[${PYTHON_USEDEP}] + ) + seccomp? ( sys-libs/libseccomp )" +DEPEND="${RDEPEND} + caps? ( virtual/pkgconfig ) + seccomp? ( virtual/pkgconfig ) + app-arch/xz-utils" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}"/${P}-python-3.7.patch +) + +_emake() { + emake \ + USE_CAP=$(usex caps) \ + USE_DEBUG=$(usex debug) \ + USE_PYTHON=$(usex python) \ + USE_SECCOMP=$(usex seccomp) \ + "$@" +} + +pkg_setup() { + if use python; then + python-single-r1_pkg_setup + fi +} + +src_configure() { + # Avoid slow configure+gnulib+make if on an up-to-date Linux system + if use prefix || ! use kernel_linux || + has_version '