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.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 A0834158094 for ; Mon, 18 Jul 2022 20:49:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFDF4E0D26; Mon, 18 Jul 2022 20:49:16 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id B9B6EE0D26 for ; Mon, 18 Jul 2022 20:49:16 +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 886D0340D2E for ; Mon, 18 Jul 2022 20:49:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBCC5500 for ; Mon, 18 Jul 2022 20:49:13 +0000 (UTC) From: "Sam James" 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" Message-ID: <1658177338.a34cfff94ac73ef6930d2de36cb4e89b4309b234.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/rsa/files/, dev-python/rsa/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/rsa/files/rsa-4.8-includes.patch dev-python/rsa/rsa-4.8-r1.ebuild dev-python/rsa/rsa-4.8-r2.ebuild X-VCS-Directories: dev-python/rsa/ dev-python/rsa/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a34cfff94ac73ef6930d2de36cb4e89b4309b234 X-VCS-Branch: master Date: Mon, 18 Jul 2022 20:49:13 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2961a117-167a-4de6-99eb-f7c1db20786b X-Archives-Hash: 998f1b96210b30bcc7a44a725cdf9aaa commit: a34cfff94ac73ef6930d2de36cb4e89b4309b234 Author: Horea Christian chymera eu> AuthorDate: Mon Jul 18 16:46:05 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jul 18 20:48:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34cfff9 dev-python/rsa: don't install LICENSE etc in site-packages Closes: https://bugs.gentoo.org/859175 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Horea Christian chymera.eu> Closes: https://github.com/gentoo/gentoo/pull/26466 Signed-off-by: Sam James gentoo.org> dev-python/rsa/files/rsa-4.8-includes.patch | 28 ++++++++++++++++++++++ .../rsa/{rsa-4.8-r1.ebuild => rsa-4.8-r2.ebuild} | 2 ++ 2 files changed, 30 insertions(+) diff --git a/dev-python/rsa/files/rsa-4.8-includes.patch b/dev-python/rsa/files/rsa-4.8-includes.patch new file mode 100644 index 000000000000..181fd638d0de --- /dev/null +++ b/dev-python/rsa/files/rsa-4.8-includes.patch @@ -0,0 +1,28 @@ +https://github.com/sybrenstuvel/python-rsa/commit/3031bf5c6ae64083431e849903b0104d2cfae893 +https://bugs.gentoo.org/859175 + +From 3031bf5c6ae64083431e849903b0104d2cfae893 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 27 Jan 2022 10:26:23 +0100 +Subject: [PATCH] Do not include arbitrary files in wheel + +Fix the include key to apply to sdist format only. Otherwise, the +listed files are added to the top directory of wheel as well and end up +being installed in top-level site-packages directory, e.g.: + + * FILES:+usr/lib/python3.9/site-packages/CHANGELOG.md + * FILES:+usr/lib/python3.9/site-packages/LICENSE + * FILES:+usr/lib/python3.9/site-packages/README.md +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -26,7 +26,9 @@ classifiers = [ + "Topic :: Security :: Cryptography", + ] + include = [ +- "LICENSE", "README.md", "CHANGELOG.md", ++ { path = "LICENSE", format = "sdist" }, ++ { path = "README.md", format = "sdist" }, ++ { path = "CHANGELOG.md", format = "sdist" }, + ] + + [tool.poetry.dependencies] diff --git a/dev-python/rsa/rsa-4.8-r1.ebuild b/dev-python/rsa/rsa-4.8-r2.ebuild similarity index 94% rename from dev-python/rsa/rsa-4.8-r1.ebuild rename to dev-python/rsa/rsa-4.8-r2.ebuild index fffb3c5c50ad..5a4cdf383088 100644 --- a/dev-python/rsa/rsa-4.8-r1.ebuild +++ b/dev-python/rsa/rsa-4.8-r2.ebuild @@ -29,6 +29,8 @@ RDEPEND=" >=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}] " +PATCHES=( "${FILESDIR}/${P}-includes.patch" ) + distutils_enable_tests unittest src_prepare() {