gentoo resync : 05.02.2020

6 files changed, 219 insertions, 15 deletions

diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 6036f1c717d2..98f2dfc37537 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,10 +1,13 @@
 AUX hydra-8.0-configure.patch 1089 BLAKE2B 7aa67a47f3fa8174b0a72b86e4bdf743750450559327ec8da31506b817d59a0f3e6b96f32acc4a8658f98845053f50ff089c57f16b9251bc0daa38795a93e2ac SHA512 d7fbc56b9d0fd6cc89ca689a07c0dcf618827bfaafb332217b695b38cc6382c32aedfec4c046575dc34c0946c9b0212a22d82554a296697d1b922ad45084a0bd
 AUX hydra-8.4-configure.patch 1217 BLAKE2B 005cd700dd32e56405afa7a37d630aa8b2fe66f94b16b1fe09e6a5172aa5ef1c5e6896b697717e6b0524b5fd8b41443a8c5a734b1273843e54a6aebaed563c62 SHA512 18d76ac35660955a07ba435bf00ceebcd62423fd08c97237f7aa3be4187532f454997008be5395b2d8ae9d66e10204f76905481034c3e5cb1761aec2b02e32c3
+AUX hydra-9.0-unneeded-buf.patch 1503 BLAKE2B 3d8da1b656263e2abcc68e3b2b2f6c2c4937d684c7080105c2821678711146d864c6ccb2985df0e17673f4e762b5e0fc078c35e5f460a93df9891920e873ca23 SHA512 34ffce41ebebed70529eec9a6f617493fc323792fc2f7771fb1fd62bfd6fa5ae5fa96c49910dc79f8e72cee6cdc88afe0505b8f41053db8e3f64016e8f479a01
+AUX hydra-9.0-vnc.patch 407 BLAKE2B b64b12b33435a84564aea4345e86b868155b5d7c4dc1fc8f8c83f98d6429499ffd6d5d54983242415676a9556caedf5c58163ad0b09a00db2545d26f9630c145 SHA512 a4f554526cbfdf0560c1866f158a210b0fbd510a60fa2ad8e8c2cca0bb4ecf58e3eeb10d3bac747162231585c3ea827e10c0a4f4fb9e949832673afc6f9b93cf
 DIST hydra-8.1.tar.gz 559031 BLAKE2B a3d2b52508a1d03a2f3d6cecf7100543487b5a0f6210dd6128d3ab48ad16ca3a8fad49709163830049ed8b9bb6891861f9c3f5fd5a6179b0a87a072877e829af SHA512 7608dd365865e5976bea446faedaad9f0334e7572fd0ee47a601c471471fc7c8a922c7114f4df08705b34b29144d3a6552e66148adf6b0f92c67301119c94959
 DIST hydra-8.9.1.tar.gz 1186320 BLAKE2B 97c29cda5e26197ed66aa29555b0e4de3ef5b08bf65aa09fd0d564ee5f63825af71d6a41c4552a06a4c86a98dab5a69913c0b0200fe4e5068284ec7fc1f1061b SHA512 68b07dcb22bc55937e79035954417d820691e3a1eea169c959886ce6a741f545efe7879f31f41a1751779c923410dcc67fe8914bb9b5cf567edfc6fad3997d72
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
-EBUILD hydra-8.1.ebuild 2231 BLAKE2B 95092e808318ddde9e4dfdffde525efba03a9327fcee14ea7e3b02c21b823d9d2b546a4a60e69d045fc2866ad30660ab796406a09c520aa4d09d1933a8fe1df2 SHA512 77b003b5e8c5118dc81c318974ae2af2b0e973a272eccf3666ada23ed2712762792c725c1d2f5b3bb1df37277d3a6951ea92dd3995ea79ec97bb053ab339cac5
+EBUILD hydra-8.1.ebuild 2232 BLAKE2B bbd80c05a0689455f7fb6be8ac1da7a076b464bc76abaea121c1437512e555759c030b4963c3ea28e035821136aaaf378b96d6eef1e3bbddde4f3f7f9ea08eed SHA512 41e1b07452dfe5752cd5204328acbad7205ec4ba76117655768d427aa0097a20ab241f69d588571b055302de0d4870acc87a324433411174e2b7ad9c202143a3
 EBUILD hydra-8.9.1.ebuild 2394 BLAKE2B 942e94342043c63494b63125d11bce1b789245e7ef40b473736ec3d7b0f14f759e80607c73d1b0b0a938b8de89bc27e7ad5e1a8556498a428db316145bb4acff SHA512 78af7fbdf73aaf1e1cc7e35352f070eee13cd757f502c229fd9b30d6e807bf0360a7344ac1e8106ee3c8f590b6df4a650f4f251d4b7541849363ad040e03f303
