Attachment 115684 Details for Bug 157468 – file.diff

[patch] file.diff

file.diff (text/plain), 8.48 KB, created by R.Mahmatkhanov on 2011-05-31 18:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R.Mahmatkhanov

Created: 2011-05-31 18:20:08 UTC

Size: 8.48 KB

patch

obsolete

>diff -ruNa hydra.orig/Makefile hydra/Makefile
>--- hydra.orig/Makefile	2011-05-31 07:30:36.000000000 +0400
>+++ hydra/Makefile	2011-05-31 20:32:30.000000000 +0400
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	hydra
>-PORTVERSION=	6.2
>+PORTVERSION=	6.3
> CATEGORIES=	security
> MASTER_SITES=	http://freeworld.thc.org/releases/
> EXTRACT_SUFX=	-src.tar.gz
>@@ -45,7 +45,7 @@
> .endif
> 
> .if defined(WITH_X11)
>-USE_GNOME=	gtk20
>+USE_GNOME=	gtk20 pkgconfig
> PLIST_FILES+=	bin/xhydra
> MAN1+=		xhydra.1
> .else
>diff -ruNa hydra.orig/distinfo hydra/distinfo
>--- hydra.orig/distinfo	2011-05-31 07:30:36.000000000 +0400
>+++ hydra/distinfo	2011-05-31 20:19:54.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (hydra-6.2-src.tar.gz) = 0b340632db9d429eb3c32a592a51f7333feda0fe682229c2027ae445a1e3f54e
>-SIZE (hydra-6.2-src.tar.gz) = 452626
>+SHA256 (hydra-6.3-src.tar.gz) = bd5bc70b70640984fb2f18a9742c10b9a0edf1ebaf0f8dd32da589d34defd424
>+SIZE (hydra-6.3-src.tar.gz) = 473265
>diff -ruNa hydra.orig/files/patch-configure hydra/files/patch-configure
>--- hydra.orig/files/patch-configure	2011-05-31 07:30:36.000000000 +0400
>+++ hydra/files/patch-configure	2011-05-31 20:23:11.000000000 +0400
>@@ -1,9 +1,9 @@
>---- configure.orig	2011-04-07 12:54:49.000000000 +0400
>-+++ configure	2011-04-15 02:18:31.000000000 +0400
>-@@ -561,7 +561,7 @@
>+--- configure.orig	2011-04-30 22:28:12.000000000 +0400
>++++ configure	2011-05-31 20:22:25.000000000 +0400
>+@@ -653,7 +653,7 @@
>  XIPATHS=""
>  
>- 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
>+ 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
> -    XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"
> +    XLIBPATHS="-L/usr/local/lib -L/usr/lib -L/lib"
>  fi
>diff -ruNa hydra.orig/files/patch-hydra-gtk-src-callbacks.c hydra/files/patch-hydra-gtk-src-callbacks.c
>--- hydra.orig/files/patch-hydra-gtk-src-callbacks.c	2005-05-22 03:55:39.000000000 +0400
>+++ hydra/files/patch-hydra-gtk-src-callbacks.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,84 +0,0 @@
>---- 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);
>diff -ruNa hydra.orig/files/patch-hydra-gtk-src_callbacks.c hydra/files/patch-hydra-gtk-src_callbacks.c
>--- hydra.orig/files/patch-hydra-gtk-src_callbacks.c	1970-01-01 03:00:00.000000000 +0300
>+++ hydra/files/patch-hydra-gtk-src_callbacks.c	2011-05-31 21:05:29.000000000 +0400
>@@ -0,0 +1,86 @@
>+--- 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);

Actions: View | Diff

Attachments on bug 157468: 115684