From owner-svn-ports-head@FreeBSD.ORG Mon Jan 21 17:35:53 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4B629F70; Mon, 21 Jan 2013 17:35:53 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3913014B; Mon, 21 Jan 2013 17:35:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0LHZrGA095712; Mon, 21 Jan 2013 17:35:53 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0LHZqox095707; Mon, 21 Jan 2013 17:35:52 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201301211735.r0LHZqox095707@svn.freebsd.org> From: Chris Rees Date: Mon, 21 Jan 2013 17:35:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310777 - in head/mail/qmail-scanner: . 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jan 2013 17:35:53 -0000 Author: crees Date: Mon Jan 21 17:35:52 2013 New Revision: 310777 URL: http://svnweb.freebsd.org/changeset/ports/310777 Log: Add additional patch by Salvatore Toribio as an OPTION, on by default PR: ports/173127 Submitted by: William Olson Approved by: lippe (maintainer) Obtained from: http://toribio.apollinare.org/qmail-scanner/ While here, convert to OPTIONSng Approved by: lippe (maintainer) Added: head/mail/qmail-scanner/files/extra-patch-configure - copied unchanged from r309902, head/mail/qmail-scanner/files/patch-configure Deleted: head/mail/qmail-scanner/files/patch-configure Modified: head/mail/qmail-scanner/Makefile head/mail/qmail-scanner/distinfo Modified: head/mail/qmail-scanner/Makefile ============================================================================== --- head/mail/qmail-scanner/Makefile Mon Jan 21 17:26:10 2013 (r310776) +++ head/mail/qmail-scanner/Makefile Mon Jan 21 17:35:52 2013 (r310777) @@ -1,12 +1,9 @@ -# New ports collection makefile for: qmail-scanner -# Date created: 2003-08-24 -# Whom: moeti -# +# Created by: moeti # $FreeBSD$ -# PORTNAME= qmail-scanner PORTVERSION= 2.10 +PORTREVISION= 1 CATEGORIES= mail security MASTER_SITES= SF EXTRACT_SUFX= .tgz @@ -56,11 +53,15 @@ CONTRIB= mrtg-qmail-scanner.cfg check_AV test-sophie.pl test-trophie.pl test_installation.sh test_password.zip \ qmail-scanner-queue.c -OPTIONS= TNEF "Mark Simpson's Patch (Recommended)" on \ - FIX_MIME "Fix broken MIME messages" off \ - REDUNDANT "Scan attachments and body mails" on \ - NORMALIZE "Decode encoded headers per MIME Base64" off \ - CWRAPPER "use C wrapper (no suid perl script needed)" on +OPTIONS_DEFINE= TNEF FIX_MIME REDUNDANT NORMALIZE CWRAPPER STPATCH +OPTIONS_DEFAULT=TNEF REDUNDANT CWRAPPER STPATCH + +TNEF_DESC= Mark Simpson\'s Patch (Recommended) +FIX_MIME_DESC= Fix broken MIME messages +REDUNDANT_DESC= Scan attachments and body mails +NORMALIZE_DESC= Decode encoded headers per MIME Base64 +CWRAPPER_DESC= C wrapper (no suid perl script needed) +STPATCH_DESC= st patch from toribio.apollinare.org SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST+= QS_USER=${QS_USER} \ @@ -70,24 +71,24 @@ SUB_LIST+= QS_USER=${QS_USER} \ .include # Options -.if defined(WITH_TNEF) +.if ${PORT_OPTIONS:MTNEF} BUILD_DEPENDS+= ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef RUN_DEPENDS+= ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef .endif -.if !defined(WITH_FIX_MIME) +.if ! ${PORT_OPTIONS:MFIX_MIME} CONFIGURE_ARGS+= --fix-mime no .endif -.if !defined(WITH_REDUNDANT) +.if ! ${PORT_OPTIONS:MREDUNDANT} CONFIGURE_ARGS+= --redundant no .endif -.if !defined(WITH_NORMALIZE) +.if ! ${PORT_OPTIONS:MNORMALIZE} CONFIGURE_ARGS+= --normalize no .endif -.if defined(WITH_CWRAPPER) +.if ${PORT_OPTIONS:MCWRAPPER} SUB_LIST+= CWRAPPER=yes SUB_LIST+= QSQ_TARGET=qmail-scanner-queue CWRAPPER_FLG= yes @@ -100,6 +101,13 @@ CWRAPPER_FLG= no PLIST_SUB+= CWRAPPER="@comment " .endif +.if ${PORT_OPTIONS:MSTPATCH} || make (makesum) +PATCH_SITES= http://freebsdrocks.net/files9/ +PATCHFILES= patch-configure-qms +.else +EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure +.endif + .if defined(QS_USER) CONFIGURE_ARGS+= --qs-user "${QS_USER}" .endif Modified: head/mail/qmail-scanner/distinfo ============================================================================== --- head/mail/qmail-scanner/distinfo Mon Jan 21 17:26:10 2013 (r310776) +++ head/mail/qmail-scanner/distinfo Mon Jan 21 17:35:52 2013 (r310777) @@ -1,2 +1,4 @@ SHA256 (qmail-scanner-2.10.tgz) = b6c430c81efd41bd28e56fb60e6e1ecbd98e44346c2faad69ff164960f042247 SIZE (qmail-scanner-2.10.tgz) = 244402 +SHA256 (patch-configure-qms) = d2aa7cc5d665f988f07ca0e66900ccf55dbeeb5ad75f9be02ba022fae07d0e3c +SIZE (patch-configure-qms) = 536757 Copied: head/mail/qmail-scanner/files/extra-patch-configure (from r309902, head/mail/qmail-scanner/files/patch-configure) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/qmail-scanner/files/extra-patch-configure Mon Jan 21 17:35:52 2013 (r310777, copy of r309902, head/mail/qmail-scanner/files/patch-configure) @@ -0,0 +1,11 @@ +--- configure.old 2012-05-25 16:16:34.000000000 -0300 ++++ configure 2012-05-25 16:16:51.000000000 -0300 +@@ -817,7 +817,7 @@ + UNZIP_OPTIONS="" + fi + #Now check we can get filesizes out +- EE=`unzip -Ptest -lv contrib/test_password.zip 2>&1|egrep '80688.*test/ls'` ++ EE=`unzip -lv contrib/test_password.zip 2>&1|egrep '80688.*test/ls'` + if [ "$EE" = "" ]; then + echo "**FATAL ERROR ***" + echo ""