[110688] trunk/dports/security/hydra
cal at macports.org
cal at macports.org
Tue Sep 3 15:59:31 PDT 2013
Revision: 110688
https://trac.macports.org/changeset/110688
Author: cal at macports.org
Date: 2013-09-03 15:59:31 -0700 (Tue, 03 Sep 2013)
Log Message:
-----------
hydra: update to 7.5, closes #36370, #38453
Modified Paths:
--------------
trunk/dports/security/hydra/Portfile
trunk/dports/security/hydra/files/patch-configure.diff
Added Paths:
-----------
trunk/dports/security/hydra/files/patch-Makefile.am-fail-if-xhydra-fails.diff
trunk/dports/security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fial-if-xhydra-fails.diff
Modified: trunk/dports/security/hydra/Portfile
===================================================================
--- trunk/dports/security/hydra/Portfile 2013-09-03 22:34:34 UTC (rev 110687)
+++ trunk/dports/security/hydra/Portfile 2013-09-03 22:59:31 UTC (rev 110688)
@@ -3,12 +3,11 @@
PortSystem 1.0
name hydra
-version 5.4
-revision 3
-distname ${name}-${version}-src
+version 7.5
categories security net
platforms darwin
maintainers nomaintainer
+license GPL-3 OpenSSL SSLeay
description \
A very fast network logon cracker which support many services
@@ -19,49 +18,218 @@
NNTP, VNC, ICQ, Socks5, PCNFS and more services within SSL \
support.
-homepage http://www.thc.org/thc-hydra
-master_sites http://freeworld.thc.org/releases
-checksums md5 fa08b465d19321e77b1a0ef912eeecc1
+homepage https://www.thc.org/thc-hydra
+master_sites https://www.thc.org/releases
+fetch.ignore_sslcert yes
-depends_lib port:openssl port:libssh01
+checksums rmd160 f5edc8473889ab90ef971226f4276683b193a466 \
+ sha256 7293e7c32198219688e5bf5308f7e8eab37ad78d49701c9860a6b22aecda0ab6
+depends_lib port:openssl \
+ port:libssh \
+ port:libidn \
+ port:ncurses \
+ port:pcre
+
+# place cut-markers and fix xhydra_support setting in line 957
patchfiles patch-configure.diff
+set incdir "${prefix}/include"
+set libdir "${prefix}/lib"
+
post-patch {
- reinplace "s|SSL_PATH=\"\"|SSL_PATH=\"${prefix}/lib\"|" ${worksrcpath}/configure
- reinplace "s|SSL_IPATH=\"\"|SSL_IPATH=\"${prefix}/include\"|" ${worksrcpath}/configure
- reinplace "s|CRYPTO_PATH=\"\"|CRYPTO_PATH=\"${prefix}/lib\"|" ${worksrcpath}/configure
- reinplace "s|SSH_PATH=\"\"|SSH_PATH=\"${prefix}/lib/libssh01\"|" ${worksrcpath}/configure
- reinplace "s|SSH_IPATH=\"\"|SSH_IPATH=\"${prefix}/include/libssh01\"|" ${worksrcpath}/configure
+ # Look only in Macports directories
+ reinplace "s|^INCDIRS=.*$|INCDIRS=\"${incdir}\"|g" ${worksrcpath}/configure
+ reinplace "s|^LIBDIRS=.*$|LIBDIRS=\"${libdir}\"|g" ${worksrcpath}/configure
+ reinplace "s|XLIBPATHS=\"-L/usr/lib -L/usr/local/lib -L/lib\"|XLIBPATHS=\"\"|g" ${worksrcpath}/configure
+
+ # Disable searching for libs/headers for any module NOT set as variant
+ if {![variant_isset postgresql80] && ![variant_isset postgresql81] && \
+ ![variant_isset postgresql82] && ![variant_isset postgresql83] && \
+ ![variant_isset postgresql84] && ![variant_isset postgresql90] && \
+ ![variant_isset postgresql91] && ![variant_isset postgresql92]} {
+ reinplace -E "/#@@CUT_POSTGRES/,/#CUT_POSTGRES@@/d" ${worksrcpath}/configure
+ }
+
+ if {![variant_isset mysql5] && ![variant_isset mysql51] && [variant_isset mysql55] && \
+ ![variant_isset mariadb] && ![variant_isset percona]} {
+ reinplace -E "/#@@CUT_MYSQLA/,/#CUT_MYSQLA@@/d" ${worksrcpath}/configure
+ reinplace -E "/#@@CUT_MYSQLB/,/#CUT_MYSQLB@@/d" ${worksrcpath}/configure
+ } else {
+ # Fix include path
+ reinplace "s|MYSQL_IPATH=\"\$i/mysql\"|MYSQL_IPATH=\"\$i\"|" ${worksrcpath}/configure
+ }
+
+ if {![variant_isset oracle]} {
+ reinplace -E "/#@@CUT_ORACLE/,/#CUT_ORACLE@@/d" ${worksrcpath}/configure
+ } else {
+ # Async I/O is compiled into libSystem.B.dylib
+ reinplace "s|LIBAIO=\"\"|LIBAIO=\"YES_WE_HAVE\"|g" ${worksrcpath}/configure
+ }
+
+ if {![variant_isset subversion]} {
+ reinplace -E "/#@@CUT_SVN/,/#CUT_SVN@@/d" ${worksrcpath}/configure
+ }
+
+ # These are not in variants, because they do not exist as ports (yet)
+ reinplace -E "/#@@CUT_FB/,/#CUT_FB@@/d" ${worksrcpath}/configure
+ reinplace -E "/#@@CUT_AFP/,/#CUT_AFP@@/d" ${worksrcpath}/configure
+ reinplace -E "/#@@CUT_NCP/,/#CUT_NCP@@/d" ${worksrcpath}/configure
+ reinplace -E "/#@@CUT_SAP/,/#CUT_SAP@@/d" ${worksrcpath}/configure
+
+ # This one is very strange, it adds /usr/kerberos/include to the path
+ # but I cannot find that it's being used anywhere. At the same time,
+ # krb5.h is in /opt/local/include, so it's found from the default search path
+ # if installed. We delete it here, because it we do not want anything from /usr,
+ # but I don't know how to otherwise disable kerberos, or that it even matters.
+ reinplace -E "/#@@CUT_KRB/,/CUT_KRB@@/d" ${worksrcpath}/configure
}
configure.args --disable-xhydra
post-configure {
reinplace "s|CC=gcc|CC=${configure.cc}|" ${worksrcpath}/Makefile
+ reinplace "s|^OPTS=.*$|OPTS=-I. -Wall ${configure.cflags}|" ${worksrcpath}/Makefile
}
-build.args XIPATHS="-I${prefix}/include/libssh01 -I${prefix}/include" \
- XLIBPATHS="-L${prefix}/lib/libssh01 -L${prefix}/lib"
-
pre-destroot {
reinplace "s|PREFIX=${prefix}|PREFIX=${destroot}${prefix}|" ${worksrcpath}/Makefile
+ reinplace "s|/man/man1|/share/man/man1|g" ${worksrcpath}/Makefile
set docdir ${destroot}${prefix}/share/doc/${name}-${version}
xinstall -d ${docdir}
xinstall -m 644 -W ${worksrcpath} \
CHANGES \
- LICENCE.HYDRA \
- LICENSE.GNU \
+ LICENSE \
+ LICENSE.OPENSSL \
README \
- TODO \
${docdir}
}
variant xhydra description {Add xhydra GUI} {
+ patchfiles-append patch-Makefile.am-fail-if-xhydra-fails.diff \
+ patch-hydra-gtk__make_xhydra.sh-fial-if-xhydra-fails.diff
+ depends_build-append port:pkgconfig
depends_lib-append port:gtk2
configure.args-delete --disable-xhydra
+ build.env-append CC=${configure.cc}
}
+variant postgresql80 \
+conflicts postgresql81 postgresql82 postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 \
+description {Add support for PostgreSQL 8.0} {
+ depends_lib-append port:postgresql80
+ set incdir "${incdir} ${prefix}/include/postgresql80"
+ set libdir "${libdir} ${prefix}/lib/postgresql80"
+}
+
+variant postgresql81 \
+conflicts postgresql80 postgresql82 postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 \
+description {Add support for PostgreSQL 8.1} {
+ depends_lib-append port:postgresql81
+ set incdir "${incdir} ${prefix}/include/postgresql81"
+ set libdir "${libdir} ${prefix}/lib/postgresql81"
+}
+
+variant postgresql82 \
+conflicts postgresql80 postgresql81 postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 \
+description {Add support for PostgreSQL 8.2} {
+ depends_lib-append port:postgresql82
+ set incdir "${incdir} ${prefix}/include/postgresql82"
+ set libdir "${libdir} ${prefix}/lib/postgresql82"
+}
+
+variant postgresql83 \
+conflicts postgresql80 postgresql81 postgresql82 postgresql84 postgresql90 postgresql91 postgresql92 \
+description {Add support for PostgreSQL 8.3} {
+ depends_lib-append port:postgresql83
+ set incdir "${incdir} ${prefix}/include/postgresql83"
+ set libdir "${libdir} ${prefix}/lib/postgresql83"
+}
+
+variant postgresql84 \
+conflicts postgresql80 postgresql81 postgresql82 postgresql83 postgresql90 postgresql91 postgresql92 \
+description {Add support for PostgreSQL 8.4} {
+ depends_lib-append port:postgresql84
+ set incdir "${incdir} ${prefix}/include/postgresql84"
+ set libdir "${libdir} ${prefix}/lib/postgresql84"
+}
+
+variant postgresql90 \
+conflicts postgresql80 postgresql81 postgresql82 postgresql83 postgresql84 postgresql91 postgresql92 \
+description {Add support for PostgreSQL 9.0} {
+ depends_lib-append port:postgresql90
+ set incdir "${incdir} ${prefix}/include/postgresql90"
+ set libdir "${libdir} ${prefix}/lib/postgresql90"
+}
+
+variant postgresql91 \
+conflicts postgresql80 postgresql81 postgresql82 postgresql83 postgresql84 postgresql90 postgresql92 \
+description {Add support for PostgreSQL 9.1} {
+ depends_lib-append port:postgresql91
+ set incdir "${incdir} ${prefix}/include/postgresql91"
+ set libdir "${libdir} ${prefix}/lib/postgresql91"
+}
+
+variant postgresql92 \
+conflicts postgresql80 postgresql81 postgresql82 postgresql83 postgresql84 postgresql90 postgresql91 \
+description {Add support for PostgreSQL 9.2} {
+ depends_lib-append port:postgresql92
+ set incdir "${incdir} ${prefix}/include/postgresql92"
+ set libdir "${libdir} ${prefix}/lib/postgresql92"
+}
+
+variant mysql5 conflicts mysql51 mysql55 mariadb percona description {Add support for MySQL5} {
+ depends_lib-append port:mysql5
+ set incdir "${incdir} ${prefix}/include/mysql5"
+ set libdir "${incdir} ${prefix}/lib/mysql5/mysql"
+}
+
+variant mysql51 conflicts mysql5 mysql55 mariadb percona description {Add support for MySQL 5.1} {
+ depends_lib-append port:mysql51
+ set incdir "${incdir} ${prefix}/include/mysql51"
+ set libdir "${libdir} ${prefix}/lib/mysql51/mysql"
+}
+
+variant mysql55 conflicts mysql5 mysql51 mariadb percona description {Add support for MySQL 5.5} {
+ depends_lib-append port:mysql55
+ set incdir "${incdir} ${prefix}/include/mysql55"
+ set libdir "${libdir} ${prefix}/lib/mysql55/mysql"
+}
+
+variant mariadb conflicts mysql5 mysql51 mysql55 percona description {Add support for MariaDB} {
+ depends_lib-append port:mariadb
+ set incdir "${incdir} ${prefix}/include/mariadb"
+ set libdir "${libdir} ${prefix}/lib/mariadb/mysql"
+}
+
+variant percona conflicts mysql5 mysql51 mysql55 mariadb description {Add support for Percona} {
+ depends_lib-append port:percona
+ set incdir "${incdir} ${prefix}/include/percona"
+ set libdir "${libdir} ${prefix}/lib/percona/mysql"
+}
+
+variant oracle description {Add support for Oracle} {
+ depends_lib-append port:oracle-instantclient
+ configure.args-append --with-oracle=${prefix}/lib/oracle/sdk/include \
+ --with-oracle-lib=${prefix}/lib/oracle
+}
+
+variant subversion description {Add support for Subversion} {
+ depends_lib-append port:subversion
+}
+
+# Add this variant once someone creates a port for FirebirdSQL.
+# See: http://www.firebirdsql.org/
+# variant firebird description {Add support for FirebirdSQL} {}
+
+# Add this variant once someone creates a port for AFP-fs, the FUSE filesystem for Apple Filing Protocol
+# See: https://sites.google.com/site/alexthepuffin/
+# variant afp description {Add support for Apple Filing Protocol} {}
+
+# Add this variant once someone creates a port for ncpfs, an implementation of the Netware Core Protocol
+# See: http://prope.insa-lyon.fr/~ppollet/ncpfs/
+# variant ncp description {Add support for Netware Core Protocol} {}
+
livecheck.type regex
livecheck.url ${homepage}
-livecheck.regex "${name}-(.*?)-src"
+livecheck.regex "Current Version: (.*)"
Added: trunk/dports/security/hydra/files/patch-Makefile.am-fail-if-xhydra-fails.diff
===================================================================
--- trunk/dports/security/hydra/files/patch-Makefile.am-fail-if-xhydra-fails.diff (rev 0)
+++ trunk/dports/security/hydra/files/patch-Makefile.am-fail-if-xhydra-fails.diff 2013-09-03 22:59:31 UTC (rev 110688)
@@ -0,0 +1,11 @@
+--- Makefile.am.orig 2013-09-04 00:55:25.000000000 +0200
++++ Makefile.am 2013-09-04 00:55:32.000000000 +0200
+@@ -42,7 +42,7 @@
+ @echo
+
+ xhydra:
+- -cd hydra-gtk && sh ./make_xhydra.sh
++ cd hydra-gtk && sh ./make_xhydra.sh
+
+ pw-inspector: pw-inspector.c
+ -$(CC) $(OPTS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o pw-inspector $(PWI_LOGO) pw-inspector.c
Modified: trunk/dports/security/hydra/files/patch-configure.diff
===================================================================
--- trunk/dports/security/hydra/files/patch-configure.diff 2013-09-03 22:34:34 UTC (rev 110687)
+++ trunk/dports/security/hydra/files/patch-configure.diff 2013-09-03 22:59:31 UTC (rev 110688)
@@ -1,20 +1,455 @@
---- configure 2006-01-20 07:44:15.000000000 -0600
-+++ configure 2008-06-04 03:27:13.000000000 -0500
-@@ -38,6 +38,8 @@
+--- configure.orig 2013-08-02 13:35:56.000000000 +0200
++++ configure 2013-09-04 00:47:08.000000000 +0200
+@@ -79,12 +79,12 @@
+ SOCKET_PATH=""
+ MANDIR=""
+ XHYDRA_SUPPORT=""
+-LIBDIRS=`cat /etc/ld.so.conf /etc/ld.so.conf.d/* 2> /dev/null | grep -v '^#' | sort | uniq`
++LIBDIRS="/opt/local/lib"
+ 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="/opt/local/lib"
++INCDIRS="/opt/local/include"
STRIP="strip"
echo
-+if false; then
-+
- 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 \
-@@ -259,6 +261,8 @@
- APR_IPATH=""
+@@ -262,171 +262,7 @@
+ PCRE_PATH=""
+ PCRE_IPATH=""
fi
+-
+-echo "Checking for Postgres (libpq.so, libpq-fe.h) ..."
+-if [ "$SYSO" = "Cygwin" ]; then
+- echo " ... DISABLED - postgres is buggy in Cygwin at the moment"
+- POSTGRES_PATH=""
+- POSTGRES_IPATH=""
+-else
+- for i in $LIBDIRS ; do
+- if [ "X" = "X$POSTGRES_PATH" ]; then
+- if [ -f "$i/libpq.so" -o -f "$i/libpq.dylib" -o -f "$i/libpq.a" ]; then
+- POSTGRES_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$POSTGRES_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libpq.so* 2> /dev/null | grep pq`
+- if [ -n "$TMP_LIB" ]; then
+- POSTGRES_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$POSTGRES_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libpq.dll* 2> /dev/null | grep pq`
+- if [ -n "$TMP_LIB" ]; then
+- POSTGRES_PATH="$i"
+- fi
+- fi
+- done
+- POSTGRES_IPATH=
+- for i in $INCDIRS \
+- /opt/p*sql*/include /usr/*p*sql*/include /usr/local/*psql*/include
+- do
+- if [ "X" = "X$POSTGRES_IPATH" ]; then
+- if [ -f "$i/libpq-fe.h" ]; then
+- POSTGRES_IPATH="$i"
+- fi
+- if [ -f "$i/pgsql/libpq-fe.h" ]; then
+- POSTGRES_IPATH="$i/pgsql"
+- fi
+- if [ -f "$i/postgresql/libpq-fe.h" ]; then
+- POSTGRES_IPATH="$i/postgresql"
+- fi
+- fi
+- done
+-
+- if [ -n "$POSTGRES_PATH" -a -n "$POSTGRES_IPATH" ]; then
+- echo " ... found"
+- fi
+- if [ "X" = "X$POSTGRES_PATH" -o "X" = "X$POSTGRES_IPATH" ]; then
+- echo " ... NOT found, module postgres disabled"
+- POSTGRES_PATH=""
+- POSTGRES_IPATH=""
+- fi
+-fi
+-
+-echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..."
+-for i in $LIBDIRS ; do
+- 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$SVN_PATH" ]; then
+- if [ -f "$i/libsvn_client-1.dylib" ]&&[ -f "$i/libapr-1.dylib" ]&&[ -f "$i/libaprutil-1.dylib" ]; then
+- SVN_PATH="$i"
+- APR_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$SVN_PATH" ]; then
+- if [ -f "$i/libsvn_client-1.a" ]&&[ -f "$i/libapr-1.a" ]&&[ -f "$i/libaprutil-1.a" ]; then
+- SVN_PATH="$i"
+- APR_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"
+- APR_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$SVN_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libsvn_client*.dll* 2> /dev/null | grep libsvn_client.`
+- if [ -n "$TMP_LIB" ]; then
+- SVN_PATH="$i"
+- APR_PATH="$i"
+- fi
+- fi
+-done
+-for i in $INCDIRS ; do
+- 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=""
+- SVN_IPATH=""
+- APR_IPATH=""
+-fi
+-if [ "$SVN_IPATH" = "/usr/include" ]; then
+- SVN_IPATH=""
+-fi
+-if [ "$APR_IPATH" = "/usr/include" ]; then
+- APR_IPATH=""
+-fi
+-
+-if [ -n "$SVN_PATH" -a -n "$APR_PATH" ]; then
+- echo " ... found"
+-fi
+-if [ "X" = "X$SVN_PATH" -o "X" = "X$APR_PATH" ]; then
+- echo " ... NOT found, module svn disabled"
+-fi
+-
+-echo "Checking for firebird (libfbclient.so) ..."
+-for i in $LIBDIRS ; do
+- if [ "X" = "X$FIREBIRD_PATH" ]; then
+- if [ -f "$i/libfbclient.so" -o -f "$i/libfbclient.dylib" -o -f "$i/libfbclient.a" ]; then
+- FIREBIRD_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$FIREBIRD_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libfbclient.so.* 2> /dev/null | grep libfbclient.`
+- if [ -n "$TMP_LIB" ]; then
+- FIREBIRD_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$FIREBIRD_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libfbclient.dll* 2> /dev/null | grep libfbclient.`
+- if [ -n "$TMP_LIB" ]; then
+- FIREBIRD_PATH="$i"
+- fi
+- fi
+-done
+-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
+-if [ "X" = "X$FIREBIRD_PATH" -o "X" = "X$FIREBIRD_IPATH" ]; then
+- echo " ... NOT found, module firebird disabled"
+- FIREBIRD_PATH=""
+- FIREBIRD_IPATH=""
+-fi
+-
++#@@CUT_MYSQLA
+ echo "Checking for MYSQL client (libmysqlclient.so, math.h) ..."
+ for i in $LIBDIRS ; do
+ if [ "X" = "X$MYSQL_PATH" ]; then
+@@ -450,13 +286,15 @@
+ for i in $INCDIRS ; do
+ if [ "X" != "X$MYSQL_PATH" ]; then
+ if [ -f "$i/mysql/mysql.h" ]; then
+- MYSQL_IPATH="$i/mysql"
++ MYSQL_IPATH="$i"
+ fi
+ fi
+ done
++#CUT_MYSQLA@@
+ MATH=""
+ if [ -f "/usr/include/math.h" ]; then
+ MATH="-DHAVE_MATH_H"
++#@@CUT_MYSQLB
+ if [ -n "$MYSQL_PATH" -a -n "$MYSQL_IPATH" -a -n "$MATH" ]; then
+ echo " ... found"
+ else
+@@ -466,117 +304,8 @@
+ fi
+ else
+ echo " ... math.h not found, module Mysql disabled"
++#CUT_MYSQLB@@
+ fi
+-echo "Checking for AFP (libafpclient.so) ..."
+-for i in $LIBDIRS ; do
+- if [ "X" = "X$AFP_PATH" ]; then
+- if [ -f "$i/libafpclient.so" -o -f "$i/libafpclient.so" -o -f "$i/libafpclient.a" ]; 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
+- if [ "X" = "X$AFP_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libafpclient.dll* 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
+-if [ "X" = "X$AFP_PATH" -o "X" = "X$AFP_IPATH" ]; then
+- echo " ... NOT found, module Apple Filing Protocol disabled - Apple sucks anyway"
+- AFP_PATH=""
+- AFP_IPATH=""
+-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" -o -f "$i/libncp.dylib" -o -f "$i/libncp.a" ]; 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
+- if [ "X" = "X$NCP_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libncp.dll* 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
+-if [ "X" = "X$NCP_PATH" -o "X" = "X$NCP_IPATH" ]; then
+- echo " ... NOT found, module NCP disabled"
+- NCP_PATH=""
+- NCP_IPATH=""
+-fi
+-
+-echo "Checking for SAP/R3 (librfc/saprfc.h) ..."
+-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
+-if [ "X" = "X$SAPR3_IPATH" ]; then
+- SAPR3_PATH=""
+-fi
+-if [ -n "$SAPR3_PATH" ]; then
+- echo " ... found"
+-fi
+-if [ "X" = "X$SAPR3_PATH" ]; then
+- echo " ... NOT found, module sapr3 disabled"
+- echo "Get it from http://www.sap.com/solutions/netweaver/linux/eval/index.asp"
+-fi
+-if [ "$SAPR3_IPATH" = "/usr/include" ]; then
+- SAPR3_IPATH=""
+-fi
+-
+ echo "Checking for libssh (libssh/libssh.h) ..."
+ for i in $LIBDIRS ; do
+ if [ "X" = "X$SSH_PATH" ]; then
+@@ -658,100 +387,6 @@
+ fi
-+fi
-+
- SYS=`uname -s`
- if [ "$SYS" = "SunOS" ]; then
- echo "Checking for Solaris libraries ..."
+
+-echo "Checking for Oracle (libocci.so libclntsh.so / oci.h and libaio.so) ..."
+-#assume if we find oci.h other headers should also be in that dir
+-#for libs we will test the 2
+-if [ "X" != "X$WORACLE_PATH" ]; then
+- INCDIRS="$INCDIRS $WORACLE_PATH"
+-fi
+-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
+- if [ -f "$i/libocci.dylib" ]&&[ -f "$i/libclntsh.dylib" ]; then
+- ORACLE_PATH="$i"
+- fi
+- fi
+- if [ "X" = "X$ORACLE_PATH" ]; then
+- if [ -f "$i/libocci.a" ]&&[ -f "$i/libclntsh.a" ]; 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
+- if [ "X" = "X$ORACLE_PATH" ]; then
+- TMP_LIB=`/bin/ls $i/libocci.dll* 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.dll* 2> /dev/null | grep clntsh.`
+- if [ -z "$TMP_LIB" ]; then
+- ORACLE_PATH=""
+- fi
+- fi
+- fi
+-done
+-#check for Kernel Asynchronous I/O (AIO) lib support
+-if [ "X" != "X$ORACLE_PATH" ]; then
+- LIBAIO=""
+- for i in $LIBDIRS ; do
+- if [ "X" = "X$LIBAIO" ]; then
+- if [ -f "$i/libaio.so" -o -f "$i/libaio.dylib" -o -f "$i/libaio.a" ]; then
+- LIBAIO="$i"
+- fi
+- fi
+- if [ "X" = "X$LIBAIO" ]; then
+- TMP_LIB=`/bin/ls $i/libaio.so.* 2> /dev/null | grep aio.`
+- if [ -n "$TMP_LIB" ]; then
+- LIBAIO="$i"
+- fi
+- TMP_LIB=`/bin/ls $i/libaio.dll* 2> /dev/null | grep aio.`
+- if [ -n "$TMP_LIB" ]; then
+- LIBAIO="$i"
+- fi
+- fi
+- done
+- if [ "X" = "X$LIBAIO" ]; then
+- ORACLE_PATH=""
+- fi
+-fi
+-
+-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
+-if [ "X" = "X$ORACLE_PATH" -o "X" = "X$ORACLE_IPATH" ]; then
+- echo " ... NOT found, module Oracle disabled"
+- echo "Get basic and sdk package from http://www.oracle.com/technetwork/database/features/instant-client/index.html"
+- ORACLE_PATH=""
+- ORACLE_IPATH=""
+-fi
+-
+-
+ if [ "X" = "X$XHYDRA_SUPPORT" ]; then
+ echo "Checking for GUI req's (pkg-config, gtk+-2.0) ..."
+ XHYDRA_SUPPORT=`pkg-config --help > /dev/null 2>&1 || echo disabled`
+@@ -830,7 +465,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 "$CURSES_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=""
+ fi
+ if [ -n "$SSL_PATH" ]; then
+ if [ -n "$SSLNEW" ]; then
+@@ -972,16 +607,11 @@
+ if [ -n "$RESOLV_PATH" ]; then
+ XLIBS="$XLIBS -lresolv"
+ fi
+-
+-if [ -d /usr/kerberos/include ]; then
+- XIPATHS="$XIPATHS -I/usr/kerberos/include"
+-fi
+-
+ if [ "X" = "X$PREFIX" ]; then
+ PREFIX="/usr/local"
+ fi
+
+-if [ "X" = "X$XHYDRA_SUPPORT" ]; then
++if [ "X" = "X$XHYDRA_SUPPORT" -o "Xdisable" = "X$XHYDRA_SUPPORT" ]; then
+ XHYDRA_SUPPORT=""
+ else
+ XHYDRA_SUPPORT="xhydra"
Added: trunk/dports/security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fial-if-xhydra-fails.diff
===================================================================
--- trunk/dports/security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fial-if-xhydra-fails.diff (rev 0)
+++ trunk/dports/security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fial-if-xhydra-fails.diff 2013-09-03 22:59:31 UTC (rev 110688)
@@ -0,0 +1,27 @@
+--- hydra-gtk/make_xhydra.sh.orig 2013-09-04 00:53:54.000000000 +0200
++++ hydra-gtk/make_xhydra.sh 2013-09-04 00:54:42.000000000 +0200
+@@ -2,19 +2,15 @@
+ PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/lib/pkgconfig
+ export PKG_CONFIG_PATH
+ echo "Trying to compile xhydra now (hydra gtk gui) - dont worry if this fails, this is really optional ..."
+-./configure > /dev/null 2> errors
++./configure
+ test -e Makefile || {
+- echo "Error: configure wasnt happy. Analyse this:"
+- cat errors
++ echo "Error: configure wasnt happy."
+ exit 1
+ }
+-make > /dev/null 2> errors
++make
+ test -e src/xhydra || {
+- echo "Error: could not compile. Analyse this:"
+- cat errors
+- echo
+- echo 'Do not worry, as I said, xhydra is really optional. ./hydra is ready to go!'
+- exit 0
++ echo "Error: could not compile."
++ exit 1
+ }
+ cp -v src/xhydra ..
+ echo "The GTK GUI is ready, type \"./xhydra\" to start"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130903/5e20bac6/attachment-0001.html>
More information about the macports-changes
mailing list