+EBUILD hydra-9.0-r1.ebuild 3780 BLAKE2B 98de0efd400e19c14e9575d3fb36e082ff3ae10d6f7f67ed941bf1520cc25e29ded776e7b9d174d58ad63f0246c1bb5f4d58d62d6fe6c91803d942e7484db799 SHA512 7ba1f10e2da24b8f0c3ceb86a0f0de42a50105e4cba7d21edc12bb10c6133e3152bfcc655eebcd5ad2473bcac9c6ddb9213f552c42284488b9dbaf0c0f548399
 EBUILD hydra-9.0.ebuild 3659 BLAKE2B 2630cf4e6cb3c2fa8ef7bdc00cab68ec20cb65160027216082a8828f7209766b414f3aa3e028267335388d91f43631648c2740fff34758b236362f0d92952ff2 SHA512 506906ec7e84934468f99449dd53bcea8ebef07e8176f17792b2641791404aa8ffc343b9ff425bbff204095d01c7e90bcaff30b4cb8959d1d8aae004a8606a23
-EBUILD hydra-9999999.ebuild 3602 BLAKE2B 00bfabe6800b5f180343e001a7f2513a96b487b9186edf9943e27a0fcaf9c0aeb321ee392c06f6f4ae19783618b62d9e8cc6d618838fcf0621d066e6266f0b03 SHA512 55af31206a407598877cacd13112af5951ff730227dc2040bab8f388975777092f227fe2dc87d2adca0e9fd6b6550b87fe63b4c3aa1e194c7e2a6f9e5de1ce8d
+EBUILD hydra-9999999.ebuild 3629 BLAKE2B a4067027c780bc3bf3d2bd3b662b79e7ff90c0c909134a7d739fd34ffe373e7447048b7fdf5b60cec6614e5dbe29843a4b6534c61709e3db8a5f4170e1ed84cf SHA512 74ee710cb68a48abba67f2edcd4f89229cdfbbeafe6c6815d5eabe9bc482f0e409d42be5b7b05051872ccf02011dcb0342b7fd12a2deae4397048d41ce7d1520
 MISC metadata.xml 570 BLAKE2B fba8cf56f3f091fdf16a86ee3a1b964e9dfc0cae8a32e6fb81b8ccec3f1efe47dfac838c86fadd80e736d4a82233e8f84695c0a0987d4f426ab88fe0841df70f SHA512 45d0573055b0fe5f820e92cd43627e5c48dee8a1151ef06c7f65dddb8078ff62197bd5c8bbd1e1b12a42df61e399f2e3bff337201fa37df085339de24c8b50ba
diff --git a/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch b/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch
new file mode 100644
index 000000000000..0055257b04a0
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-9.0-unneeded-buf.patch
@@ -0,0 +1,60 @@
+--- 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
new file mode 100644
index 000000000000..69c933ee8386
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-9.0-vnc.patch
@@ -0,0 +1,11 @@
+--- 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-8.1.ebuild b/net-analyzer/hydra/hydra-8.1.ebuild
index 80610ce9cb2e..2aef23f9b8fd 100644
--- a/net-analyzer/hydra/hydra-8.1.ebuild
+++ b/net-analyzer/hydra/hydra-8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="firebird gtk idn mysql ncp oracle pcre postgres ssl subversion"
 
 RDEPEND="
diff --git a/net-analyzer/hydra/hydra-9.0-r1.ebuild b/net-analyzer/hydra/hydra-9.0-r1.ebuild
new file mode 100644
index 000000000000..402929ea2301
--- /dev/null
+++ b/net-analyzer/hydra/hydra-9.0-r1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2020 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 ncp 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= )
+	ncp? ( net-fs/ncpfs )
+	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 ncp '-lncp' '' '-DLIBNCP'
+	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-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild
index 9ef6f73c7ec4..3ff5496cc9b3 100644
--- a/net-analyzer/hydra/hydra-9999999.ebuild
+++ b/net-analyzer/hydra/hydra-9999999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 toolchain-funcs
+inherit flag-o-matic git-r3 toolchain-funcs
 
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
@@ -64,6 +64,7 @@ src_prepare() {
 src_configure() {
 	# Note: the top level configure script is not autoconf-based
 	tc-export CC PKG_CONFIG
+	append-cflags -fcommon
 
 	export OPTS="${CFLAGS}"
 
@@ -81,21 +82,21 @@ src_configure() {
 
 	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 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 ncp '-lncp' '' '-DLIBNCP'
-	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 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'
+	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' '$( "${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'
+	hydra_sed zlib '-lz' '$( "${PKG_CONFIG}" --libs zlib )' '-DHAVE_ZLIB'
 
 	sh configure \
 		$(use gtk || echo --disable-xhydra) \