- Update to 6.4

PR:		157996
Submitted by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru> (maintainer)

3 files changed, 3 insertions, 89 deletions

diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index a87ce52228c6..108c8f70a665 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	hydra
-PORTVERSION=	6.3
+PORTVERSION=	6.4
 CATEGORIES=	security
 MASTER_SITES=	http://freeworld.thc.org/releases/
 EXTRACT_SUFX=	-src.tar.gz
diff --git a/security/hydra/distinfo b/security/hydra/distinfo
index 1255d99b260b..a2ffe0105a6a 100644
--- a/security/hydra/distinfo
+++ b/security/hydra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hydra-6.3-src.tar.gz) = bd5bc70b70640984fb2f18a9742c10b9a0edf1ebaf0f8dd32da589d34defd424
-SIZE (hydra-6.3-src.tar.gz) = 473265
+SHA256 (hydra-6.4-src.tar.gz) = 21abade4b39ab816dfb53b578163d678cfe176749cb13f80dc71d08fbac66d8f
+SIZE (hydra-6.4-src.tar.gz) = 501251
diff --git a/security/hydra/files/patch-hydra-gtk-src_callbacks.c b/security/hydra/files/patch-hydra-gtk-src_callbacks.c
deleted file mode 100644
index 3eb631ca984a..000000000000
--- a/security/hydra/files/patch-hydra-gtk-src_callbacks.c
+++ /dev/null
@@ -1,86 +0,0 @@
---- hydra-gtk/src/callbacks.c.orig	2011-04-30 22:28:12.000000000 +0400
-+++ hydra-gtk/src/callbacks.c	2011-05-31 21:02:22.000000000 +0400
-@@ -71,21 +71,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);
-@@ -325,6 +310,21 @@
-     }
-   }
- 
-+  /* 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);
-+
-   options[i] = NULL;
-   return i;
- }
-@@ -495,8 +495,8 @@
-   -1, -1};
-   static int *pfd = NULL;
- 
--  hydra_pid = 0;
-   char *options[128];
-+  hydra_pid = 0;
- 
-   update_statusbar();
- 
-@@ -517,6 +517,7 @@
-     g_warning("popen_rw_unbuffered: Error forking!");
-     return NULL;
-   } else if (hydra_pid == 0) {  /* child */
-+    int k;
-     if (setpgid(getpid(), getpid()) < 0)
-       g_warning("popen_rw_unbuffered: setpgid() failed");
-     if (close(p_r[0]) < 0)
-@@ -540,8 +541,7 @@
-     execv(HYDRA_BIN, options);
- 
-     g_warning("%s %i: popen_rw_unbuffered: execv() returned", __FILE__, __LINE__);
--    int k;
--
-+    
-     for (k = 0; options[k] != NULL; k++) {
-       g_warning("%s", options[k]);
-     }
-@@ -667,8 +667,9 @@
- 
- void
- on_chkColon_toggled(GtkToggleButton * togglebutton, gpointer user_data) {
--  GtkWidget *user = lookup_widget(GTK_WIDGET(wndMain), "frmUsername");;
--  GtkWidget *pass = lookup_widget(GTK_WIDGET(wndMain), "frmPass");
-+  GtkWidget *user, *pass;
-+  user =  lookup_widget(GTK_WIDGET(wndMain), "frmUsername");
-+  pass =  lookup_widget(GTK_WIDGET(wndMain), "frmPass");
- 
-   if (gtk_toggle_button_get_active(togglebutton)) {
-     gtk_widget_set_sensitive(user, FALSE);