<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/94917613b6195a52b5e66e706a72411fab279446">https://github.com/macports/macports-ports/commit/94917613b6195a52b5e66e706a72411fab279446</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 94917613b61 hydra: update to 9.1 & new variants
</span>94917613b61 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 94917613b6195a52b5e66e706a72411fab279446
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Wed Jul 29 11:49:45 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> hydra: update to 9.1 & new variants
</span>---
security/hydra/Portfile | 43 +-
.../patch-Makefile.am-fail-if-xhydra-fails.diff | 11 -
security/hydra/files/patch-configure.diff | 439 ---------------------
...-gtk__make_xhydra.sh-fail-if-xhydra-fails.diff} | 6 +-
4 files changed, 30 insertions(+), 469 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/hydra/Portfile b/security/hydra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4acc10300fb..ffa63411538 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/hydra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/hydra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ PortSystem 1.0
</span>
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup vanhauser-thc thc-hydra 9.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup vanhauser-thc thc-hydra 9.1 v
</span> name hydra
revision 0
categories security net
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,9 +19,9 @@ long_description \
</span> NNTP, VNC, ICQ, Socks5, PCNFS and more services within SSL \
support.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9a0b2076d153fc831a095bfae98792185d430cde \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3be2a19557dec452ef6cc33ee9fbfbfc02cb7a6ea46dfd23e2fe08d5ad076a08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1168651
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b41ef0d58c7c4d9aa477090c68f17f30b758608a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 73bc3d65862d513ff6f64e9221e8b6e52fbed5902f2918db465798d3d2c5706e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 612022
</span>
depends_lib-append port:libssh \
port:libidn \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,13 +38,15 @@ post-patch {
</span> 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
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-L/usr/lib -L/usr/local/lib||g" ${worksrcpath}/configure
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset mysql55] || [variant_isset mariadb] || [variant_isset mysql57]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset mysql57] || [variant_isset mariadb]} {
</span> reinplace "s|MYSQL_IPATH=\"\$i/mysql\"|MYSQL_IPATH=\"\$i\"|" ${worksrcpath}/configure
}
}
configure.args --disable-xhydra
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CC=${configure.cc}
</span>
pre-destroot {
reinplace "s|/man/man1|/share/man/man1|g" ${worksrcpath}/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +56,7 @@ pre-destroot {
</span> CHANGES \
LICENSE \
LICENSE.OPENSSL \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README.md \
</span> ${docdir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,41 +64,50 @@ variant xhydra description {Add xhydra GUI} {
</span> depends_build-append port:pkgconfig
depends_lib-append port:gtk2
configure.args-delete --disable-xhydra
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-Wl,--allow-multiple-definition|-W|g" ${worksrcpath}/hydra-gtk/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-hydra-gtk__make_xhydra.sh-fail-if-xhydra-fails.diff
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql96 conflicts postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql96 conflicts postgresql12 postgresql13 \
</span> description {Add support for PostgreSQL 9.6} {
depends_lib-append port:postgresql96
set incdir "${incdir} ${prefix}/include/postgresql96"
set libdir "${libdir} ${prefix}/lib/postgresql96"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant postgresql12 conflicts postgresql96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql12 conflicts postgresql96 postgresql13 \
</span> description {Add support for PostgreSQL 12} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:postgresql96
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql12
</span> set incdir "${incdir} ${prefix}/include/postgresql12"
set libdir "${libdir} ${prefix}/lib/postgresql12"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql55 conflicts mysql57 mariadb description {Add support for MySQL 5.5} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:mysql55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set incdir "${incdir} ${prefix}/include/mysql55"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libdir "${libdir} ${prefix}/lib/mysql55/mysql"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant postgresql13 conflicts postgresql96 postgresql12 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description {Add support for PostgreSQL 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:postgresql13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set incdir "${incdir} ${prefix}/include/postgresql13"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libdir "${libdir} ${prefix}/lib/postgresql13"
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mysql57 conflicts mysql55 mariadb description {Add support for MySQL 5.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mysql57 conflicts mariadb description {Add support for MySQL 5.7} {
</span> depends_lib-append port:mysql57
set incdir "${incdir} ${prefix}/include/mysql57"
set libdir "${libdir} ${prefix}/lib/mysql57/mysql"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant mariadb conflicts mysql55 mysql57 description {Add support for MariaDB} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant mariadb conflicts mysql57 description {Add support for MariaDB 5.5} {
</span> depends_lib-append port:mariadb
set incdir "${incdir} ${prefix}/include/mariadb"
set libdir "${libdir} ${prefix}/lib/mariadb/mysql"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant smb2 description {Add support for SMB 2 and 3} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:samba3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set libdir "${libdir} ${prefix}/lib/samba3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant subversion description {Add support for Subversion} {
depends_lib-append port:subversion
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/hydra/files/patch-Makefile.am-fail-if-xhydra-fails.diff b/security/hydra/files/patch-Makefile.am-fail-if-xhydra-fails.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e1902cee87b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/hydra/files/patch-Makefile.am-fail-if-xhydra-fails.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.am.orig 2013-09-04 00:55:25.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.am 2013-09-04 00:55:32.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xhydra:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- -cd hydra-gtk && sh ./make_xhydra.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cd hydra-gtk && sh ./make_xhydra.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pw-inspector: pw-inspector.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -$(CC) $(OPTS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o pw-inspector $(PWI_LOGO) pw-inspector.c
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/hydra/files/patch-configure.diff b/security/hydra/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e4abd9d1e18..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/hydra/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,439 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2013-08-02 13:35:56.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2013-09-04 00:47:08.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -262,171 +262,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PCRE_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PCRE_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Checking for Postgres (libpq.so, libpq-fe.h) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "$SYSO" = "Cygwin" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... DISABLED - postgres is buggy in Cygwin at the moment"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$POSTGRES_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libpq.so" -o -f "$i/libpq.dylib" -o -f "$i/libpq.a" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$POSTGRES_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libpq.so* 2> /dev/null | grep pq`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$POSTGRES_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libpq.dll* 2> /dev/null | grep pq`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_IPATH=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for i in $INCDIRS \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/p*sql*/include /usr/*p*sql*/include /usr/local/*psql*/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$POSTGRES_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libpq-fe.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_IPATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/pgsql/libpq-fe.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_IPATH="$i/pgsql"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/postgresql/libpq-fe.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_IPATH="$i/postgresql"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$POSTGRES_PATH" -a -n "$POSTGRES_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$POSTGRES_PATH" -o "X" = "X$POSTGRES_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... NOT found, module postgres disabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- POSTGRES_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$SVN_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-1.so" ]&&[ -f "$i/libaprutil-1.so" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$SVN_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libsvn_client-1.dylib" ]&&[ -f "$i/libapr-1.dylib" ]&&[ -f "$i/libaprutil-1.dylib" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$SVN_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libsvn_client-1.a" ]&&[ -f "$i/libapr-1.a" ]&&[ -f "$i/libaprutil-1.a" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$SVN_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libsvn_client*.so* 2> /dev/null | grep libsvn_client.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$SVN_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libsvn_client*.dll* 2> /dev/null | grep libsvn_client.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $INCDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$SVN_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d "$i/subversion-1" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_IPATH="$i/subversion-1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d "$i/svn" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_IPATH="$i/svn"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$APR_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d "$i/apr-1.0" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_IPATH="$i/apr-1.0"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d "$i/apr-1" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_IPATH="$i/apr-1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d "$i/apr" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_IPATH="$i/apr"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$SVN_PATH" -o "X" = "X$SVN_IPATH" -o "X" = "X$APR_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "$SVN_IPATH" = "/usr/include" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SVN_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "$APR_IPATH" = "/usr/include" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- APR_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ -n "$SVN_PATH" -a -n "$APR_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$SVN_PATH" -o "X" = "X$APR_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... NOT found, module svn disabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Checking for firebird (libfbclient.so) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$FIREBIRD_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libfbclient.so" -o -f "$i/libfbclient.dylib" -o -f "$i/libfbclient.a" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FIREBIRD_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$FIREBIRD_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libfbclient.so.* 2> /dev/null | grep libfbclient.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FIREBIRD_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$FIREBIRD_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libfbclient.dll* 2> /dev/null | grep libfbclient.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FIREBIRD_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $INCDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" != "X$FIREBIRD_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/ibase.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FIREBIRD_IPATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ -n "$FIREBIRD_PATH" -a -n "$FIREBIRD_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$FIREBIRD_PATH" -o "X" = "X$FIREBIRD_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... NOT found, module firebird disabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FIREBIRD_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FIREBIRD_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#@@CUT_MYSQLA
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Checking for MYSQL client (libmysqlclient.so, math.h) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "X" = "X$MYSQL_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -450,13 +286,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for i in $INCDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "X" != "X$MYSQL_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -f "$i/mysql/mysql.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MYSQL_IPATH="$i/mysql"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MYSQL_IPATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CUT_MYSQLA@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -f "/usr/include/math.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MATH="-DHAVE_MATH_H"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#@@CUT_MYSQLB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$MYSQL_PATH" -a -n "$MYSQL_IPATH" -a -n "$MATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " ... found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -466,117 +304,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo " ... math.h not found, module Mysql disabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#CUT_MYSQLB@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Checking for AFP (libafpclient.so) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$AFP_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libafpclient.so" -o -f "$i/libafpclient.so" -o -f "$i/libafpclient.a" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AFP_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$AFP_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libafpclient.so.* 2> /dev/null | grep libafpclient.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AFP_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$AFP_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libafpclient.dll* 2> /dev/null | grep libafpclient.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AFP_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $INCDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" != "X$AFP_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/afpfs-ng/afp.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AFP_IPATH="$i/afpfs-ng"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ -n "$AFP_PATH" -a -n "$AFP_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$AFP_PATH" -o "X" = "X$AFP_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... NOT found, module Apple Filing Protocol disabled - Apple sucks anyway"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AFP_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AFP_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Checking for NCP (libncp.so / nwcalls.h) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$NCP_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libncp.so" -o -f "$i/libncp.dylib" -o -f "$i/libncp.a" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NCP_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$NCP_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libncp.so.* 2> /dev/null | grep ncp.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NCP_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$NCP_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libncp.dll* 2> /dev/null | grep ncp.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NCP_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $INCDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" != "X$NCP_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/ncp/nwcalls.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NCP_IPATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ -n "$NCP_PATH" -a -n "$NCP_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$NCP_PATH" -o "X" = "X$NCP_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... NOT found, module NCP disabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NCP_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NCP_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Checking for SAP/R3 (librfc/saprfc.h) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$SAPR3_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/librfc.a" -o -f "$i/librfc.dylib" -o "$i/librfc32.dll" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SAPR3_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$SAPR3_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/librfc.* $i/librfc32.* 2> /dev/null | grep librfc`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SAPR3_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $INCDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$SAPR3_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/saprfc.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SAPR3_IPATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$SAPR3_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SAPR3_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$SAPR3_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SAPR3_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ -n "$SAPR3_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$SAPR3_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... NOT found, module sapr3 disabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "Get it from http://www.sap.com/solutions/netweaver/linux/eval/index.asp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "$SAPR3_IPATH" = "/usr/include" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SAPR3_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Checking for libssh (libssh/libssh.h) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "X" = "X$SSH_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -658,100 +387,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Checking for Oracle (libocci.so libclntsh.so / oci.h and libaio.so) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#assume if we find oci.h other headers should also be in that dir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#for libs we will test the 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" != "X$WORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INCDIRS="$INCDIRS $WORACLE_PATH"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" != "X$WORACLE_LIB_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBDIRS="$LIBDIRS $WORACLE_LIB_PATH"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$ORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libocci.so" ]&&[ -f "$i/libclntsh.so" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$ORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libocci.dylib" ]&&[ -f "$i/libclntsh.dylib" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$ORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libocci.a" ]&&[ -f "$i/libclntsh.a" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$ORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libocci.so.* 2> /dev/null | grep occi.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" != "X$ORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libclntsh.so.* 2> /dev/null | grep clntsh.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -z "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$ORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libocci.dll* 2> /dev/null | grep occi.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_PATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" != "X$ORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libclntsh.dll* 2> /dev/null | grep clntsh.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -z "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#check for Kernel Asynchronous I/O (AIO) lib support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" != "X$ORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBAIO=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for i in $LIBDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$LIBAIO" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/libaio.so" -o -f "$i/libaio.dylib" -o -f "$i/libaio.a" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBAIO="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$LIBAIO" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libaio.so.* 2> /dev/null | grep aio.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBAIO="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- TMP_LIB=`/bin/ls $i/libaio.dll* 2> /dev/null | grep aio.`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -n "$TMP_LIB" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBAIO="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" = "X$LIBAIO" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--for i in $INCDIRS ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ "X" != "X$ORACLE_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -f "$i/oci.h" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_IPATH="$i"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ -n "$ORACLE_PATH" -a -n "$ORACLE_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... found"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$ORACLE_PATH" -o "X" = "X$ORACLE_IPATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo " ... NOT found, module Oracle disabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "Get basic and sdk package from http://www.oracle.com/technetwork/database/features/instant-client/index.html"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_PATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ORACLE_IPATH=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "X" = "X$XHYDRA_SUPPORT" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Checking for GUI req's (pkg-config, gtk+-2.0) ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XHYDRA_SUPPORT=`pkg-config --help > /dev/null 2>&1 || echo disabled`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -830,7 +465,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XIPATHS=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XLIBPATHS=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$SSL_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$SSLNEW" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -972,16 +607,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ -n "$RESOLV_PATH" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XLIBS="$XLIBS -lresolv"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ -d /usr/kerberos/include ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XIPATHS="$XIPATHS -I/usr/kerberos/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [ "X" = "X$PREFIX" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX="/usr/local"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if [ "X" = "X$XHYDRA_SUPPORT" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if [ "X" = "X$XHYDRA_SUPPORT" -o "Xdisable" = "X$XHYDRA_SUPPORT" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XHYDRA_SUPPORT=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XHYDRA_SUPPORT="xhydra"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fial-if-xhydra-fails.diff b/security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fail-if-xhydra-fails.diff
</span>similarity index 60%
rename from security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fial-if-xhydra-fails.diff
rename to security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fail-if-xhydra-fails.diff
<span style='display:block; white-space:pre;color:#808080;'>index 80e6a7a5253..b7e5b0128b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fial-if-xhydra-fails.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/hydra/files/patch-hydra-gtk__make_xhydra.sh-fail-if-xhydra-fails.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- hydra-gtk/make_xhydra.sh.orig 2013-09-04 00:53:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ hydra-gtk/make_xhydra.sh 2013-09-04 00:54:42.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /Users/Admin/Downloads/make_xhydra.sh 2020-07-29 03:36:37.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ /opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_macports_release_tarballs_ports_security_hydra/hydra/work/vanhauser-thc-thc-hydra-0a17bf5/hydra-gtk/make_xhydra.sh 2020-07-29 11:52:02.000000000 -0400
</span> @@ -2,19 +2,15 @@
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/gnome/lib/pkgconfig
export PKG_CONFIG_PATH
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Trying to compile xhydra now (hydra gtk gui) - dont worry if this fails, this is really optional ..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Trying to compile xhydra now (hydra gtk gui) - don't worry if this fails, this is really optional ..."
</span> -./configure > /dev/null 2> errors
+./configure
test -e Makefile || {
</pre><pre style='margin:0'>
</pre>