Attachment 111421 Details for Bug 152683 – file.diff

[patch] file.diff

file.diff (text/plain), 4.10 KB, created by R.Mahmatkhanov on 2010-11-29 21:20:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R.Mahmatkhanov

Created: 2010-11-29 21:20:12 UTC

Size: 4.10 KB

patch

obsolete

>diff -ruNa hydra.orig/Makefile hydra/Makefile
>--- hydra.orig/Makefile	2010-11-08 23:10:25.000000000 +0300
>+++ hydra/Makefile	2010-11-30 00:16:48.000000000 +0300
>@@ -7,7 +7,7 @@
> #
> 
> PORTNAME=	hydra
>-PORTVERSION=	5.8
>+PORTVERSION=	5.9
> CATEGORIES=	security
> MASTER_SITES=	http://freeworld.thc.org/releases/
> MASTER_SITE_SUBDIR=	groups/thc
>@@ -26,6 +26,22 @@
> USE_OPENSSL=	yes
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
> 
>+OPTIONS=	SVN "Enable subversion support" off \
>+		SSH "Enable ssh support" off \
>+		FIREBIRD "Enable firebird support" off
>+
>+.include <bsd.port.pre.mk>
>+
>+.if defined(WITH_SVN)
>+BUILD_DEPENDS+=${LOCALBASE}/lib/libsvn_client-1.a:${PORTSDIR}/devel/subversion
>+.endif
>+.if defined(WITH_SSH)
>+BUILD_DEPENDS+=${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
>+.endif
>+.if defined(WITH_FIREBIRD)
>+BUILD_DEPENDS+=${LOCALBASE}/lib/libfbclient.so:${PORTSDIR}/databases/firebird20-client
>+.endif
>+
> post-patch:
> 	@${REINPLACE_CMD} -e 's|CC = gcc||; \
> 		s|-O2|${CFLAGS}|; s|md4\..||g' \
>@@ -34,4 +50,4 @@
> do-install:
> 	@${INSTALL_PROGRAM} ${WRKSRC}/hydra ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruNa hydra.orig/distinfo hydra/distinfo
>--- hydra.orig/distinfo	2010-11-08 21:45:02.000000000 +0300
>+++ hydra/distinfo	2010-11-24 13:00:24.000000000 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (hydra-5.8-src.tar.gz) = 8c97472509a1afe9c60bddbb3f3541eb706d3719fb1c4634749d1531397377aa
>-SIZE (hydra-5.8-src.tar.gz) = 203164
>+SHA256 (hydra-5.9-src.tar.gz) = 66023f94460abe76e76c1c6b187d44e82bafafb4c517314261bbd34429f913a7
>+SIZE (hydra-5.9-src.tar.gz) = 423995
>diff -ruNa hydra.orig/files/patch-configure hydra/files/patch-configure
>--- hydra.orig/files/patch-configure	2010-11-08 21:45:02.000000000 +0300
>+++ hydra/files/patch-configure	2010-11-30 00:06:23.000000000 +0300
>@@ -1,51 +1,22 @@
>---- configure.orig	2010-09-29 15:19:43.000000000 +0400
>-+++ configure	2010-10-24 22:49:10.000000000 +0400
>-@@ -125,11 +125,11 @@
>-     echo "                                 ... NOT found, module postgres disabled"
>- fi
>- 
>--echo "Checking for SVN (libsvn_client-1 libapr-0.so libaprutil-0.so) ..."
>-+echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..."
>- for i in  $LIBDIRS /lib  /usr/lib /usr/local/lib /opt/local/lib .
>- do
>-     if [ "X" = "X$SVN_PATH" ]; then
>--        if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-0.so" ]&&[ -f "$i/libaprutil-0.so" ]; then
>-+        if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-1.so" ]&&[ -f "$i/libaprutil-1.so" ]; then
>-             SVN_PATH="$i"
>-         fi
>-     fi
>-@@ -303,8 +303,8 @@
>+--- configure.orig	2010-11-19 12:52:07.000000000 +0300
>++++ configure	2010-11-30 00:06:09.000000000 +0300
>+@@ -152,8 +152,8 @@
>          fi
>      fi  
>      if [ "X" = "X$APR_IPATH" ]; then
>--        if [ -d "$i/apr-0" ]; then
>--            APR_IPATH="$i/apr-0"
>+-        if [ -d "$i/apr-1.0" ]; then
>+-            APR_IPATH="$i/apr-1.0"
> +        if [ -d "$i/apr-1" ]; then
> +            APR_IPATH="$i/apr-1"
>          fi
>      fi  
>  done
>-@@ -321,8 +321,8 @@
>-         fi
>-     fi  
>-     if [ "X" = "X$APR_IPATH" ]; then
>--        if [ -d "$i/apr-0" ]; then
>--            APR_IPATH="$i/apr-0"
>-+        if [ -d "$i/apr-1" ]; then
>-+            APR_IPATH="$i/apr-1"
>-         fi
>-     fi  
>- done
>-@@ -528,10 +528,10 @@
>-     XLIBS="$XLIBS -lpq"
>- fi
>- if [ -n "$SVN_PATH" ]; then
>--    XLIBS="$XLIBS -lsvn_client-1 -lapr-0 -laprutil-0"
>-+    XLIBS="$XLIBS -lsvn_client-1 -lapr-1 -laprutil-1"
>+@@ -473,7 +473,7 @@
>  fi
>- if [ -n "$SVN_PATH" ]; then
>--    XLIBS="$XLIBS -lsvn_client-1 -lapr-0 -laprutil-0"
>-+    XLIBS="$XLIBS -lsvn_client-1 -lapr-1 -laprutil-1"
>+ 
>+ if [ -n "$FIREBIRD_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 "$AFP_PATH" -o -n "$MYSQL_PATH" ]; then
>+-    XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"
>++    XLIBPATHS="-L/usr/local/lib -L/usr/lib -L/lib"
>  fi
>- if [ -n "$SSH_PATH" ]; then
>-     XLIBS="$XLIBS -lssh"
>+ if [ -n "$SSL_PATH" ]; then
>+     XDEFINES="$XDEFINES -DLIBOPENSSL"

Actions: View | Diff

Attachments on bug 152683: 111421