From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 25 15:00:33 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 73B6316A407 for ; Mon, 25 Dec 2006 15:00:33 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 4290D13C463 for ; Mon, 25 Dec 2006 15:00:33 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBPF0Xn1061794 for ; Mon, 25 Dec 2006 15:00:33 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBPF0XPi061793; Mon, 25 Dec 2006 15:00:33 GMT (envelope-from gnats) Resent-Date: Mon, 25 Dec 2006 15:00:33 GMT Resent-Message-Id: <200612251500.kBPF0XPi061793@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, Michael Scheidell Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1493116A412 for ; Mon, 25 Dec 2006 14:52:23 +0000 (UTC) (envelope-from scheidell@secnap.net) Received: from mail.secnap.net (mail.secnap.com [204.89.241.129]) by mx1.freebsd.org (Postfix) with ESMTP id E355E13C489 for ; Mon, 25 Dec 2006 14:52:22 +0000 (UTC) (envelope-from scheidell@secnap.net) Received: by mail.secnap.net (Postfix, from userid 1001) id 2DFE416483D; Mon, 25 Dec 2006 09:32:48 -0500 (EST) Message-Id: <20061225143248.2DFE416483D@mail.secnap.net> Date: Mon, 25 Dec 2006 09:32:48 -0500 (EST) From: Michael Scheidell To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/107191: add DKIM, fix gnupg typo X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Dec 2006 15:00:33 -0000 >Number: 107191 >Category: ports >Synopsis: add DKIM, fix gnupg typo >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 25 15:00:32 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Michael Scheidell >Release: FreeBSD 5.5-RELEASE-p8 sparc64 >Organization: SECNAP Network Security >Environment: System: FreeBSD mail.secnap.net 5.5-RELEASE-p8 FreeBSD 5.5-RELEASE-p8 #7: Sun Nov 12 12:30:30 EST 2006 scheidell@mail.secnap.net:/usr/obj/usr/src/sys/OUTSIDE sparc64 >Description: #1, gnupg seems to be gnupg not gnupg1 #2, SpamAssassin has supported DKIM in addition to DomainKeys for a while now, and (finally) DKIM.pm is in ports. This patch adds DKIM and fixes gnupg type. >How-To-Repeat: NA >Fix: patch: diff -bBru Makefile.orig Makefile --- Makefile.orig Thu Dec 21 21:51:12 2006 +++ Makefile Mon Dec 25 09:16:08 2006 @@ -7,7 +7,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 3.1.7 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan @@ -23,7 +23,7 @@ RUN_DEPENDS= ${BUILD_DEPENDS} \ ${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \ ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \ - gpgv:${PORTSDIR}/security/gnupg1 + gpgv:${PORTSDIR}/security/gnupg PERL_CONFIGURE= yes CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \ @@ -35,6 +35,7 @@ OPTIONS= AS_ROOT "Run spamd as root (recommended)" on \ DOMAINKEYS "DomainKeys support" off \ + DKIM "DomainKeys Identified Mail" off \ SSL "Build with SSL support for spamd/spamc" on \ MYSQL "Add MySQL support" off \ PGSQL "Add PostreSQL support" off \ @@ -72,7 +73,11 @@ RUN_DEPENDS+= razor-agents>=2.81:${PORTSDIR}/mail/razor-agents .endif -.if defined(WITH_DOMAINKEYS) +.if defined(WITH_DKIM) +RUN_DEPENDS+= ${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM +.endif + +.if defined(WITH_DOMAINKEYS) || defined(WITH_DKIM) RUN_DEPENDS+= p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys .endif @@ -179,7 +184,10 @@ .if defined(WITH_RAZOR) ${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre .endif -.if defined(WITH_DOMAINKEYS) +.if defined(WITH_DKIM) + ${REINPLACE_CMD} -e '/DKIM/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre +.endif +.if defined(WITH_DOMAINKEYS) || defined(WITH_DKIM) ${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre .endif .if defined(WITH_RELAY_COUNTRY) >Release-Note: >Audit-Trail: >Unformatted: