From fec8e00ba2efcda6d7aec54efc698e052242b79d Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Tue, 13 Jul 2021 10:30:00 +0800 Subject: [PATCH] pwntools-4.6.0.ebuild --- app-exploits/pwntools/Manifest | 4 +-- ...-4.5.1-r2.ebuild => pwntools-4.6.0.ebuild} | 0 ...-r2.ebuild => pwntools-4.7.0_beta0.ebuild} | 26 ++++++++------- scripts/python_dependencies.py | 32 +++++++++---------- 4 files changed, 33 insertions(+), 29 deletions(-) rename app-exploits/pwntools/{pwntools-4.5.1-r2.ebuild => pwntools-4.6.0.ebuild} (100%) rename app-exploits/pwntools/{pwntools-4.5.0-r2.ebuild => pwntools-4.7.0_beta0.ebuild} (63%) diff --git a/app-exploits/pwntools/Manifest b/app-exploits/pwntools/Manifest index 0621dbad3..ea766e07c 100644 --- a/app-exploits/pwntools/Manifest +++ b/app-exploits/pwntools/Manifest @@ -1,2 +1,2 @@ -DIST pwntools-4.5.0.tar.gz 4046674 BLAKE2B 13f4e0ecbca87f66ce7068fa5559452199af7d45ad9674f15248b487fcc18dba5999d1abc01c59b27431c53c13c262e0c78f81bfa04805e099b855396f6d869b SHA512 c564058bb1cd6db89711d5183062d8898e185a4eb3bde81a9fcac23d84ddf4023b255821d4a51999a10e1088b406ca15f57ca3231e4fac5441a39563d13d22f6 -DIST pwntools-4.5.1.tar.gz 4047241 BLAKE2B 70b431bdecbdcd4b65dbb215451f4d59c5e24bc66fa0ef44ba3d78e6e49674b298e693f1726221cd198e580e3c78f8e0a3ff36b4ccdba6dcdbb54973502ade25 SHA512 6c681fc5e80405764a109466fd7ea51a54c0290a1eb857f1c69e43b0b9af71647e97607f17ed9c9c050be0e2ac65e2bcaed2aa66178fd3c42e4ad02abe1bf6a2 +DIST pwntools-4.6.0.tar.gz 4053753 BLAKE2B e0189cb8e4832c487da3cc2345b2757540aafc5fdc29e18b7ac2bac9df5b67d5a06f36c4b22206e55b607650c11833d194c4449deba9ac50060ca7bd14d58391 SHA512 bbd433b9dd5be5f926952e6ba5dfc2d10615b591b77d7a56a5b95ad2430b8fca1f61b18f0420f6391b5e950fb89946acb0f141ed9a70c23656b9d5c7568ae53d +DIST pwntools-4.7.0_beta0.tar.gz 4209562 BLAKE2B cb472552deccb171d7497d85e247811a88ae620844b73ec572ee2590146e17e5d357e7d66446f986d45dda7c559daa97c99e2852c8c42c02bec2d8a63592648c SHA512 9a94fed8a155a35c0cb18296fe3be753be9e0882fafaf39e02ea5fb310edf5696c8206af6a222d0362a0d15a05b6698074cc540148962b5c8c5b0258dbeca921 diff --git a/app-exploits/pwntools/pwntools-4.5.1-r2.ebuild b/app-exploits/pwntools/pwntools-4.6.0.ebuild similarity index 100% rename from app-exploits/pwntools/pwntools-4.5.1-r2.ebuild rename to app-exploits/pwntools/pwntools-4.6.0.ebuild diff --git a/app-exploits/pwntools/pwntools-4.5.0-r2.ebuild b/app-exploits/pwntools/pwntools-4.7.0_beta0.ebuild similarity index 63% rename from app-exploits/pwntools/pwntools-4.5.0-r2.ebuild rename to app-exploits/pwntools/pwntools-4.7.0_beta0.ebuild index 6a98207a9..a4a14b613 100644 --- a/app-exploits/pwntools/pwntools-4.5.0-r2.ebuild +++ b/app-exploits/pwntools/pwntools-4.7.0_beta0.ebuild @@ -3,13 +3,16 @@ EAPI=7 +MY_PV=${PV/_/} + PYTHON_COMPAT=( python3_{7..9} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 DESCRIPTION="CTF framework and exploit development library" HOMEPAGE="https://github.com/Gallopsled/pwntools" -SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/Gallopsled/pwntools/archive/${MY_PV}.tar.gz -> ${P}.tar.gz" +#https://github.com/Gallopsled/pwntools/archive/refs/tags/4.7.0beta0.tar.gz #Most is under an MIT license, but a few pieces are under GPL or a BSD 2-clause licence LICENSE="MIT" @@ -19,21 +22,21 @@ KEYWORDS="~amd64 ~x86" RDEPEND="${PYTHON_DEPS} >=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - dev-python/pyelftools[${PYTHON_USEDEP}] - dev-libs/capstone[python,${PYTHON_USEDEP}] - app-exploits/ropgadget[${PYTHON_USEDEP}] - dev-python/pyserial[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] + >=dev-python/mako-1.0.0[${PYTHON_USEDEP}] + >=dev-python/pyelftools-0.2.4[${PYTHON_USEDEP}] + >=dev-libs/capstone-3.0.5[python,${PYTHON_USEDEP}] + >=app-exploits/ropgadget-5.3[${PYTHON_USEDEP}] + >=dev-python/pyserial-2.7[${PYTHON_USEDEP}] + >=dev-python/requests-2.0[${PYTHON_USEDEP}] + >=dev-python/pygments-2.0[${PYTHON_USEDEP}] dev-python/PySocks[${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] dev-python/packaging[${PYTHON_USEDEP}] - dev-python/psutil[${PYTHON_USEDEP}] + >=dev-python/psutil-3.3.0[${PYTHON_USEDEP}] >=dev-python/intervaltree-3.0[${PYTHON_USEDEP}] dev-python/sortedcontainers[${PYTHON_USEDEP}] >dev-util/unicorn-1.0.2_rc1[python,unicorn_targets_x86(+),${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] + >=dev-python/six-1.12.0[${PYTHON_USEDEP}] dev-python/rpyc[${PYTHON_USEDEP}] dev-python/colored-traceback[${PYTHON_USEDEP}] " @@ -42,5 +45,6 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}/${PN}-4.0.0_do_not_mess_with_docs.patch" "${FILESDIR}/${PN}-4.1.0_update_deps.patch" - "${FILESDIR}/${PN}-4.1.0_update_deps2.patch" ) + +S=${WORKDIR}/${PN}-${MY_PV} diff --git a/scripts/python_dependencies.py b/scripts/python_dependencies.py index 049f7628a..d4d5c3a10 100755 --- a/scripts/python_dependencies.py +++ b/scripts/python_dependencies.py @@ -24,31 +24,31 @@ def portage_mapping(search): mapping = { "dev-python/androguard": "dev-util/androguard", "dev-python/bs4": "dev-python/beautifulsoup:4", - "dev-python/Django": "dev-python/django", - "dev-python/frida": "dev-python/frida-python", - "dev-python/lief": "dev-util/lief", - "dev-python/prompt-toolkit": "dev-python/prompt_toolkit", - "dev-python/pycrypto": "dev-python/pycryptodome", - "dev-python/pyOpenSSL": "dev-python/pyopenssl", - "dev-python/pypykatz": "app-exploits/pypykatz", - "dev-python/ruamel.yaml": "dev-python/ruamel-yaml", - "dev-python/tls-parser": "dev-python/tls_parser", "dev-python/capstone": "dev-libs/capstone[python]", - "dev-python/unicorn": "dev-util/unicorn[python]", "dev-python/colored_traceback": "dev-python/colored-traceback", - "dev-python/pycryptodomedomex": "dev-python/pycryptodome", + "dev-python/Django": "dev-python/django", + "dev-python/flask-BabelEx": "dev-python/flask-babelex", "dev-python/Flask": "dev-python/flask", "dev-python/flask-Login": "dev-python/flask-login", "dev-python/flask-Mail": "dev-python/flask-mail", "dev-python/flask-Principal": "dev-python/flask-principal", "dev-python/flask-WTF": "dev-python/flask-wtf", - "dev-python/flask-BabelEx": "dev-python/flask-babelex", - "dev-python/scapy": "net-analyzer/scapy", + "dev-python/frida": "dev-python/frida-python", + "dev-python/lief": "dev-util/lief", + "dev-python/Pillow": "dev-python/pillow", + "dev-python/prompt-toolkit": "dev-python/prompt_toolkit", + "dev-python/pycrypto": "dev-python/pycryptodome", + "dev-python/pycryptodomedomex": "dev-python/pycryptodome", + "dev-python/pyOpenSSL": "dev-python/pyopenssl", + "dev-python/pypykatz": "app-exploits/pypykatz", + "dev-python/pysocks": "dev-python/PySocks", "dev-python/PyYAML": "dev-python/pyyaml", "dev-python/redis": "dev-python/redis-py", - "dev-python/Pillow": "dev-python/pillow", - - "dev-python/pysocks": "dev-python/PySocks", + "dev-python/ropgadget": "app-exploits/ropgadget", + "dev-python/ruamel.yaml": "dev-python/ruamel-yaml", + "dev-python/scapy": "net-analyzer/scapy", + "dev-python/tls-parser": "dev-python/tls_parser", + "dev-python/unicorn": "dev-util/unicorn[python]", } for key in mapping: