diff options
| author | bad <bad@pkgsrc.org> | 2008-10-30 14:52:14 +0000 |
|---|---|---|
| committer | bad <bad@pkgsrc.org> | 2008-10-30 14:52:14 +0000 |
| commit | c67f903d999a72ef736645658bde5b7e1d81d58c (patch) | |
| tree | 297401442a8688dca77919c1fd7879d4be3ac691 /security/hydra | |
| parent | c4a6a95b415ceff226ebf5aa2fc736f5bf616281 (diff) | |
| download | pkgsrc-c67f903d999a72ef736645658bde5b7e1d81d58c.tar.gz | |
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.
Diffstat (limited to 'security/hydra')
| -rw-r--r-- | security/hydra/Makefile | 4 | ||||
| -rw-r--r-- | security/hydra/distinfo | 3 | ||||
| -rw-r--r-- | security/hydra/patches/patch-ae | 48 |
3 files changed, 52 insertions, 3 deletions
diff --git a/security/hydra/Makefile b/security/hydra/Makefile index c195e8897c9..130b4f947da 100644 --- a/security/hydra/Makefile +++ b/security/hydra/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.19 2008/10/30 14:49:41 bad Exp $ +# $NetBSD: Makefile,v 1.20 2008/10/30 14:52:14 bad Exp $ # DISTNAME= ${PKGNAME_NOREV}-src PKGNAME= hydra-5.4 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= security MASTER_SITES= http://freeworld.thc.org/releases/ diff --git a/security/hydra/distinfo b/security/hydra/distinfo index db42c7bc1dc..620024703e2 100644 --- a/security/hydra/distinfo +++ b/security/hydra/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2008/08/31 10:54:52 adrianp Exp $ +$NetBSD: distinfo,v 1.9 2008/10/30 14:52:14 bad Exp $ SHA1 (hydra-5.4-src.tar.gz) = 2134092c7b64132c080b6b1ba155124b885767db RMD160 (hydra-5.4-src.tar.gz) = e3b4b98250394945dc5a8bfe234302de793db014 @@ -7,5 +7,6 @@ SHA1 (patch-aa) = 7e28e9143cd78d49d4f28b77e4bdf554f001caa5 SHA1 (patch-ab) = ed44b46422063b4cb31bbccfb66ed54559495727 SHA1 (patch-ac) = ade8ea964018dc7034154a35338f50361b5185f8 SHA1 (patch-ad) = 3734123af4511161eee93f624b1b9dd575be0ae7 +SHA1 (patch-ae) = eb6f4ecea7fab5119fcd90d08b2681d0e6921a97 SHA1 (patch-af) = 90c24ad7df23f2be23d08b646d68c93846c7618b SHA1 (patch-ag) = 1837595ef533b657c88449aa5a241ddf4570b149 diff --git a/security/hydra/patches/patch-ae b/security/hydra/patches/patch-ae new file mode 100644 index 00000000000..5e863ea26be --- /dev/null +++ b/security/hydra/patches/patch-ae @@ -0,0 +1,48 @@ +$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"); |