From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 3 13:00:42 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3703D16A4CE for ; Mon, 3 May 2004 13:00:42 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CF56E43D46 for ; Mon, 3 May 2004 13:00:41 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i43K0fRL049846 for ; Mon, 3 May 2004 13:00:41 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i43K0fTg049845; Mon, 3 May 2004 13:00:41 -0700 (PDT) (envelope-from gnats) Date: Mon, 3 May 2004 13:00:41 -0700 (PDT) Message-Id: <200405032000.i43K0fTg049845@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Mikhail Teterin Subject: Re: ports/65395: Hydra 3.1 port upgrade X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Mikhail Teterin List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2004 20:00:42 -0000 The following reply was made to PR ports/65395; it has been noted by GNATS. From: Mikhail Teterin To: freebsd-gnats-submit@FreeBSD.org, llevier@argosnet.com Cc: Subject: Re: ports/65395: Hydra 3.1 port upgrade Date: Mon, 3 May 2004 15:59:47 -0400 --Boundary-00=_zSqlAmBgpX+VFZT Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, Laurent! I intent to commit the patch below, which will upgrade the port to the freshly released 4.0. In addition, I plan to add the two attached patches to the port's files-directory, so that the smbnt-cracking is always enabled using OpenSSL instead of libdes and fixing some printf-formating discrepancies.b Please, respond promptly if you have any considerations. Thanks! Yours, -mi cvs server: Diffing . Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/hydra/Makefile,v retrieving revision 1.8 diff -U2 -r1.8 Makefile --- Makefile 28 Mar 2004 17:35:46 -0000 1.8 +++ Makefile 3 May 2004 19:55:53 -0000 @@ -8,8 +8,9 @@ PORTNAME= hydra -PORTVERSION= 2.6 +PORTVERSION= 4.0 CATEGORIES= security MASTER_SITES= http://www.thc.org/releases/ \ ${MASTER_SITE_PACKETSTORM} +EXTRACT_SUFX= -src.tar.gz MASTER_SITE_SUBDIR= groups/thc @@ -24,5 +25,5 @@ post-patch: @${REINPLACE_CMD} -e 's|CC = gcc||; \ - s|-O2|${CFLAGS}|' \ + s|-O2|${CFLAGS}|; s|md4\..||g' \ ${WRKSRC}/Makefile.am Index: distinfo =================================================================== RCS file: /home/ncvs/ports/security/hydra/distinfo,v retrieving revision 1.2 diff -U2 -r1.2 distinfo --- distinfo 28 Mar 2004 17:35:46 -0000 1.2 +++ distinfo 3 May 2004 19:55:53 -0000 @@ -1,2 +1,2 @@ -MD5 (hydra-2.6.tar.gz) = 293dbc40e9b1ae67cd74a9e5495bd389 -SIZE (hydra-2.6.tar.gz) = 48954 +MD5 (hydra-4.0-src.tar.gz) = 858e0b049fed9dcf06c7c8d052579f69 +SIZE (hydra-4.0-src.tar.gz) = 82558 --Boundary-00=_zSqlAmBgpX+VFZT Content-Type: text/x-diff; charset="us-ascii"; name="patch-smbnt" Content-Transfer-Encoding: 7bit Content-Description: Use OpenSSL's DES_* and MD4_* functions Content-Disposition: attachment; filename="patch-smbnt" --- configure Thu Nov 20 10:45:28 2003 +++ configure Mon May 3 15:14:26 2004 @@ -26,5 +26,5 @@ LIBDIRS=`cat /etc/ld.so.conf 2> /dev/null` PREFIX=`echo "$1"|sed 's/.*--prefix=//'` -LIBDES="" +LIBDES=" " echo --- hydra-smbnt.c Fri Dec 12 03:47:16 2003 +++ hydra-smbnt.c Mon May 3 15:19:09 2004 @@ -5,6 +5,7 @@ } #else -#include "md4.h" -#include +#include +#include +#include /* @@ -132,7 +132,7 @@ unicodePassword[i * 2] = (u_char)pass[i]; - MD4Init(&md4Context); - MD4Update(&md4Context, unicodePassword, mdlen); - MD4Final(hash, &md4Context); /* Tell MD4 we're done */ + MD4_Init(&md4Context); + MD4_Update(&md4Context, unicodePassword, mdlen); + MD4_Final(hash, &md4Context); /* Tell MD4 we're done */ } --Boundary-00=_zSqlAmBgpX+VFZT Content-Type: text/x-diff; charset="us-ascii"; name="patch-printf" Content-Transfer-Encoding: 7bit Content-Description: fix printf-related warnings Content-Disposition: attachment; filename="patch-printf" --- hydra.c Fri Apr 16 11:37:13 2004 +++ hydra.c Mon May 3 15:43:51 2004 @@ -215,5 +215,5 @@ return; - printf("[DEBUG] Code: %s Time: %lu\n", string, time(NULL)); + printf("[DEBUG] Code: %s Time: %lu\n", string, (long unsigned)time(NULL)); printf("[DEBUG] Options: mode %d ssl %d restore %d showAttempt %d tasks %d tnp %d tpsal %d exit_found %d miscptr %s service %s\n", hydra_options.mode, hydra_options.ssl, hydra_options.restore, hydra_options.showAttempt, hydra_options.tasks, @@ -1608,5 +1608,5 @@ if ((hydra_brains.todo_all - hydra_brains.sent) / (hydra_brains.sent / (elapsed_status - starttime)) < 150) status_print = 59; - printf("[STATUS] %.2f tries/min, %lu tries in %02lu:%02luh, %lu todo in %02lu:%02luh\n", + printf("[STATUS] %.2f tries/min, %lu tries in %02d:%02dh, %lu todo in %02lu:%02luh\n", (1.0 * hydra_brains.sent) / (((elapsed_status - starttime) * 1.0) / 60), hydra_brains.sent, (elapsed_status - starttime) / 3600, ((elapsed_status - starttime) % 3600) / 60, hydra_brains.todo_all - hydra_brains.sent, --Boundary-00=_zSqlAmBgpX+VFZT--