Update to 5.2

> Release 5.2
> ###########
> * Again again some fixed for the ssh2 module. This is the last try. If it
>   finally does not work reliable, I am throwing out that library!
>   Thanks to bykhe@mymail.ch for the patch
> * Added a new module: VMWare-Auth! Thanks to david.maciejak@gmail.com!
>
>
> Release 5.1
> ###########
> * Again some fixed for the ssh2 module. Sorry. And still it might not work
>   in all occasions. The libssh is not as mature as we all wish it would be :-(
> * HYDRA_PROXY_AUTH was never used ... weird that nobody reported that. fixed.
> * Fixed bug in the base64 encoding function
> * Added an md5.h include which is needed since openssl 0.9.8
> * Added an enhacement to the FTP module, thanks to piotr_sobolewski@o2.pl
> * Fixed a bug when not using passwords and just -e n/s
>
>
> Release 5.0
> ###########
> ! THIS IS A THC - TAX - 10TH ANNIVERSARY RELEASE ! HAVE FUN !
> * Increadible speed-up for most modules :-)
> * Added module for PC-Anywhere, thanks to david.maciejak(at)kyxar.fr!
> * Added module for SVN, thanks to david.maciejak(at)kyxar.fr!
> * Added --disable-xhydra option to configure, thanks to david.maciejak(at)kyxar.
> fr!
>   - he is becoming the top supporter :-)
> * Added module for SIP (VoIP), thanks to gh0st(at)staatsfeind.org
> * Added support for newer sap r/3 rfcsdk
> * Added check to the telnet module to work with Cisco AAA
> * Fix for the VNC module, thanks to xmag
> * Small enhancement to the mysql plugin by pjohnson(at)bosconet.org
>
>
> Release 4.7
> ###########
> * Updated ssh2 support to libssh v0.11 - you *must* use this version if
>   you want to use ssh2! download from http://www.0xbadc0de.be/?part=libssh
>   This hopefully fixes problems on/against Sun machines.
>   After fixing, I also received a patch from david maciejak - thanks :-)
> * Added an attack module for rlogin and rsh, thanks to
>   david.maciejak(at)kyxar.fr!
> * Added an attack module for the postgres database, thanks to
>   diaul(at)devilopers.org! (and again: david maciejak sent on in as well)
> * JoMo-Kun sent in an update for his smbnt module. cool new features:
>   win2k native mode, xp anonymous account detection, machine name as password
> * Hopefully made VNC 3.7 protocol versions to work. please report.
> * Switched http and https service module to http-head, http-get and
>   https-get, https-head. Some web servers want HEAD, others only GET
> * An initial password for cisco-enable is now not required anymore. Some
>   people had console access without password, so this was necessary.
> * Fixed a bug in xhydra which did not allow custom ports > 100
> ! Soon to come: v5.0 - some cool new features to arrive on your pentest
>   machine!

7 files changed, 54 insertions, 67 deletions

diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 8e88d02224f..b03e046049d 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:17 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2006/02/05 00:18:29 adrianp Exp $
 #
 
 DISTNAME=	${PKGNAME}-src
-PKGNAME=	hydra-4.6
+PKGNAME=	hydra-5.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.thc.org/releases/
 
@@ -14,7 +14,7 @@ COMMENT=	Login password cracker
 
 USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	YES
-BUILD_TARGET=	all ssl
+BUILD_TARGET=	all
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 LICENSE+=	hydra-license
@@ -25,14 +25,14 @@ SUBST_FILES.build=	Makefile.am configure hydra-gtk/src/main.c
 SUBST_SED.build=	-e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" \
 			-e "s|@PREFIX@|${PREFIX}|g" \
 			-e "s|uname|${UNAME}|g" \
-			-e "s|\./hydra|${PREFIX}/bin/hydra|g" \
+			-e "s|\\./hydra|${PREFIX}/bin/hydra|g" \
 			-e "s|LIBS=-lm|LIBS=-lm ${COMPILER_RPATH_FLAG}${PREFIX}/lib ${COMPILER_RPATH_FLAG}/usr/lib|g"
-SUBST_MESSAGE.build=	"Patching build files."
+SUBST_MESSAGE.build=	Patching build files.
 
 USE_OLD_DES_API=	YES
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
-BUILDLINK_DEPENDS.libssh+=	libssh-0.1
+BUILDLINK_DEPENDS.libssh+=	libssh-0.11
 
 INSTALLATION_DIRS=	bin
 
diff --git a/security/hydra/distinfo b/security/hydra/distinfo
index 7e09ae28efa..f08ebe6156f 100644
--- a/security/hydra/distinfo
+++ b/security/hydra/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.4 2006/01/20 00:55:35 joerg Exp $
+$NetBSD: distinfo,v 1.5 2006/02/05 00:18:29 adrianp Exp $
 
