From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 2 00:30:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 024CC1065688 for ; Fri, 2 Sep 2011 00:30:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id CCF498FC16 for ; Fri, 2 Sep 2011 00:30:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p820UAZn042123 for ; Fri, 2 Sep 2011 00:30:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p820UAO2042119; Fri, 2 Sep 2011 00:30:10 GMT (envelope-from gnats) Resent-Date: Fri, 2 Sep 2011 00:30:10 GMT Resent-Message-Id: <201109020030.p820UAO2042119@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, Janky@purplehat.org, Jay@purplehat.org, III Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC26D1065670 for ; Fri, 2 Sep 2011 00:29:08 +0000 (UTC) (envelope-from ek@purplehat.org) Received: from morbid.purplehat.org (morbid.purplehat.org [206.225.83.29]) by mx1.freebsd.org (Postfix) with ESMTP id 92AB48FC14 for ; Fri, 2 Sep 2011 00:29:08 +0000 (UTC) Received: from localhost (morbid.purplehat.org [206.225.83.29]) by morbid.purplehat.org (Postfix) with ESMTP id 28DAC85B0B0 for ; Thu, 1 Sep 2011 17:29:08 -0700 (PDT) Received: from morbid.purplehat.org ([206.225.83.29]) by localhost (morbid.purplehat.org [206.225.83.29]) (maiad, port 10024) with ESMTP id 21080-06 for ; Thu, 1 Sep 2011 17:29:07 -0700 (PDT) Received: by morbid.purplehat.org (Postfix, from userid 1001) id D8B7985B0B2; Thu, 1 Sep 2011 17:29:07 -0700 (PDT) Message-Id: <20110902002907.D8B7985B0B2@morbid.purplehat.org> Date: Thu, 1 Sep 2011 17:29:07 -0700 (PDT) From: Janky@purplehat.org, Jay@purplehat.org, III To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/160379: Update port: security/maia Fix for out-of-sync patches and dependencies. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Janky@purplehat.org, Jay@purplehat.org, III List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 00:30:11 -0000 >Number: 160379 >Category: ports >Synopsis: Update port: security/maia Fix for out-of-sync patches and dependencies. >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: Fri Sep 02 00:30:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Janky Jay, III >Release: FreeBSD 8.2-RELEASE-p2 i386 >Organization: Purplehat Organization >Environment: System: FreeBSD morbid.purplehat.org 8.2-RELEASE-p2 FreeBSD 8.2-RELEASE-p2 #0: Wed Aug 31 10:04:16 PDT 2011 root@morbid.purplehat.org:/usr/obj/usr/src/sys/MORBID i386 >Description: Added p5-forks as dependency. Fixed ${WRKSRC} directory stupidity. Replaced obsolete p5-Mail-SPF-Query with p5-Mail-SPF. Added optional DKIM module. Adjusted for changes in ${REINPLACE_CMD} files. Added ${CHOWN} for configuration files for security. Completely removed files/maiad.sh.in file. Can a committer please permanently delete this? Completely removed files/.placeholder (no longer needed? Also needs permanent deletion...) >How-To-Repeat: >Fix: --- maia-1.0.3-r1575_1.diff begins here --- diff -Naur maia.orig/Makefile maia/Makefile --- maia.orig/Makefile 2011-08-29 08:57:18.000000000 -0700 +++ maia/Makefile 2011-09-01 17:14:01.000000000 -0700 @@ -7,6 +7,7 @@ PORTNAME= maia DISTVERSION= 1.0.3-${SVNREVISION} +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.purplehat.org/downloads/maia/ @@ -18,6 +19,7 @@ p5-Convert-TNEF>=0.08:${PORTSDIR}/converters/p5-Convert-TNEF \ p5-Convert-UUlib>=1.08,1:${PORTSDIR}/converters/p5-Convert-UUlib \ p5-Net-CIDR-Lite>=0.18:${PORTSDIR}/net/p5-Net-CIDR-Lite \ + p5-forks>=0.34:${PORTSDIR}/devel/p5-forks \ p5-Archive-Zip>=0.10:${PORTSDIR}/archivers/p5-Archive-Zip \ p5-IO-stringy>=1.203:${PORTSDIR}/devel/p5-IO-stringy \ p5-IO-Socket-INET6>=1.27:${PORTSDIR}/net/p5-IO-Socket-INET6 \ @@ -28,7 +30,6 @@ # SVN source: https://www.maiamailguard.com/svn/branches/1.0 SVNREVISION= r1575 -WRKSRC= ${WRKDIR}/${PORTNAME}-1.0-${SVNREVISION} USE_PERL5_RUN= 5.8.2+ NO_BUILD= yes @@ -59,7 +60,8 @@ CRYPT "Encryption support" off \ IPCOUNTRY "SpamAssassin IP Country plugin" on \ DOMAINKEYS "SpamAssassin DomainKey plugin" on \ - SPFQUERY "SpamAssassin SPF Query plugin" on \ + SPF "SpamAssassin SPF plugin" on \ + DKIM "SpamAssassin DKIM plugin" on \ FILE "Use newer file(1) utility from ports" on \ RAR "RAR support with archivers/rar" off \ UNRAR "RAR support with archivers/unrar" on \ @@ -197,10 +199,14 @@ RUN_DEPENDS+= ${SITE_PERL}/Mail/DomainKeys.pm:${PORTSDIR}/mail/p5-Mail-DomainKeys .endif -.if defined(WITH_SPFQUERY) +.if defined(WITH_SPF) RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF .endif +.if defined(WITH_DKIM) +RUN_DEPENDS+= ${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM +.endif + .if defined(WITH_FILE) # security fix, file > 4.21 needed RUN_DEPENDS+= file>=4.21:${PORTSDIR}/sysutils/file @@ -277,20 +283,20 @@ .endfor .for i in maiad.conf.dist maiad @${REINPLACE_CMD} -e "s|$daemon_user = \'amavis\';|$daemon_user = \'${USERS}\';|" \ - -e "s|$daemon_group = \'amavis\';|$daemon_group = \'${GROUPS}\';|" \ - -e 's|$$log_level = 0;|$$log_level = 1;|' \ - -e 's|/etc/maiad.conf|${PREFIX}/etc/maiad.conf|' \ - -e "s|/var/virusmails|${MAIAQUARANTINE}|" ${WRKSRC}/${i} + -e "s|$daemon_group = \'amavis\';|$daemon_group = \'${GROUPS}\';|" \ + -e 's|$$log_level = 0;|$$log_level = 1;|' \ + -e 's|/etc/maiad.conf|${PREFIX}/etc/maiad.conf|' \ + -e "s|/var/virusmails|${MAIAQUARANTINE}|" ${WRKSRC}/${i} .endfor .for f in maiad maiad.conf.dist maia.conf.dist scripts/send-quarantine-digests.pl \ scripts/process-quarantine.pl scripts/load-sa-rules.pl @${REINPLACE_CMD} "s|/var/maiad|${MAIADIR}|" ${WRKSRC}/${f} .endfor -.for i in maia.conf.dist scripts/expire-quarantine-cache.pl scripts/stats-snapshot.pl \ +.for i in maiad maia.conf.dist scripts/expire-quarantine-cache.pl scripts/stats-snapshot.pl \ scripts/maiadbtool.pl scripts/configtest.pl scripts/send-quarantine-reminders.pl \ scripts/send-quarantine-digests.pl scripts/process-quarantine.pl \ scripts/load-sa-rules.pl - @${REINPLACE_CMD} "s|/etc/maia.conf|${PREFIX}/etc/maia.conf|" ${WRKSRC}/${i} + @${REINPLACE_CMD} "s|/etc/maia/maia.conf|${PREFIX}/etc/maia.conf|" ${WRKSRC}/${i} .endfor pre-install: @@ -330,6 +336,8 @@ ${CP} -p ${PREFIX}/etc/${maiaconf}.conf.dist \ ${PREFIX}/etc/${maiaconf}.conf ; \ fi + @${CHOWN} ${USERS}:${GROUPS} ${PREFIX}/etc/${maiaconf}.conf \ + ${PREFIX}/etc/${maiaconf}.conf.dist .endfor @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} @${CHOWN} -R ${USERS}:${GROUPS} ${MAIADIR}/ diff -Naur maia.orig/distinfo maia/distinfo --- maia.orig/distinfo 2011-08-30 15:17:14.000000000 -0700 +++ maia/distinfo 2011-09-01 17:08:36.000000000 -0700 @@ -1,2 +1,2 @@ -SHA256 (maia-1.0.3-r1575.tar.gz) = da82c256752f88f363445a688d8f877f17df1d9395f7f1aeb6db2bb61900dcd9 -SIZE (maia-1.0.3-r1575.tar.gz) = 2273711 +SHA256 (maia-1.0.3-r1575.tar.gz) = 139ea56ad050d8e6cf73f98e92afab6c09be4f05edaaf25cd4326efa4a3cfdbd +SIZE (maia-1.0.3-r1575.tar.gz) = 2273788 diff -Naur maia.orig/files/pkg-deinstall.in maia/files/pkg-deinstall.in --- maia.orig/files/pkg-deinstall.in 2011-08-29 08:57:19.000000000 -0700 +++ maia/files/pkg-deinstall.in 2011-09-01 17:08:36.000000000 -0700 @@ -8,11 +8,9 @@ MAIAWEB=%%PREFIX%%/www/maia if [ "$2" = "POST-DEINSTALL" ]; then - if [ -e ${DIR} ]; then echo "You should manually remove the \"${DIR}\" directory." fi - if [ -e ${QUARANTINE} ]; then echo "You should manually remove the \"${QUARANTINE}\" directory." fi diff -Naur maia.orig/files/pkg-install.in maia/files/pkg-install.in --- maia.orig/files/pkg-install.in 2011-08-29 08:57:19.000000000 -0700 +++ maia/files/pkg-install.in 2011-09-01 17:08:36.000000000 -0700 @@ -9,7 +9,6 @@ QUARANTINE=%%MAIAQUARANTINE%% if [ "$2" = "PRE-INSTALL" ]; then - /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR} echo "Created \"${DIR}\" directory." /usr/bin/install -o ${USER} -g ${GROUP} -m 750 -d ${DIR}/db diff -Naur maia.orig/files/pkg-message.in maia/files/pkg-message.in --- maia.orig/files/pkg-message.in 2011-08-29 08:57:19.000000000 -0700 +++ maia/files/pkg-message.in 2011-09-01 17:08:36.000000000 -0700 @@ -1,11 +1,18 @@ -To use Maia-Mailguard, you need to install at least one virus scanner. -The following virus scanners are available in the FreeBSD ports -collection: - security/clamav Clam Antivirus - security/f-prot F-Prot Antivirus - security/drweb DrWeb antivirus suite +******************************************************************* + To use Maia-Mailguard, you need to install at least one virus scanner. + The following virus scanners are available in the FreeBSD ports + collection: + + security/clamav Clam Antivirus + security/f-prot F-Prot Antivirus + security/drweb DrWeb antivirus suite -Enable Maia-Mailguard in /etc/rc.conf with the following line: + Enable Maia-Mailguard in /etc/rc.conf with the following line: + + maiad_enable="YES" + + Configuration templates are available in %%PREFIX%%/etc + as maia.conf.dist and maiad.conf.dist. +******************************************************************* - maiad_enable="YES" diff -Naur maia.orig/pkg-plist maia/pkg-plist --- maia.orig/pkg-plist 2011-08-29 08:57:18.000000000 -0700 +++ maia/pkg-plist 2011-09-01 17:08:36.000000000 -0700 @@ -4,6 +4,7 @@ @unexec if cmp -s %D/etc/maia.conf.dist %D/etc/maia.conf; then rm -f %D/etc/maia.conf; fi etc/maia.conf.dist @exec if [ ! -f %D/etc/maia.conf ] ; then cp -p %D/%F %B/maia.conf; fi +etc/rc.d/maiad sbin/maiad %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/README --- maia-1.0.3-r1575_1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: