[96055] trunk/dports/security/medusa
jmr at macports.org
jmr at macports.org
Mon Jul 30 05:50:58 PDT 2012
Revision: 96055
https://trac.macports.org/changeset/96055
Author: jmr at macports.org
Date: 2012-07-30 05:50:57 -0700 (Mon, 30 Jul 2012)
Log Message:
-----------
medusa: update to 2.1.1, fix return values (#33399)
Modified Paths:
--------------
trunk/dports/security/medusa/Portfile
Added Paths:
-----------
trunk/dports/security/medusa/files/src_medusa.c.diff
Removed Paths:
-------------
trunk/dports/security/medusa/files/patch-configure.in.diff
Modified: trunk/dports/security/medusa/Portfile
===================================================================
--- trunk/dports/security/medusa/Portfile 2012-07-30 12:36:42 UTC (rev 96054)
+++ trunk/dports/security/medusa/Portfile 2012-07-30 12:50:57 UTC (rev 96055)
@@ -3,8 +3,7 @@
PortSystem 1.0
name medusa
-version 2.0
-revision 2
+version 2.1.1
categories security net
platforms darwin
maintainers pmq openmaintainer
@@ -26,32 +25,21 @@
necessary to the core application in order to extend the \
supported list of services for brute-forcing.
-homepage http://www.foofus.net/jmk/medusa/medusa.html
-master_sites http://www.foofus.net/jmk/tools freebsd:
-checksums md5 75df63e1cd3b0d18fd2b017f12fc51d7 \
- sha1 bdea5e5c81d588af35e564a54d9eb2b77eb92371 \
- rmd160 28e27525d704621c1d897c368a58080dac12be45
-# Remove this line at next version update
-dist_subdir ${name}/${version}_0
+homepage http://www.foofus.net/~jmk/medusa/medusa.html
+master_sites http://www.foofus.net/~jmk/tools/
+checksums rmd160 0638e4f9e1ce2df6351f98afd7ecdee10a7bbbfc \
+ sha256 c8f83f54f76f021f213007c1c83e659f30dd16de84046df2b50e3db2bb6a7ef2
-depends_lib port:openssl port:libssh2 port:pcre
+depends_lib port:openssl port:libssh2
livecheck.type regex
livecheck.url ${homepage}
livecheck.regex "${name}-(.*?).tar.gz"
-use_autoreconf yes
+patchfiles src_medusa.c.diff
-patchfiles patch-configure.in.diff
-
-post-patch {
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/configure.in
-}
-
# --enable-untested
-# hopefully the mod-path will be superfluous next release
-configure.args --with-default-mod-path=${prefix}/lib/medusa/modules \
- --enable-module-svn=no \
+configure.args --enable-module-svn=no \
--enable-module-postgres=no
# All modules end up linked with libsvn_client-1.0.dylib, even if the svn
Deleted: trunk/dports/security/medusa/files/patch-configure.in.diff
===================================================================
--- trunk/dports/security/medusa/files/patch-configure.in.diff 2012-07-30 12:36:42 UTC (rev 96054)
+++ trunk/dports/security/medusa/files/patch-configure.in.diff 2012-07-30 12:50:57 UTC (rev 96055)
@@ -1,57 +0,0 @@
---- configure.in.orig 2010-02-09 16:17:51.000000000 -0600
-+++ configure.in 2011-08-08 14:29:05.000000000 -0500
-@@ -32,36 +32,18 @@
- AC_ARG_WITH(postgresql, AC_HELP_STRING([--with-postgresql=prefix], [Prefix for postgresql include directory (default = /usr)]), [postgresql_prefix="$withval"], [postgresql_prefix="/usr"])
- AC_ARG_WITH(afpfsng, AC_HELP_STRING([--with-afpfsng=prefix], [Prefix for afpfs-ng include directory (default = /usr)]), [afpfsng_prefix="$withval"], [afpfsng_prefix="/usr"])
-
--dnl FreeBSD was not looking in /usr/local...
- dnl AC_SEARCH_LIBS ?
--if test -d "/usr/local/lib"
-- then LDFLAGS="$LDFLAGS -L/usr/local/lib"
--fi
--if test -d "/usr/local/ssl/lib"
-- then LDFLAGS="$LDFLAGS -L/usr/local/ssl/lib"
-+if test -d "@PREFIX@/ssl/lib"
-+ then LDFLAGS="$LDFLAGS -L at PREFIX@/ssl/lib"
- fi
-
- CFLAGS="$CFLAGS -fPIC"
--CFLAGS="$CFLAGS -I/usr/local/include -I/usr/local/ssl/include -I${subversion_prefix}/include/subversion-1 \
-+CFLAGS="$CFLAGS -I at PREFIX@/ssl/include -I${subversion_prefix}/include/subversion-1 \
- -I${postgresql_prefix}/include/postgresql -I${postgresql_prefix}/include/pgsql -I${afpfsng_prefix}/include/afpfs-ng"
-
- AC_CHECKING([for pthread support])
- AC_CHECK_LIB(pthread, main, [], [AC_MSG_ERROR([ *** Application requires pthread support *** ])])
-
--dnl Mac OS X pcre header
--if test -f "/usr/include/php/ext/pcre/pcrelib/pcre.h"
-- then CFLAGS="$CFLAGS -I/usr/include/php/ext/pcre/pcrelib/pcre.h"
--else
-- if test -d "/Developer/SDKs/MacOSX10.5.sdk/usr/include/php/ext/pcre/pcrelib"
-- then CFLAGS="$CFLAGS -I/Developer/SDKs/MacOSX10.5.sdk/usr/include/php/ext/pcre/pcrelib"
-- fi
--fi
--
--dnl MacPorts
--if test -d "/opt/local"; then
-- CFLAGS="$CFLAGS -I/opt/local/include"
-- LDFLAGS="$LDFLAGS -L/opt/local/lib"
--fi
-
- AC_CHECKING([for pcre (Perl Compatible Regular Expressions) support])
- AC_CHECK_HEADER([pcre.h],
-@@ -565,10 +547,10 @@
- if test x"$check_module_ssh" = "xtrue"; then
- if test -f "/usr/lib/libssh2.so"; then
- LIBSSH2_PATH="/usr/lib/libssh2.so"
-- elif test -f "/usr/local/lib/libssh2.so"; then
-- LIBSSH2_PATH="/usr/local/lib/libssh2.so"
-- elif test -f "/opt/local/lib/libssh2.dylib"; then
-- LIBSSH2_PATH="/opt/local/lib/libssh2.dylib"
-+ elif test -f "@PREFIX@/lib/libssh2.so"; then
-+ LIBSSH2_PATH="@PREFIX@/lib/libssh2.so"
-+ elif test -f "@PREFIX@/lib/libssh2.dylib"; then
-+ LIBSSH2_PATH="@PREFIX@/lib/libssh2.dylib"
- fi
-
- dnl Use otool on Mac OS X
Added: trunk/dports/security/medusa/files/src_medusa.c.diff
===================================================================
--- trunk/dports/security/medusa/files/src_medusa.c.diff (rev 0)
+++ trunk/dports/security/medusa/files/src_medusa.c.diff 2012-07-30 12:50:57 UTC (rev 96055)
@@ -0,0 +1,54 @@
+--- src/medusa.c.orig 2012-03-02 04:39:35.000000000 +1100
++++ src/medusa.c 2012-07-30 22:44:35.000000000 +1000
+@@ -1438,6 +1438,7 @@ int setPassResult(sLogin *_psLogin, char
+ }
+
+ pthread_mutex_unlock(&_psLogin->psServer->ptmMutex);
++ return 0;
+ }
+
+
+@@ -1497,6 +1498,7 @@ int addMissedCredSet(sLogin *_psLogin, s
+ _psLogin->psServer->iCredentialsMissed++;
+
+ pthread_mutex_unlock(&_psLogin->psServer->ptmMutex);
++ return 0;
+ }
+
+
+@@ -1567,7 +1569,7 @@ void *startLoginThreadPool(void *arg)
+ if (errcode != 0)
+ {
+ writeError(ERR_CRITICAL, "Failed to resolve hostname: %s - %s", _psServer->psHost->pHost, gai_strerror(errcode));
+- return;
++ return NULL;
+ }
+
+ if (res->ai_next != NULL)
+@@ -1609,7 +1611,7 @@ void *startLoginThreadPool(void *arg)
+ if ( thr_pool_queue(login_pool, startModule, (void *) &modParams[iLoginId]) < 0 )
+ {
+ writeError(ERR_CRITICAL, "Failed to add module launch task to login thread pool for server queue: %d.", _psServer->iId);
+- return;
++ return NULL;
+ }
+ }
+
+@@ -1645,7 +1647,7 @@ void *startLoginThreadPool(void *arg)
+ if ( thr_pool_queue(login_pool, startModule, (void *) &modParams[iLoginId]) < 0 )
+ {
+ writeError(ERR_CRITICAL, "Failed to add module launch task to login thread pool for server queue: %d.", _psServer->iId);
+- return;
++ return NULL;
+ }
+
+ /* wait for login thread pool to finish */
+@@ -1675,7 +1677,7 @@ void *startLoginThreadPool(void *arg)
+
+ free(_psServer->pHostIP);
+
+- return;
++ return NULL;
+ }
+
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120730/637a51d7/attachment-0001.html>
More information about the macports-changes
mailing list