Attachment #111421 for bug #152683

View | Details | Raw Unified | Return to bug 152683
Collapse All | Expand All




#

PORTNAME=	hydra
PORTVERSION=	5.9
CATEGORIES=	security
MASTER_SITES=	http://freeworld.thc.org/releases/
MASTER_SITE_SUBDIR=	groups/thc

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' \

do-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/hydra ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)hydra/distinfo (-2 / +2 lines)
1	SHA256 (hydra-5.8-src.tar.gz) = 8c97472509a1afe9c60bddbb3f3541eb706d3719fb1c4634749d1531397377aa	1	SHA256 (hydra-5.9-src.tar.gz) = 66023f94460abe76e76c1c6b187d44e82bafafb4c517314261bbd34429f913a7
2	SIZE (hydra-5.8-src.tar.gz) = 203164	2	SIZE (hydra-5.9-src.tar.gz) = 423995




--- configure.orig	2010-11-19 12:52:07.000000000 +0300
+++ configure	2010-11-30 00:06:09.000000000 +0300
@@ -152,8 +152,8 @@
     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 @@
         fi
     fi  
     if [ "X" = "X$APR_IPATH" ]; then
-        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
@@ -473,7 +473,7 @@
         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"
 fi
 
 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 "$SSL_PATH" ]; then
     XDEFINES="$XDEFINES -DLIBOPENSSL"

Return to bug 152683

Lines 7-13 Link Here

(-)hydra/Makefile (-2 / +18 lines)
7	#	7	#
8		8
9	PORTNAME= hydra	9	PORTNAME= hydra
10	PORTVERSION= 5.8	10	PORTVERSION= 5.9
11	CATEGORIES= security	11	CATEGORIES= security
12	MASTER_SITES= http://freeworld.thc.org/releases/	12	MASTER_SITES= http://freeworld.thc.org/releases/
13	MASTER_SITE_SUBDIR= groups/thc	13	MASTER_SITE_SUBDIR= groups/thc
Lines 26-31 Link Here
26	USE_OPENSSL= yes	26	USE_OPENSSL= yes
27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src	27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
28		28
		29	OPTIONS= SVN "Enable subversion support" off \
		30	SSH "Enable ssh support" off \
		31	FIREBIRD "Enable firebird support" off
		32
		33	.include <bsd.port.pre.mk>
		34
		35	.if defined(WITH_SVN)
		36	BUILD_DEPENDS+=${LOCALBASE}/lib/libsvn_client-1.a:${PORTSDIR}/devel/subversion
		37	.endif
		38	.if defined(WITH_SSH)
		39	BUILD_DEPENDS+=${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh
		40	.endif
		41	.if defined(WITH_FIREBIRD)
		42	BUILD_DEPENDS+=${LOCALBASE}/lib/libfbclient.so:${PORTSDIR}/databases/firebird20-client
		43	.endif
		44
29	post-patch:	45	post-patch:
30	@${REINPLACE_CMD} -e 's\|CC = gcc\|\|; \	46	@${REINPLACE_CMD} -e 's\|CC = gcc\|\|; \
31	s\|-O2\|${CFLAGS}\|; s\|md4\..\|\|g' \	47	s\|-O2\|${CFLAGS}\|; s\|md4\..\|\|g' \
Lines 34-37 Link Here
34	do-install:	50	do-install:
35	@${INSTALL_PROGRAM} ${WRKSRC}/hydra ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin	51	@${INSTALL_PROGRAM} ${WRKSRC}/hydra ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin
36		52
37	.include <bsd.port.mk>	53	.include <bsd.port.post.mk>

Lines 1-51 Link Here

(-)hydra/files/patch-configure (-41 / +12 lines)
1	--- configure.orig 2010-09-29 15:19:43.000000000 +0400	1	--- configure.orig 2010-11-19 12:52:07.000000000 +0300
2	+++ configure 2010-10-24 22:49:10.000000000 +0400	2	+++ configure 2010-11-30 00:06:09.000000000 +0300
3	@@ -125,11 +125,11 @@	3	@@ -152,8 +152,8 @@
4	echo " ... NOT found, module postgres disabled"
5	fi
6
7	-echo "Checking for SVN (libsvn_client-1 libapr-0.so libaprutil-0.so) ..."
8	+echo "Checking for SVN (libsvn_client-1 libapr-1.so libaprutil-1.so) ..."
9	for i in $LIBDIRS /lib /usr/lib /usr/local/lib /opt/local/lib .
10	do
11	if [ "X" = "X$SVN_PATH" ]; then
12	- if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-0.so" ]&&[ -f "$i/libaprutil-0.so" ]; then
13	+ if [ -f "$i/libsvn_client-1.so" ]&&[ -f "$i/libapr-1.so" ]&&[ -f "$i/libaprutil-1.so" ]; then
14	SVN_PATH="$i"
15	fi
16	fi
17	@@ -303,8 +303,8 @@
18	fi	4	fi
19	fi	5	fi
20	if [ "X" = "X$APR_IPATH" ]; then	6	if [ "X" = "X$APR_IPATH" ]; then
21	- if [ -d "$i/apr-0" ]; then	7	- if [ -d "$i/apr-1.0" ]; then
22	- APR_IPATH="$i/apr-0"	8	- APR_IPATH="$i/apr-1.0"
23	+ if [ -d "$i/apr-1" ]; then	9	+ if [ -d "$i/apr-1" ]; then
24	+ APR_IPATH="$i/apr-1"	10	+ APR_IPATH="$i/apr-1"
25	fi	11	fi
26	fi	12	fi
27	done	13	done
28	@@ -321,8 +321,8 @@	14	@@ -473,7 +473,7 @@
29	fi
30	fi
31	if [ "X" = "X$APR_IPATH" ]; then
32	- if [ -d "$i/apr-0" ]; then
33	- APR_IPATH="$i/apr-0"
34	+ if [ -d "$i/apr-1" ]; then
35	+ APR_IPATH="$i/apr-1"
36	fi
37	fi
38	done
39	@@ -528,10 +528,10 @@
40	XLIBS="$XLIBS -lpq"
41	fi
42	if [ -n "$SVN_PATH" ]; then
43	- XLIBS="$XLIBS -lsvn_client-1 -lapr-0 -laprutil-0"
44	+ XLIBS="$XLIBS -lsvn_client-1 -lapr-1 -laprutil-1"
45	fi	15	fi
46	if [ -n "$SVN_PATH" ]; then	16
47	- XLIBS="$XLIBS -lsvn_client-1 -lapr-0 -laprutil-0"	17	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
48	+ XLIBS="$XLIBS -lsvn_client-1 -lapr-1 -laprutil-1"	18	- XLIBPATHS="-L/usr/lib -L/usr/local/lib -L/lib"
		19	+ XLIBPATHS="-L/usr/local/lib -L/usr/lib -L/lib"
49	fi	20	fi
50	if [ -n "$SSH_PATH" ]; then	21	if [ -n "$SSL_PATH" ]; then
51	XLIBS="$XLIBS -lssh"	22	XDEFINES="$XDEFINES -DLIBOPENSSL"