Update to 5.3

Separate out options.mk functionality
Add in options for subversion and postresql support
> 	CHANGELOG for 5.3:
> 	###########
> 	* Added NTLM support modules for pop3, imap, smtp-auth and http-proxy.
>           Work done by ilo (at) reversing.org. THANKS!
>         * Added a http form module, thanks to phil (at) irmplc.com
>         * Fixed a bug in the vnc module (thanks to kan (at) dcit.cz)
>         * Input files may *not* contain null bytes. I might fix that in the future
>           but currently I have enough other things on my todo sheet.
>           Thanks to didiln (at) gmail.com for reporting.

6 files changed, 69 insertions, 70 deletions

diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 1788377b2c8..1aaa55c89ac 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2006/04/20 08:15:48 adrianp Exp $
+# $NetBSD: Makefile,v 1.11 2006/05/12 23:35:55 adrianp Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-src
-PKGNAME=	hydra-5.2
-PKGREVISION=	1
+PKGNAME=	hydra-5.3
 CATEGORIES=	security
 MASTER_SITES=	http://www.thc.org/releases/
 
@@ -23,11 +22,11 @@ LICENSE+=	hydra-license
 SUBST_CLASSES+=		build
 SUBST_STAGE.build=	post-patch
 SUBST_FILES.build=	Makefile.am configure hydra-gtk/src/main.c
-SUBST_SED.build=	-e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g" \
-			-e "s|@PREFIX@|${PREFIX}|g" \
-			-e "s|uname|${UNAME}|g" \
-			-e "s|\\./hydra|${PREFIX}/bin/hydra|g" \
-			-e "s|LIBS=-lm|LIBS=-lm ${COMPILER_RPATH_FLAG}${PREFIX}/lib ${COMPILER_RPATH_FLAG}/usr/lib|g"
+SUBST_SED.build=	-e "s|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g"
+SUBST_SED.build+=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.build+=	-e "s|uname|${UNAME}|g"
+SUBST_SED.build+=	-e "s|\\./hydra|${PREFIX}/bin/hydra|g"
+SUBST_SED.build+=	-e "s|LIBS=-lm|LIBS=-lm ${COMPILER_RPATH_FLAG}${PREFIX}/lib ${COMPILER_RPATH_FLAG}/usr/lib|g"
 SUBST_MESSAGE.build=	Patching build files.
 
 USE_OLD_DES_API=	YES
@@ -37,34 +36,13 @@ BUILDLINK_API_DEPENDS.libssh+=	libssh-0.11
 
 INSTALLATION_DIRS=	bin
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.hydra
-PKG_SUPPORTED_OPTIONS=	gtkfe
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtkfe)
-
-.include "../../x11/gtk2/buildlink3.mk"
-
-post-configure:
-	cd ${WRKSRC}/hydra-gtk && \
-	${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
-
-post-build:
-	cd ${WRKSRC}/hydra-gtk && \
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin
-
-PLIST_SRC+=	${PKGDIR}/PLIST.xhydra
-.endif
+.include "options.mk"
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/libssh/buildlink3.mk"
 
 pre-build:
-	 @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
+	 @${CP:Q} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hydra ${PREFIX}/bin
diff --git a/security/hydra/distinfo b/security/hydra/distinfo
index 5c50c315255..dae835c796c 100644
--- a/security/hydra/distinfo
+++ b/security/hydra/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.6 2006/02/14 01:13:32 rillig Exp $
+$NetBSD: distinfo,v 1.7 2006/05/12 23:35:55 adrianp Exp $
 
-SHA1 (hydra-5.2-src.tar.gz) = 1a05b06030336c252dd4e8a0a048d8d45885f6f1
-RMD160 (hydra-5.2-src.tar.gz) = b4a707890cfd07637a2bf12604da8ef26075d44f
-Size (hydra-5.2-src.tar.gz) = 189979 bytes
-SHA1 (patch-aa) = 45227db4cf4cc1919bcc597920ca1442f6b970cf
-SHA1 (patch-ab) = b841c1cb0db99381516add4174a243ac43a6536f
+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 (patch-ac) = ade8ea964018dc7034154a35338f50361b5185f8
 SHA1 (patch-ad) = 3734123af4511161eee93f624b1b9dd575be0ae7
 SHA1 (patch-af) = 90c24ad7df23f2be23d08b646d68c93846c7618b
-SHA1 (patch-ag) = b67ce4814866da7b93d376b6afcbcf455b700da2
diff --git a/security/hydra/options.mk b/security/hydra/options.mk
new file mode 100644
index 00000000000..8c7897bd6c8
--- /dev/null
+++ b/security/hydra/options.mk
@@ -0,0 +1,30 @@
+# $NetBSD: options.mk,v 1.1 2006/05/12 23:35:55 adrianp Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.hydra
+PKG_SUPPORTED_OPTIONS=	gtkfe svn pgsql
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgtkfe)
+.include "../../x11/gtk2/buildlink3.mk"
+
+post-configure:
+	cd ${WRKSRC}/hydra-gtk && \
+		${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
+
+post-build:
+	cd ${WRKSRC}/hydra-gtk && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/hydra-gtk/src/xhydra ${PREFIX}/bin
+PLIST_SRC+=	${PKGDIR}/PLIST.xhydra
+.endif
+
+.if !empty(PKG_OPTIONS:Msvn)
+.include "../../devel/subversion-base/buildlink3.mk"
+.include "../../devel/apr/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mpgsql)
+.include "../../databases/postgresql81-client/buildlink3.mk"
+.endif
diff --git a/security/hydra/patches/patch-aa b/security/hydra/patches/patch-aa
index 8eb047d319a..d3b12b751da 100644
--- a/security/hydra/patches/patch-aa
+++ b/security/hydra/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2006/02/05 00:18:29 adrianp Exp $
+$NetBSD: patch-aa,v 1.3 2006/05/12 23:35:55 adrianp Exp $
 
---- Makefile.am.orig	2006-01-20 11:37:28.000000000 +0000
+--- Makefile.am.orig	2006-05-05 15:10:44.000000000 +0100
 +++ Makefile.am
-@@ -31,17 +31,11 @@ EXTRA_DIST = README README.arm README.pa
+@@ -33,14 +33,9 @@ EXTRA_DIST = README README.arm README.pa
               hydra-mod.h hydra.h crc32.h d3des.h md4.h
  
  all:	pw-inspector hydra $(XHYDRA_SUPPORT) 
@@ -10,13 +10,10 @@ $NetBSD: patch-aa,v 1.2 2006/02/05 00:18:29 adrianp Exp $
 -	@echo Now type "make install"
  
  hydra:	$(OBJ)
- 	$(CC) $(OPTS) $(LIBS) -o $(BIN) $(OBJ) $(LIBS) $(XLIBS) $(XLIBPATHS)
+ 	$(CC) $(OPTS) $(LIBS) -o $(BIN) $(OBJ) $(LIBS) $(XLIBS) $(XLIBPATHS) || echo -e "\nIF YOU RECEIVED THE ERROR MESSAGE \"cannot find -lpq\" DO THE FOLLOWING:\n  make clean; ./configure\n  vi Makefile    <- and remove the \"-lpq\" and \"-DLIBPOSTGRES\" statements\n  make\n"
 -	@echo
 -	@echo If men could get pregnant, abortion would be a sacrament
 -	@echo
  
  xhydra:	
--	-cd hydra-gtk && ./make_xhydra.sh
- 
- pw-inspector: pw-inspector.c
- 	-$(CC) $(OPTS) -o pw-inspector pw-inspector.c
+ 	-cd hydra-gtk && ./make_xhydra.sh
diff --git a/security/hydra/patches/patch-ab b/security/hydra/patches/patch-ab
index 24438866bb4..c3bc00099b7 100644
--- a/security/hydra/patches/patch-ab
+++ b/security/hydra/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2006/02/05 00:18:29 adrianp Exp $
+$NetBSD: patch-ab,v 1.4 2006/05/12 23:35:55 adrianp Exp $
 
 --- configure.orig	2006-01-20 13:44:15.000000000 +0000
 +++ configure
@@ -21,6 +21,24 @@ $NetBSD: patch-ab,v 1.3 2006/02/05 00:18:29 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
+ fi
+ 
+ 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
+     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
+ fi
+ 
+ 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
+     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" ]; 
  fi
  
diff --git a/security/hydra/patches/patch-ag b/security/hydra/patches/patch-ag
deleted file mode 100644
index ee672ac7a92..00000000000
--- a/security/hydra/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2006/02/14 01:13:32 rillig Exp $
-
-gcc warning: ISO C90 forbids declarations intermixed with code.
-
---- hydra-pcanywhere.c.orig	2005-09-07 21:59:26.000000000 +0200
-+++ hydra-pcanywhere.c	2006-02-14 02:11:44.000000000 +0100
-@@ -114,6 +114,8 @@ start_pcanywhere(int s, unsigned long in
- 
-   char *client[4];
-   int clientsize[4];
-+  char *server[5];
-+
-   client[0]="\x00\x00\x00\x00";
-   clientsize[0]=4;
-   client[1]="\x6F\x06\xff"; 
-@@ -123,7 +125,6 @@ start_pcanywhere(int s, unsigned long in
-   client[3]="\x6f\x62\x01\x02\x00\x00\x00";
-   clientsize[3]=7;
- 
--  char *server[5];
-   server[0]= "nter";
-   server[1]="\x1B\x61"; 
-   server[2]="\0x1B\0x62";