diff options
author | adrianp <adrianp> | 2008-08-31 10:54:52 +0000 |
---|---|---|
committer | adrianp <adrianp> | 2008-08-31 10:54:52 +0000 |
commit | 99ff5e63884addffdf2489388306707cd0dad562 (patch) | |
tree | f7dd41573d488779d8e22fb161aa93eddcf60745 | |
parent | 652ca5d7ab38d0122a30b93e0de0746db4bd1eb0 (diff) | |
download | pkgsrc-99ff5e63884addffdf2489388306707cd0dad562.tar.gz |
Update to 5.4
- Make this compile on amd64
- Don't silently look for libraries when we don't need them. This should fix
PR 39318
- Add missing depends on apr
Release 5.4
###########
* Fixes to the http modules as some Apache installations are picky
* The MySQL module also works with mysqld-5.0, updated
* Added AS/400 return code checks to pop3 module
* Fixed memory leaks in the http-form module.
* Implemented a proposal by Jean-Baptiste.BEAUFRETON (at) turbomeca.fr to
check for "530 user unknown" message in the ftp module
* Added a performance patch by alejandro.mendiondo (at) baicom.com. This one
needs stability testing!
* Beautification to remove compiler warnings of modern gcc
-rw-r--r-- | security/hydra/Makefile | 6 | ||||
-rw-r--r-- | security/hydra/distinfo | 13 | ||||
-rw-r--r-- | security/hydra/options.mk | 8 | ||||
-rw-r--r-- | security/hydra/patches/patch-aa | 10 | ||||
-rw-r--r-- | security/hydra/patches/patch-ab | 134 | ||||
-rw-r--r-- | security/hydra/patches/patch-ag | 22 |
6 files changed, 166 insertions, 27 deletions
diff --git a/security/hydra/Makefile b/security/hydra/Makefile index ac940af5cf1..980b7829535 100644 --- a/security/hydra/Makefile +++ b/security/hydra/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2008/01/24 11:10:53 tnn Exp $ +# $NetBSD: Makefile,v 1.17 2008/08/31 10:54:52 adrianp Exp $ # DISTNAME= ${PKGNAME_NOREV}-src -PKGNAME= hydra-5.3 -PKGREVISION= 1 +PKGNAME= hydra-5.4 CATEGORIES= security MASTER_SITES= http://freeworld.thc.org/releases/ @@ -41,6 +40,7 @@ INSTALLATION_DIRS= bin .include "../../security/openssl/buildlink3.mk" .include "../../security/libssh/buildlink3.mk" +.include "../../devel/apr0/buildlink3.mk" pre-build: ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC diff --git a/security/hydra/distinfo b/security/hydra/distinfo index dae835c796c..db42c7bc1dc 100644 --- a/security/hydra/distinfo +++ b/security/hydra/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.7 2006/05/12 23:35:55 adrianp Exp $ +$NetBSD: distinfo,v 1.8 2008/08/31 10:54:52 adrianp Exp $ -SHA1 (hydra-5.3-src.tar.gz) = 45dde08acac61a24f57cdad6b5744932248dd912 -RMD160 (hydra-5.3-src.tar.gz) = c833d9c401d11c14085652f95e89cb03a657166f -Size (hydra-5.3-src.tar.gz) = 207043 bytes -SHA1 (patch-aa) = 41a939a3739b5337423241740f17f662698b8b29 -SHA1 (patch-ab) = bf80ca76307e547677beb6c6ec52ea608e370741 +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-af) = 90c24ad7df23f2be23d08b646d68c93846c7618b +SHA1 (patch-ag) = 1837595ef533b657c88449aa5a241ddf4570b149 diff --git a/security/hydra/options.mk b/security/hydra/options.mk index 6c8b7c23b4d..c71d64f17e8 100644 --- a/security/hydra/options.mk +++ b/security/hydra/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2007/01/24 19:46:45 epg Exp $ +# $NetBSD: options.mk,v 1.3 2008/08/31 10:54:52 adrianp Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.hydra PKG_SUPPORTED_OPTIONS= gtkfe svn pgsql @@ -23,8 +23,14 @@ PLIST_SRC+= ${PKGDIR}/PLIST.xhydra .if !empty(PKG_OPTIONS:Msvn) .include "../../devel/subversion-base/buildlink3.mk" .include "../../devel/apr0/buildlink3.mk" +CONFIGURE_ENV+= WITH_SVN=1 +.else +CONFIGURE_ENV+= WITH_SVN=0 .endif .if !empty(PKG_OPTIONS:Mpgsql) .include "../../databases/postgresql81-client/buildlink3.mk" +CONFIGURE_ENV+= WITH_PGSQL=1 +.else +CONFIGURE_ENV+= WITH_PGSQL=0 .endif diff --git a/security/hydra/patches/patch-aa b/security/hydra/patches/patch-aa index d3b12b751da..dafb2d41189 100644 --- a/security/hydra/patches/patch-aa +++ b/security/hydra/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2006/05/12 23:35:55 adrianp Exp $ +$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,14 +33,9 @@ EXTRA_DIST = README README.arm README.pa +@@ -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) @@ -16,4 +16,8 @@ $NetBSD: patch-aa,v 1.3 2006/05/12 23:35:55 adrianp Exp $ - @echo xhydra: - -cd hydra-gtk && ./make_xhydra.sh +- -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 index c3bc00099b7..8043e1aeb44 100644 --- a/security/hydra/patches/patch-ab +++ b/security/hydra/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2006/05/12 23:35:55 adrianp Exp $ +$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 @@ -21,25 +21,95 @@ $NetBSD: patch-ab,v 1.4 2006/05/12 23:35:55 adrianp Exp $ do if [ "X" = "X$SSL_IPATH" ]; then if [ -f "$i/openssl/ssl.h" ]; then -@@ -97,7 +98,7 @@ if [ "$SSL_IPATH" = "/usr/include" ]; th +@@ -96,50 +97,52 @@ if [ "$SSL_IPATH" = "/usr/include" ]; th + SSL_IPATH="" fi - echo "Checking for Postgres (libpq) ..." +-echo "Checking for Postgres (libpq) ..." -for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib . -+for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib @PREFIX@/lib . - do +-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 - if [ -f "$i/libpq.so" -o -f "$i/libpq.dylib" ]; then -@@ -119,7 +120,7 @@ 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) ..." +-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 . -+for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib @PREFIX@/lib . - do +-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 - if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-0.so" ]&&[ -f "$i/libaprutil-0.so" ]; then -@@ -183,7 +184,7 @@ if [ "$SAPR3_IPATH" = "/usr/include" ]; +- 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) ..." @@ -48,7 +118,25 @@ $NetBSD: patch-ab,v 1.4 2006/05/12 23:35:55 adrianp Exp $ do if [ "X" = "X$SSH_PATH" ]; then if [ -f "$i/libssh.so" -o -f "$i/libssh.dylib" ]; then -@@ -207,7 +208,7 @@ do +@@ -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 @@ -57,7 +145,25 @@ $NetBSD: patch-ab,v 1.4 2006/05/12 23:35:55 adrianp Exp $ do if [ "X" = "X$SSH_IPATH" ]; then if [ -f "$i/libssh/libssh.h" ]; then -@@ -451,9 +452,3 @@ cat Makefile.unix > Makefile + 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 diff --git a/security/hydra/patches/patch-ag b/security/hydra/patches/patch-ag new file mode 100644 index 00000000000..9824771033a --- /dev/null +++ b/security/hydra/patches/patch-ag @@ -0,0 +1,22 @@ +$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++; |