Attachment #115684 for bug #157468

View | Details | Raw Unified | Return to bug 157468
Collapse All | Expand All

Lines 7-13 Link Here

(-)hydra/Makefile (-2 / +2 lines)
7	#	7	#
8		8
9	PORTNAME= hydra	9	PORTNAME= hydra
10	PORTVERSION= 6.2	10	PORTVERSION= 6.3
11	CATEGORIES= security	11	CATEGORIES= security
12	MASTER_SITES= http://freeworld.thc.org/releases/	12	MASTER_SITES= http://freeworld.thc.org/releases/
13	EXTRACT_SUFX= -src.tar.gz	13	EXTRACT_SUFX= -src.tar.gz
Lines 45-51 Link Here
45	.endif	45	.endif
46		46
47	.if defined(WITH_X11)	47	.if defined(WITH_X11)
48	USE_GNOME= gtk20	48	USE_GNOME= gtk20 pkgconfig
49	PLIST_FILES+= bin/xhydra	49	PLIST_FILES+= bin/xhydra
50	MAN1+= xhydra.1	50	MAN1+= xhydra.1
51	.else	51	.else

Lines 1-2 Link Here

(-)hydra/distinfo (-2 / +2 lines)
1	SHA256 (hydra-6.2-src.tar.gz) = 0b340632db9d429eb3c32a592a51f7333feda0fe682229c2027ae445a1e3f54e	1	SHA256 (hydra-6.3-src.tar.gz) = bd5bc70b70640984fb2f18a9742c10b9a0edf1ebaf0f8dd32da589d34defd424
2	SIZE (hydra-6.2-src.tar.gz) = 452626	2	SIZE (hydra-6.3-src.tar.gz) = 473265

Lines 1-9 Link Here

(-)hydra/files/patch-configure (-4 / +4 lines)
1	--- configure.orig 2011-04-07 12:54:49.000000000 +0400	1	--- configure.orig 2011-04-30 22:28:12.000000000 +0400
2	+++ configure 2011-04-15 02:18:31.000000000 +0400	2	+++ configure 2011-05-31 20:22:25.000000000 +0400
3	@@ -561,7 +561,7 @@	3	@@ -653,7 +653,7 @@
4	XIPATHS=""	4	XIPATHS=""
5		5
6	if [ -n "$FIREBIRD_PATH" -o -n "$PCRE_PATH" -o -n "$IDN_PATH" -o -n "$SSL_PATH" -o -n "$CRYPTO_PATH" -o -n "$NSL_PATH" -o -n "$SOCKET_PATH" -o -n "$RESOLV_PATH" -o -n "$SAPR3_PATH" -o -n "$SSH_PATH" -o -n "$POSTGRES_PATH" -o -n "$SVN_PATH" -o -n "$NCP_PATH" -o -n "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then	6	if [ -n "$FIREBIRD_PATH" -o -n "$PCRE_PATH" -o -n "$IDN_PATH" -o -n "$SSL_PATH" -o -n "$CRYPTO_PATH" -o -n "$NSL_PATH" -o -n "$SOCKET_PATH" -o -n "$RESOLV_PATH" -o -n "$SAPR3_PATH" -o -n "$SSH_PATH" -o -n "$POSTGRES_PATH" -o -n "$SVN_PATH" -o -n "$NCP_PATH" -o -n "$ORACLE_PATH" -o -n "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then
7	- XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"	7	- XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"
8	+ XLIBPATHS="-L/usr/local/lib -L/usr/lib -L/lib"	8	+ XLIBPATHS="-L/usr/local/lib -L/usr/lib -L/lib"
9	fi	9	fi




--- hydra-gtk/src/callbacks.c.realorig	Tue Jun  8 00:33:18 2004
+++ hydra-gtk/src/callbacks.c	Sat May 21 14:20:53 2005
@@ -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);
@@ -307,6 +292,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;
 }