-SHA1 (hydra-4.6-src.tar.gz) = acf0f61f8dc2a5307e266c337231dbdb3a9b9d79
-RMD160 (hydra-4.6-src.tar.gz) = 72cffce9eda1659023b74f22baabfad43ac5933d
-Size (hydra-4.6-src.tar.gz) = 171063 bytes
-SHA1 (patch-aa) = 0ca0d1f6edf7bad05050c0a76ec6601044981c5b
-SHA1 (patch-ab) = 7c2697a746b6439bab35a801bbf30760920898fa
-SHA1 (patch-ac) = c9ba9d8b584ec92b940dbf2e69768dad4ff86d25
+SHA1 (hydra-5.2-src.tar.gz) = 1a05b06030336c252dd4e8a0a048d8d45885f6f1
+RMD160 (hydra-5.2-src.tar.gz) = b4a707890cfd07637a2bf12604da8ef26075d44f
+Size (hydra-5.2-src.tar.gz) = 189979 bytes
+SHA1 (patch-aa) = 45227db4cf4cc1919bcc597920ca1442f6b970cf
+SHA1 (patch-ab) = b841c1cb0db99381516add4174a243ac43a6536f
+SHA1 (patch-ac) = ade8ea964018dc7034154a35338f50361b5185f8
 SHA1 (patch-ad) = 3734123af4511161eee93f624b1b9dd575be0ae7
-SHA1 (patch-ae) = 68952bea6383a3f5fa6b94925710437be6aeea3a
-SHA1 (patch-af) = ae3c8ce05b1a2a1404c3febfcf5d4eba132bcb15
+SHA1 (patch-af) = 90c24ad7df23f2be23d08b646d68c93846c7618b
diff --git a/security/hydra/patches/patch-aa b/security/hydra/patches/patch-aa
index 6f0cbeb9cd1..8eb047d319a 100644
--- a/security/hydra/patches/patch-aa
+++ b/security/hydra/patches/patch-aa
@@ -1,16 +1,16 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/04/17 12:19:54 adrianp Exp $
+$NetBSD: patch-aa,v 1.2 2006/02/05 00:18:29 adrianp Exp $
 
---- Makefile.am.orig	2005-04-17 13:11:05.000000000 +0100
+--- Makefile.am.orig	2006-01-20 11:37:28.000000000 +0000
 +++ Makefile.am
-@@ -28,17 +28,11 @@ EXTRA_DIST = README README.arm README.pa
+@@ -31,17 +31,11 @@ EXTRA_DIST = README README.arm README.pa
               hydra-mod.h hydra.h crc32.h d3des.h md4.h
  
- all:	pw-inspector hydra xhydra
+ all:	pw-inspector hydra $(XHYDRA_SUPPORT) 
 -	@echo
 -	@echo Now type "make install"
  
  hydra:	$(OBJ)
- 	$(CC) $(OPTS) $(LIBS) -o $(BIN) $(OBJ) $(LIB) $(XLIBS) $(XLIBPATHS)
+ 	$(CC) $(OPTS) $(LIBS) -o $(BIN) $(OBJ) $(LIBS) $(XLIBS) $(XLIBPATHS)
 -	@echo
 -	@echo If men could get pregnant, abortion would be a sacrament
 -	@echo
diff --git a/security/hydra/patches/patch-ab b/security/hydra/patches/patch-ab
index d6af0dddb04..24438866bb4 100644
--- a/security/hydra/patches/patch-ab
+++ b/security/hydra/patches/patch-ab
@@ -1,30 +1,48 @@
-$NetBSD: patch-ab,v 1.2 2005/04/24 10:42:49 adrianp Exp $
+$NetBSD: patch-ab,v 1.3 2006/02/05 00:18:29 adrianp Exp $
 
---- configure.orig	2005-02-01 14:50:26.000000000 +0000
+--- configure.orig	2006-01-20 13:44:15.000000000 +0000
 +++ configure
