From 4552638d48d12c9ea670be61ef2c1e1a7fe1305e Mon Sep 17 00:00:00 2001 From: sturm Date: Fri, 11 Feb 2005 19:46:22 +0000 Subject: [PATCH] update to hydra 4.6 now with no_x11 FLAVOR from Jon Trembley --- security/hydra/Makefile | 22 ++++++++++-- security/hydra/distinfo | 8 ++--- security/hydra/patches/patch-Makefile.am | 36 +++++++++++++++++++ security/hydra/patches/patch-configure | 16 ++++++--- .../patches/patch-hydra-gtk_src_callbacks_c | 12 +++++++ security/hydra/pkg/PFRAG.no-no_x11 | 2 ++ security/hydra/pkg/PLIST | 6 ++-- 7 files changed, 90 insertions(+), 12 deletions(-) create mode 100644 security/hydra/patches/patch-Makefile.am create mode 100644 security/hydra/patches/patch-hydra-gtk_src_callbacks_c create mode 100644 security/hydra/pkg/PFRAG.no-no_x11 diff --git a/security/hydra/Makefile b/security/hydra/Makefile index 4da1d3451f1..dc47743e90d 100644 --- a/security/hydra/Makefile +++ b/security/hydra/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.17 2005/02/07 19:01:49 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.18 2005/02/11 19:46:22 sturm Exp $ COMMENT= "parallelized login hacker" -DISTNAME= hydra-4.1-src +DISTNAME= hydra-4.6-src PKGNAME= ${DISTNAME:S/-src//} CATEGORIES= security @@ -22,12 +22,30 @@ NO_REGRESS= Yes CONFIGURE_STYLE= gnu dest + +USE_GMAKE= yes +MAKE_FLAGS= CC="${CC}" OPTS="${CFLAGS}" + post-extract: @chmod -R u+w ${WRKDIST} MAKE_FLAGS= CC="${CC}" OPTS="${CFLAGS}" FAKE_FLAGS= INSTALL="${WRKINST}${PREFIX}/bin" +FLAVORS= no_x11 +FLAVOR?= + +.if ${FLAVOR:L:Mno_x11} +ALL_TARGET= hydra pw-inspector +.else +USE_X11= Yes +ALL_TARGET= all +LIB_DEPENDS+= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 pangox-1.0.0.0::devel/pango +WANTLIB+= iconv intl X11 Xext Xft freetype Xrender Xinerama Xcursor \ + fontconfig gmodule-2.0.0.0 gobject-2.0.0.0 pangoxft-1.0.0.0 \ + glib-2.0.0.0 pango-1.0.0.0 atk-1.0.0.0 +.endif + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hydra ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/hydra diff --git a/security/hydra/distinfo b/security/hydra/distinfo index 5a99a0c723d..1d1d6b298de 100644 --- a/security/hydra/distinfo +++ b/security/hydra/distinfo @@ -1,4 +1,4 @@ -MD5 (hydra-4.1-src.tar.gz) = 63f1bea8ff62d296099f777d25ee842e -RMD160 (hydra-4.1-src.tar.gz) = f1221dc0396c43079b6e4fa60395526d9e722868 -SHA1 (hydra-4.1-src.tar.gz) = 6d23824befff8f3acd4b22d323ef63df4891a8b1 -SIZE (hydra-4.1-src.tar.gz) = 172264 +MD5 (hydra-4.6-src.tar.gz) = e41a6653cb0b75c0ab2033c84ebb92cc +RMD160 (hydra-4.6-src.tar.gz) = 72cffce9eda1659023b74f22baabfad43ac5933d +SHA1 (hydra-4.6-src.tar.gz) = acf0f61f8dc2a5307e266c337231dbdb3a9b9d79 +SIZE (hydra-4.6-src.tar.gz) = 171063 diff --git a/security/hydra/patches/patch-Makefile.am b/security/hydra/patches/patch-Makefile.am new file mode 100644 index 00000000000..7a5ad18b464 --- /dev/null +++ b/security/hydra/patches/patch-Makefile.am @@ -0,0 +1,36 @@ +--- Makefile.am.orig Fri Jan 7 14:46:53 2005 ++++ Makefile.am Fri Feb 11 20:32:41 2005 +@@ -22,14 +22,12 @@ OBJ = hydra-vnc.o hydra-pcnfs.o hydra-re + hydra-teamspeak.o \ + crc32.o d3des.o md4.o hydra-mod.o hydra.o + BIN = hydra +-BINS = $(BIN) xhydra pw-inspector hydra.exe pw-inspector.exe ++BINS = $(BIN) hydra-gtk/src/xhydra pw-inspector + + EXTRA_DIST = README README.arm README.palm CHANGES TODO INSTALL LICENSE.GNU LICENCE.HYDRA \ + hydra-mod.h hydra.h crc32.h d3des.h md4.h + + all: pw-inspector hydra xhydra +- @echo +- @echo Now type "make install" + + hydra: $(OBJ) + $(CC) $(OPTS) $(LIBS) -o $(BIN) $(OBJ) $(LIB) $(XLIBS) $(XLIBPATHS) +@@ -38,7 +36,7 @@ hydra: $(OBJ) + @echo + + xhydra: +- -cd hydra-gtk && ./make_xhydra.sh ++ -cd hydra-gtk && ./configure && $(MAKE) + + pw-inspector: pw-inspector.c + -$(CC) $(OPTS) -o pw-inspector pw-inspector.c +@@ -51,7 +49,7 @@ strip: hydra + + install: strip + -cp $(BINS) $(PREFIX)$(DIR) 2> /dev/null +- -chmod 755 $(PREFIX)$(DIR)/$(BIN) $(PREFIX)$(DIR)/pw-inspector $(PREFIX)$(DIR)/xhydra 2> /dev/null ++ -chmod 755 $(PREFIX)$(DIR)/$(BIN) $(PREFIX)$(DIR)/pw-inspector $(PREFIX)$(DIR)/hydra-gtk/src/xhydra 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 diff --git a/security/hydra/patches/patch-configure b/security/hydra/patches/patch-configure index e4cb6d6af91..990b426eadd 100644 --- a/security/hydra/patches/patch-configure +++ b/security/hydra/patches/patch-configure @@ -1,7 +1,6 @@ -$OpenBSD: patch-configure,v 1.2 2003/12/14 16:35:49 margarida Exp $ ---- configure.orig 2003-11-20 07:45:06.000000000 -0800 -+++ configure 2003-12-13 19:47:10.000000000 -0800 -@@ -142,7 +142,7 @@ fi +--- configure.orig Tue Feb 1 15:50:26 2005 ++++ configure Fri Feb 11 20:32:41 2005 +@@ -206,16 +206,9 @@ fi echo XDEFINES="" @@ -9,4 +8,13 @@ $OpenBSD: patch-configure,v 1.2 2003/12/14 16:35:49 margarida Exp $ +XLIBS="-lm" XLIBPATHS="" XIPATHS="" +- +-SYS=`uname -o` +-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" ]; then + XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib" diff --git a/security/hydra/patches/patch-hydra-gtk_src_callbacks_c b/security/hydra/patches/patch-hydra-gtk_src_callbacks_c new file mode 100644 index 00000000000..73af9581ef8 --- /dev/null +++ b/security/hydra/patches/patch-hydra-gtk_src_callbacks_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-hydra-gtk_src_callbacks_c,v 1.1 2005/02/11 19:46:22 sturm Exp $ +--- hydra-gtk/src/callbacks.c.orig Fri Feb 11 20:35:37 2005 ++++ hydra-gtk/src/callbacks.c Fri Feb 11 20:37:22 2005 +@@ -34,7 +34,7 @@ char tasks[10]; + char timeout[10]; + char smbntparm[4]; + char snmpparm[4]; +-char sapr3id[4]; ++char sapr3id[10]; + char passLoginNull[4]; + + diff --git a/security/hydra/pkg/PFRAG.no-no_x11 b/security/hydra/pkg/PFRAG.no-no_x11 new file mode 100644 index 00000000000..29ef9a9ade6 --- /dev/null +++ b/security/hydra/pkg/PFRAG.no-no_x11 @@ -0,0 +1,2 @@ +@comment $OpenBSD: PFRAG.no-no_x11,v 1.1 2005/02/11 19:46:22 sturm Exp $ +bin/xhydra diff --git a/security/hydra/pkg/PLIST b/security/hydra/pkg/PLIST index a317b12b37a..048d9319c2e 100644 --- a/security/hydra/pkg/PLIST +++ b/security/hydra/pkg/PLIST @@ -1,4 +1,6 @@ -@comment $OpenBSD: PLIST,v 1.4 2004/10/02 04:08:42 tedu Exp $ +@comment $OpenBSD: PLIST,v 1.5 2005/02/11 19:46:22 sturm Exp $ bin/hydra +bin/pw-inspector +share/doc/hydra/ share/doc/hydra/README -@dirrm share/doc/hydra +!%%no_x11%%