[pkgsrc/trunk]: pkgsrc/security/hydra Fix hydra-gtk/src/callbacks.c to put se...

[bad <bad%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f9c34f88cf60
branches:  trunk
changeset: 549255:f9c34f88cf60
user:      bad <bad%pkgsrc.org@localhost>
date:      Thu Oct 30 14:52:14 2008 +0000

description:
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:

 security/hydra/Makefile         |   4 +-
 security/hydra/distinfo         |   3 +-
 security/hydra/patches/patch-ae |  48 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diffs (83 lines):

diff -r ea8b27a98fde -r f9c34f88cf60 security/hydra/Makefile
--- a/security/hydra/Makefile   Thu Oct 30 14:49:41 2008 +0000
+++ b/security/hydra/Makefile   Thu Oct 30 14:52:14 2008 +0000
@@ -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 -r ea8b27a98fde -r f9c34f88cf60 security/hydra/distinfo
--- a/security/hydra/distinfo   Thu Oct 30 14:49:41 2008 +0000
+++ b/security/hydra/distinfo   Thu Oct 30 14:52:14 2008 +0000
@@ -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-ab) = ed44b46422063b4cb31bbccfb66ed54559495727
 SHA1 (patch-ac) = ade8ea964018dc7034154a35338f50361b5185f8
 SHA1 (patch-ad) = 3734123af4511161eee93f624b1b9dd575be0ae7
+SHA1 (patch-ae) = eb6f4ecea7fab5119fcd90d08b2681d0e6921a97
 SHA1 (patch-af) = 90c24ad7df23f2be23d08b646d68c93846c7618b
 SHA1 (patch-ag) = 1837595ef533b657c88449aa5a241ddf4570b149
diff -r ea8b27a98fde -r f9c34f88cf60 security/hydra/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/hydra/patches/patch-ae   Thu Oct 30 14:52:14 2008 +0000
@@ -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");