diff options
author | joerg <joerg@pkgsrc.org> | 2013-09-20 23:10:12 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-09-20 23:10:12 +0000 |
commit | 8e36ef434e88d9a6323c7fc90e4dcf38f4fe2645 (patch) | |
tree | 4610d15cfec252062c405d6f333d76228464fd03 /security/hydra | |
parent | 277df0ce88a7a10dee6f6c297948c80f93b67732 (diff) | |
download | pkgsrc-8e36ef434e88d9a6323c7fc90e4dcf38f4fe2645.tar.gz |
Update to hydra-7.5 since the old version doesn't build with newer
libssh. Too many changes to list indivually. Adjust license to AGPLv3.
Diffstat (limited to 'security/hydra')
-rw-r--r-- | security/hydra/Makefile | 38 | ||||
-rw-r--r-- | security/hydra/PLIST | 7 | ||||
-rw-r--r-- | security/hydra/distinfo | 19 | ||||
-rw-r--r-- | security/hydra/options.mk | 20 | ||||
-rw-r--r-- | security/hydra/patches/patch-Makefile.am | 28 | ||||
-rw-r--r-- | security/hydra/patches/patch-aa | 23 | ||||
-rw-r--r-- | security/hydra/patches/patch-ab | 175 | ||||
-rw-r--r-- | security/hydra/patches/patch-ac | 13 | ||||
-rw-r--r-- | security/hydra/patches/patch-ad | 13 | ||||
-rw-r--r-- | security/hydra/patches/patch-ae | 48 | ||||
-rw-r--r-- | security/hydra/patches/patch-af | 12 | ||||
-rw-r--r-- | security/hydra/patches/patch-ag | 22 | ||||
-rw-r--r-- | security/hydra/patches/patch-configure | 20 | ||||
-rw-r--r-- | security/hydra/patches/patch-hydra-gtk_src_Makefile.in | 19 | ||||
-rw-r--r-- | security/hydra/patches/patch-hydra-snmp.c | 15 |
15 files changed, 111 insertions, 361 deletions
diff --git a/security/hydra/Makefile b/security/hydra/Makefile index 8c34edc565f..2830289017a 100644 --- a/security/hydra/Makefile +++ b/security/hydra/Makefile @@ -1,51 +1,31 @@ -# $NetBSD: Makefile,v 1.53 2013/09/07 14:00:48 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2013/09/20 23:10:12 joerg Exp $ # -DISTNAME= ${PKGNAME_NOREV}-src -PKGNAME= hydra-5.4 -PKGREVISION= 30 +DISTNAME= hydra-7.5 CATEGORIES= security MASTER_SITES= http://freeworld.thc.org/releases/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://freeworld.thc.org/thc-hydra/ COMMENT= Login password cracker -LICENSE= hydra-license +LICENSE= gnu-agpl-v3 .include "../../mk/bsd.prefs.mk" -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config gmake GNU_CONFIGURE= YES -BUILD_TARGET= all -WRKSRC= ${WRKDIR}/${DISTNAME} - -SUBST_CLASSES+= build -SUBST_STAGE.build= post-patch -SUBST_FILES.build= Makefile.am configure hydra-gtk/src/main.c -SUBST_SED.build= -e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" -SUBST_SED.build+= -e "s|@PREFIX@|${PREFIX}|g" -SUBST_SED.build+= -e "s|uname|${UNAME}|g" -SUBST_SED.build+= -e "s|\\./hydra|${PREFIX}/bin/hydra|g" -SUBST_SED.build+= -e "s|LIBS=-lm|LIBS=-L${PREFIX}/lib -lm ${COMPILER_RPATH_FLAG}${PREFIX}/lib ${COMPILER_RPATH_FLAG}/usr/lib|g" -SUBST_MESSAGE.build= Patching build files. - -USE_OLD_DES_API= YES -PLIST_SRC= ${WRKDIR}/.PLIST_SRC + +CONFIGURE_ENV+= BUILDLINK_DIR=${BUILDLINK_DIR:Q} + CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -BUILDLINK_API_DEPENDS.libssh+= libssh-0.54{,nb*} INSTALLATION_DIRS= bin .include "options.mk" +.include "../../devel/libidn/buildlink3.mk" +.include "../../devel/pcre/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../security/libssh/buildlink3.mk" -pre-build: - ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hydra ${DESTDIR}${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/pw-inspector ${DESTDIR}${PREFIX}/bin - .include "../../mk/bsd.pkg.mk" diff --git a/security/hydra/PLIST b/security/hydra/PLIST index 908952d06de..e07a6d07168 100644 --- a/security/hydra/PLIST +++ b/security/hydra/PLIST @@ -1,3 +1,8 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2005/04/17 12:19:54 adrianp Exp $ +@comment $NetBSD: PLIST,v 1.2 2013/09/20 23:10:12 joerg Exp $ +bin/dpl4hydra.sh bin/hydra bin/pw-inspector +${PLIST.gtk}bin/xhydra +man/man1/hydra.1 +man/man1/pw-inspector.1 +man/man1/xhydra.1 diff --git a/security/hydra/distinfo b/security/hydra/distinfo index 620024703e2..3737eac062e 100644 --- a/security/hydra/distinfo +++ b/security/hydra/distinfo @@ -1,12 +1,9 @@ -$NetBSD: distinfo,v 1.9 2008/10/30 14:52:14 bad Exp $ +$NetBSD: distinfo,v 1.10 2013/09/20 23:10:12 joerg Exp $ -SHA1 (hydra-5.4-src.tar.gz) = 2134092c7b64132c080b6b1ba155124b885767db -RMD160 (hydra-5.4-src.tar.gz) = e3b4b98250394945dc5a8bfe234302de793db014 -Size (hydra-5.4-src.tar.gz) = 208272 bytes -SHA1 (patch-aa) = 7e28e9143cd78d49d4f28b77e4bdf554f001caa5 -SHA1 (patch-ab) = ed44b46422063b4cb31bbccfb66ed54559495727 -SHA1 (patch-ac) = ade8ea964018dc7034154a35338f50361b5185f8 -SHA1 (patch-ad) = 3734123af4511161eee93f624b1b9dd575be0ae7 -SHA1 (patch-ae) = eb6f4ecea7fab5119fcd90d08b2681d0e6921a97 -SHA1 (patch-af) = 90c24ad7df23f2be23d08b646d68c93846c7618b -SHA1 (patch-ag) = 1837595ef533b657c88449aa5a241ddf4570b149 +SHA1 (hydra-7.5.tar.gz) = 475980f8e6c0c97b7702201e89fbcf441a6fd2c0 +RMD160 (hydra-7.5.tar.gz) = f5edc8473889ab90ef971226f4276683b193a466 +Size (hydra-7.5.tar.gz) = 681784 bytes +SHA1 (patch-Makefile.am) = 9ce2a3c8acfa672786729c161010e56c1055055e +SHA1 (patch-configure) = 4954b157e6fa201f0542279e961f0e39c66ca23c +SHA1 (patch-hydra-gtk_src_Makefile.in) = 961b07aeb9e78cb4d5fa3e43213fd6164bcd08c3 +SHA1 (patch-hydra-snmp.c) = 1c17271eae1cdb56b6c89cdb55ea34f31dc7b67f diff --git a/security/hydra/options.mk b/security/hydra/options.mk index 4cdb0b1fdca..39f9b0631f2 100644 --- a/security/hydra/options.mk +++ b/security/hydra/options.mk @@ -1,23 +1,15 @@ -# $NetBSD: options.mk,v 1.7 2010/10/15 04:40:34 obache Exp $ +# $NetBSD: options.mk,v 1.8 2013/09/20 23:10:12 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.hydra -PKG_SUPPORTED_OPTIONS= gtkfe svn pgsql +PKG_SUPPORTED_OPTIONS= gtk svn pgsql .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mgtkfe) -.include "../../x11/gtk2/buildlink3.mk" - -post-configure: - cd ${WRKSRC}/hydra-gtk && \ - ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS} +PLIST_VARS+= gtk -post-build: - cd ${WRKSRC}/hydra-gtk && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} - -post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${DESTDIR}${PREFIX}/bin -PLIST_SRC+= ${PKGDIR}/PLIST.xhydra +.if !empty(PKG_OPTIONS:Mgtk) +.include "../../x11/gtk2/buildlink3.mk" +PLIST.gtk= yes .endif .if !empty(PKG_OPTIONS:Msvn) diff --git a/security/hydra/patches/patch-Makefile.am b/security/hydra/patches/patch-Makefile.am new file mode 100644 index 00000000000..fd6326aecf2 --- /dev/null +++ b/security/hydra/patches/patch-Makefile.am @@ -0,0 +1,28 @@ +$NetBSD: patch-Makefile.am,v 1.1 2013/09/20 23:10:12 joerg Exp $ + +--- Makefile.am.orig 2013-09-20 22:00:03.000000000 +0000 ++++ Makefile.am +@@ -55,15 +55,15 @@ strip: all + -echo OK > /dev/null && test -x xhydra && strip xhydra || echo OK > /dev/null + + install: strip +- -mkdir -p $(PREFIX)$(DIR) +- cp -f $(BINS) $(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 ${DESTDIR}$(PREFIX)$(DIR) ++ cp -f $(BINS) ${DESTDIR}$(PREFIX)$(DIR) && cd ${DESTDIR}$(PREFIX)$(DIR) && chmod 755 $(BINS) ++ -echo OK > /dev/null && test -x xhydra && cp xhydra ${DESTDIR}$(PREFIX)$(DIR) && cd ${DESTDIR}$(PREFIX)$(DIR) && chmod 755 xhydra || echo OK > /dev/null + # -cp -f dpl4hydra.sh ($PREFIX)/dpl4hydra.sh +- -sed -e "s|^INSTALLDIR=.*|INSTALLDIR="$(PREFIX)"|" dpl4hydra.sh > $(PREFIX)/bin/dpl4hydra.sh +- -chmod 755 $(PREFIX)/bin/dpl4hydra.sh +- -cp -f *.csv $(PREFIX)/etc/ +- -mkdir -p $(PREFIX)/man/man1 +- -cp -f hydra.1 xhydra.1 pw-inspector.1 $(PREFIX)/man/man1 ++ -sed -e "s|^INSTALLDIR=.*|INSTALLDIR="$(PREFIX)"|" dpl4hydra.sh > ${DESTDIR}$(PREFIX)/bin/dpl4hydra.sh ++ -chmod 755 ${DESTDIR}$(PREFIX)/bin/dpl4hydra.sh ++ -cp -f *.csv ${DESTDIR}$(PREFIX)/etc/ ++ -mkdir -p ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1 ++ -cp -f hydra.1 xhydra.1 pw-inspector.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1 + + clean: + 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 diff --git a/security/hydra/patches/patch-aa b/security/hydra/patches/patch-aa deleted file mode 100644 index dafb2d41189..00000000000 --- a/security/hydra/patches/patch-aa +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2008/08/31 10:54:52 adrianp Exp $ - ---- Makefile.am.orig 2006-05-05 15:10:44.000000000 +0100 -+++ Makefile.am -@@ -33,17 +33,12 @@ EXTRA_DIST = README README.arm README.pa - hydra-mod.h hydra.h crc32.h d3des.h md4.h - - all: pw-inspector hydra $(XHYDRA_SUPPORT) -- @echo -- @echo Now type "make install" - - hydra: $(OBJ) - $(CC) $(OPTS) $(LIBS) -o $(BIN) $(OBJ) $(LIBS) $(XLIBS) $(XLIBPATHS) || echo -e "\nIF YOU RECEIVED THE ERROR MESSAGE \"cannot find -lpq\" DO THE FOLLOWING:\n make clean; ./configure\n vi Makefile <- and remove the \"-lpq\" and \"-DLIBPOSTGRES\" statements\n make\n" -- @echo -- @echo If men could get pregnant, abortion would be a sacrament -- @echo - - xhydra: -- -cd hydra-gtk && ./make_xhydra.sh -+ # -cd hydra-gtk && ./make_xhydra.sh - - pw-inspector: pw-inspector.c - -$(CC) $(OPTS) -o pw-inspector pw-inspector.c diff --git a/security/hydra/patches/patch-ab b/security/hydra/patches/patch-ab deleted file mode 100644 index 8043e1aeb44..00000000000 --- a/security/hydra/patches/patch-ab +++ /dev/null @@ -1,175 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2008/08/31 10:54:52 adrianp Exp $ - ---- configure.orig 2006-01-20 13:44:15.000000000 +0000 -+++ configure -@@ -41,7 +41,8 @@ echo - echo "Checking for openssl (libssl/ssl.h) ..." - for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib \ - /*ssl /usr/*ssl /opt/*ssl /usr/local/*ssl /opt/local/*ssl \ --/*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib . -+/*ssl/lib /usr/*ssl/lib /opt/*ssl/lib /usr/local/*ssl/lib /opt/local/*ssl/lib \ -+@PREFIX@/lib . - do - if [ "X" = "X$SSL_PATH" ]; then - if [ -f "$i/libssl.so" -o -f "$i/libssl.dylib" ]; then -@@ -68,7 +69,7 @@ do - done - - for i in /usr/local/include /*ssl/include /usr/include \ --/opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include . -+/opt/*ssl/include /usr/*ssl/include /usr/local/*ssl/include @SSLBASE@/include . - do - if [ "X" = "X$SSL_IPATH" ]; then - if [ -f "$i/openssl/ssl.h" ]; then -@@ -96,50 +97,52 @@ if [ "$SSL_IPATH" = "/usr/include" ]; th - SSL_IPATH="" - fi - --echo "Checking for Postgres (libpq) ..." --for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib . --do -- if [ "X" = "X$POSTGRES_PATH" ]; then -- if [ -f "$i/libpq.so" -o -f "$i/libpq.dylib" ]; then -- POSTGRES_PATH="$i" -+if [ "X$WITH_PGSQL" = "X1" ]; then -+ echo "Checking for Postgres (libpq) ..." -+ for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib @PREFIX@/lib . -+ do -+ if [ "X" = "X$POSTGRES_PATH" ]; then -+ if [ -f "$i/libpq.so" -o -f "$i/libpq.dylib" ]; then -+ POSTGRES_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 [ -n "$TMP_LIB" ]; then -+ POSTGRES_PATH="$i" -+ fi -+ fi -+ done -+ if [ -n "$POSTGRES_PATH" ]; then -+ echo " ... found" - fi - if [ "X" = "X$POSTGRES_PATH" ]; then -- TMP_LIB=`/bin/ls $i/libpq.so* /bin/cygpq*.dll 2> /dev/null | grep pq` -- if [ -n "$TMP_LIB" ]; then -- POSTGRES_PATH="$i" -- fi -+ echo " ... NOT found, module postgres disabled" - 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 . --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" -- fi -+if [ "X$WITH_SVN" = "X1" ]; then -+ 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 @PREFIX@/lib . -+ 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" -+ fi -+ fi -+ 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 -+ SVN_PATH="$i" -+ fi -+ fi -+ done -+ if [ -n "$SVN_PATH" ]; then -+ echo " ... found" - fi - 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 -- SVN_PATH="$i" -- fi -+ echo " ... NOT found, module svn disabled" - fi -- -- --done --if [ -n "$SVN_PATH" ]; then -- echo " ... found" --fi --if [ "X" = "X$SVN_PATH" ]; then -- echo " ... NOT found, module svn disabled" - fi - - echo "Checking for SAP/R3 (librfc/saprfc.h) ..." -@@ -183,7 +186,7 @@ if [ "$SAPR3_IPATH" = "/usr/include" ]; - fi - - echo "Checking for libssh (libssh/libssh.h) ..." --for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib . -+for i in @PREFIX@/lib $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib . - do - if [ "X" = "X$SSH_PATH" ]; then - if [ -f "$i/libssh.so" -o -f "$i/libssh.dylib" ]; then -@@ -196,29 +199,33 @@ do - SSH_PATH="$i" - fi - fi -- if [ "X" = "X$SVN_IPATH" ]; then -- if [ -d "$i/subversion-1" ]; then -- SVN_IPATH="$i/subversion-1" -- fi -- fi -+ if [ "X$WITH_SVN" = "X1" ]; then -+ if [ "X" = "X$SVN_IPATH" ]; then -+ if [ -d "$i/subversion-1" ]; then -+ SVN_IPATH="$i/subversion-1" -+ fi -+ fi -+ fi - if [ "X" = "X$APR_IPATH" ]; then - if [ -d "$i/apr-0" ]; then - APR_IPATH="$i/apr-0" - fi - fi - done --for i in /usr/local/include /*ssl/include /usr/include . -+for i in @PREFIX@/include /usr/local/include /*ssl/include /usr/include . - do - if [ "X" = "X$SSH_IPATH" ]; then - if [ -f "$i/libssh/libssh.h" ]; then - SSH_IPATH="$i" - fi - fi -- if [ "X" = "X$SVN_IPATH" ]; then -- if [ -d "$i/subversion-1" ]; then -- SVN_IPATH="$i/subversion-1" -- fi -- fi -+ if [ "X$WITH_SVN" = "X1" ]; then -+ if [ "X" = "X$SVN_IPATH" ]; then -+ if [ -d "$i/subversion-1" ]; then -+ SVN_IPATH="$i/subversion-1" -+ fi -+ fi -+ fi - if [ "X" = "X$APR_IPATH" ]; then - if [ -d "$i/apr-0" ]; then - APR_IPATH="$i/apr-0" -@@ -451,9 +458,3 @@ cat Makefile.unix > Makefile - cat Makefile.in >> Makefile - cat Makefile.am >> Makefile - --echo --echo NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES NOTES --echo ======================================================================= --echo ARM/PalmPilot users: please run ./configure-arm or ./configure-palm respectivly --echo --echo "now type \"make\"" diff --git a/security/hydra/patches/patch-ac b/security/hydra/patches/patch-ac deleted file mode 100644 index 57e4f78262f..00000000000 --- a/security/hydra/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2006/02/05 00:18:29 adrianp Exp $ - ---- hydra-gtk/src/main.c.orig 2004-05-12 00:28:27.000000000 +0100 -+++ hydra-gtk/src/main.c -@@ -30,7 +30,7 @@ main (int argc, char *argv[]) - gtk_set_locale (); - gtk_init (&argc, &argv); - -- add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps"); -+ add_pixmap_directory ("@PREFIX@/share/xhydra/pixmaps"); - - /* initialize the message id */ - message_id = 0; diff --git a/security/hydra/patches/patch-ad b/security/hydra/patches/patch-ad deleted file mode 100644 index 309dd82b325..00000000000 --- a/security/hydra/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2005/04/17 12:19:54 adrianp Exp $ - ---- hydra-gtk/src/Makefile.in.orig 2005-01-05 22:33:45.000000000 +0000 -+++ hydra-gtk/src/Makefile.in 2005-01-05 22:34:23.000000000 +0000 -@@ -88,7 +88,7 @@ - xhydra_OBJECTS = main.o support.o interface.o callbacks.o - xhydra_DEPENDENCIES = - xhydra_LDFLAGS = --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ $(INCLUDES) - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) - LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ diff --git a/security/hydra/patches/patch-ae b/security/hydra/patches/patch-ae deleted file mode 100644 index 5e863ea26be..00000000000 --- a/security/hydra/patches/patch-ae +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2008/10/30 14:52:14 bad Exp $ - ---- hydra-gtk/src/callbacks.c.orig 2005-09-22 17:19:27.000000000 +0200 -+++ hydra-gtk/src/callbacks.c 2008-10-30 14:05:58.000000000 +0100 -@@ -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); -@@ -284,6 +269,21 @@ - } - } - -+ /* lastly, 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); -+ - /* clean up proxy settings */ - unsetenv("HYDRA_PROXY_HTTP"); - unsetenv("HYDRA_PROXY_CONNECT"); diff --git a/security/hydra/patches/patch-af b/security/hydra/patches/patch-af deleted file mode 100644 index 6a2cda52605..00000000000 --- a/security/hydra/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.2 2006/02/05 00:18:29 adrianp Exp $ - ---- hydra.c.orig 2006-01-20 11:39:15.000000000 +0000 -+++ hydra.c -@@ -167,7 +167,6 @@ typedef struct { - - /* external vars */ - extern char HYDRA_EXIT[5]; --extern int errno; - extern int debug; - extern int verbose; - extern int waittime; diff --git a/security/hydra/patches/patch-ag b/security/hydra/patches/patch-ag deleted file mode 100644 index 9824771033a..00000000000 --- a/security/hydra/patches/patch-ag +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ag,v 1.3 2008/08/31 10:54:52 adrianp Exp $ - ---- pw-inspector.c.orig 2007-03-22 14:04:29.000000000 +0000 -+++ pw-inspector.c -@@ -140,7 +140,7 @@ main(int argc, char *argv[]) - if (set_print) { - j = 0; - for (k = 0; k < strlen(buf); k++) -- if (isprint(buf[k]) && isalnum(buf[k]) == 0) -+ if (isprint((unsigned char)buf[k]) && isalnum((unsigned char)buf[k]) == 0) - j = 1; - if (j) - i++; -@@ -148,7 +148,7 @@ main(int argc, char *argv[]) - if (set_other) { - j = 0; - for (k = 0; k < strlen(buf); k++) -- if (isprint(buf[k]) == 0 && isalnum(buf[k]) == 0) -+ if (isprint((unsigned char)buf[k]) == 0 && isalnum((unsigned char)buf[k]) == 0) - j = 1; - if (j) - i++; diff --git a/security/hydra/patches/patch-configure b/security/hydra/patches/patch-configure new file mode 100644 index 00000000000..a01cbdb4e0c --- /dev/null +++ b/security/hydra/patches/patch-configure @@ -0,0 +1,20 @@ +$NetBSD: patch-configure,v 1.1 2013/09/20 23:10:12 joerg Exp $ + +--- configure.orig 2013-08-02 11:35:56.000000000 +0000 ++++ configure +@@ -79,12 +79,9 @@ NSL_PATH="" + SOCKET_PATH="" + MANDIR="" + XHYDRA_SUPPORT="" +-LIBDIRS=`cat /etc/ld.so.conf /etc/ld.so.conf.d/* 2> /dev/null | grep -v '^#' | sort | uniq` +-if [ "$SIXFOUR" = "64" ]; then +- LIBDIRS="$LIBDIRS /lib64 /usr/lib64 /usr/local/lib64 /opt/local/lib64" +-fi +-LIBDIRS="$LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib" +-INCDIRS="/usr/include /usr/local/include /opt/include /opt/local/include" ++LIBDIRS=${BUILDLINK_DIR}/lib ++INCDIRS=${BUILDLINK_DIR}/include ++ + STRIP="strip" + echo + diff --git a/security/hydra/patches/patch-hydra-gtk_src_Makefile.in b/security/hydra/patches/patch-hydra-gtk_src_Makefile.in new file mode 100644 index 00000000000..f0b584ad44b --- /dev/null +++ b/security/hydra/patches/patch-hydra-gtk_src_Makefile.in @@ -0,0 +1,19 @@ +$NetBSD: patch-hydra-gtk_src_Makefile.in,v 1.1 2013/09/20 23:10:12 joerg Exp $ + +--- hydra-gtk/src/Makefile.in.orig 2013-09-20 22:05:22.000000000 +0000 ++++ hydra-gtk/src/Makefile.in +@@ -83,12 +83,12 @@ PROGRAMS = $(bin_PROGRAMS) + + DEFS = @DEFS@ -I. -I$(srcdir) -I.. + CPPFLAGS = @CPPFLAGS@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ `pkg-config --libs gtk+-2.0` + LIBS = @LIBS@ + xhydra_OBJECTS = main.o support.o interface.o callbacks.o + xhydra_DEPENDENCIES = + xhydra_LDFLAGS = +-CFLAGS = @CFLAGS@ ++CFLAGS = @CFLAGS@ `pkg-config --cflags gtk+-2.0` + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ diff --git a/security/hydra/patches/patch-hydra-snmp.c b/security/hydra/patches/patch-hydra-snmp.c new file mode 100644 index 00000000000..e43ac4e3038 --- /dev/null +++ b/security/hydra/patches/patch-hydra-snmp.c @@ -0,0 +1,15 @@ +$NetBSD: patch-hydra-snmp.c,v 1.1 2013/09/20 23:10:12 joerg Exp $ + +--- hydra-snmp.c.orig 2013-08-02 11:35:56.000000000 +0000 ++++ hydra-snmp.c +@@ -335,8 +335,8 @@ int start_snmp(int s, char *ip, int port + // xor initVect with salt + for (i = 0; i < 8; i++) + initVect[i] ^= privacy_params[i]; +- des_key_sched((C_Block*)key, symcbc); +- des_ncbc_encrypt(snmpv3_get2 + 2, buf, sizeof(snmpv3_get2) - 2, symcbc, (C_Block*)(initVect), DES_ENCRYPT); ++ DES_key_sched((C_Block*)key, &symcbc); ++ DES_ncbc_encrypt(snmpv3_get2 + 2, buf, sizeof(snmpv3_get2) - 2, &symcbc, (C_Block*)(initVect), DES_ENCRYPT); + + #endif + |