From c3299f9eb9c4f9c3852627c773d154586d473f7a Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Wed, 28 Jul 2021 02:37:47 +0800 Subject: [PATCH] empire-4.0.1.ebuild --- app-exploits/empire/Manifest | 2 +- ...mpire-3.7.2.ebuild => empire-4.0.1.ebuild} | 19 +++++++++++---- dev-python/sqlalchemy_utc/Manifest | 1 + .../sqlalchemy_utc-0.12.0.ebuild | 24 +++++++++++++++++++ scripts/python_dependencies.py | 11 ++++----- 5 files changed, 45 insertions(+), 12 deletions(-) rename app-exploits/empire/{empire-3.7.2.ebuild => empire-4.0.1.ebuild} (86%) create mode 100644 dev-python/sqlalchemy_utc/Manifest create mode 100644 dev-python/sqlalchemy_utc/sqlalchemy_utc-0.12.0.ebuild diff --git a/app-exploits/empire/Manifest b/app-exploits/empire/Manifest index b9b5390ba..d534c207f 100644 --- a/app-exploits/empire/Manifest +++ b/app-exploits/empire/Manifest @@ -1,2 +1,2 @@ -DIST empire-3.7.2.tar.gz 13956635 BLAKE2B 4c1f9d12c1cfe44c2929a89bc099e0d0e667a25d8db53875f2dd74fdff2ad9906ba4e6af9bd88c86419c8c91f3f37fc6a5f192c93b042fd5bba0c694e69ee684 SHA512 34015b1e18e1733b8c05f1696af6d19e2714a343f4a46e6d8f0b95ef6aaa7abf826b65e8ceca5d567181dda31c4837935e574f7e5c98917daf1b3b8432505763 DIST empire-3.8.2.tar.gz 14702301 BLAKE2B 7d36785d802b4a9092a471aa53d29d9e7a750c207cfeae112ca9040e09dc07a7f5e91b03edfe4ccab4e104bcb743ad64cc1aed41b8eeada63fe3eb77b7df29f2 SHA512 2efc8ec38e435f12c3d07719d8d8831b45330fcac6a14e3f49b8239cb83570d17907239db84030e52c01a9e672251ad8a140c9ef9985af9d0866ec61f2bd624b +DIST empire-4.0.1.tar.gz 34310554 BLAKE2B 3eb2a3d4e3b95cd9e8cf525e70d2ef829fdf9ffab61c130e68feed74099c9112864c1369f127e020dc8ee26b6c60ab93d5a06632a9697b5bff0c05bb5fe6ab71 SHA512 8e1497a458c4fe3ec47bcf82082f8cc4b2d4a56f730c08cf2bf29dce00ea26689bc84c7c6bf2d6bc75bfa25f944ffd14ab66e58dae861e636c447b8aa29b80fb diff --git a/app-exploits/empire/empire-3.7.2.ebuild b/app-exploits/empire/empire-4.0.1.ebuild similarity index 86% rename from app-exploits/empire/empire-3.7.2.ebuild rename to app-exploits/empire/empire-4.0.1.ebuild index 80337d5b5..acc066c4e 100644 --- a/app-exploits/empire/empire-3.7.2.ebuild +++ b/app-exploits/empire/empire-4.0.1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +DISTUTILS_USE_SETUPTOOLS=pyproject.toml #https://github.com/BC-SECURITY/Empire/issues/196 PYTHON_COMPAT=( python3_{8..9} ) PYTHON_REQ_USE="sqlite" @@ -36,17 +37,25 @@ RDEPEND="${PYTHON_DEPS} dev-python/pyinstaller[${PYTHON_MULTI_USEDEP}] dev-python/zlib_wrapper[${PYTHON_MULTI_USEDEP}] dev-python/netifaces[${PYTHON_MULTI_USEDEP}] - dev-python/m2crypto[${PYTHON_MULTI_USEDEP}] dev-python/jinja[${PYTHON_MULTI_USEDEP}] - dev-python/cryptography[${PYTHON_MULTI_USEDEP}] dev-python/pyminifier[${PYTHON_MULTI_USEDEP}] dev-python/xlutils[${PYTHON_MULTI_USEDEP}] dev-python/pefile[${PYTHON_MULTI_USEDEP}] - dev-python/simplejson[${PYTHON_MULTI_USEDEP}] dev-python/bcrypt[${PYTHON_MULTI_USEDEP}] - dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}] dev-python/pyparsing[${PYTHON_MULTI_USEDEP}] + dev-python/pymysql[${PYTHON_MULTI_USEDEP}] + dev-python/sqlalchemy[${PYTHON_MULTI_USEDEP}] + dev-python/pyyaml[${PYTHON_MULTI_USEDEP}] + dev-python/sqlalchemy_utc[${PYTHON_MULTI_USEDEP}] + >=dev-python/prompt_toolkit-3.0.9[${PYTHON_MULTI_USEDEP}] + >=dev-python/terminaltables-3.1.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/docopt-0.6.2[${PYTHON_MULTI_USEDEP}] + >=dev-python/humanize-3.2.0[${PYTHON_MULTI_USEDEP}] + >=dev-python/pydantic-1.8.1[${PYTHON_MULTI_USEDEP}] + dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}] + dev-python/cryptography[${PYTHON_MULTI_USEDEP}] dev-python/flask-socketio[${PYTHON_MULTI_USEDEP}] + dev-python/python-socketio[${PYTHON_MULTI_USEDEP}] ') powershell? ( !x86? ( app-shells/pwsh-bin ) ) @@ -69,7 +78,7 @@ src_prepare() { #https://github.com/BC-SECURITY/Empire/issues/39 src_install() { insinto "/usr/share/${PN}" - doins -r data/ lib/ plugins/ setup/ empire + doins -r setup/ empire python_optimize "${D}/usr/share/${PN}/lib" diff --git a/dev-python/sqlalchemy_utc/Manifest b/dev-python/sqlalchemy_utc/Manifest new file mode 100644 index 000000000..522ca654e --- /dev/null +++ b/dev-python/sqlalchemy_utc/Manifest @@ -0,0 +1 @@ +DIST sqlalchemy_utc-0.12.0.tar.gz 7779 BLAKE2B 3d42d3490b4318cc1d0f2552cb6d2985b7ab6c47687e8a0b9781373c47ad5ed971081c00e01184b8a3c65e2b259ad92b5e2eee47419e8b4143b69d5f338d9492 SHA512 2df12e90aa729dbaf37f2b766b671c64f217c6cf0f207ef223055bfca46925875abb28c94fb0ff30b5610ddc5361c1a6c9ae593a64e8aaf19d0e8beca35728c4 diff --git a/dev-python/sqlalchemy_utc/sqlalchemy_utc-0.12.0.ebuild b/dev-python/sqlalchemy_utc/sqlalchemy_utc-0.12.0.ebuild new file mode 100644 index 000000000..5c28d7e36 --- /dev/null +++ b/dev-python/sqlalchemy_utc/sqlalchemy_utc-0.12.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=rdepend +PYTHON_COMPAT=( python3_{8..9} ) +inherit distutils-r1 + +DESCRIPTION="SQLAlchemy type to store aware datetime values" +HOMEPAGE="https://pypi.org/project/SQLAlchemy-Utc/" +#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/spoqa/sqlalchemy-utc/archive/refs/tags/0.12.0.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="test" + +RDEPEND="dev-python/sqlalchemy[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +S="${WORKDIR}/sqlalchemy-utc-${PV}" diff --git a/scripts/python_dependencies.py b/scripts/python_dependencies.py index 57aedced0..25a50762c 100755 --- a/scripts/python_dependencies.py +++ b/scripts/python_dependencies.py @@ -52,7 +52,7 @@ def portage_mapping(search): "dev-python/ruamel.yaml": "dev-python/ruamel-yaml", "dev-python/scapy": "net-analyzer/scapy", "dev-python/SQLAlchemy": "dev-python/sqlalchemy", - "dev-python/sqlalchemy-Utc": "dev-python/sqlalchemy-utc", + "dev-python/sqlalchemy-Utc": "dev-python/sqlalchemy_utc", "dev-python/tls-parser": "dev-python/tls_parser", "dev-python/tornado": "www-servers/tornado", "dev-python/unicorn": "dev-util/unicorn[python]", @@ -63,12 +63,11 @@ def portage_mapping(search): return search def pyproject_toml(): - with open('./pyproject.toml') as f: - try: + try: + with open('./pyproject.toml') as f: dependencies = tomli.load(f)['tool']['poetry']['dependencies'] - except: - print("pyproject.toml not found") - return 1 + except FileNotFoundError: + return 1 #Debug #print(dependencies ) # List of static requirements for key, value in dependencies.items():