-@@ -130,7 +130,7 @@ if [ "$SAPR3_IPATH" = "/usr/include" ]; 
+@@ -41,7 +41,8 @@ echo
+ echo "Checking for openssl (libssl/ssl.h) ..."
+ for i in  $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib \
+ /*ssl /usr/*ssl /opt/*ssl /usr/local/*ssl /opt/local/*ssl \
+-/*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib .
++/*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib \
++@PREFIX@/lib .
+ do
+     if [ "X" = "X$SSL_PATH" ]; then
+         if [ -f "$i/libssl.so" -o -f "$i/libssl.dylib" ]; then
+@@ -68,7 +69,7 @@ do
+ done
+ 
+ for i in /usr/local/include /*ssl/include /usr/include \
+-/opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include .
++/opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include @SSLBASE@/include .
+ do
+     if [ "X" = "X$SSL_IPATH" ]; then
+         if [ -f "$i/openssl/ssl.h" ]; then
+@@ -183,7 +184,7 @@ if [ "$SAPR3_IPATH" = "/usr/include" ]; 
  fi
  
  echo "Checking for libssh (libssh/libssh.h) ..."
 -for i in  $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib .
-+for i in  $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib @PREFIX@/lib .
++for i in @PREFIX@/lib $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib .
  do
      if [ "X" = "X$SSH_PATH" ]; then
          if [ -f "$i/libssh.so" -o -f "$i/libssh.dylib" ]; then
-@@ -144,7 +144,7 @@ do
+@@ -207,7 +208,7 @@ do
          fi
-     fi
+     fi  
  done
 -for i in /usr/local/include /*ssl/include /usr/include .
-+for i in /usr/local/include /*ssl/include /usr/include @SSLBASE@/include .
++for i in @PREFIX@/include /usr/local/include /*ssl/include /usr/include .
  do
      if [ "X" = "X$SSH_IPATH" ]; then
          if [ -f "$i/libssh/libssh.h" ]; then
-@@ -291,10 +291,3 @@ echo >> Makefile.in
- cat Makefile.unix > Makefile
+@@ -451,9 +452,3 @@ cat Makefile.unix > Makefile
  cat Makefile.in >> Makefile
  cat Makefile.am >> Makefile
--
+ 
 -echo
 -echo NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES
 -echo =======================================================================
diff --git a/security/hydra/patches/patch-ac b/security/hydra/patches/patch-ac
index dbee963559d..57e4f78262f 100644
--- a/security/hydra/patches/patch-ac
+++ b/security/hydra/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/04/17 12:19:54 adrianp Exp $
+$NetBSD: patch-ac,v 1.2 2006/02/05 00:18:29 adrianp Exp $
 
---- hydra-gtk/src/main.c.orig	2005-01-05 22:31:46.000000000 +0000
-+++ hydra-gtk/src/main.c	2005-01-05 22:32:41.000000000 +0000
-@@ -30,7 +30,7 @@
+--- hydra-gtk/src/main.c.orig	2004-05-12 00:28:27.000000000 +0100
++++ hydra-gtk/src/main.c
+@@ -30,7 +30,7 @@ main (int argc, char *argv[])
    gtk_set_locale ();
    gtk_init (&argc, &argv);
  
diff --git a/security/hydra/patches/patch-ae b/security/hydra/patches/patch-ae
deleted file mode 100644
index b5c201f1435..00000000000
--- a/security/hydra/patches/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/04/29 22:17:13 rillig Exp $
-
-Needed for ISO C90 compliance.
-
---- hydra-teamspeak.c.orig	Thu Jan  6 16:39:55 2005
-+++ hydra-teamspeak.c	Tue Apr 26 12:16:41 2005
-@@ -14,11 +14,6 @@ start_teamspeak(int s, unsigned long int
-   char *login, *pass; 
-   char buf[100]; 
- 
--  if (strlen(login = hydra_get_next_login()) == 0)
--    login = empty;
--  if (strlen(pass = hydra_get_next_password()) == 0)
--    pass = empty;
--
-   struct team_speak {
-     char header[16];
-     unsigned long crc;
-@@ -35,6 +30,11 @@ start_teamspeak(int s, unsigned long int
-     char login[29];
-   };
-   struct team_speak teamspeak;
-+
-+  if (strlen(login = hydra_get_next_login()) == 0)
-+    login = empty;
-+  if (strlen(pass = hydra_get_next_password()) == 0)
-+    pass = empty;
- 
-   memset(&teamspeak, 0, sizeof(struct team_speak));
- 
diff --git a/security/hydra/patches/patch-af b/security/hydra/patches/patch-af
index 2e295078c73..6a2cda52605 100644
--- a/security/hydra/patches/patch-af
+++ b/security/hydra/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2006/01/20 00:55:35 joerg Exp $
+$NetBSD: patch-af,v 1.2 2006/02/05 00:18:29 adrianp Exp $
 
---- hydra.c.orig	2006-01-20 00:52:40.000000000 +0000
+--- hydra.c.orig	2006-01-20 11:39:15.000000000 +0000
 +++ hydra.c
-@@ -154,7 +154,6 @@ typedef struct {
+@@ -167,7 +167,6 @@ typedef struct {
  
  /* external vars */
  extern char HYDRA_EXIT[5];