diff options
Diffstat (limited to 'dev-debug/pwndbg')
| -rw-r--r-- | dev-debug/pwndbg/Manifest | 8 | ||||
| -rw-r--r-- | dev-debug/pwndbg/files/pwndbg-20230717-no-venv.patch | 46 | ||||
| -rw-r--r-- | dev-debug/pwndbg/pwndbg-20240829.ebuild (renamed from dev-debug/pwndbg/pwndbg-20230717-r1.ebuild) | 63 | ||||
| -rw-r--r-- | dev-debug/pwndbg/pwndbg-99999999.ebuild | 2 |
4 files changed, 30 insertions, 89 deletions
diff --git a/dev-debug/pwndbg/Manifest b/dev-debug/pwndbg/Manifest index 0c276f65a92b..9e853184a5a6 100644 --- a/dev-debug/pwndbg/Manifest +++ b/dev-debug/pwndbg/Manifest @@ -1,8 +1,6 @@ -AUX pwndbg-20230717-no-venv.patch 1623 BLAKE2B abab8d6cec25a8efc8fc6e3b16159b0ace65ed2b11d5dc64686ea09aa5efdfddc4bf704c2fbfb24e4e2fdb542d41b2ac7c1737cd1211717b72bebe50cd075ba5 SHA512 2eb2441fa27e8e3a024bb88731ab81d81370648cc7f8e3f2694809fa64beacfdfcb61a06b7689fa97a3f046775a1d12eaf9310ac3beea44ba28c67175e5e89fb -DIST gdb-pt-dump-ebdc24573a4bf075cf3ab6016add9db6baacf977.tar.gz 385989 BLAKE2B b7582289f83fd0c76b8ef2a04540db979b0f599b6b711e17541e2804b93bcffe6fd611d43101c96644a7324398eea5df02326267b4e201564929de956849b719 SHA512 57701b5fdd4c69be79a451f08fa6d7cbd43a0963cfd7689443676b68ece96154ccb61121d4a770d6e519d3142f99c589df1143b0ff8308547c06fb0e87e187db -DIST pwndbg-20230717.tar.gz 8392017 BLAKE2B e373a7408366090f58385dac8dfcdd13702c475117a35158a1a149d149c9a2cbf5f2702be33aeab537451cfd990b5253e9bc0283fa5ae197c9cceb680e65a724 SHA512 d261ed992327d62b0b3e7cc002d3185435748e27cc2ce0085d438848ef1bdb0b3921ae5c1ce19c25e49d52b10f8340eb67c4e05fc197d2adeb888b47e2c158ba DIST pwndbg-20240214.tar.gz 8536795 BLAKE2B 75524fb9f701769f2a117b4aa1158f648cd854fd38475c20bee4b7ae27ae8f331c40367738a467dd5c7f8994ac80efd3290a64e59ffb9e5a240546be8fb1c6e8 SHA512 3d55e762cecd2b42b9debb36f3ee0a8983be744192d4c1a0424517b0fd8ae8fb329197228a88ddd726e640f1bcd0e0bcdc7e95a64e041630e20cfcbf6acff1aa -EBUILD pwndbg-20230717-r1.ebuild 2561 BLAKE2B 2334a96b1f249dea1944a6cb141f540eecdd5cad8ea203bbb485af31cf330386f174a4246205e735a4176c7aee741095325375c7bab44d7bc66dc3503dfbd91d SHA512 14949ba16b98801f1fe71ec8116d19066a910e10d99e74942d6a55f69b577b1262b3624ddbe87a62eec0506d6bb2d39b799452720f14d43f723acefcbc3ca5f8 +DIST pwndbg-20240829.tar.gz 8649207 BLAKE2B 5333c318ba3ccbaaac459f9c7b917d3defa1ad712f45555b31eb76774089e55e80720744dc92813ad8234302445e3bed3237c2275c795a49856028dec416dcc2 SHA512 503924742d4a6d767ec369bb1e37c931afb5ab09f2b4cfa048765ce7a61fb6adcda2576cdda64dd4cf74de27d83b13b4dc09d6e7480e01ae8f646c5394992d43 EBUILD pwndbg-20240214.ebuild 2300 BLAKE2B 3b26d3b0feb7d425a1dee2f948823632ebb4f63dab672202aef5abeab69b48bd566f2aa0b3dc55dfba2e8a39a202ce0fc7c414eb585fcc8a7178ce8f3a4784ba SHA512 6d2a4fd1e003d46b8dc32f1921fbcf450b055982d5ecc5b008ee1c8e8b8a42ad044a62751f1df36f4ff0e02f69c0c01647be1456747eec450d4ffa123aca4230 -EBUILD pwndbg-99999999.ebuild 2295 BLAKE2B 1f5b8e97211e5906cff5c8e512b44eb202aa74d8afca45c8c5fcdeae4274f2aa4cc1a7c02e1abdb631e01ef62a67a215d55b8efc9a11a0f156c2f6e8fe155c0a SHA512 b2ffcc59fb397f74fc5559007d0b5c0560f568a88628271f0006289872a50e1b22fc3367832a5bf5c915368b05232e5c418ff2ef6524f8248ea5f42e7d9e37cd +EBUILD pwndbg-20240829.ebuild 2406 BLAKE2B da6428a222ea73abfba57a4102d889c2a479e39a836de6b6d496c957a091f062388593800e7797b46aa92b3f72c2bbcbe46ea632be8927a1cd86069976fae21e SHA512 fee145587134b88bcead017303fbed1e120c950d371c5c6232efa13be0d9b4bfde12ceb00fbb5393f3ab295f4be55ef1642aaaa47878034c202d6e5b31a29665 +EBUILD pwndbg-99999999.ebuild 2302 BLAKE2B 8b6dc4ca852df13461ec81625ae1d2bc52d65f2962e7292ac3245cfa8f22f9f00ce63deb8d7a58d17f7f12f352efd49be0092d648e8fd973100897732f0ff299 SHA512 d78afd034729de99e384203382ab8bced2a11d864ea1d90a12ce21607dc1da177e21906b85581d1c2448b5d9d6f0e62f9b1643f4435db8c0824a6544be831316 MISC metadata.xml 692 BLAKE2B bb74dda183fe35e5873e7cbaa5886dec5beaf082968b16352bcda55f2e14dbdb78ee48d2e0195baa735b0f615b0469f8fd48429c47f4a81d2fc0391cafaade76 SHA512 8a6a9ec3aa03e597d8302a5b1001fbfd569e6efb08157445bedb58ec82b4d7812aad7a852ae3eb0d0f245cbf89c85a357e532855c19e6dbc9d438c16e0bd549d diff --git a/dev-debug/pwndbg/files/pwndbg-20230717-no-venv.patch b/dev-debug/pwndbg/files/pwndbg-20230717-no-venv.patch deleted file mode 100644 index 4011236240f9..000000000000 --- a/dev-debug/pwndbg/files/pwndbg-20230717-no-venv.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 6a351680675123ccc0d8fb192f28f3c654979c92 Mon Sep 17 00:00:00 2001 -From: Stefan Gloor <code@stefan-gloor.ch> -Date: Tue, 28 Nov 2023 20:24:26 +0100 -Subject: [PATCH] Use global python packages instead of virtualenv -Bug: https://bugs.gentoo.org/918705 - -The upstream install script creates a .venv and installs the -dependencies there. This patch allows the normal python packages to be -used. - -Signed-off-by: Stefan Gloor <code@stefan-gloor.ch> ---- a/gdbinit.py -+++ b/gdbinit.py -@@ -20,29 +20,6 @@ directory, file = path.split(__file__) - directory = path.expanduser(directory) - directory = path.abspath(directory) - --# Get virtualenv's site-packages path --venv_path = os.environ.get("PWNDBG_VENV_PATH") --if not venv_path: -- venv_path = os.path.join(directory, ".venv") -- --if not os.path.exists(venv_path): -- print(f"Cannot find Pwndbg virtualenv directory: {venv_path}: please re-run setup.sh") -- sys.exit(1) -- --site_pkgs_path = glob(os.path.join(venv_path, "lib/*/site-packages"))[0] -- --# add virtualenv's site-packages to sys.path and run .pth files --site.addsitedir(site_pkgs_path) -- --# remove existing, system-level site-packages from sys.path --for site_packages in site.getsitepackages(): -- if site_packages in sys.path: -- sys.path.remove(site_packages) -- --# Set virtualenv's bin path (needed for utility tools like ropper, pwntools etc) --bin_path = os.path.join(venv_path, "bin") --os.environ["PATH"] = bin_path + os.pathsep + os.environ.get("PATH") -- - # Add gdb-pt-dump directory to sys.path so it can be imported - gdbpt = path.join(directory, "gdb-pt-dump") - sys.path.append(directory) --- -2.41.0 - diff --git a/dev-debug/pwndbg/pwndbg-20230717-r1.ebuild b/dev-debug/pwndbg/pwndbg-20240829.ebuild index 78a314abc39d..d15962d258f3 100644 --- a/dev-debug/pwndbg/pwndbg-20230717-r1.ebuild +++ b/dev-debug/pwndbg/pwndbg-20240829.ebuild @@ -3,9 +3,11 @@ EAPI=8 +DISTUTILS_USE_PEP517=poetry +DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python3_{10..12} ) -inherit python-single-r1 wrapper +inherit distutils-r1 wrapper DESCRIPTION="A GDB plug-in that makes debugging with GDB suck less" HOMEPAGE="https://github.com/pwndbg/pwndbg" @@ -15,58 +17,45 @@ if [[ ${PV} == "99999999" ]]; then EGIT_REPO_URI="https://github.com/pwndbg/pwndbg" else MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}" - GDB_PT_DUMP_COMMIT="ebdc24573a4bf075cf3ab6016add9db6baacf977" - SRC_URI=" - https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz - https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz - " - KEYWORDS="amd64 ~arm64 x86" + SRC_URI="https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~x86" S="${WORKDIR}/${PN}-${MY_PV}" fi LICENSE="MIT" SLOT="0" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" RDEPEND=" - ${PYTHON_DEPS} dev-debug/gdb[python,${PYTHON_SINGLE_USEDEP}] + ~dev-python/gdb-pt-dump-0.0.0_p20240401[${PYTHON_SINGLE_USEDEP}] $(python_gen_cond_dep ' - >=dev-libs/capstone-5.0_rc4[python,${PYTHON_USEDEP}] - >=dev-python/psutil-5.9.5[${PYTHON_USEDEP}] - >=dev-python/pycparser-2.21[${PYTHON_USEDEP}] + >=dev-libs/capstone-5.0.2[python,${PYTHON_USEDEP}] + >=dev-python/psutil-5.9.8[${PYTHON_USEDEP}] + >=dev-python/pycparser-2.22[${PYTHON_USEDEP}] >=dev-python/pyelftools-0.29[${PYTHON_USEDEP}] - >=dev-python/pygments-2.15.1[${PYTHON_USEDEP}] + >=dev-python/pygments-2.18.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.32.3[${PYTHON_USEDEP}] + >=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}] >=dev-python/tabulate-0.9.0[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-4.6.1[${PYTHON_USEDEP}] - >=dev-util/pwntools-4.10.0[${PYTHON_USEDEP}] - >=dev-util/ROPgadget-7.2[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.12.0[${PYTHON_USEDEP}] + >=dev-util/pwntools-4.13.0[${PYTHON_USEDEP}] + >=dev-util/ROPgadget-7.3[${PYTHON_USEDEP}] >=dev-util/unicorn-2.0.1[python,${PYTHON_USEDEP}] - ')" + ') +" -PATCHES=( - "${FILESDIR}/${P}-no-venv.patch" # Bug 918705 -) - -src_prepare() { - if [[ ${PV} == *9999 ]]; then - rm -r gdb-pt-dump/.git || die - else - sed -e "s/__version__ = '\(.*\)'/__version__ = '${PV}'/" \ - -i pwndbg/lib/version.py || die - - rm -r gdb-pt-dump || die - mv "${WORKDIR}/gdb-pt-dump-${GDB_PT_DUMP_COMMIT}" gdb-pt-dump || die - fi - - python_fix_shebang "${S}" - default -} +# Tests are architectur-specific (precompiled binaries) +RESTRICT="test" src_install() { + distutils-r1_src_install + insinto /usr/share/${PN} - doins -r pwndbg/ gdbinit.py # ida_script.py - doins -r gdb-pt-dump/ + doins gdbinit.py + + # Signal pwndbg not to create it's own python venv (Bug #918705). + # See: https://github.com/pwndbg/pwndbg/commit/139b7542cd9567eaff32bd713df971b6ac5b81de + touch "${ED}/usr/share/${PN}/.skip-venv" || die python_optimize "${ED}"/usr/share/${PN} diff --git a/dev-debug/pwndbg/pwndbg-99999999.ebuild b/dev-debug/pwndbg/pwndbg-99999999.ebuild index 20a51614142c..212d1aa4a3ed 100644 --- a/dev-debug/pwndbg/pwndbg-99999999.ebuild +++ b/dev-debug/pwndbg/pwndbg-99999999.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == "99999999" ]]; then else MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}" SRC_URI="https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~x86" S="${WORKDIR}/${PN}-${MY_PV}" fi |