From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Mar 14 11:10:06 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2385D16A4CE for ; Mon, 14 Mar 2005 11:10:06 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 60AAF43D39 for ; Mon, 14 Mar 2005 11:10:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j2EBA27s097155 for ; Mon, 14 Mar 2005 11:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j2EBA2Dd097154; Mon, 14 Mar 2005 11:10:02 GMT (envelope-from gnats) Resent-Date: Mon, 14 Mar 2005 11:10:02 GMT Resent-Message-Id: <200503141110.j2EBA2Dd097154@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Renato Botelho Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3291E16A4CE for ; Mon, 14 Mar 2005 11:01:18 +0000 (GMT) Received: from data.galle.com.br (data.galle.com.br [200.246.25.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id B8BC143D5E for ; Mon, 14 Mar 2005 11:01:16 +0000 (GMT) (envelope-from renato@data.galle.com.br) Received: from data.galle.com.br (data.galle.com.br [200.246.25.10]) by data.galle.com.br (8.13.1/8.13.1) with ESMTP id j2EB1EVB061602 for ; Mon, 14 Mar 2005 08:01:14 -0300 (BRST) (envelope-from renato@data.galle.com.br) Received: (from root@localhost) by data.galle.com.br (8.13.1/8.13.1/Submit) id j2EB19ZA061601; Mon, 14 Mar 2005 08:01:09 -0300 (BRST) (envelope-from renato) Message-Id: <200503141101.j2EB19ZA061601@data.galle.com.br> Date: Mon, 14 Mar 2005 08:01:09 -0300 (BRST) From: Renato Botelho To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: =?iso-8859-1?q?ports/78813=3A_=5BMAINTAINER=5D_ma?= =?iso-8859-1?q?il/qmail-spamcontrol=3A_OPTION?= =?iso-8859-1?q?S=B4ify=2C_Fix_author=B4s_name_and?= =?iso-8859-1?q?_patch_install=5Fspamcontrol=2Esh?= X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2005 11:10:06 -0000 >Number: 78813 >Category: ports >Synopsis: [MAINTAINER] mail/qmail-spamcontrol: OPTIONS´ify, Fix author´s name and patch install_spamcontrol.sh >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Mar 14 11:10:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 5.3-RELEASE-p5 i386 >Organization: Galle Folheados - http://www.galle.com.br >Environment: System: FreeBSD data.galle.com.br 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #7: Thu Mar 3 09:03:28 BRST >Description: o OPTIONS´ify o Fix Spamcontrol author´s name in pkg-descr o Patch install_spamcontrol.sh to don´t copy anything to /var/qmail on configure time Added file(s): - files/install_spamcontrol.sh.patch.in Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- qmail-spamcontrol-1.03.2312.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/mail/qmail-spamcontrol/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- Makefile 11 Mar 2005 21:08:48 -0000 1.2 +++ Makefile 14 Mar 2005 10:58:26 -0000 @@ -22,6 +22,16 @@ SPAMCONTROL_VERSION= 2312 PREFIX?= ${QMAIL_PORT_PREFIX} +OPTIONS= RELAYMAILFROM "Open relay based on mailfrom" off \ + QUITASAP "Close session in case of a filter condition" off \ + REQBRACKETS "Require brackets in " on \ + VERP "VERP addresses for recipients" on \ + RECIPIENTS550 "Get a 550 reply instead of a deferred bounce" off \ + LOCALMFREQAUTH "Require auth when from is @ your domains" off \ + AUTHCRAM "Aditional CRAM-MD5 support" off \ + MOREIPME "Additional control files moreipme & notipme" off \ + BIGTODO "Bruce Guenter's BigToDo patch" off + .if !defined(PRE_MK_INCLUDED) .include .endif @@ -49,22 +59,22 @@ EXTRA_MAN8= qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8 MAN8+= ${EXTRA_MAN8} -DOCFILES+= ${WRKSRC}/FILES.spamcontrol ${WRKSRC}/HISTORY.spamcontrol \ - ${WRKSRC}/INSTALL.spamcontrol ${WRKSRC}/LICENSE.spamcontrol \ - ${WRKSRC}/LOGGING.spamcontrol ${WRKSRC}/Makefile.djbdns \ - ${WRKSRC}/README.auth ${WRKSRC}/README.bigtodo \ - ${WRKSRC}/README.bouncemaxbytes ${WRKSRC}/README.djbdns \ - ${WRKSRC}/README.doublebouncetrim ${WRKSRC}/README.moreipme \ - ${WRKSRC}/README.qmailqueue ${WRKSRC}/README.recipients \ - ${WRKSRC}/README.spamcontrol ${WRKSRC}/README.wildmat \ - ${WRKSRC}/README_spamcontrol.html \ - ${WRKSRC}/RELEASE_22.spamcontrol \ - ${WRKSRC}/RELEASE_23.spamcontrol \ - ${WRKSRC}/SMTPREPLY.spamcontrol ${WRKSRC}/TESTING.spamcontrol \ - ${WRKSRC}/TODO.spamcontrol ${WRKSRC}/badloadertypes \ - ${WRKSRC}/badmailfrom ${WRKSRC}/badmimetypes \ - ${WRKSRC}/badrcptto ${WRKSRC}/conf-spamcontrol \ - ${WRKSRC}/install_spamcontrol.sh ${WRKSRC}/tarpitcount +DOCFILES+= ${WRKDIR}/doc/FILES.spamcontrol ${WRKDIR}/doc/HISTORY.spamcontrol \ + ${WRKDIR}/doc/INSTALL.spamcontrol ${WRKDIR}/doc/LICENSE.spamcontrol \ + ${WRKDIR}/doc/LOGGING.spamcontrol ${WRKDIR}/doc/Makefile.djbdns \ + ${WRKDIR}/doc/README.auth ${WRKDIR}/doc/README.bigtodo \ + ${WRKDIR}/doc/README.bouncemaxbytes ${WRKDIR}/doc/README.djbdns \ + ${WRKDIR}/doc/README.doublebouncetrim ${WRKDIR}/doc/README.moreipme \ + ${WRKDIR}/doc/README.qmailqueue ${WRKDIR}/doc/README.recipients \ + ${WRKDIR}/doc/README.spamcontrol ${WRKDIR}/doc/README.wildmat \ + ${WRKDIR}/doc/README_spamcontrol.html \ + ${WRKDIR}/doc/RELEASE_22.spamcontrol \ + ${WRKDIR}/doc/RELEASE_23.spamcontrol \ + ${WRKDIR}/doc/SMTPREPLY.spamcontrol ${WRKDIR}/doc/TESTING.spamcontrol \ + ${WRKDIR}/doc/TODO.spamcontrol ${WRKDIR}/doc/badloadertypes \ + ${WRKDIR}/doc/badmailfrom ${WRKDIR}/doc/badmimetypes \ + ${WRKDIR}/doc/badrcptto ${WRKDIR}/doc/conf-spamcontrol \ + ${WRKDIR}/doc/install_spamcontrol.sh ${WRKDIR}/doc/tarpitcount SCRIPTS= qmail-alias2recipients qmail-pwd2recipients \ qmail-users2recipients qmail-vpopmail2recipients @@ -123,35 +133,17 @@ SELECTED_OPTIONS+= bigtodo=no .endif -slaveport-pre-fetch: - @${ECHO_MSG} "" - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} "" - @${ECHO_MSG} "WITH_RELAYMAILFROM Permit to open relay based" - @${ECHO_MSG} " on mailfrom (may be dangerous)" - @${ECHO_MSG} "WITH_QUITASAP Close SMTP session in case of a" - @${ECHO_MSG} " filter condition (violates SMTP RFC)" - @${ECHO_MSG} "WITHOUT_REQBRACKETS Disable function that requires" - @${ECHO_MSG} " brackets in " - @${ECHO_MSG} "WITHOUT_VERP Disable VERP addresses for recipients" - @${ECHO_MSG} "WITH_RECIPIENTS550 In case of non existing" - @${ECHO_MSG} " recipients get a direct 550 reply" - @${ECHO_MSG} " instead of a deferred bounce (via 450)" - @${ECHO_MSG} "WITH_LOCALMFREQAUTH Require authentication when" - @${ECHO_MSG} " mailfrom is @ your local-domains" - @${ECHO_MSG} "WITH_AUTHCRAM Aditional CRAM-MD5 support; needs" - @${ECHO_MSG} " a CRAM-MD5 supporting PAM (ie. cmd5chkpw)" - @${ECHO_MSG} "WITH_MOREIPME Scott Gifford's additional control" - @${ECHO_MSG} " files moreipme and notipme" - @${ECHO_MSG} "WITH_BIGTODO Bruce Guenter's BigToDo patch consider" - @${ECHO_MSG} " raising conf-split in the first place" - @${ECHO_MSG} "" - post-extract: @cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${SPAMCONTROL_DIST} slaveport-post-patch: - cd ${WRKSRC} && ${PATCH} < ${.CURDIR}/files/patch-qmail-smtpd.c.patch + @${SED} -e 's@%%WRKDIR%%@${WRKDIR}@g' \ + ${.CURDIR}/files/install_spamcontrol.sh.patch.in \ + > ${WRKDIR}/install_spamcontrol.sh.patch + + @cd ${WRKSRC} && \ + ${PATCH} -s < ${.CURDIR}/files/patch-qmail-smtpd.c.patch && \ + ${PATCH} -s < ${WRKDIR}/install_spamcontrol.sh.patch post-configure: @${ECHO_CMD} "# Generated by qmail-spamcontrol FreeBSD port" \ @@ -159,12 +151,12 @@ .for option in ${SELECTED_OPTIONS} @${ECHO_CMD} ${option} >> ${WRKSRC}/conf-spamcontrol .endfor - @${MKDIR} ${PREFIX}/scripts @cd ${WRKSRC} && ./install_spamcontrol.sh post-install: + @${MKDIR} ${PREFIX}/scripts .for script in ${SCRIPTS} - @${INSTALL_SCRIPT} ${WRKSRC}/${script} ${PREFIX}/scripts + @${INSTALL_SCRIPT} ${WRKDIR}/scripts/${script} ${PREFIX}/scripts .endfor .include "${MASTERDIR}/Makefile" Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/mail/qmail-spamcontrol/pkg-descr,v retrieving revision 1.1 diff -u -r1.1 pkg-descr --- pkg-descr 11 Mar 2005 16:28:55 -0000 1.1 +++ pkg-descr 14 Mar 2005 10:58:26 -0000 @@ -1,5 +1,5 @@ SpamControl is a collection of patches for qmail developed and maintained -by Erwin Hoffman (feh@fehcom.de). +by Erwin Hoffmann (feh@fehcom.de). Some SpamControl features: smtp-auth (plain, login and cram-md5), requirement of brackets on addresses, qmail-queue, bigtodo, moreipme, Index: files/install_spamcontrol.sh.patch.in =================================================================== RCS file: files/install_spamcontrol.sh.patch.in diff -N files/install_spamcontrol.sh.patch.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/install_spamcontrol.sh.patch.in 14 Mar 2005 10:58:27 -0000 @@ -0,0 +1,11 @@ +--- install_spamcontrol.sh.orig Mon Mar 14 07:37:04 2005 ++++ install_spamcontrol.sh Mon Mar 14 07:37:36 2005 +@@ -58,7 +58,7 @@ + # + DATE=$(date) + LOCDIR=${PWD} +-QMAILHOME=$(head -n 1 conf-qmail) ++QMAILHOME=%%WRKDIR%% + SOLARIS=$(sh ./find-systype.sh | grep -ci "SunOS") + LOGFILE=spamcontrol.log + TARGETS=FILES.spamcontrol --- qmail-spamcontrol-1.03.2312.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: