gentoo resync : 27.03.2021

6 files changed, 2 insertions, 328 deletions

diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index fda5771e865b..a0c408945c94 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,12 +1,7 @@
-AUX hydra-9.0-unneeded-buf.patch 1503 BLAKE2B 3d8da1b656263e2abcc68e3b2b2f6c2c4937d684c7080105c2821678711146d864c6ccb2985df0e17673f4e762b5e0fc078c35e5f460a93df9891920e873ca23 SHA512 34ffce41ebebed70529eec9a6f617493fc323792fc2f7771fb1fd62bfd6fa5ae5fa96c49910dc79f8e72cee6cdc88afe0505b8f41053db8e3f64016e8f479a01
-AUX hydra-9.0-vnc.patch 407 BLAKE2B b64b12b33435a84564aea4345e86b868155b5d7c4dc1fc8f8c83f98d6429499ffd6d5d54983242415676a9556caedf5c58163ad0b09a00db2545d26f9630c145 SHA512 a4f554526cbfdf0560c1866f158a210b0fbd510a60fa2ad8e8c2cca0bb4ecf58e3eeb10d3bac747162231585c3ea827e10c0a4f4fb9e949832673afc6f9b93cf
 AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1a31f2775dceb6b2b305885a2a3e72a2329c5337221c895ab49129e920c36941d5b34101877ebf0d35f10f46d601de58981c21 SHA512 b00112c17f025b657111c93decdecc5ee4a10f388e259929ed2f55ca08888d24fb2fac1892df017d00602943ba93a72dcbbb4cf00fa808c2bc05ed1b95cb428a
-DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
 DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
-EBUILD hydra-9.0-r1.ebuild 3716 BLAKE2B 2d9d455c9f620808543630a784c382f4769521e81141cca5821ca25d90536023376a874077ed1c91e775e8a89f9044329b9897f9d0519949c2755988061e6e28 SHA512 d8e95cb07cc08d6ef37fa1c4a975de86c777cdc5b48fd3ea585dd9cd4b0f6f553b3f09a91d4e9d0ff13f39e71bbb241cd389af1109424fe0dc3d5dc3e8be0730
-EBUILD hydra-9.0.ebuild 3620 BLAKE2B 79f6117e6de4892d9597bd431020151abfd11c9948235051e5abdb45cb21329e37ebe998ae318568c3a29cafc371464d7f37700fe43e726367fab8b255e40fa8 SHA512 12fc637a1e756c26eaf396c353cabf0295d15f078cb9b48441f99532e31d62d8f7ef086894ddb493f23bfaab845304cd0f5a76c8a6985de1d13f42b433b44968
-EBUILD hydra-9.1.ebuild 3626 BLAKE2B d89f6e3dd2a8040183551e96f51012dcb8ddd2277873f83294f789523848ac893e5e4471476edac35a299611d7e9b116715510d55d7ca6cbbe9a04538f2ed124 SHA512 5a835262af5aee665550955909549fcb5838a8d9ba0a5226d659576c56ddf7d984cf6a8bc97839c8f15340edb67609c8e2ef3279d1fa2df33e8bce7d9d946387
+EBUILD hydra-9.1.ebuild 3625 BLAKE2B 2b45007774a181be5459a133c630c60c74f33845825b925e5dd316cc8f0f8f258990c10298179653427723bb4bb9b7f281cf484eecb58c5ff5d609b2c1f264f6 SHA512 7a93fbe38732a4336af0cbd57b75ded2ab850f92f589ca5ded2ed0615738d31a58bd3cc624b8f7fd6b59918ff9d8a4af79e2dc287001f5ba5146efbf65c214d6
 EBUILD hydra-9.2.ebuild 3662 BLAKE2B e49f162de992b218bd65ae480f52887188caa337ec0202b6ff19f52dc967e7ad93a7112203754541b2e065ce00fe245550b519bb7f47fa8c42fdc3d957379cea SHA512 f4db9ae074d853275a1a4fddbcaf7b81af05fdb91c3594327aa6dd39b51ad5f5513d0d7f6c65b4862ca184903be75851db361e317f7c8efd3cb58af25a87ade7
 EBUILD hydra-9999999.ebuild 3586 BLAKE2B d510ae7b3a31e0064563f7858c87b5830849ffb68fd4277e0716bf927fb2a879786844aa840c54c7da4beddd56b7518a9ade811ad26b3b63f55e44eae717fdf2 SHA512 73bd694d30bc004c10ff5ab4a61ff610e5830db180205991a4ba5e066904b663afba91554fe728496bf5f67d2bcc6383d1bc668931965cb996185369c3e3ad78
 MISC metadata.xml 583 BLAKE2B 4471d2ece7889ace03be32f2d7227bfe9a0b7795a0d6292b97cb46fb9944cdac8b248deafcef087bbbc885c885cc60d2d58c4ccac391dc6f90bcdd975bdff3df SHA512 ab05494b6f96f007c06d7f86b696d148a8b2bf12ab23e193751785023733d9472623a873167f3b580d9167021d794466304732958ffbc0e67027a06076fd2ec5
