From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 20 10:40:08 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB51B106566C for ; Sun, 20 Feb 2011 10:40:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9E6B28FC16 for ; Sun, 20 Feb 2011 10:40:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p1KAe8Pe066984 for ; Sun, 20 Feb 2011 10:40:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1KAe8KK066983; Sun, 20 Feb 2011 10:40:08 GMT (envelope-from gnats) Resent-Date: Sun, 20 Feb 2011 10:40:08 GMT Resent-Message-Id: <201102201040.p1KAe8KK066983@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ruslan Mahmatkhanov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 12B981065672 for ; Sun, 20 Feb 2011 10:31:36 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id E9E258FC1B for ; Sun, 20 Feb 2011 10:31:35 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p1KAVZJS061272 for ; Sun, 20 Feb 2011 10:31:35 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p1KAVZ1J061271; Sun, 20 Feb 2011 10:31:35 GMT (envelope-from nobody) Message-Id: <201102201031.p1KAVZ1J061271@red.freebsd.org> Date: Sun, 20 Feb 2011 10:31:35 GMT From: Ruslan Mahmatkhanov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/154905: [UPDATE] security/hydra: update to 6.1 [feature safe] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 10:40:08 -0000 >Number: 154905 >Category: ports >Synopsis: [UPDATE] security/hydra: update to 6.1 [feature safe] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Feb 20 10:40:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 8.2-PRERELEASE >Organization: >Environment: 8.2-PRERELEASE i386 >Description: - update to 6.1 changelog is here: http://www.thc.org/thc-hydra/ - remove unneeded files/patch-Makefile.am - build and install xhydra only if WITH_X11 is defined - add WITH_X11 option, default off >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruNa hydra.orig/Makefile hydra/Makefile --- hydra.orig/Makefile 2010-12-27 23:32:24.000000000 +0300 +++ hydra/Makefile 2011-02-20 13:17:10.000000000 +0300 @@ -7,10 +7,9 @@ # PORTNAME= hydra -PORTVERSION= 5.9 +PORTVERSION= 6.1 CATEGORIES= security MASTER_SITES= http://freeworld.thc.org/releases/ -MASTER_SITE_SUBDIR= groups/thc EXTRACT_SUFX= -src.tar.gz MAINTAINER= llevier@argosnet.com @@ -19,16 +18,17 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE NO_LATEST_LINK= yes -PLIST_FILES= bin/hydra bin/xhydra +PLIST_FILES= bin/hydra GNU_CONFIGURE= yes USE_GMAKE= yes -USE_GNOME= gtk20 USE_OPENSSL= yes +WANT_GNOME= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src OPTIONS= FIREBIRD "Enable firebird support" off \ SSH "Enable ssh support" off \ - SVN "Enable subversion support" off + SVN "Enable subversion support" off \ + X11 "Install xhydra" off .include @@ -42,12 +42,22 @@ LIB_DEPENDS+= svn_client-1:${PORTSDIR}/devel/subversion .endif +.if defined(WITH_X11) +USE_GNOME= gtk20 +PLIST_FILES+= bin/xhydra +.else +CONFIGURE_ARGS+= --disable-xhydra +.endif + post-patch: @${REINPLACE_CMD} -e 's|CC = gcc||; \ s|-O2|${CFLAGS}|; s|md4\..||g' \ ${WRKSRC}/Makefile.am do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/hydra ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/hydra ${PREFIX}/bin +.if defined(WITH_X11) + @${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin +.endif .include diff -ruNa hydra.orig/distinfo hydra/distinfo --- hydra.orig/distinfo 2010-12-27 23:32:24.000000000 +0300 +++ hydra/distinfo 2011-02-20 12:45:38.000000000 +0300 @@ -1,2 +1,2 @@ -SHA256 (hydra-5.9-src.tar.gz) = 66023f94460abe76e76c1c6b187d44e82bafafb4c517314261bbd34429f913a7 -SIZE (hydra-5.9-src.tar.gz) = 423995 +SHA256 (hydra-6.1-src.tar.gz) = 85fbcf53bc7d8ae99a8bd31dd09810abd9cf9397679a94aea52cd1b1c8e06ac0 +SIZE (hydra-6.1-src.tar.gz) = 432515 diff -ruNa hydra.orig/files/patch-Makefile.am hydra/files/patch-Makefile.am --- hydra.orig/files/patch-Makefile.am 2010-11-08 21:45:02.000000000 +0300 +++ hydra/files/patch-Makefile.am 1970-01-01 03:00:00.000000000 +0300 @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2010-09-29 15:19:43.000000000 +0400 -+++ Makefile.am 2010-10-24 22:35:49.000000000 +0400 -@@ -45,7 +45,7 @@ - @echo - - xhydra: -- -cd hydra-gtk && ./make_xhydra.sh -+ -cd hydra-gtk && sh make_xhydra.sh - - pw-inspector: pw-inspector.c - -$(CC) $(OPTS) -o pw-inspector pw-inspector.c >Release-Note: >Audit-Trail: >Unformatted: