diff options
Diffstat (limited to 'net-analyzer/wapiti')
-rw-r--r-- | net-analyzer/wapiti/Manifest | 4 | ||||
-rw-r--r-- | net-analyzer/wapiti/files/wapiti-3.1.6-setup_scripts.patch | 14 | ||||
-rw-r--r-- | net-analyzer/wapiti/wapiti-3.1.6.ebuild | 31 | ||||
-rw-r--r-- | net-analyzer/wapiti/wapiti-9999.ebuild | 50 |
4 files changed, 39 insertions, 60 deletions
diff --git a/net-analyzer/wapiti/Manifest b/net-analyzer/wapiti/Manifest index 7f1b965d202f..3ecc6239e864 100644 --- a/net-analyzer/wapiti/Manifest +++ b/net-analyzer/wapiti/Manifest @@ -1,6 +1,6 @@ +AUX wapiti-3.1.6-setup_scripts.patch 527 BLAKE2B 91e15cd08ee4104d90c0578712836b85ab5db185f415e28ed49b76d7d64e7ac6ac7c2fd57d1d45310b15b94599b27af1623a71e238e5d3d11f18eb1979e32472 SHA512 27e796113f5bdb3b1ec1a2b72ff708b4f2c5c3b98dbfc09c3b31d87b08509b64c540bc107ec0dc34df297e813c1cea9ee70bbfc611485c042957477dd41459ea DIST wapiti3-3.1.3.tar.gz 651457 BLAKE2B 7b0a0837012a25c4a0d4288730bb16dd056910d79e8d26712d7e508a9a51d7e23eb5fc29f0a619b534e2fe5e87262d91d4c29db50a02b500eb516c68f0850fc3 SHA512 321e068ddb117faa42c3f8cb01957ec7313a700bcb5b312b832d717a3957d3f6226bcf67c4348cc0b91cb13ec713828d0b03b662ea2f170d32f88d0721dd93bf DIST wapiti3-3.1.6.tar.gz 538064 BLAKE2B fca98e05af7e4979ce5cc1360c565748b720f84e640accc9abd6d60017696827fb119228fec37bcf905e6e9f29c07ad5b9041a16fb49a6204777df07dd642bbd SHA512 8017d88c35a232f20f97297f5955154bead777a1b3d3937d29e6a39d2eeb5167764aa81286bfca5b9d200a29c25a6173052ddd8cbfebc1cb18aa84c0e2bb0e22 EBUILD wapiti-3.1.3.ebuild 1393 BLAKE2B 4020f098880dd1d5ce675e396d4fd4490bafe0b810466d7456c5782b0ccc9b58fb4035a8c58567ad75f6bbf8f5ed759b8545a181541b86d938325c53e5c8fc53 SHA512 e0c1a88e0228e367aab22dc7dce6f76192ecce8e69c583536e11c5994085b107f03a4967abfd8ecefa0c10e2d5931d9b8724a4df0a5ff630eae3eb265d6cc813 -EBUILD wapiti-3.1.6.ebuild 1427 BLAKE2B 85e132377a78f1815534b8854a567407ec7b8654c3536b86e3f095ab65dd9322d3e943b5d7fc3180acc2df313de74354ac7829f94069d8c76274d225c2fea360 SHA512 b50f5103bb4931bead7d6e890c19e5df5c2759a1a6ef700ddae138b8057953ccdbb938fbbb97ce741bccd76e77b7688aa67caf80c9bf69e8921ec9b3b0fd978c -EBUILD wapiti-9999.ebuild 1395 BLAKE2B b333888db19dc17781afdc1b8616d7395446ed06737e0205a9f4b56e9fb89242314edbef23bb3c37f981a4ab6e562b89556067ef0f8330ac3bf4aec5bbad6e12 SHA512 938b82ec4a8103eb42986a1972e773c2ddb1f4d77d1323461bc9b144f651a984bb314a62727239041b9de55f6920d7a84ff2ca8e321430decb2a5ee11a62b33f +EBUILD wapiti-3.1.6.ebuild 2079 BLAKE2B 1189f0c1b49dc983a1804906b5122c32e616d4ae2d315d463508ed73cc308a5020d6ba262062134e0b3f21cb8a4564d8c0a95e4c3f19b84b12e4d65b1ca57295 SHA512 0a873735b448b3e31b3cd06db7c2f70b6e50debbc3e7858c1dce8f1dbd42455c51407adf47fbda8784970f9047d7607c3ef38f2fd6689daeeac4c1944eb811b1 MISC metadata.xml 826 BLAKE2B a208e446822ec67d274724c24f59681afb7d1d66378828ca94103355b134acc951a699b71c584f539a8dc344e7782c6ae7fef637c35e567b783babc22eff00a1 SHA512 601effee73d6c7a39ba4e90fb62b4e8b6fc7d795a5925202cfc30dcc57ecdf479e970e4c8a225a49996f366671f0b9c9b3aa6b954e012af1ec9fbc61bb6f8dd7 diff --git a/net-analyzer/wapiti/files/wapiti-3.1.6-setup_scripts.patch b/net-analyzer/wapiti/files/wapiti-3.1.6-setup_scripts.patch new file mode 100644 index 000000000000..8df972aeb1bc --- /dev/null +++ b/net-analyzer/wapiti/files/wapiti-3.1.6-setup_scripts.patch @@ -0,0 +1,14 @@ +diff -Naur wapiti3-3.1.6.orig/setup.py wapiti3-3.1.6/setup.py +--- wapiti3-3.1.6.orig/setup.py 2023-01-31 22:19:30.000000000 +0100 ++++ wapiti3-3.1.6/setup.py 2023-02-09 21:56:43.644507169 +0100 +@@ -81,10 +81,6 @@ + packages=find_packages(exclude=["tests", "tests.*"]), + data_files=doc_and_conf_files, + include_package_data=True, +- scripts=[ +- "bin/wapiti", +- "bin/wapiti-getcookie" +- ], + classifiers=[ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", diff --git a/net-analyzer/wapiti/wapiti-3.1.6.ebuild b/net-analyzer/wapiti/wapiti-3.1.6.ebuild index 3ab9a88d574c..6cb05031672e 100644 --- a/net-analyzer/wapiti/wapiti-3.1.6.ebuild +++ b/net-analyzer/wapiti/wapiti-3.1.6.ebuild @@ -4,7 +4,8 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) +# No 3.11 in loguru +PYTHON_COMPAT=( python3_{9..10} ) PYTHON_REQ_USE='xml(+)' inherit distutils-r1 @@ -16,22 +17,34 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64" # Requires httpx-ntlm (to package) #IUSE="ntlm" IUSE="test" # httpx requires brotli and socks, so depending on # dev-python/socksio and dev-python/brotlicffi -RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}] +RDEPEND=" + >=dev-python/aiocache-0.11.1[${PYTHON_USEDEP}] + >=dev-python/aiohttp-3.8.1[${PYTHON_USEDEP}] + >=dev-python/aiosqlite-0.17.0[${PYTHON_USEDEP}] + >=dev-python/arsenic-21.8[${PYTHON_USEDEP}] + >=dev-python/beautifulsoup4-4.10.0[${PYTHON_USEDEP}] dev-python/brotlicffi[${PYTHON_USEDEP}] - dev-python/httpx[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] + >=dev-python/browser-cookie3-0.16.2[${PYTHON_USEDEP}] + >=dev-python/dnspython-2.1.0[${PYTHON_USEDEP}] + >=dev-python/h11-0.14[${PYTHON_USEDEP}] + >=dev-python/httpx-0.23.3[${PYTHON_USEDEP}] + >=dev-python/loguru-0.5.3[${PYTHON_USEDEP}] + >=dev-python/mako-1.1.4[${PYTHON_USEDEP}] + >=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}] + >=dev-python/pyasn1-0.4.8[${PYTHON_USEDEP}] >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] dev-python/socksio[${PYTHON_USEDEP}] - dev-python/tld[${PYTHON_USEDEP}] - dev-python/yaswfp[${PYTHON_USEDEP}]" + >=dev-python/sqlalchemy-1.4.26[${PYTHON_USEDEP}] + >=dev-python/tld-0.12.5[${PYTHON_USEDEP}] + >=dev-python/yaswfp-0.9.3[${PYTHON_USEDEP}] + >=net-proxy/mitmproxy-9.0.0[${PYTHON_USEDEP}]" distutils_enable_tests pytest # Tests also require unpackaged respx @@ -43,6 +56,8 @@ BDEPEND+=" test? ( # Many tests require execution of local test php server RESTRICT="test" +PATCHES=( "${FILESDIR}"/${PN}-3.1.6-setup_scripts.patch ) + S=${WORKDIR}/${MY_P} python_prepare_all() { diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild deleted file mode 100644 index 462342ee254f..000000000000 --- a/net-analyzer/wapiti/wapiti-9999.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{9..11} ) -PYTHON_REQ_USE='xml(+)' - -inherit distutils-r1 git-r3 - -DESCRIPTION="Web-application vulnerability scanner" -HOMEPAGE="http://wapiti.sourceforge.net/" -EGIT_REPO_URI="https://git.code.sf.net/p/wapiti/git wapiti-git" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="" -# Requires httpx-ntlm (to package) -#IUSE="ntlm" -IUSE="test" - -# httpx requires brotli and socks, so depending on -# dev-python/socksio and dev-python/brotlicffi -RDEPEND="dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/brotlicffi[${PYTHON_USEDEP}] - dev-python/httpx[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - >=dev-python/requests-1.2.3[${PYTHON_USEDEP}] - dev-python/socksio[${PYTHON_USEDEP}] - dev-python/tld[${PYTHON_USEDEP}] - dev-python/yaswfp[${PYTHON_USEDEP}]" - -distutils_enable_tests pytest -# Tests also require unpackaged respx -BDEPEND+=" test? ( - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - dev-python/responses[${PYTHON_USEDEP}] - )" -# Many tests require execution of local test php server -RESTRICT="test" - -python_prepare_all() { - sed -e 's/"pytest-runner"//' \ - -e "/DOC_DIR =/s/wapiti/${PF}/" \ - -i setup.py || die - distutils-r1_python_prepare_all -} |