diff --git a/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch b/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch
deleted file mode 100644
index 0055257b04a0..000000000000
--- a/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/hydra-irc.c
-+++ b/hydra-irc.c
-@@ -7,7 +7,6 @@ RFC 1459: Internet Relay Chat Protocol
- */
- 
- extern char *HYDRA_EXIT;
--char *buf;
- char buffer[300] = "";
- int32_t myport = PORT_IRC, mysslport = PORT_IRC_SSL;
- 
---- a/hydra-rexec.c
-+++ b/hydra-rexec.c
-@@ -5,7 +5,6 @@
- #define COMMAND "/bin/ls /"
- 
- extern char *HYDRA_EXIT;
--char *buf;
- 
- int32_t start_rexec(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) {
-   char *empty = "";
---- a/hydra-rlogin.c
-+++ b/hydra-rlogin.c
-@@ -12,7 +12,6 @@ no memleaks found on 110425
- #define TERM "vt100/9600"
- 
- extern char *HYDRA_EXIT;
--char *buf;
- 
- int32_t start_rlogin(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) {
-   char *empty = "";
---- a/hydra-rsh.c
-+++ b/hydra-rsh.c
-@@ -11,7 +11,6 @@ no memleaks found on 110425
- */
- 
- extern char *HYDRA_EXIT;
--char *buf;
- 
- int32_t start_rsh(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) {
-   char *empty = "";
---- a/hydra-rtsp.c
-+++ b/hydra-rtsp.c
-@@ -12,7 +12,6 @@
- #include "sasl.h"
- 
- extern char *HYDRA_EXIT;
--char *buf;
- char packet[500];
- char packet2[500];
- 
---- a/hydra-teamspeak.c
-+++ b/hydra-teamspeak.c
-@@ -36,7 +36,6 @@ struct team_speak {
- extern int32_t hydra_data_ready_timed(int32_t socket, long sec, long usec);
- 
- extern char *HYDRA_EXIT;
--char *buf;
- 
- int32_t start_teamspeak(int32_t s, char *ip, int32_t port, unsigned char options, char *miscptr, FILE * fp) {
-   char *empty = "";
diff --git a/net-analyzer/hydra/files/hydra-9.0-vnc.patch b/net-analyzer/hydra/files/hydra-9.0-vnc.patch
deleted file mode 100644
index 69c933ee8386..000000000000
--- a/net-analyzer/hydra/files/hydra-9.0-vnc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/hydra-vnc.c
-+++ b/hydra-vnc.c
-@@ -75,7 +75,7 @@ int32_t start_vnc(int32_t s, char *ip, int32_t port, unsigned char options, char
-   //supported security type
-   switch (buf2[3]) {
-   case 0x0:
--    hydra_report(stderr, "[ERROR] VNC server told us to quit %c\n", buf[3]);
-+    hydra_report(stderr, "[ERROR] VNC server told us to quit %c\n", buf2[3]);
-     hydra_child_exit(0);
-     break;
-   case 0x1:
diff --git a/net-analyzer/hydra/hydra-9.0-r1.ebuild b/net-analyzer/hydra/hydra-9.0-r1.ebuild
deleted file mode 100644
index f1397694c8ad..000000000000
--- a/net-analyzer/hydra/hydra-9.0-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Parallelized network login hacker"
-HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
-SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
-	oracle pcre postgres rdp libssh subversion zlib
-"
-
-RDEPEND="
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	firebird? ( dev-db/firebird )
-	gcrypt? ( dev-libs/libgcrypt )
-	idn? ( net-dns/libidn:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	memcached? ( dev-libs/libmemcached[sasl] )
-	mongodb? ( dev-libs/mongo-c-driver )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ncurses? ( sys-libs/ncurses:= )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:* )
-	rdp? ( net-misc/freerdp )
-	libssh? ( >=net-libs/libssh-0.4.0 )
-	subversion? ( dev-vcs/subversion )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.0-unneeded-buf.patch
-	"${FILESDIR}"/${PN}-9.0-vnc.patch
-)
-S=${WORKDIR}/thc-${P}
-
-src_prepare() {
-	default
-
-	# None of the settings in Makefile.unix are useful to us
-	mv Makefile.unix{,.gentoo_unused} || die
-	touch Makefile.unix || die
-
-	sed -i \
-		-e 's:|| echo.*$::' \
-		-e '/\t-$(CC)/s:-::' \
-		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
-		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
-		Makefile.am || die
-}
-
-src_configure() {
-	# Note: the top level configure script is not autoconf-based
-	tc-export CC PKG_CONFIG
-
-	append-cflags -fcommon
-
-	export OPTS="${CFLAGS}"
-
-	hydra_sed() {
-		if use ${1}; then
-			einfo "Enabling ${1}"
-			if [[ -n "${3}" ]]; then
-				sed -i 's#'"${2}"'#'"${3}"'#' configure || die
-			fi
-		else
-			einfo "Disabling ${1}"
-			sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die
-		fi
-	}
-
-	hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD'
-	hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT'
-	hydra_sed idn '-lidn' '$( "${PKG_CONFIG}" --libs libidn )' '-DLIBIDN -DHAVE_PR29_H'
-	hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}" --libs libssh )' '-DLIBSSH'
-	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}" --libs libmemcached )' '-DLIBMCACHED'
-	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}" --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
-	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}" --libs ncurses )' '-DLIBNCURSES'
-	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
-	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
-	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
-	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2'
-	# TODO: https://bugs.gentoo.org/686148
-	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN'
-	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
-	hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB'
-
-	sh configure \
-		$(use gtk || echo --disable-xhydra) \
-		$(usex debug '--debug' '') \
-		--nostrip \
-		--prefix=/usr \
-		|| die
-
-	if use gtk ; then
-		pushd hydra-gtk || die
-		econf
-	fi
-}
-
-src_compile() {
-	emake XLIBPATHS=''
-	use gtk && emake -C hydra-gtk
-}
-
-src_install() {
-	dobin hydra pw-inspector
-	use gtk && dobin hydra-gtk/src/xhydra
-	dodoc CHANGES README
-}
diff --git a/net-analyzer/hydra/hydra-9.0.ebuild b/net-analyzer/hydra/hydra-9.0.ebuild
deleted file mode 100644
index 190b5ed145c3..000000000000
--- a/net-analyzer/hydra/hydra-9.0.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="Parallelized network login hacker"
-HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
-SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="
-	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
-	oracle pcre postgres rdp libssh subversion zlib
-"
-
-RDEPEND="
-	gtk? (
-		dev-libs/atk
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-	)
-	firebird? ( dev-db/firebird )
-	gcrypt? ( dev-libs/libgcrypt )
-	idn? ( net-dns/libidn:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	memcached? ( dev-libs/libmemcached[sasl] )
-	mongodb? ( dev-libs/mongo-c-driver )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ncurses? ( sys-libs/ncurses:= )
-	oracle? ( dev-db/oracle-instantclient-basic )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:* )
-	rdp? ( net-misc/freerdp )
-	libssh? ( >=net-libs/libssh-0.4.0 )
-	subversion? ( dev-vcs/subversion )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-S=${WORKDIR}/thc-${P}
-
-src_prepare() {
-	default
-
-	# None of the settings in Makefile.unix are useful to us
-	mv Makefile.unix{,.gentoo_unused} || die
-	touch Makefile.unix || die
-
-	sed -i \
-		-e 's:|| echo.*$::' \
-		-e '/\t-$(CC)/s:-::' \
-		-e '/^OPTS/{s|=|+=|;s| -O3||}' \
-		-e '/ -o /s:$(OPTS):& $(LDFLAGS):g' \
-		Makefile.am || die
-}
-
-src_configure() {
-	# Note: the top level configure script is not autoconf-based
-	tc-export CC PKG_CONFIG
-
-	append-cflags -fcommon
-
-	export OPTS="${CFLAGS}"
-
-	hydra_sed() {
-		if use ${1}; then
-			einfo "Enabling ${1}"
-			if [[ -n "${3}" ]]; then
-				sed -i 's#'"${2}"'#'"${3}"'#' configure || die
-			fi
-		else
-			einfo "Disabling ${1}"
-			sed -i 's#'"${2}"'##; s#'"${4}"'##' configure || die
-		fi
-	}
-
-	hydra_sed firebird '-lfbclient' '' '-DLIBFIREBIRD'
-	hydra_sed gcrypt '-lgcrypt' '$( ${CTARGET:-${CHOST}}-libgcrypt-config --libs )' '-DHAVE_GCRYPT'
-	hydra_sed idn '-lidn' '$( "${PKG_CONFIG}"  --libs libidn )' '-DLIBIDN -DHAVE_PR29_H'
-	hydra_sed libssh '-lssh' '$( "${PKG_CONFIG}"  --libs libssh )' '-DLIBSSH'
-	hydra_sed memcached '-lmemcached' '$( "${PKG_CONFIG}"  --libs libmemcached )' '-DLIBMCACHED'
-	hydra_sed mongodb '-lmongoc-1.0' '$( "${PKG_CONFIG}"  --libs libmongoc-1.0 )' '-DLIBMONGODB\|-DLIBBSON'
-	hydra_sed mysql '-lmysqlclient' '$( ${CTARGET:-${CHOST}}-mysql_config --libs )' '-DLIBMYSQLCLIENT'
-	hydra_sed ncurses '-lcurses' '$( "${PKG_CONFIG}"  --libs ncurses )' '-DLIBNCURSES'
-	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}"  --libs libpcre )' '-DHAVE_PCRE'
-	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}"  --libs libpq )' '-DLIBPOSTGRES'
-	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
-	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}"  --libs freerdp2 )' '-DLIBFREERDP2'
-	# TODO: https://bugs.gentoo.org/686148
-	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}"  --libs libsvn_client )' '-DLIBSVN'
-	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
-	hydra_sed zlib '-lz' '$( "${PKG_CONFIG}"  --libs zlib )' '-DHAVE_ZLIB'
-
-	sh configure \
-		$(use gtk || echo --disable-xhydra) \
-		$(usex debug '--debug' '') \
-		--nostrip \
-		--prefix=/usr \
-		|| die
-
-	if use gtk ; then
-		pushd hydra-gtk || die
-		econf
-	fi
-}
-
-src_compile() {
-	emake XLIBPATHS=''
-	use gtk && emake -C hydra-gtk
-}
-
-src_install() {
-	dobin hydra pw-inspector
-	use gtk && dobin hydra-gtk/src/xhydra
-	dodoc CHANGES README
-}
diff --git a/net-analyzer/hydra/hydra-9.1.ebuild b/net-analyzer/hydra/hydra-9.1.ebuild
index edfc864a713f..1d9dfaec2fc5 100644
--- a/net-analyzer/hydra/hydra-9.1.ebuild
+++ b/net-analyzer/hydra/hydra-9.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="
 	debug firebird gcrypt gtk idn libressl memcached mongodb mysql ncurses
 	oracle pcre postgres rdp libssh subversion zlib