From 8a6fe341ce0a4c690f59ad78a6d3be96c3fb1d98 Mon Sep 17 00:00:00 2001
From: Kurt Jaeger <pi@FreeBSD.org>
Date: Mon, 18 Jan 2016 19:48:35 +0000
Subject: [PATCH] mail/sqlgrey: Fix missing dependencies (bash, wget, md5sum)

PR:		205754
Submitted by:	me@cschwarz.com
---
 mail/sqlgrey/Makefile                         | 14 ++--
 .../files/{patch-ipv6 => patch-sqlgrey}       |  6 +-
 .../files/patch-update__sqlgrey__config       | 67 +++++++++++++++++++
 3 files changed, 78 insertions(+), 9 deletions(-)
 rename mail/sqlgrey/files/{patch-ipv6 => patch-sqlgrey} (64%)
 create mode 100644 mail/sqlgrey/files/patch-update__sqlgrey__config

diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index 96e2d85997e7..eedff8acbe46 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -14,7 +14,9 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
 		p5-IO-Multiplex>=0:${PORTSDIR}/devel/p5-IO-Multiplex \
-		p5-Pod-Parser>=0:${PORTSDIR}/textproc/p5-Pod-Parser
+		p5-Pod-Parser>=0:${PORTSDIR}/textproc/p5-Pod-Parser \
+		${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
+		${LOCALBASE}/bin/gmd5sum:${PORTSDIR}/sysutils/coreutils
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	${WRKSRC}/sqlgrey-logstats.pl ${WRKSRC}/update_sqlgrey_config ${WRKSRC}/sqlgrey
@@ -60,17 +62,17 @@ post-patch:
 	@${REINPLACE_CMD} -e 's!/etc/sqlgrey!${PREFIX}/${ETCDIR}!g' ${WRKSRC}/sqlgrey
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey-logstats.pl ${STAGEDIR}/${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey ${STAGEDIR}/${PREFIX}/sbin
-	@${INSTALL_SCRIPT} ${WRKSRC}/update_sqlgrey_config ${STAGEDIR}/${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey-logstats.pl ${STAGEDIR}/${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey ${STAGEDIR}/${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/update_sqlgrey_config ${STAGEDIR}/${PREFIX}/sbin
 	@cd ${WRKSRC} && perldoc -u sqlgrey | pod2man sqlgrey > ${STAGEDIR}/${MANPREFIX}/man/man1/sqlgrey.1
 	@${MKDIR} ${STAGEDIR}/${PREFIX}/${ETCDIR}
 .for i in ${ETCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}/${PREFIX}/${ETCDIR}/${i}.sample
+	${INSTALL_DATA} ${WRKSRC}/etc/${i} ${STAGEDIR}/${PREFIX}/${ETCDIR}/${i}.sample
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
-	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}/${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}/${DOCSDIR}
 	@${ECHO_MSG} "===> Documentation installed in ${STAGEDIR}/${DOCSDIR}."
 .endif
 
diff --git a/mail/sqlgrey/files/patch-ipv6 b/mail/sqlgrey/files/patch-sqlgrey
similarity index 64%
rename from mail/sqlgrey/files/patch-ipv6
rename to mail/sqlgrey/files/patch-sqlgrey
index 8be3f957e0a2..8de4190d0b4b 100644
--- a/mail/sqlgrey/files/patch-ipv6
+++ b/mail/sqlgrey/files/patch-sqlgrey
@@ -1,6 +1,6 @@
---- sqlgrey.orig	2013-09-27 06:51:40.913265753 -0500
-+++ sqlgrey	2013-09-27 06:51:25.000000000 -0500
-@@ -1037,7 +1037,7 @@
+--- sqlgrey.orig	2012-02-13 16:54:08 UTC
++++ sqlgrey
+@@ -1037,7 +1037,7 @@ sub ipv6_smart($) {
          return join(":", (split(/:/, $addr))[0..3]);
      } else {
          ## For Non-EUI64 or Non-Global-Unicast return the address
diff --git a/mail/sqlgrey/files/patch-update__sqlgrey__config b/mail/sqlgrey/files/patch-update__sqlgrey__config
new file mode 100644
index 000000000000..e2be8dc52df7
--- /dev/null
+++ b/mail/sqlgrey/files/patch-update__sqlgrey__config
@@ -0,0 +1,67 @@
+--- update_sqlgrey_config.orig	2016-01-06 23:51:29 UTC
++++ update_sqlgrey_config
+@@ -1,7 +1,7 @@
+-#!/bin/bash
++#!/usr/local/bin/bash
+ 
+-# We need md5sum, diff and wget
+-MD5SUM=`which md5sum 2>/dev/null`
++# We need md5sum, diff and fetch
++MD5SUM=`which gmd5sum 2>/dev/null`
+ if [ $? -ne 0 ]
+ then
+     echo "md5sum not found in PATH, can't continue"
+@@ -13,10 +13,10 @@ then
+     echo "diff not found in PATH, can't continue"
+     exit -1
+ fi
+-WGET=`which wget 2>/dev/null`
++FETCH=`which fetch 2>/dev/null`
+ if [ $? -ne 0 ]
+ then
+-    echo "wget not found in PATH, can't continue"
++    echo "fetch not found in PATH, can't continue"
+     exit -1
+ fi
+ 
+@@ -24,7 +24,7 @@ fi
+ LANG=C
+ LC_ALL=C
+ 
+-MYDIR=/etc/sqlgrey
++MYDIR=/usr/local/etc/sqlgrey
+ CONF=$MYDIR/sqlgrey.conf
+ 
+ # Get whitelists host and pidfile from conf
+@@ -55,11 +55,11 @@ clean_exit() {
+ trap clean_exit 2 3 15
+ 
+ # Fetch MD5
+-$WGET -q http://$whitelists_host/MD5SUMS
++$FETCH -q http://$whitelists_host/MD5SUMS
+ 
+ # Check installed files
+ cd $MYDIR
+-TOUPDATE=`md5sum -c $MYTMP/MD5SUMS 2>/dev/null | grep FAILED | cut -d: -f1`
++TOUPDATE=`$MD5SUM -c $MYTMP/MD5SUMS 2>/dev/null | grep FAILED | cut -d: -f1`
+ 
+ if [ -z "$TOUPDATE" ]
+ then
+@@ -77,7 +77,7 @@ for todownload in $TOUPDATE
+ do
+     echo "updating $MYDIR/$todownload:"
+     rm $todownload 2>/dev/null
+-    $WGET -N -q http://$whitelists_host/$todownload
++    $FETCH -q http://$whitelists_host/$todownload
+     if [ -f $MYDIR/$todownload ]; then
+ 	$DIFF -u $MYDIR/$todownload $todownload
+     else
+@@ -85,7 +85,7 @@ do
+     fi
+ done
+ 
+-md5sum -c MD5SUMS >/dev/null 2>/dev/null
++$MD5SUM -c MD5SUMS >/dev/null 2>/dev/null
+ if [ $? -ne 0 ]
+ then
+     # Can only happen if remote site is borked or file got corrupt in transit