[gentoo-commits] repo/gentoo:master commit in: net-analyzer/hydra/files/

2024-03-23 Thread Arthur Zamarin
commit: 3b305d92ffdaab6b7703010911dccff204b67571
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Mar 19 19:20:31 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Mar 23 06:05:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b305d92

net-analyzer/hydra: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/35834
Signed-off-by: Arthur Zamarin  gentoo.org>

 .../hydra/files/hydra-9.4-implicit-func-decl.patch | 33 --
 1 file changed, 33 deletions(-)

diff --git a/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch 
b/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch
deleted file mode 100644
index bf4dd61e33ce..
--- a/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://github.com/vanhauser-thc/thc-hydra/pull/786
-
-From 613bd02264dcc989eeeb77b83603d4c2f48f0bbc Mon Sep 17 00:00:00 2001
-From: Sam James 
-Date: Fri, 9 Sep 2022 04:32:05 +0100
-Subject: [PATCH] Makefile.am: add -D_GNU_SOURCE for strcasestr
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-strcasestr is not a standard function and per
-the man page, needs -D_GNU_SOURCE to be visible.
-
-Fixes a build error:
-```
-hydra-rtsp.c:20:7: error: implicit declaration of function ‘strcasestr’; did 
you mean ‘strcasecmp’? [-Werror=implicit-function-declaration]
-   20 |   if (strcasestr(s, "401 Unauthorized") != NULL) {
-  |   ^~
-  |   strcasecmp
-```
-
-Signed-off-by: Sam James 
 a/Makefile.am
-+++ b/Makefile.am
-@@ -5,6 +5,7 @@ WARN_CLANG=-Wformat-nonliteral -Wstrncat-size 
-Wformat-security -Wsign-conversio
- WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral 
-Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 
-Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion 
-Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations 
-fno-common -Wcast-align
- CFLAGS ?= -g
- OPTS=-I. -O3 $(CFLAGS) -fcommon
-+CPPFLAGS += -D_GNU_SOURCE
- # -Wall -g -pedantic
- LIBS=-lm
- DESTDIR ?=
-



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/hydra/files/

2022-09-24 Thread Sam James
commit: 83eeb745e14a21cf045994a56cf70f66d1945b25
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Sep 14 06:37:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 25 01:27:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83eeb745

net-analyzer/hydra: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Portage 3.0.35 / pkgdev 0.2.1 / pkgcheck 0.10.14
Closes: https://github.com/gentoo/gentoo/pull/27248
Signed-off-by: Sam James  gentoo.org>

 .../files/hydra-999-respect-cflags-more.patch  | 31 --
 1 file changed, 31 deletions(-)

diff --git a/net-analyzer/hydra/files/hydra-999-respect-cflags-more.patch 
b/net-analyzer/hydra/files/hydra-999-respect-cflags-more.patch
deleted file mode 100644
index 0fe5753ec8af..
--- a/net-analyzer/hydra/files/hydra-999-respect-cflags-more.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Don't inject hardening CFLAGS. We already have these by default in Gentoo.
 a/configure
