Index: head/security/hydra/Makefile =================================================================== --- head/security/hydra/Makefile (revision 420627) +++ head/security/hydra/Makefile (revision 420628) @@ -1,55 +1,55 @@ # Created by: Laurent LEVIER # $FreeBSD$ PORTNAME= hydra -PORTVERSION= 8.2 +PORTVERSION= 8.3 CATEGORIES= security MASTER_SITES= https://www.thc.org/releases/ \ PACKETSTORM/groups/thc/ MAINTAINER= rm@FreeBSD.org COMMENT= Brute force attack utility working on multiple network services LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libidn.so:dns/libidn \ libpcre.so:devel/pcre \ libsasl2.so:security/cyrus-sasl2 CONFLICTS_INSTALL= hydra-web-[0-9]* PLIST_FILES= bin/hydra bin/pw-inspector bin/dpl4hydra.sh bin/hydra-wizard.sh \ man/man1/hydra.1.gz man/man1/pw-inspector.1.gz GNU_CONFIGURE= yes USES= gmake localbase ssl OPTIONS_DEFINE= FIREBIRD SSH SVN X11 OPTIONS_DEFAULT=SSH OPTIONS_EXCLUDE=NLS DOCS FIREBIRD_USES= firebird SVN_LIB_DEPENDS= libsvn_client-1.so:devel/subversion SSH_LIB_DEPENDS= libssh.so.4:security/libssh X11_USES= gettext pkgconfig X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 X11_USE= gnome=atk,cairo,gdkpixbuf2,glib20,gtk20,pango X11_PLIST_FILES= bin/xhydra man/man1/xhydra.1.gz post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|CC=gcc||; s|-O3|${CFLAGS}|;' \ ${WRKSRC}/Makefile.am ${WRKSRC}/Makefile.unix do-install: ${INSTALL_PROGRAM} ${WRKSRC}/hydra ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/pw-inspector ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/dpl4hydra.sh ${STAGEDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/hydra-wizard.sh ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/hydra.1 ${STAGEDIR}${MANPREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/pw-inspector.1 ${STAGEDIR}${MANPREFIX}/man/man1 post-install-X11-on: ${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/xhydra.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include Index: head/security/hydra/distinfo =================================================================== --- head/security/hydra/distinfo (revision 420627) +++ head/security/hydra/distinfo (revision 420628) @@ -1,3 +1,3 @@ -TIMESTAMP = 1469203290 -SHA256 (hydra-8.2.tar.gz) = 9e88496aca1d7ee94410cf3e3d87bc8cbaa91e37fd5ef700cab2f55ce92b4ac4 -SIZE (hydra-8.2.tar.gz) = 578596 +TIMESTAMP = 1471866771 +SHA256 (hydra-8.3.tar.gz) = b94ee47254e01a8c18be38eae8b953bfe4f734db60cafd1054b3316419b1687d +SIZE (hydra-8.3.tar.gz) = 1136387 Index: head/security/hydra/files/patch-fix-libressl-build =================================================================== --- head/security/hydra/files/patch-fix-libressl-build (revision 420627) +++ head/security/hydra/files/patch-fix-libressl-build (nonexistent) @@ -1,92 +0,0 @@ -From ae324d6544e36251dedda0c5e20049d04eab776e Mon Sep 17 00:00:00 2001 -From: Bernard Spil -Date: Thu, 12 Mar 2015 08:57:57 +0100 -Subject: [PATCH] Replace deprecated des_ and fix LibreSSL build - -uses deprecated des_ methods and types that were marked deprecated by -OpenSSL 0.9.7 and will be removed in OpenSSL 1.1.0 . This patch replaces -the des_ methods and types with their new DES_ counterparts. This -enables building with LibreSSL as OpenSSL library. ---- - hydra-oracle-listener.c | 10 +++++----- - hydra-smb.c | 10 +++++----- - hydra-snmp.c | 4 ++-- - 3 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/hydra-oracle-listener.c b/hydra-oracle-listener.c -index 242bd61..6636705 100644 ---- hydra-oracle-listener.c -+++ hydra-oracle-listener.c -@@ -106,7 +106,7 @@ int convert_byteorder(unsigned char **result, int size) { - int ora_descrypt(unsigned char **rs, unsigned char *result, int siz) { - int i = 0; - char lastkey[8]; -- des_key_schedule ks1; -+ DES_key_schedule ks1; - unsigned char key1[8] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF }; - unsigned char ivec1[] = { 0, 0, 0, 0, 0, 0, 0, 0 }; - unsigned char *desresult; -@@ -116,17 +116,17 @@ int ora_descrypt(unsigned char **rs, unsigned char *result, int siz) { - hydra_report(stderr, "[ERROR] Can't allocate memory\n"); - return 1; - } -- des_key_sched((C_Block *) key1, ks1); -- des_ncbc_encrypt(result, desresult, siz, ks1, &ivec1, DES_ENCRYPT); -+ DES_key_sched((DES_cblock *) key1, &ks1); -+ DES_ncbc_encrypt(result, desresult, siz, &ks1, &ivec1, DES_ENCRYPT); - - for (i = 0; i < 8; i++) { - lastkey[i] = desresult[siz - 8 + i]; - } - -- des_key_sched((C_Block *) lastkey, ks1); -+ DES_key_sched((DES_cblock *) lastkey, &ks1); - memset(desresult, 0, siz); - memset(ivec1, 0, sizeof(ivec1)); -- des_ncbc_encrypt(result, desresult, siz, ks1, &ivec1, DES_ENCRYPT); -+ DES_ncbc_encrypt(result, desresult, siz, &ks1, &ivec1, DES_ENCRYPT); - - if ((*rs = malloc(siz)) == NULL) { - hydra_report(stderr, "[ERROR] Can't allocate memory\n"); -diff --git a/hydra-smb.c b/hydra-smb.c -index 0d6fb2e..2d9ee7f 100644 ---- hydra-smb.c -+++ hydra-smb.c -@@ -176,17 +176,17 @@ static void MakeKey(unsigned char *key, unsigned char *des_key) { - des_key[6] = Get7Bits(key, 42); - des_key[7] = Get7Bits(key, 49); - -- des_set_odd_parity((des_cblock *) des_key); -+ DES_set_odd_parity((DES_cblock *) des_key); - } - - /* Do the DesEncryption */ - void DesEncrypt(unsigned char *clear, unsigned char *key, unsigned char *cipher) { -- des_cblock des_key; -- des_key_schedule key_schedule; -+ DES_cblock des_key; -+ DES_key_schedule key_schedule; - - MakeKey(key, des_key); -- des_set_key(&des_key, key_schedule); -- des_ecb_encrypt((des_cblock *) clear, (des_cblock *) cipher, key_schedule, 1); -+ DES_set_key(&des_key, &key_schedule); -+ DES_ecb_encrypt((DES_cblock *) clear, (DES_cblock *) cipher, &key_schedule, 1); - } - - /* -diff --git a/hydra-snmp.c b/hydra-snmp.c -index 5649bb7..21ada7f 100644 ---- hydra-snmp.c -+++ hydra-snmp.c -@@ -335,8 +335,8 @@ int start_snmp(int s, char *ip, int port, unsigned char options, char *miscptr, - // xor initVect with salt - for (i = 0; i < 8; i++) - initVect[i] ^= privacy_params[i]; -- des_key_sched((C_Block *) key, symcbc); -- des_ncbc_encrypt(snmpv3_get2 + 2, buf, sizeof(snmpv3_get2) - 2, symcbc, (C_Block *) (initVect), DES_ENCRYPT); -+ DES_key_sched((DES_cblock *) key, &symcbc); -+ DES_ncbc_encrypt(snmpv3_get2 + 2, buf, sizeof(snmpv3_get2) - 2, &symcbc, (DES_cblock *) (initVect), DES_ENCRYPT); - - #endif - Property changes on: head/security/hydra/files/patch-fix-libressl-build ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/hydra/files/patch-configure =================================================================== --- head/security/hydra/files/patch-configure (revision 420627) +++ head/security/hydra/files/patch-configure (revision 420628) @@ -1,21 +1,21 @@ ---- configure.orig 2016-06-16 14:57:15 UTC +--- configure.orig 2016-08-11 07:50:21 UTC +++ configure @@ -1009,7 +1009,7 @@ XLIBPATHS="" XIPATHS="" if [ -n "$FIREBIRD_PATH" -o -n "$PCRE_PATH" -o -n "$IDN_PATH" -o -n "$SSL_PATH" -o -n "$CRYPTO_PATH" -o -n "$NSL_PATH" -o -n "$SOCKET_PATH" -o -n "$RESOLV_PATH" -o -n "$SAPR3_PATH" -o -n "$SSH_PATH" -o -n "$POSTGRES_PATH" -o -n "$SVN_PATH" -o -n "$NCP_PATH" -o -n "$CURSES_PATH" -o -n "$ORACLE_PATH" -o -n "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then - XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib" + XLIBPATHS="-L/usr/local/lib -L/usr/lib -L/lib" fi if [ -n "$MYSQL_IPATH" ]; then XIPATHS="$XIPATHS -I$MYSQL_IPATH" @@ -1024,6 +1024,9 @@ if [ -n "$SSL_PATH" ]; then XDEFINES="$XDEFINES -DLIBOPENSSL" fi fi +if [ -d $PREFIX/include ];then + XIPATHS="$XIPATHS -I$PREFIX/include" +fi if [ -n "$CURSES_PATH" ]; then XDEFINES="$XDEFINES -DLIBNCURSES" fi Index: head/security/hydra/files/patch-hydra-gtk-make_xhydra.sh =================================================================== --- head/security/hydra/files/patch-hydra-gtk-make_xhydra.sh (revision 420627) +++ head/security/hydra/files/patch-hydra-gtk-make_xhydra.sh (revision 420628) @@ -1,11 +1,11 @@ ---- hydra-gtk/make_xhydra.sh.orig 2016-06-16 14:57:15 UTC +--- hydra-gtk/make_xhydra.sh.orig 2016-08-11 07:50:21 UTC +++ hydra-gtk/make_xhydra.sh @@ -8,7 +8,7 @@ test -e Makefile || { cat errors exit 1 } -make > /dev/null 2> errors +gmake > /dev/null 2> errors test -e src/xhydra || { echo "Error: could not compile. Analyse this:" cat errors