@@ -472,8 +472,8 @@
 int *popen_re_unbuffered(char *command) {
 	static int p_r[2] = {-1, -1}, p_e[2] = {-1, -1};
 	static int *pfd = NULL;
-	hydra_pid = 0;
 	char *options[128];
+	hydra_pid = 0;
 
 	update_statusbar();
 
@@ -494,6 +494,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)
@@ -517,7 +518,6 @@
 		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(options[k]);
 		}
@@ -669,8 +669,9 @@
 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);




--- 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);

Return to bug 157468

Lines 1-84 Link Here

(-)hydra/files/patch-hydra-gtk-src-callbacks.c (-84 lines)
1	--- hydra-gtk/src/callbacks.c.realorig Tue Jun 8 00:33:18 2004
2	+++ hydra-gtk/src/callbacks.c Sat May 21 14:20:53 2005
3	@@ -69,21 +69,6 @@
4
5	options[0] = HYDRA_BIN;
6
7	- /* get the target, or target list */
8	- widget = lookup_widget(GTK_WIDGET(wndMain), "radioTarget1");
9	- if ( gtk_toggle_button_get_active((GtkToggleButton *) widget) ){
10	- widget = lookup_widget(GTK_WIDGET(wndMain), "entTarget");
11	- options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
12	- } else {
13	- options[i++] = "-M";
14	- widget = lookup_widget(GTK_WIDGET(wndMain), "entTargetFile");
15	- options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
16	- }
17	-
18	- /* get the service */
19	- widget = lookup_widget(GTK_WIDGET(wndMain), "entProtocol");
20	- options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
21	-
22	/* get the port */
23	widget = lookup_widget(GTK_WIDGET(wndMain), "spnPort");
24	j = gtk_spin_button_get_value_as_int((GtkSpinButton *) widget);
25	@@ -307,6 +292,21 @@
26	}
27	}
28
29	+ /* get the target, or target list */
30	+ widget = lookup_widget(GTK_WIDGET(wndMain), "radioTarget1");
31	+ if ( gtk_toggle_button_get_active((GtkToggleButton *) widget) ){
32	+ widget = lookup_widget(GTK_WIDGET(wndMain), "entTarget");
33	+ options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
34	+ } else {
35	+ options[i++] = "-M";
36	+ widget = lookup_widget(GTK_WIDGET(wndMain), "entTargetFile");
37	+ options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
38	+ }
39	+
40	+ /* get the service */
41	+ widget = lookup_widget(GTK_WIDGET(wndMain), "entProtocol");
42	+ options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
43	+
44	options[i] = NULL;
45	return i;
46	}
47	@@ -472,8 +472,8 @@
48	int popen_re_unbuffered(char command) {
49	static int p_r[2] = {-1, -1}, p_e[2] = {-1, -1};
50	static int *pfd = NULL;
51	- hydra_pid = 0;
52	char *options[128];
53	+ hydra_pid = 0;
54
55	update_statusbar();
56
57	@@ -494,6 +494,7 @@
58	g_warning("popen_rw_unbuffered: Error forking!");
59	return NULL;
60	} else if (hydra_pid == 0) { /* child */
61	+ int k;
62	if (setpgid(getpid(), getpid()) < 0)
63	g_warning("popen_rw_unbuffered: setpgid() failed");
64	if (close(p_r[0]) < 0)
65	@@ -517,7 +518,6 @@
66	execv(HYDRA_BIN, options);
67
68	g_warning("%s %i: popen_rw_unbuffered: execv() returned", __FILE__, __LINE__);
69	- int k;
70	for ( k = 0; options[k] != NULL; k++ ){
71	g_warning(options[k]);
72	}
73	@@ -669,8 +669,9 @@
74	on_chkColon_toggled (GtkToggleButton *togglebutton,
75	gpointer user_data)
76	{
77	- GtkWidget *user = lookup_widget(GTK_WIDGET(wndMain), "frmUsername");;
78	- GtkWidget *pass = lookup_widget(GTK_WIDGET(wndMain), "frmPass");
79	+ GtkWidget user, pass;
80	+ user = lookup_widget(GTK_WIDGET(wndMain), "frmUsername");;
81	+ pass = lookup_widget(GTK_WIDGET(wndMain), "frmPass");
82
83	if (gtk_toggle_button_get_active(togglebutton)){
84	gtk_widget_set_sensitive(user, FALSE);

Line 0 Link Here

(-)hydra/files/patch-hydra-gtk-src_callbacks.c (+86 lines)
		1	--- hydra-gtk/src/callbacks.c.orig 2011-04-30 22:28:12.000000000 +0400
		2	+++ hydra-gtk/src/callbacks.c 2011-05-31 21:02:22.000000000 +0400
		3	@@ -71,21 +71,6 @@
		4
		5	options[0] = HYDRA_BIN;
		6
		7	- /* get the target, or target list */
		8	- widget = lookup_widget(GTK_WIDGET(wndMain), "radioTarget1");
		9	- if (gtk_toggle_button_get_active((GtkToggleButton *) widget)) {
		10	- widget = lookup_widget(GTK_WIDGET(wndMain), "entTarget");
		11	- options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
		12	- } else {
		13	- options[i++] = "-M";
		14	- widget = lookup_widget(GTK_WIDGET(wndMain), "entTargetFile");
		15	- options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
		16	- }
		17	-
		18	- /* get the service */
		19	- widget = lookup_widget(GTK_WIDGET(wndMain), "entProtocol");
		20	- options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
		21	-
		22	/* get the port */
		23	widget = lookup_widget(GTK_WIDGET(wndMain), "spnPort");
		24	j = gtk_spin_button_get_value_as_int((GtkSpinButton *) widget);
		25	@@ -325,6 +310,21 @@
		26	}
		27	}
		28
		29	+ /* get the target, or target list */
		30	+ widget = lookup_widget(GTK_WIDGET(wndMain), "radioTarget1");
		31	+ if (gtk_toggle_button_get_active((GtkToggleButton *) widget)) {
		32	+ widget = lookup_widget(GTK_WIDGET(wndMain), "entTarget");
		33	+ options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
		34	+ } else {
		35	+ options[i++] = "-M";
		36	+ widget = lookup_widget(GTK_WIDGET(wndMain), "entTargetFile");
		37	+ options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
		38	+ }
		39	+
		40	+ /* get the service */
		41	+ widget = lookup_widget(GTK_WIDGET(wndMain), "entProtocol");
		42	+ options[i++] = (char ) gtk_entry_get_text((GtkEntry ) widget);
		43	+
		44	options[i] = NULL;
		45	return i;
		46	}
		47	@@ -495,8 +495,8 @@
		48	-1, -1};
		49	static int *pfd = NULL;
		50
		51	- hydra_pid = 0;
		52	char *options[128];
		53	+ hydra_pid = 0;
		54
		55	update_statusbar();
		56
		57	@@ -517,6 +517,7 @@
		58	g_warning("popen_rw_unbuffered: Error forking!");
		59	return NULL;
		60	} else if (hydra_pid == 0) { /* child */
		61	+ int k;
		62	if (setpgid(getpid(), getpid()) < 0)
		63	g_warning("popen_rw_unbuffered: setpgid() failed");
		64	if (close(p_r[0]) < 0)
65	@@ -540,8 +541,7 @@
66	execv(HYDRA_BIN, options);
67
68	g_warning("%s %i: popen_rw_unbuffered: execv() returned", __FILE__, __LINE__);
69	- int k;
70	-
71	+
72	for (k = 0; options[k] != NULL; k++) {
73	g_warning("%s", options[k]);
74	}
75	@@ -667,8 +667,9 @@
76
77	void
78	on_chkColon_toggled(GtkToggleButton * togglebutton, gpointer user_data) {
79	- GtkWidget *user = lookup_widget(GTK_WIDGET(wndMain), "frmUsername");;
80	- GtkWidget *pass = lookup_widget(GTK_WIDGET(wndMain), "frmPass");
81	+ GtkWidget user, pass;
82	+ user = lookup_widget(GTK_WIDGET(wndMain), "frmUsername");
83	+ pass = lookup_widget(GTK_WIDGET(wndMain), "frmPass");
84
85	if (gtk_toggle_button_get_active(togglebutton)) {
86	gtk_widget_set_sensitive(user, FALSE);