-+++ b/configure
-@@ -1380,27 +1380,6 @@ if [ -n "$CRYPTO_PATH" ]; then
-   echo "  ... RSA_generate_key()$RSA found"
- fi
-
--echo "Checking for secure compile option support in $CC ..."
--GCCSEC="no"
--LDSEC="no"
--GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4 
-D_FORTIFY_SOURCE=2"
--echo '#include ' > $TMPC.c
--echo 'int main() { printf(""); return 0; }' >> $TMPC.c
--$CC -pie -fPIE $GCCSEPOPT -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err
--test -x $TMPC && GCCSEC="yes"
--grep -q fPI $TMPC.c.err || GCCSECOPT="-pie -fPIE $GCCSECOPT"
--rm -f "$TMPC"
--$CC $GCCSECOPT -Wl,-z,now -Wl,-z,relro -o $TMPC $TMPC.c > /dev/null 2> 
$TMPC.c.err
--test -x $TMPC && { LDSEC="yes" ; GCCSECOPT="$GCCSECOPT -Wl,-z,now 
-Wl,-z,relro" ; }
--rm -f $TMPC $TMPC.c $TMPC.c.err
--echo "  Compiling... $GCCSEC"
--echo "  Linking... $LDSEC"
--
--echo "Checking for --allow-multiple-definition linker option ... $WALLOW"
--if [ "$WALLOW" = "yes" ]; then
--  GCCSECOPT="$GCCSECOPT -Wl,--allow-multiple-definition"
--fi
--
- echo
- XDEFINES=""
- XLIBS=""
\ No newline at end of file



[gentoo-commits] repo/gentoo:master commit in: net-analyzer/hydra/files/, net-analyzer/hydra/

2022-09-08 Thread Sam James
commit: 4c9c2bb1098e1146d681b1f807163f3c42ffe93a
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  9 03:35:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Sep  9 03:35:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c9c2bb1

net-analyzer/hydra: add 9.4, drop 999

Signed-off-by: Sam James  gentoo.org>

 net-analyzer/hydra/Manifest|  1 +
 .../hydra/files/hydra-9.4-implicit-func-decl.patch | 33 +++
 .../{hydra-999.ebuild => hydra-9.4.ebuild} | 38 +-
 3 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index b3c28ec91261..62f2f9a362a3 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,3 +1,4 @@
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 
9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba
 SHA512 
863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
 DIST hydra-9.2.tar.gz 614176 BLAKE2B 
102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7
 SHA512 
ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
 DIST hydra-9.3.tar.gz 829856 BLAKE2B 
5ae1ab77f64d2bc17bd8389acf8a47201d84455a82f5ae28ab740594571a13ab145f5981efdfb09ddab3d6cc443e171e4664bff08c1a6b2f08169dea4f87ba54
 SHA512 
06d2ed61492c76d16ff3b2fbbde3938f79d6038c979a2af949f9b4d116a1506943e0a3a246da4d1bc8848cf440097e6175962e3fdf3e7644dd36ad7c2f6b2ce4
+DIST hydra-9.4.tar.gz 833465 BLAKE2B 
2ba7f7e4a70c4f6c9dc4ec94d652ab7534cb0fb17b88412dfcf1e651d9f31af573ab9acd2d9cb698da6462f4744f53dfb8f87a437c32bebfa4f9a04f2f9136c0
 SHA512 
de5a1e73673fdc2f193cfb1aeec337c9d8faad52b06524850f352a797a4a5ef08cba8fc51da96fed1db01d141127e58c2aa874027f51c40a94a474de778d5241

diff --git a/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch 
b/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch
new file mode 100644
index ..bf4dd61e33ce
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-9.4-implicit-func-decl.patch
@@ -0,0 +1,33 @@
+https://github.com/vanhauser-thc/thc-hydra/pull/786
+
+From 613bd02264dcc989eeeb77b83603d4c2f48f0bbc Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Fri, 9 Sep 2022 04:32:05 +0100
+Subject: [PATCH] Makefile.am: add -D_GNU_SOURCE for strcasestr
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+strcasestr is not a standard function and per
+the man page, needs -D_GNU_SOURCE to be visible.
+
+Fixes a build error:
+```
+hydra-rtsp.c:20:7: error: implicit declaration of function ‘strcasestr’; did 
you mean ‘strcasecmp’? [-Werror=implicit-function-declaration]
+   20 |   if (strcasestr(s, "401 Unauthorized") != NULL) {
+  |   ^~
+  |   strcasecmp
+```
+
+Signed-off-by: Sam James 
+--- a/Makefile.am
 b/Makefile.am
+@@ -5,6 +5,7 @@ WARN_CLANG=-Wformat-nonliteral -Wstrncat-size 
-Wformat-security -Wsign-conversio
+ WARN_GCC=-Wformat=2 -Wformat-overflow=2 -Wformat-nonliteral 
-Wformat-truncation=2 -Wnull-dereference -Wstrict-overflow=2 
-Wstringop-overflow=4 -Walloca-larger-than=4096 -Wtype-limits -Wconversion 
-Wtrampolines -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations 
-fno-common -Wcast-align
+ CFLAGS ?= -g
+ OPTS=-I. -O3 $(CFLAGS) -fcommon
++CPPFLAGS += -D_GNU_SOURCE
+ # -Wall -g -pedantic
+ LIBS=-lm
+ DESTDIR ?=
+

diff --git a/net-analyzer/hydra/hydra-999.ebuild 
b/net-analyzer/hydra/hydra-9.4.ebuild
similarity index 76%
rename from net-analyzer/hydra/hydra-999.ebuild
rename to net-analyzer/hydra/hydra-9.4.ebuild
index 1e7e5e715482..156d8dd35936 100644
--- a/net-analyzer/hydra/hydra-999.ebuild
+++ b/net-analyzer/hydra/hydra-9.4.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit git-r3 toolchain-funcs
+inherit edo toolchain-funcs
 
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra;
-EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra;
+SRC_URI="https://github.com/vanhauser-thc/thc-hydra/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+S="${WORKDIR}"/thc-${P}
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="
-   debug firebird gcrypt gtk idn memcached mongodb mysql ncurses
-   oracle pcre postgres rdp libssh subversion zlib
-"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug firebird gcrypt gtk idn memcached mongodb mysql ncurses oracle 
pcre postgres rdp libssh samba subversion zlib"
 
 RDEPEND="
+   dev-libs/openssl:=
gtk? (
dev-libs/atk
dev-libs/glib:2
@@ -26,24 +26,23 @@ RDEPEND="
firebird? ( dev-db/firebird 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/hydra/files/, net-analyzer/hydra/

2022-04-12 Thread Sam James
commit: 1b6d55530908535b7439045af4ea35a096ee4a95
Author: Sam James  gentoo  org>
AuthorDate: Wed Apr 13 01:39:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Apr 13 01:39:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b6d5553

net-analyzer/hydra: add 9.3

Closes: https://bugs.gentoo.org/805533
Closes: https://bugs.gentoo.org/838031
Closes: https://bugs.gentoo.org/811798
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/hydra/Manifest|   1 +
 net-analyzer/hydra/files/hydra-9.3-pcre2.patch | 113 +++
 net-analyzer/hydra/hydra-9.3.ebuild| 121 +
 3 files changed, 235 insertions(+)

diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index f12f1ce825e8..b3c28ec91261 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,2 +1,3 @@
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 
9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba
 SHA512 
863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
 DIST hydra-9.2.tar.gz 614176 BLAKE2B 
102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7
 SHA512 
ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
+DIST hydra-9.3.tar.gz 829856 BLAKE2B 
5ae1ab77f64d2bc17bd8389acf8a47201d84455a82f5ae28ab740594571a13ab145f5981efdfb09ddab3d6cc443e171e4664bff08c1a6b2f08169dea4f87ba54
 SHA512 
06d2ed61492c76d16ff3b2fbbde3938f79d6038c979a2af949f9b4d116a1506943e0a3a246da4d1bc8848cf440097e6175962e3fdf3e7644dd36ad7c2f6b2ce4

diff --git a/net-analyzer/hydra/files/hydra-9.3-pcre2.patch 
b/net-analyzer/hydra/files/hydra-9.3-pcre2.patch
new file mode 100644
index ..bb12936254bb
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-9.3-pcre2.patch
@@ -0,0 +1,113 @@
+https://github.com/vanhauser-thc/thc-hydra/commit/c82e5d51c5595374e6b7801bfc84c26a497d8989.patch
+https://bugs.gentoo.org/838031
+
+From c82e5d51c5595374e6b7801bfc84c26a497d8989 Mon Sep 17 00:00:00 2001
+From: vanhauser-thc 
+Date: Tue, 1 Mar 2022 14:56:05 +0100
+Subject: [PATCH] switch to pcre2
+
+--- a/configure
 b/configure
+@@ -380,21 +380,21 @@ if [ "X" = "X$CURSES_PATH" -o "X" = "X$CURSES_IPATH" ]; 
then
+ CURSES_IPATH=""
+ fi
+ 
+-echo "Checking for pcre (libpcre/pcre.h) ..."
++echo "Checking for pcre2 (libpcre/pcre.h) ..."
+ for i in $LIBDIRS ; do
+ if [ "X" = "X$PCRE_PATH" ]; then
+-if [ -f "$i/libpcre.so" -o -f "$i/libpcre.dylib" -o -f "$i/libpcre.a" 
  ]; then
++if [ -f "$i/libpcre2-8.so" -o -f "$i/libpcre2-8.dylib" -o -f 
"$i/libpcre2-8.a"   ]; then
+ PCRE_PATH="$i"
+ fi
+ fi
+ if [ "X" = "X$PCRE_PATH" ]; then
+-TMP_LIB=`/bin/ls $i/libpcre.so* 2> /dev/null | grep libpcre.`
++TMP_LIB=`/bin/ls $i/libpcre2*.so* 2> /dev/null | grep libpcre.`
+ if [ -n "$TMP_LIB" ]; then
+   PCRE_PATH="$i"
+ fi
+ fi
+ if [ "X" = "X$PCRE_PATH" ]; then
+-TMP_LIB=`/bin/ls $i/libpcre.dll* 2> /dev/null | grep libpcre.`
++TMP_LIB=`/bin/ls $i/libpcre2*.dll* 2> /dev/null | grep libpcre.`
+ if [ -n "$TMP_LIB" ]; then
+   PCRE_PATH="$i"
+ fi
+@@ -402,20 +402,20 @@ for i in $LIBDIRS ; do
+ done
+ for i in $INCDIRS ; do
+ if [ "X" != "X$PCRE_PATH" ]; then
+-if [ -f "$i/pcre.h" ]; then
++if [ -f "$i/pcre2.h" ]; then
+ PCRE_IPATH="$i"
+ fi
+ fi
+ done
+ if [ "X" != "X$DEBUG" ]; then
+echo DEBUG: PCRE_PATH=$PCRE_PATH/libpcre
+-   echo DEBUG: PCRE_IPATH=$PCRE_IPATH/pcre.h
++   echo DEBUG: PCRE_IPATH=$PCRE_IPATH/pcre2.h
+ fi
+ if [ -n "$PCRE_PATH" -a -n "$PCRE_IPATH" ]; then
+-echo "   ... found"
++echo "... found"
+ fi
+ if [ "X" = "X$PCRE_PATH" -o "X" = "X$PCRE_IPATH" ]; then
+-echo "   ... NOT found, server response 
checks will be less reliable"
++echo "... NOT found, server response 
checks will be less reliable"
+ PCRE_PATH=""
+ PCRE_IPATH=""
+ fi
+@@ -1649,7 +1649,7 @@ if [ -n "$IDN_PATH" ]; then
+ XLIBS="$XLIBS -lidn"
+ fi
+ if [ -n "$PCRE_PATH" ]; then
+-XLIBS="$XLIBS -lpcre"
++XLIBS="$XLIBS -lpcre2-8"
+ fi
+ if [ -n "$MYSQL_PATH" ]; then
+ XLIBS="$XLIBS -lmysqlclient"
+--- a/hydra-mod.c
 b/hydra-mod.c
+@@ -7,7 +7,8 @@
+ #include 
+ #endif
+ #ifdef HAVE_PCRE
+-#include 
++#define PCRE2_CODE_UNIT_WIDTH 8
++#include 
+ #endif
+ 
+ #define MAX_CONNECT_RETRY 1
+@@ -1291,19 +1292,23 @@ void hydra_set_srcport(int32_t port) { src_port = 
port; }
+ 
+ #ifdef HAVE_PCRE
+ int32_t hydra_string_match(char *str, const char 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/hydra/files/, net-analyzer/hydra/

2021-03-26 Thread Sam James
commit: 56dd9923947f9d4178efa7c14a114155c8b0955a
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 26 16:59:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 26 16:59:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56dd9923

net-analyzer/hydra: drop 9.0, 9.0-r1

Closes: https://bugs.gentoo.org/776532
Signed-off-by: Sam James  gentoo.org>

 net-analyzer/hydra/Manifest|   1 -
 .../hydra/files/hydra-9.0-unneeded-buf.patch   |  60 --
 net-analyzer/hydra/files/hydra-9.0-vnc.patch   |  11 --
 net-analyzer/hydra/hydra-9.0-r1.ebuild | 127 -
 net-analyzer/hydra/hydra-9.0.ebuild| 123 
 5 files changed, 322 deletions(-)

diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 8d6ee303deb..f12f1ce825e 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,3 +1,2 @@
-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

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 0055257b04a..000
--- 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 69c933ee838..000
--- 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 f1397694c8a..000
--- 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"
-

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/hydra/files/, net-analyzer/hydra/

2017-04-16 Thread Jeroen Roovers
commit: 3b38108bc45b4930319a10e22f7c576dbc92a566
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Apr 16 20:48:45 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Apr 16 20:49:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b38108b

net-analyzer/hydra: Version bump (bug #615584).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-analyzer/hydra/Manifest|   1 +
 net-analyzer/hydra/files/hydra-8.4-configure.patch |  48 ++
 net-analyzer/hydra/hydra-8.4.ebuild| 101 +
 3 files changed, 150 insertions(+)

diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 63141477f5b..01de2f14ba9 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1 +1,2 @@
 DIST hydra-8.1.tar.gz 559031 SHA256 
e4bc2fd11f97a8d985a38a31785c86d38cc60383e47a8f4a5c436351e5135f19 SHA512 
7608dd365865e5976bea446faedaad9f0334e7572fd0ee47a601c471471fc7c8a922c7114f4df08705b34b29144d3a6552e66148adf6b0f92c67301119c94959
 WHIRLPOOL 
b1555fe1a8257c88f8f5c110fce1d06834eb6dadad394b61e2a90c3289b8fdd117944da160871003b1583aefb81a02d5c49a653e8de7d3adcd07917ae760c83c
+DIST hydra-8.4.tar.gz 1205609 SHA256 
482846580888f54e000bb125e263a65c32fa28ba86c9d4012371cf55c3bdc140 SHA512 
62c53f1725eb5b965d16d293cd90ab5e74779eba8fe2e2ab9094f51851fa24acfd74574f509a7914af8254e43197d803cca6b41eace3557d9599d79d695f6a48
 WHIRLPOOL 
aecc31645e7775662e32b766baa942e92e31143e5b6fbe64620ee85179288dc60f3ada477b4605444769c9e76c17d94835db5f3651af409d5562a2e8971279ef

diff --git a/net-analyzer/hydra/files/hydra-8.4-configure.patch 
b/net-analyzer/hydra/files/hydra-8.4-configure.patch
new file mode 100644
index 000..ba99ff2acda
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-8.4-configure.patch
@@ -0,0 +1,48 @@
+--- a/configure
 b/configure
+@@ -46,8 +46,6 @@
+ MYSQL_IPATH=""
+ AFP_PATH=""
+ AFP_IPATH=""
+-NCP_PATH=""
+-NCP_IPATH=""
+ SVN_PATH=""
+ SVN_IPATH=""
+ APR_IPATH=""
+@@ -679,36 +677,6 @@
+ fi
+ 
+ echo "Checking for NCP (libncp.so / nwcalls.h) ..."
+-for i in $LIBDIRS ; do
+-if [ "X" = "X$NCP_PATH" ]; then
+-if [ -f "$i/libncp.so" -o -f "$i/libncp.dylib" -o -f "$i/libncp.a"  
]; then
+-NCP_PATH="$i"
+-fi
+-fi
+-if [ "X" = "X$NCP_PATH" ]; then
+-TMP_LIB=`/bin/ls $i/libncp.so.* 2> /dev/null | grep ncp.`
+-if [ -n "$TMP_LIB" ]; then
+-NCP_PATH="$i"
+-fi
+-fi
+-if [ "X" = "X$NCP_PATH" ]; then
+-TMP_LIB=`/bin/ls $i/libncp.dll* 2> /dev/null | grep ncp.`
+-if [ -n "$TMP_LIB" ]; then
+-NCP_PATH="$i"
+-fi
+-fi
+-done
+-for i in $INCDIRS ; do
+-if [ "X" != "X$NCP_PATH" ]; then
+-if [ -f "$i/ncp/nwcalls.h" ]; then
+-NCP_IPATH="$i"
+-fi
+-fi
+-done
+-if [ "X" != "X$DEBUG" ]; then
+-   echo DEBUG: NCP_PATH=$NCP_PATH/libncp
+-   echo DEBUG: NCP_IPATH=$NCP_IPATH/ncp/nwcalls.h
+-fi
+ if [ -n "$NCP_PATH" -a -n "$NCP_IPATH" ]; then
+ echo " ... found"
+ fi

diff --git a/net-analyzer/hydra/hydra-8.4.ebuild 
b/net-analyzer/hydra/hydra-8.4.ebuild
new file mode 100644
index 000..ce796181b20
--- /dev/null
+++ b/net-analyzer/hydra/hydra-8.4.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Advanced parallized login hacker"
+HOMEPAGE="https://www.thc.org/thc-hydra/;
+SRC_URI="https://www.thc.org/releases/${P}.tar.gz;
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="firebird gtk idn libressl mysql ncp oracle pcre postgres ssl subversion"
+
+RDEPEND="
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:0= )
+   sys-libs/ncurses:=
+   firebird? ( dev-db/firebird )
+   gtk? (
+   dev-libs/atk
+   dev-libs/glib:2
+   x11-libs/gdk-pixbuf:2
+   x11-libs/gtk+:2
+   )
+   idn? ( net-dns/libidn )
+   mysql? ( virtual/mysql )
+   ncp? ( net-fs/ncpfs )
+   oracle? ( dev-db/oracle-instantclient-basic )
+   pcre? ( dev-libs/libpcre )
+   postgres? ( dev-db/postgresql:* )
+   ssl? ( >=net-libs/libssh-0.4.0 )
+   subversion? ( dev-vcs/subversion )
+"
+DEPEND="
+   ${RDEPEND}
+   virtual/pkgconfig
+"
+PATCHES=(
+   "${FILESDIR}"/${PN}-8.4-configure.patch
+)
+
+src_prepare() {
+   default
+   # None of the settings in Makefile.unix are useful to us
+   : > Makefile.unix
+
+   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() {
+   export OPTS="${CFLAGS}"
+
+   if ! use subversion; then
+   sed -i