| 1 |
commit: 2c49cc00ae62e5161c8ad4b0e105d6d0456a4752 |
| 2 |
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de> |
| 3 |
AuthorDate: Tue Jan 31 21:39:10 2023 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 1 07:25:43 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c49cc00 |
| 7 |
|
| 8 |
dev-util/pwntools: don't mess up /usr/bin with file collision |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/892724 |
| 11 |
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/29364 |
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/pwntools/Manifest | 4 ++-- |
| 16 |
...ols-4.10.0_beta0-r1.ebuild => pwntools-4.10.0_beta0-r2.ebuild} | 8 +++++++- |
| 17 |
.../{pwntools-4.9.0-r1.ebuild => pwntools-4.9.0-r2.ebuild} | 8 +++++++- |
| 18 |
dev-util/pwntools/pwntools-9999.ebuild | 8 +++++++- |
| 19 |
4 files changed, 23 insertions(+), 5 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-util/pwntools/Manifest b/dev-util/pwntools/Manifest |
| 22 |
index 43f0be0443ed..4a83d4346459 100644 |
| 23 |
--- a/dev-util/pwntools/Manifest |
| 24 |
+++ b/dev-util/pwntools/Manifest |
| 25 |
@@ -1,2 +1,2 @@ |
| 26 |
-DIST pwntools-4.10.0_beta0.tar.gz 4228046 BLAKE2B 3b03b3a9af12b23405af3d59fffa6c0baf430d9c8fc9c4180d43fb015b5707e317189a4d38091de02a688da34756aa9dd1ba8ae264857556db142880141f7d61 SHA512 9806509deff098e1d0f4f3cec335191f536d3e59d620acb7966aafccc64ebc84a28ee77c91b2aac93c8ba13a36fc77968dfe56852b1fc593a1ca2d2e568d82c6 |
| 27 |
-DIST pwntools-4.9.0.tar.gz 4218616 BLAKE2B d811a96943fbe80a4082bdff412aee5df02250846189e6300e99a6630bc02906053e728ca9904b27ddc546ad2c3612818a046b4d6418d8ebf682df600b99bc99 SHA512 8ed404dc556383712ad4de799fbff09f51735065cac07ca909f1430b22e6e9574d870aaaa4a7ce0e22d5f6edb18b956847a7aaf4dd6cf0b44fbfcf58e32497fb |
| 28 |
+DIST pwntools-4.10.0_beta0.gh.tar.gz 4228046 BLAKE2B 3b03b3a9af12b23405af3d59fffa6c0baf430d9c8fc9c4180d43fb015b5707e317189a4d38091de02a688da34756aa9dd1ba8ae264857556db142880141f7d61 SHA512 9806509deff098e1d0f4f3cec335191f536d3e59d620acb7966aafccc64ebc84a28ee77c91b2aac93c8ba13a36fc77968dfe56852b1fc593a1ca2d2e568d82c6 |
| 29 |
+DIST pwntools-4.9.0.gh.tar.gz 4218616 BLAKE2B d811a96943fbe80a4082bdff412aee5df02250846189e6300e99a6630bc02906053e728ca9904b27ddc546ad2c3612818a046b4d6418d8ebf682df600b99bc99 SHA512 8ed404dc556383712ad4de799fbff09f51735065cac07ca909f1430b22e6e9574d870aaaa4a7ce0e22d5f6edb18b956847a7aaf4dd6cf0b44fbfcf58e32497fb |
| 30 |
|
| 31 |
diff --git a/dev-util/pwntools/pwntools-4.10.0_beta0-r1.ebuild b/dev-util/pwntools/pwntools-4.10.0_beta0-r2.ebuild |
| 32 |
similarity index 93% |
| 33 |
rename from dev-util/pwntools/pwntools-4.10.0_beta0-r1.ebuild |
| 34 |
rename to dev-util/pwntools/pwntools-4.10.0_beta0-r2.ebuild |
| 35 |
index 765bf018a914..716ef0f390c1 100644 |
| 36 |
--- a/dev-util/pwntools/pwntools-4.10.0_beta0-r1.ebuild |
| 37 |
+++ b/dev-util/pwntools/pwntools-4.10.0_beta0-r2.ebuild |
| 38 |
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then |
| 39 |
inherit git-r3 |
| 40 |
EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git" |
| 41 |
else |
| 42 |
- SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.tar.gz" |
| 43 |
+ SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz" |
| 44 |
KEYWORDS="~amd64 ~x86" |
| 45 |
S="${WORKDIR}/${PN}-${PV/_beta/beta}" |
| 46 |
fi |
| 47 |
@@ -49,6 +49,12 @@ PATCHES=( |
| 48 |
"${FILESDIR}/${PN}-4.1.0_update_deps.patch" |
| 49 |
) |
| 50 |
|
| 51 |
+python_configure_all() { |
| 52 |
+ DISTUTILS_ARGS=( |
| 53 |
+ --only-use-pwn-command |
| 54 |
+ ) |
| 55 |
+} |
| 56 |
+ |
| 57 |
src_install() { |
| 58 |
distutils-r1_src_install |
| 59 |
|
| 60 |
|
| 61 |
diff --git a/dev-util/pwntools/pwntools-4.9.0-r1.ebuild b/dev-util/pwntools/pwntools-4.9.0-r2.ebuild |
| 62 |
similarity index 93% |
| 63 |
rename from dev-util/pwntools/pwntools-4.9.0-r1.ebuild |
| 64 |
rename to dev-util/pwntools/pwntools-4.9.0-r2.ebuild |
| 65 |
index 765bf018a914..716ef0f390c1 100644 |
| 66 |
--- a/dev-util/pwntools/pwntools-4.9.0-r1.ebuild |
| 67 |
+++ b/dev-util/pwntools/pwntools-4.9.0-r2.ebuild |
| 68 |
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then |
| 69 |
inherit git-r3 |
| 70 |
EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git" |
| 71 |
else |
| 72 |
- SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.tar.gz" |
| 73 |
+ SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz" |
| 74 |
KEYWORDS="~amd64 ~x86" |
| 75 |
S="${WORKDIR}/${PN}-${PV/_beta/beta}" |
| 76 |
fi |
| 77 |
@@ -49,6 +49,12 @@ PATCHES=( |
| 78 |
"${FILESDIR}/${PN}-4.1.0_update_deps.patch" |
| 79 |
) |
| 80 |
|
| 81 |
+python_configure_all() { |
| 82 |
+ DISTUTILS_ARGS=( |
| 83 |
+ --only-use-pwn-command |
| 84 |
+ ) |
| 85 |
+} |
| 86 |
+ |
| 87 |
src_install() { |
| 88 |
distutils-r1_src_install |
| 89 |
|
| 90 |
|
| 91 |
diff --git a/dev-util/pwntools/pwntools-9999.ebuild b/dev-util/pwntools/pwntools-9999.ebuild |
| 92 |
index 765bf018a914..716ef0f390c1 100644 |
| 93 |
--- a/dev-util/pwntools/pwntools-9999.ebuild |
| 94 |
+++ b/dev-util/pwntools/pwntools-9999.ebuild |
| 95 |
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then |
| 96 |
inherit git-r3 |
| 97 |
EGIT_REPO_URI="https://github.com/Gallopsled/pwntools.git" |
| 98 |
else |
| 99 |
- SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.tar.gz" |
| 100 |
+ SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz" |
| 101 |
KEYWORDS="~amd64 ~x86" |
| 102 |
S="${WORKDIR}/${PN}-${PV/_beta/beta}" |
| 103 |
fi |
| 104 |
@@ -49,6 +49,12 @@ PATCHES=( |
| 105 |
"${FILESDIR}/${PN}-4.1.0_update_deps.patch" |
| 106 |
) |
| 107 |
|
| 108 |
+python_configure_all() { |
| 109 |
+ DISTUTILS_ARGS=( |
| 110 |
+ --only-use-pwn-command |
| 111 |
+ ) |
| 112 |
+} |
| 113 |
+ |
| 114 |
src_install() { |
| 115 |
distutils-r1_src_install |
Archives