From owner-svn-ports-all@freebsd.org Mon Jan 18 19:48:37 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AA1EDA87ADC; Mon, 18 Jan 2016 19:48:37 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 658E3147A; Mon, 18 Jan 2016 19:48:37 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0IJma9w080829; Mon, 18 Jan 2016 19:48:36 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0IJmaTn080825; Mon, 18 Jan 2016 19:48:36 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201601181948.u0IJmaTn080825@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 18 Jan 2016 19:48:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406608 - in head/mail/sqlgrey: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2016 19:48:37 -0000 Author: pi Date: Mon Jan 18 19:48:35 2016 New Revision: 406608 URL: https://svnweb.freebsd.org/changeset/ports/406608 Log: mail/sqlgrey: Fix missing dependencies (bash, wget, md5sum) PR: 205754 Submitted by: me@cschwarz.com Added: head/mail/sqlgrey/files/patch-sqlgrey (contents, props changed) head/mail/sqlgrey/files/patch-update__sqlgrey__config (contents, props changed) Deleted: head/mail/sqlgrey/files/patch-ipv6 Modified: head/mail/sqlgrey/Makefile Modified: head/mail/sqlgrey/Makefile ============================================================================== --- head/mail/sqlgrey/Makefile Mon Jan 18 19:44:47 2016 (r406607) +++ head/mail/sqlgrey/Makefile Mon Jan 18 19:48:35 2016 (r406608) @@ -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 Added: head/mail/sqlgrey/files/patch-sqlgrey ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/sqlgrey/files/patch-sqlgrey Mon Jan 18 19:48:35 2016 (r406608) @@ -0,0 +1,11 @@ +--- 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 +- return $addr; ++ return join(":", (split(/:/, $addr))[0..3]); + } + } + Added: head/mail/sqlgrey/files/patch-update__sqlgrey__config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/sqlgrey/files/patch-update__sqlgrey__config Mon Jan 18 19:48:35 2016 (r406608) @@ -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