Thu Oct 30 14:52:14 2008 UTC ()
Fix hydra-gtk/src/callbacks.c to put server and service last on the
command line as hydra(1) expects.  Makes xhydra work again.
Bump PKGREVISION.


(bad)
diff -r1.19 -r1.20 pkgsrc/security/hydra/Makefile
diff -r1.8 -r1.9 pkgsrc/security/hydra/distinfo
diff -r0 -r1.3 pkgsrc/security/hydra/patches/patch-ae
cvs diff -r1.19 -r1.20 pkgsrc/security/hydra/Makefile (expand / switch to unified diff)

--- pkgsrc/security/hydra/Makefile 2008/10/30 14:49:41 1.19
+++ pkgsrc/security/hydra/Makefile 2008/10/30 14:52:14 1.20
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.19 2008/10/30 14:49:41 bad Exp $ 1# $NetBSD: Makefile,v 1.20 2008/10/30 14:52:14 bad Exp $
2# 2#
3 3
4DISTNAME= ${PKGNAME_NOREV}-src 4DISTNAME= ${PKGNAME_NOREV}-src
5PKGNAME= hydra-5.4 5PKGNAME= hydra-5.4
6PKGREVISION= 1 6PKGREVISION= 2
7CATEGORIES= security 7CATEGORIES= security
8MASTER_SITES= http://freeworld.thc.org/releases/ 8MASTER_SITES= http://freeworld.thc.org/releases/
9 9
10MAINTAINER= adrianp@NetBSD.org 10MAINTAINER= adrianp@NetBSD.org
11HOMEPAGE= http://freeworld.thc.org/thc-hydra/ 11HOMEPAGE= http://freeworld.thc.org/thc-hydra/
12COMMENT= Login password cracker 12COMMENT= Login password cracker
13 13
14.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
15 15
16USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
17GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
18BUILD_TARGET= all 18BUILD_TARGET= all
19WRKSRC= ${WRKDIR}/${DISTNAME} 19WRKSRC= ${WRKDIR}/${DISTNAME}
cvs diff -r1.8 -r1.9 pkgsrc/security/hydra/distinfo (expand / switch to unified diff)

--- pkgsrc/security/hydra/distinfo 2008/08/31 10:54:52 1.8
+++ pkgsrc/security/hydra/distinfo 2008/10/30 14:52:14 1.9
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.8 2008/08/31 10:54:52 adrianp Exp $ 1$NetBSD: distinfo,v 1.9 2008/10/30 14:52:14 bad Exp $
2 2
3SHA1 (hydra-5.4-src.tar.gz) = 2134092c7b64132c080b6b1ba155124b885767db 3SHA1 (hydra-5.4-src.tar.gz) = 2134092c7b64132c080b6b1ba155124b885767db
4RMD160 (hydra-5.4-src.tar.gz) = e3b4b98250394945dc5a8bfe234302de793db014 4RMD160 (hydra-5.4-src.tar.gz) = e3b4b98250394945dc5a8bfe234302de793db014
5Size (hydra-5.4-src.tar.gz) = 208272 bytes 5Size (hydra-5.4-src.tar.gz) = 208272 bytes
6SHA1 (patch-aa) = 7e28e9143cd78d49d4f28b77e4bdf554f001caa5 6SHA1 (patch-aa) = 7e28e9143cd78d49d4f28b77e4bdf554f001caa5
7SHA1 (patch-ab) = ed44b46422063b4cb31bbccfb66ed54559495727 7SHA1 (patch-ab) = ed44b46422063b4cb31bbccfb66ed54559495727
8SHA1 (patch-ac) = ade8ea964018dc7034154a35338f50361b5185f8 8SHA1 (patch-ac) = ade8ea964018dc7034154a35338f50361b5185f8
9SHA1 (patch-ad) = 3734123af4511161eee93f624b1b9dd575be0ae7 9SHA1 (patch-ad) = 3734123af4511161eee93f624b1b9dd575be0ae7
 10SHA1 (patch-ae) = eb6f4ecea7fab5119fcd90d08b2681d0e6921a97
10SHA1 (patch-af) = 90c24ad7df23f2be23d08b646d68c93846c7618b 11SHA1 (patch-af) = 90c24ad7df23f2be23d08b646d68c93846c7618b
11SHA1 (patch-ag) = 1837595ef533b657c88449aa5a241ddf4570b149 12SHA1 (patch-ag) = 1837595ef533b657c88449aa5a241ddf4570b149
File Added: pkgsrc/security/hydra/patches/Attic/patch-ae
$NetBSD: patch-ae,v 1.3 2008/10/30 14:52:14 bad Exp $

--- hydra-gtk/src/callbacks.c.orig	2005-09-22 17:19:27.000000000 +0200
+++ hydra-gtk/src/callbacks.c	2008-10-30 14:05:58.000000000 +0100
@@ -69,21 +69,6 @@
 
 	options[0] = HYDRA_BIN;
 
-	/* get the target, or target list */
-	widget = lookup_widget(GTK_WIDGET(wndMain), "radioTarget1");
-	if ( gtk_toggle_button_get_active((GtkToggleButton *) widget) ){	
-		widget = lookup_widget(GTK_WIDGET(wndMain), "entTarget");
-		options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
-	} else {
-		options[i++] = "-M";
-		widget = lookup_widget(GTK_WIDGET(wndMain), "entTargetFile");
-		options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
-	}
-
-	/* get the service */
-	widget = lookup_widget(GTK_WIDGET(wndMain), "entProtocol");
-	options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
-	
 	/* get the port */
 	widget = lookup_widget(GTK_WIDGET(wndMain), "spnPort");
 	j = gtk_spin_button_get_value_as_int((GtkSpinButton *) widget);
@@ -284,6 +269,21 @@
 		}
 	}
 
+	/* lastly, get the target, or target list */
+	widget = lookup_widget(GTK_WIDGET(wndMain), "radioTarget1");
+	if ( gtk_toggle_button_get_active((GtkToggleButton *) widget) ){	
+		widget = lookup_widget(GTK_WIDGET(wndMain), "entTarget");
+		options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
+	} else {
+		options[i++] = "-M";
+		widget = lookup_widget(GTK_WIDGET(wndMain), "entTargetFile");
+		options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
+	}
+
+	/* get the service */
+	widget = lookup_widget(GTK_WIDGET(wndMain), "entProtocol");
+	options[i++] = (char *) gtk_entry_get_text((GtkEntry *) widget);
+	
 	/* clean up proxy settings */
 	unsetenv("HYDRA_PROXY_HTTP");
 	unsetenv("HYDRA_PROXY_CONNECT");