On 11/02/11 20:15, Nigel Taylor wrote: > Hi, > > Update to security/hydra v7.1, builds on amd64. > > hydra v5.4 is over 4yrs old, and doesn't build with the > current version of libssh. > > Comments? Ok? > > Nigel
The attached diff, now includes the man pages. Nigel
Index: Makefile =================================================================== RCS file: /home/cvs/ports/security/hydra/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- Makefile 21 Oct 2011 16:23:45 -0000 1.44 +++ Makefile 2 Nov 2011 22:12:11 -0000 @@ -3,17 +3,15 @@ COMMENT-main= parallelized login hacker COMMENT-gui= GTK frontend for hydra -VERSION= 5.4 -DISTNAME= hydra-5.4-src +VERSION= 7.1 +DISTNAME= hydra-${VERSION}-src PKGNAME-main= hydra-${VERSION} -REVISION-main= 1 PKGNAME-gui= hydra-gui-${VERSION} -REVISION-gui= 5 CATEGORIES= security HOMEPAGE= http://thc.org/thc-hydra/ -# GPLv2 + restrictions in LICENCE.HYDRA +# GPLv3 + restrictions in LICENCE.HYDRA PERMIT_PACKAGE_CDROM= no charge PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= no charge @@ -21,7 +19,8 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c m -MASTER_SITES= ${MASTER_SITE_PACKETSTORM:=groups/thc/} +MASTER_SITES = http://www.thc.org/releases/ +MASTER_SITES += ${MASTER_SITE_PACKETSTORM:=groups/thc/} PSEUDO_FLAVORS= no_x11 FLAVOR?= @@ -33,6 +32,7 @@ CONFIGURE_STYLE=gnu dest USE_GMAKE= Yes NO_REGRESS= Yes MAKE_FLAGS= CC=${CC} +CFLAGS += -I${LOCALBASE}/include .if ${FLAVOR:L:Mno_x11} ALL_TARGET= hydra pw-inspector @@ -51,20 +51,24 @@ post-configure: cd ${WRKSRC}/hydra-gtk && ./configure .endif -LIB_DEPENDS-main= +LIB_DEPENDS-main= databases/mysql,-main \ + databases/postgresql,-main \ + devel/libidn \ + devel/pcre \ + security/libssh RUN_DEPENDS-main= -WANTLIB-main= c m ssl crypto +WANTLIB-main= c crypto idn m mysqlclient pcre pq ssh ssl LIB_DEPENDS-gui=x11/gtk+2 \ ${MODGETTEXT_LIB_DEPENDS} RUN_DEPENDS-gui=hydra-${VERSION}:security/hydra,-main \ ${MODGETTEXT_RUN_DEPENDS} -WANTLIB-gui= ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes \ +WANTLIB-gui= ${WANTLIB} GL X11 Xcomposite Xcursor Xdamage Xfixes \ Xext Xi Xinerama Xrandr Xrender atk-1.0 freetype fontconfig \ gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \ gio-2.0 gmodule-2.0 gobject-2.0 glib-2.0 gthread-2.0 png \ pango-1.0 pangocairo-1.0 pixman-1 cairo z expat \ pangoft2-1.0 pthread pthread-stubs xcb xcb-render \ - xcb-render-util + xcb-shm post-extract: chmod -R u+w ${WRKDIST} Index: distinfo =================================================================== RCS file: /home/cvs/ports/security/hydra/distinfo,v retrieving revision 1.11 diff -u -p -r1.11 distinfo --- distinfo 5 Jan 2009 22:10:06 -0000 1.11 +++ distinfo 1 Nov 2011 16:26:35 -0000 @@ -1,5 +1,5 @@ -MD5 (hydra-5.4-src.tar.gz) = +gi0ZdGTIed7Gg75Eu7swQ== -RMD160 (hydra-5.4-src.tar.gz) = 47S5glA5SUXcWov+I0MC3nk9sBQ= -SHA1 (hydra-5.4-src.tar.gz) = ITQJLHtkEywIC2sboVUSS4hXZ9s= -SHA256 (hydra-5.4-src.tar.gz) = zS5+XqR51QmCsIM0sfRHemYg5rRbx5q1Xd0HsSjGRhE= -SIZE (hydra-5.4-src.tar.gz) = 208272 +MD5 (hydra-7.1-src.tar.gz) = DDpqNRyy4jPLmJ8Lzdde3w== +RMD160 (hydra-7.1-src.tar.gz) = n8HIad/5ARrB6OXZjsw3iZw09eo= +SHA1 (hydra-7.1-src.tar.gz) = nkyt28n4ufKZcJaulYucEMr0Nt0= +SHA256 (hydra-7.1-src.tar.gz) = VR7x9yhI2rGfah/5/jHwgUPIzvJvY42T5xELS85J0KQ= +SIZE (hydra-7.1-src.tar.gz) = 664022 Index: patches/patch-Makefile_am =================================================================== RCS file: /home/cvs/ports/security/hydra/patches/patch-Makefile_am,v retrieving revision 1.1 diff -u -p -r1.1 patch-Makefile_am --- patches/patch-Makefile_am 5 Jan 2009 22:10:06 -0000 1.1 +++ patches/patch-Makefile_am 2 Nov 2011 22:21:55 -0000 @@ -1,35 +1,39 @@ $OpenBSD: patch-Makefile_am,v 1.1 2009/01/05 22:10:06 rui Exp $ ---- Makefile.am.orig Fri May 5 15:10:44 2006 -+++ Makefile.am Sat May 12 21:58:03 2007 +--- Makefile.am.orig Sun Oct 2 09:06:16 2011 ++++ Makefile.am Wed Nov 2 22:11:22 2011 @@ -2,7 +2,7 @@ - # Makefile for Hydra - (c) 2001-2006 by van Hauser / THC <v...@thc.org> + # Makefile for Hydra - (c) 2001-2011 by van Hauser / THC <v...@thc.org> # --OPTS=-I. -Wall -O2 +-OPTS=-I. -O3 +OPTS=-I. $(CFLAGS) - # -ggdb -pedantic + # -Wall -ggdb -pedantic LIBS=-lm DIR=/bin -@@ -43,7 +43,7 @@ hydra: $(OBJ) +@@ -43,7 +43,7 @@ hydra: hydra.c $(OBJ) @echo xhydra: -- -cd hydra-gtk && ./make_xhydra.sh -+ -cd hydra-gtk/src && $(MAKE) +- -cd hydra-gtk && sh ./make_xhydra.sh ++ -cd hydra-gtk/src && $(MAKE) pw-inspector: pw-inspector.c - -$(CC) $(OPTS) -o pw-inspector pw-inspector.c -@@ -56,10 +56,9 @@ strip: hydra - -test -e hydra.exe && strip $(BINWIN) || touch hydra - -test -e xhydra && strip xhydra || touch Makefile + -$(CC) $(OPTS) -o pw-inspector $(PWI_LOGO) pw-inspector.c +@@ -55,12 +55,11 @@ strip: hydra + strip $(BINS) + -echo OK > /dev/null && test -x xhydra && strip xhydra || echo OK > /dev/null -install: strip -- -test -e hydra.exe && touch Makefile || cp $(BINUNIX) $(PREFIX)$(DIR) && cd $(PREFIX)$(DIR) && chmod 755 $(BINUNIX) -- -test -e hydra.exe && cp $(BINWIN) $(PREFIX)$(DIR) && cd $(PREFIX)$(DIR) && chmod 755 $(BINWIN) || touch Makefile -- -test -e xhydra && cp xhydra $(PREFIX)$(DIR) && cd $(PREFIX)$(DIR) && chmod 755 xhydra +- -mkdir -p $(PREFIX)$(DIR) +- cp $(BINS) dpl4hydra* $(PREFIX)$(DIR) && cd $(PREFIX)$(DIR) && chmod 755 $(BINS) +- -echo OK > /dev/null && test -x xhydra && cp xhydra $(PREFIX)$(DIR) && cd $(PREFIX)$(DIR) && chmod 755 xhydra || echo OK > /dev/null +- -mkdir -p $(PREFIX)/man/man1 +- -cp -f hydra.1 xhydra.1 pw-inspector.1 $(PREFIX)/man/man1 +install: -+ $(BSD_INSTALL_PROGRAM) $(BINUNIX) $(PREFIX)$(DIR) 2> /dev/null ++ $(BSD_INSTALL_PROGRAM) $(BINS) $(PREFIX)$(DIR) 2> /dev/null ++ $(BSD_INSTALL_MAN_DIR) $(PREFIX)/man/man1 2> /dev/null ++ $(BSD_INSTALL_MAN) hydra.1 pw-inspector.1 xhydra.1 $(PREFIX)/man/man1 2> /dev/null + cd hydra-gtk/src && $(BSD_INSTALL_PROGRAM) xhydra $(PREFIX)$(DIR) 2> /dev/null clean: - rm -rf hydra pw-inspector xhydra pw-inspector.exe hydra.exe *.o core *~ Makefile.in Makefile dev_rfc hydra.restore arm/*.ipk arm/ipkg/usr/bin/* hydra-gtk/src/*.o hydra-gtk/src/xhydra hydra-gtk/stamp-h hydra-gtk/config.status hydra-gtk/errors hydra-gtk/config.log hydra-gtk/src/.deps hydra-gtk/src/Makefile hydra-gtk/Makefile + rm -rf xhydra pw-inspector hydra *.o core *.core *.stackdump *~ Makefile.in Makefile dev_rfc hydra.restore arm/*.ipk arm/ipkg/usr/bin/* hydra-gtk/src/*.o hydra-gtk/src/xhydra hydra-gtk/stamp-h hydra-gtk/config.status hydra-gtk/errors hydra-gtk/config.log hydra-gtk/src/.deps hydra-gtk/src/Makefile hydra-gtk/Makefile Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/security/hydra/patches/patch-configure,v retrieving revision 1.5 diff -u -p -r1.5 patch-configure --- patches/patch-configure 5 Jan 2009 22:10:06 -0000 1.5 +++ patches/patch-configure 2 Nov 2011 11:03:45 -0000 @@ -1,60 +1,210 @@ -$OpenBSD: patch-configure,v 1.5 2009/01/05 22:10:06 rui Exp $ ---- configure.orig Fri Jan 20 13:44:15 2006 -+++ configure Sat Jan 3 13:50:44 2009 -@@ -96,52 +96,6 @@ if [ "$SSL_IPATH" = "/usr/include" ]; then - SSL_IPATH="" +$OpenBSD$ +Remove tests for include files and libraries there are no +configure options to disable support the build may fail or be altered +if added +--- configure.orig Sun Oct 2 09:06:15 2011 ++++ configure Tue Nov 1 20:03:28 2011 +@@ -246,44 +246,6 @@ if [ "X" = "X$POSTGRES_PATH" -o "X" = "X$POSTGRES_IPAT fi --echo "Checking for Postgres (libpq) ..." --for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib . + echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..." +-for i in $LIBDIRS -do -- if [ "X" = "X$POSTGRES_PATH" ]; then -- if [ -f "$i/libpq.so" -o -f "$i/libpq.dylib" ]; then -- POSTGRES_PATH="$i" +- if [ "X" = "X$SVN_PATH" ]; then +- if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-1.so" ]&&[ -f "$i/libaprutil-1.so" ]; then +- SVN_PATH="$i" +- APR_PATH="$i" - fi - fi -- if [ "X" = "X$POSTGRES_PATH" ]; then -- TMP_LIB=`/bin/ls $i/libpq.so* /bin/cygpq*.dll 2> /dev/null | grep pq` +- if [ "X" = "X$SVN_PATH" ]; then +- TMP_LIB=`/bin/ls $i/libsvn_client*.so* 2> /dev/null | grep libsvn_client.` - if [ -n "$TMP_LIB" ]; then -- POSTGRES_PATH="$i" +- SVN_PATH="$i" +- APR_PATH="$i" - fi - fi -done --if [ -n "$POSTGRES_PATH" ]; then -- echo " ... found" --fi --if [ "X" = "X$POSTGRES_PATH" ]; then -- echo " ... NOT found, module postgres disabled" --fi -- --echo "Checking for SVN (ibsvn_client-1 libapr-0.so libaprutil-0.so) ..." --for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib . +-for i in $INCDIRS -do -- if [ "X" = "X$SVN_PATH" ]; then -- if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-0.so" ]&&[ -f "$i/libaprutil-0.so" ]; then -- SVN_PATH="$i" +- if [ "X" = "X$SVN_IPATH" ]; then +- if [ -d "$i/subversion-1" ]; then +- SVN_IPATH="$i/subversion-1" +- fi +- if [ -d "$i/svn" ]; then +- SVN_IPATH="$i/svn" +- fi +- fi +- if [ "X" = "X$APR_IPATH" ]; then +- if [ -d "$i/apr-1.0" ]; then +- APR_IPATH="$i/apr-1.0" +- fi +- if [ -d "$i/apr-1" ]; then +- APR_IPATH="$i/apr-1" +- fi +- if [ -d "$i/apr" ]; then +- APR_IPATH="$i/apr" +- fi +- fi +-done + + if [ "X" = "X$SVN_PATH" -o "X" = "X$SVN_IPATH" -o "X" = "X$APR_IPATH" ]; then + SVN_PATH="" +@@ -305,28 +267,7 @@ if [ "X" = "X$SVN_PATH" -o "X" = "X$APR_PATH" ]; then + fi + + echo "Checking for firebird (libfbclient.so) ..." +-for i in $LIBDIRS +-do +- if [ "X" = "X$FIREBIRD_PATH" ]; then +- if [ -f "$i/libfbclient.so" ]; then +- FIREBIRD_PATH="$i" - fi - fi -- if [ "X" = "X$SVN_PATH" ]; then -- TMP_LIB=`/bin/ls $i/libsvn_client*.so* 2> /dev/null | grep libsvn_client.` +- if [ "X" = "X$FIREBIRD_PATH" ]; then +- TMP_LIB=`/bin/ls $i/libfbclient.so.* 2> /dev/null | grep libfbclient.` - if [ -n "$TMP_LIB" ]; then -- SVN_PATH="$i" +- FIREBIRD_PATH="$i" - fi - fi -- -- -done --if [ -n "$SVN_PATH" ]; then -- echo " ... found" --fi --if [ "X" = "X$SVN_PATH" ]; then -- echo " ... NOT found, module svn disabled" --fi -- +-for i in $INCDIRS +-do +- if [ "X" != "X$FIREBIRD_PATH" ]; then +- if [ -f "$i/ibase.h" ]; then +- FIREBIRD_IPATH="$i" +- fi +- fi +-done ++ + if [ -n "$FIREBIRD_PATH" -a -n "$FIREBIRD_IPATH" ]; then + echo " ... found" + fi +@@ -373,28 +314,7 @@ else + echo " ... math.h not found, module Mysql disabled" + fi + echo "Checking for AFP (libafpclient.so) ..." +-for i in $LIBDIRS +-do +- if [ "X" = "X$AFP_PATH" ]; then +- if [ -f "$i/libafpclient.so" ]; then +- AFP_PATH="$i" +- fi +- fi +- if [ "X" = "X$AFP_PATH" ]; then +- TMP_LIB=`/bin/ls $i/libafpclient.so.* 2> /dev/null | grep libafpclient.` +- if [ -n "$TMP_LIB" ]; then +- AFP_PATH="$i" +- fi +- fi +-done +-for i in $INCDIRS +-do +- if [ "X" != "X$AFP_PATH" ]; then +- if [ -f "$i/afpfs-ng/afp.h" ]; then +- AFP_IPATH="$i/afpfs-ng" +- fi +- fi +-done ++ + if [ -n "$AFP_PATH" -a -n "$AFP_IPATH" ]; then + echo " ... found" + fi +@@ -405,28 +325,7 @@ if [ "X" = "X$AFP_PATH" -o "X" = "X$AFP_IPATH" ]; then + fi + + echo "Checking for NCP (libncp.so / nwcalls.h) ..." +-for i in $LIBDIRS +-do +- if [ "X" = "X$NCP_PATH" ]; then +- if [ -f "$i/libncp.so" ]; then +- NCP_PATH="$i" +- fi +- fi +- if [ "X" = "X$NCP_PATH" ]; then +- TMP_LIB=`/bin/ls $i/libncp.so.* 2> /dev/null | grep ncp.` +- if [ -n "$TMP_LIB" ]; then +- NCP_PATH="$i" +- fi +- fi +-done +-for i in $INCDIRS +-do +- if [ "X" != "X$NCP_PATH" ]; then +- if [ -f "$i/ncp/nwcalls.h" ]; then +- NCP_IPATH="$i" +- fi +- fi +-done ++ + if [ -n "$NCP_PATH" -a -n "$NCP_IPATH" ]; then + echo " ... found" + fi +@@ -437,28 +336,7 @@ if [ "X" = "X$NCP_PATH" -o "X" = "X$NCP_IPATH" ]; then + fi + echo "Checking for SAP/R3 (librfc/saprfc.h) ..." - for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib . - do -@@ -294,17 +248,9 @@ fi +-for i in $LIBDIRS +-do +- if [ "X" = "X$SAPR3_PATH" ]; then +- if [ -f "$i/librfc.a" -o -f "$i/librfc.dylib" -o "$i/librfc32.dll" ]; then +- SAPR3_PATH="$i" +- fi +- fi +- if [ "X" = "X$SAPR3_PATH" ]; then +- TMP_LIB=`/bin/ls $i/librfc.* $i/librfc32.* 2> /dev/null | grep librfc` +- if [ -n "$TMP_LIB" ]; then +- SAPR3_PATH="$i" +- fi +- fi +-done +-for i in $INCDIRS +-do +- if [ "X" = "X$SAPR3_IPATH" ]; then +- if [ -f "$i/saprfc.h" ]; then +- SAPR3_IPATH="$i" +- fi +- fi +-done ++ + if [ "X" = "X$SAPR3_PATH" ]; then + SAPR3_IPATH="" + fi +@@ -558,34 +436,6 @@ if [ "X" != "X$WORACLE_LIB_PATH" ]; then + LIBDIRS="$LIBDIRS $WORACLE_LIB_PATH" + fi + +-for i in $LIBDIRS +-do +- if [ "X" = "X$ORACLE_PATH" ]; then +- if [ -f "$i/libocci.so" ]&&[ -f "$i/libclntsh.so" ]; then +- ORACLE_PATH="$i" +- fi +- fi +- if [ "X" = "X$ORACLE_PATH" ]; then +- TMP_LIB=`/bin/ls $i/libocci.so.* 2> /dev/null | grep occi.` +- if [ -n "$TMP_LIB" ]; then +- ORACLE_PATH="$i" +- fi +- if [ "X" != "X$ORACLE_PATH" ]; then +- TMP_LIB=`/bin/ls $i/libclntsh.so.* 2> /dev/null | grep clntsh.` +- if [ -z "$TMP_LIB" ]; then +- ORACLE_PATH="" +- fi +- fi +- fi +-done +-for i in $INCDIRS +-do +- if [ "X" != "X$ORACLE_PATH" ]; then +- if [ -f "$i/oci.h" ]; then +- ORACLE_IPATH="$i" +- fi +- fi +-done + if [ -n "$ORACLE_PATH" -a -n "$ORACLE_IPATH" ]; then + echo " ... found" + fi +@@ -648,7 +498,7 @@ fi echo XDEFINES="" @@ -62,14 +212,4 @@ $OpenBSD: patch-configure,v 1.5 2009/01/ +XLIBS="-lm" XLIBPATHS="" XIPATHS="" -- --# ignore errors if this uname call fails --SYS=`uname -o 2>/dev/null` --if [ "$SYS" = "Cygwin" ]; then -- echo "Cygwin detected, enabling compability options ..." -- XDEFINES="-DCYGWIN" -- echo --fi - if [ -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" ]; then - XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib" Index: patches/patch-hydra-gtk_src_callbacks_c =================================================================== RCS file: /home/cvs/ports/security/hydra/patches/patch-hydra-gtk_src_callbacks_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-hydra-gtk_src_callbacks_c --- patches/patch-hydra-gtk_src_callbacks_c 5 Jan 2009 22:10:06 -0000 1.3 +++ patches/patch-hydra-gtk_src_callbacks_c 2 Nov 2011 00:37:02 -0000 @@ -1,94 +1,12 @@ $OpenBSD: patch-hydra-gtk_src_callbacks_c,v 1.3 2009/01/05 22:10:06 rui Exp $ ---- hydra-gtk/src/callbacks.c.orig Thu Sep 22 16:19:27 2005 -+++ hydra-gtk/src/callbacks.c Sun May 13 13:48:10 2007 -@@ -34,7 +34,7 @@ char tasks[10]; +--- hydra-gtk/src/callbacks.c.orig Sun Oct 2 09:06:15 2011 ++++ hydra-gtk/src/callbacks.c Wed Nov 2 00:36:25 2011 +@@ -35,7 +35,7 @@ char tasks[10]; char timeout[10]; - char smbntparm[4]; + char smbparm[12]; char snmpparm[4]; -char sapr3id[4]; +char sapr3id[10]; char passLoginNull[4]; - -@@ -69,21 +69,6 @@ int hydra_get_options(char *options[]) { - 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); -@@ -317,6 +302,21 @@ int hydra_get_options(char *options[]) { - } - } - -+ /* 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; - } -@@ -482,9 +482,9 @@ static void close_pipe(int *pipe) { - 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(); - - /* only allocate once */ -@@ -504,6 +504,7 @@ int *popen_re_unbuffered(char *command) { - 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) -@@ -527,7 +528,6 @@ int *popen_re_unbuffered(char *command) { - 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]); - } -@@ -679,8 +679,9 @@ void - on_chkColon_toggled (GtkToggleButton *togglebutton, - gpointer user_data) - { -- GtkWidget *user = lookup_widget(GTK_WIDGET(wndMain), "frmUsername");; -+ GtkWidget *user; - GtkWidget *pass = lookup_widget(GTK_WIDGET(wndMain), "frmPass"); -+ user = lookup_widget(GTK_WIDGET(wndMain), "frmUsername");; - - if (gtk_toggle_button_get_active(togglebutton)){ - gtk_widget_set_sensitive(user, FALSE); Index: pkg/PLIST-gui =================================================================== RCS file: /home/cvs/ports/security/hydra/pkg/PLIST-gui,v retrieving revision 1.2 diff -u -p -r1.2 PLIST-gui --- pkg/PLIST-gui 5 Jan 2009 22:10:06 -0000 1.2 +++ pkg/PLIST-gui 2 Nov 2011 22:23:06 -0000 @@ -1,2 +1,3 @@ @comment $OpenBSD: PLIST-gui,v 1.2 2009/01/05 22:10:06 rui Exp $ @bin bin/xhydra +@man man/man1/xhydra.1 Index: pkg/PLIST-main =================================================================== RCS file: /home/cvs/ports/security/hydra/pkg/PLIST-main,v retrieving revision 1.2 diff -u -p -r1.2 PLIST-main --- pkg/PLIST-main 5 Jan 2009 22:10:06 -0000 1.2 +++ pkg/PLIST-main 2 Nov 2011 22:23:18 -0000 @@ -2,5 +2,7 @@ @pkgpath security/hydra @bin bin/hydra @bin bin/pw-inspector +@man man/man1/hydra.1 +@man man/man1/pw-inspector.1 share/doc/hydra/ share/doc/hydra/README