From 8d55649eb57291163536eb1bf3f3b49b0f84be77 Mon Sep 17 00:00:00 2001 From: Anton Bolshakov Date: Thu, 29 Apr 2021 09:00:40 +0800 Subject: [PATCH] honeypots: unfuck @necrose99 code, untested --- dev-python/psycopg2cffi/Manifest | 1 - .../psycopg2cffi/psycopg2cffi-2.8.1-r1.ebuild | 13 ++-- net-analyzer/honeypots/Manifest | 2 - net-analyzer/honeypots/honeypots-0.12.ebuild | 1 - net-analyzer/honeypots/honeypots-0.13.ebuild | 1 - net-analyzer/honeypots/honeypots-9999.ebuild | 59 ++++++++----------- 6 files changed, 31 insertions(+), 46 deletions(-) delete mode 120000 net-analyzer/honeypots/honeypots-0.12.ebuild delete mode 120000 net-analyzer/honeypots/honeypots-0.13.ebuild diff --git a/dev-python/psycopg2cffi/Manifest b/dev-python/psycopg2cffi/Manifest index 05beeec97..8383d3a36 100644 --- a/dev-python/psycopg2cffi/Manifest +++ b/dev-python/psycopg2cffi/Manifest @@ -1,2 +1 @@ DIST psycopg2cffi-2.8.1.tar.gz 63189 BLAKE2B 1c32f7e0eb0263a16e165753cad8dabbcd7f982157e89d86f1ed7d315f988d677b2437e041607f9a1a0a5b747758b1b0100e083a591783cc7f984d0c6ad7264b SHA512 d6e85822193621b5558acce148ed5ead8e5c19a5096e3c00a82a861af0fa0510de27af3b717e5effbc675d606c238b615f867558e89661e1437842ac8eead07d -EBUILD psycopg2cffi-2.8.1-r1.ebuild 508 BLAKE2B 15051d76d6ab59e4bbee275a5bec55af67f5011f2755cd4536790ec9ac31fa24dd49f07418913ee270c31c6915b1cf8acc78f3d4d5c3e3cee5990c1a0b4773c5 SHA512 975406c8b34164c72008a40f40c21830cbb8f5daee28997ae26141608f6447da3174c5a39d89c2ec407d429a6a2180e5d4099e69484c3e841c5a21d65148f3d9 diff --git a/dev-python/psycopg2cffi/psycopg2cffi-2.8.1-r1.ebuild b/dev-python/psycopg2cffi/psycopg2cffi-2.8.1-r1.ebuild index c58919680..6df9a1a1b 100644 --- a/dev-python/psycopg2cffi/psycopg2cffi-2.8.1-r1.ebuild +++ b/dev-python/psycopg2cffi/psycopg2cffi-2.8.1-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( pypy{,3} python3_{5,6,7,9} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit distutils-r1 DESCRIPTION="Implementation of the psycopg2 module using cffi. Compatible with Psycopg 2.5." @@ -12,11 +12,10 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] -" -RDEPEND="${DEPEND}" +RDEPEND="" +DEPEND="${RDEPEND}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" diff --git a/net-analyzer/honeypots/Manifest b/net-analyzer/honeypots/Manifest index aa73442fd..2dc0ca5e0 100644 --- a/net-analyzer/honeypots/Manifest +++ b/net-analyzer/honeypots/Manifest @@ -1,3 +1 @@ -DIST honeypots-0.12.tar.gz 24275 BLAKE2B 936d6eb34f3f8befb73bceee310b5ce1633af05880a4fdc397e1da1490a6023f9dfc6dc00291d232971deb0f7aadaa17833590b1e156a3bc75635371d27a862d SHA512 a2869abc86fe728785320c64c0c7b1831904d9a1ccd34427c56b2b56868c69f798315320cd48c9937a3770f5a641e3142503d3240b2341a68ef2d003e3153b69 -DIST honeypots-0.13.tar.gz 24739 BLAKE2B f07ed77279a5c3b8f99ffdb3a504639ee5bb30d613876191c13ffe339fb8959f7b5f798e4b105ea54b247a305423db720ff616b111e0fcfb942d5d087c515a2c SHA512 81144b38763dbbf5ed509729a4d7fa09a1a75964b5f0b8d971c80d90f01329b4704c300e7aa7e03251acfc1e6c3f792abea288e109a364dba5e4aa2f232a66aa DIST honeypots-0.14.tar.gz 24742 BLAKE2B 9671eaffe3d3d7eef49f602a2a7f27faac58a5c2ff287aa016c0ac74d72fec15498d1ef00c12d0c1554aa064fc67bc32e60cba3e1d596736c3374b7c5cbd3202 SHA512 cd61b090d2f8951949456458bc484d06c532827363fa040e186f04666a27ea4204c3fd093299612cda959204b5f13460ce47004e92191ac287a403525a9a0045 diff --git a/net-analyzer/honeypots/honeypots-0.12.ebuild b/net-analyzer/honeypots/honeypots-0.12.ebuild deleted file mode 120000 index 758cafcc2..000000000 --- a/net-analyzer/honeypots/honeypots-0.12.ebuild +++ /dev/null @@ -1 +0,0 @@ -honeypots-9999.ebuild \ No newline at end of file diff --git a/net-analyzer/honeypots/honeypots-0.13.ebuild b/net-analyzer/honeypots/honeypots-0.13.ebuild deleted file mode 120000 index 758cafcc2..000000000 --- a/net-analyzer/honeypots/honeypots-0.13.ebuild +++ /dev/null @@ -1 +0,0 @@ -honeypots-9999.ebuild \ No newline at end of file diff --git a/net-analyzer/honeypots/honeypots-9999.ebuild b/net-analyzer/honeypots/honeypots-9999.ebuild index 5987f73b6..0cc274041 100644 --- a/net-analyzer/honeypots/honeypots-9999.ebuild +++ b/net-analyzer/honeypots/honeypots-9999.ebuild @@ -3,53 +3,44 @@ EAPI=7 +DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python3_{7..9} ) -inherit distutils-r1 #eutils +inherit distutils-r1 -DESCRIPTION="16 different honeypots 'swissarmy-knife' in a single PyPI package for monitoring network traffic" +DESCRIPTION="16 different honeypots for monitoring network traffic" HOMEPAGE="https://github.com/qeeqbox/honeypots" -## also has varrious python OSINT tools github.com/qeeqbox/ ..... - if [ "${PV#9999}" != "${PV}" ] ; then SCM="git-r3" EGIT_REPO_URI=="https://github.com/qeeqbox/honeypots.git" -else -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" +else + SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + #untested and broken. Do not use + #KEYWORDS="amd64 ~arm64 ~x86 ~arm ~*" fi - -LICENSE="AGPL-3.0" +LICENSE="AGPL-3" SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86 ~arm ~*" IUSE="" +RDEPEND=" + dev-python/twisted[${PYTHON_USEDEP}] + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + dev-python/impacket[${PYTHON_USEDEP}] + dev-python/paramiko[${PYTHON_USEDEP}] + dev-python/redis-py[${PYTHON_USEDEP}] + dev-python/mysql-connector-python[${PYTHON_USEDEP}] + dev-python/pycryptodome[${PYTHON_USEDEP}] + dev-python/vncdotool[${PYTHON_USEDEP}] + dev-python/service_identity[${PYTHON_USEDEP}] + dev-python/PySocks[${PYTHON_USEDEP}] + dev-python/pygments[${PYTHON_USEDEP}] + ( dev-python/psycopg[${PYTHON_USEDEP}] dev-python/psycopg2cffi[${PYTHON_USEDEP}] )" +DEPEND="${RDEPEND}" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS} ${DEPEND}" - dev-python/pipenv - dev-python/twisted - dev-python/psutil - dev-python/psycopg2 - dev-python/dnspython - dev-python/requests[socks] - dev-python/impacket - dev-python/paramiko - dev-python/redis-py - dev-python/mysql-connector-python - dev-python/pycryptodome - dev-python/vncdotool - dev-python/service_identity - dev-python/PySocks - dev-python/pygments - DEPEND="|| ( dev-python/psycopg dev-python/psycopg2cffi )" - # dev-python/psycopg in gentoo / psycopg2cffi rappid c++ extensions either should run. # dev-python/psycopg2cffi::tgbugs-overlay , implementation of the psycopg2 module using cffi. Compatible with Psycopg 2.5. - -SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm ~arm64" - -S="${WORKDIR}/${PN}-${MY_PV}" - -einfo "https://pypi.org/project/honeypots/ https://github.com/qeeqbox/honeypots for wiki/directions" \ No newline at end of file