From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 3 05:10: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 8917D106566B for ; Sat, 3 Sep 2011 05:10: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 767258FC0A for ; Sat, 3 Sep 2011 05:10:11 +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 p835ABW4069126 for ; Sat, 3 Sep 2011 05:10:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p835ABWg069125; Sat, 3 Sep 2011 05:10:11 GMT (envelope-from gnats) Date: Sat, 3 Sep 2011 05:10:11 GMT Message-Id: <201109030510.p835ABWg069125@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: "Janky Jay, III" Cc: Subject: Re: 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 Jay, III" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 05:10:11 -0000 The following reply was made to PR ports/160379; it has been noted by GNATS. From: "Janky Jay, III" To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/160379: Update port: security/maia Fix for out-of-sync patches and dependencies. Date: Fri, 02 Sep 2011 23:04:42 -0600 This is a multi-part message in MIME format. --------------050504070308090300010802 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Okay. Managed to fix the problem. Still don't understand what was wrong but I divided the sed commands by file name and/or directory and all seems fine now. Along with the same previous changes, I added a PORTREVISION of 1. Please commit the attached patch. Thanks! Regards, Janky Jay, III -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk5htWoACgkQZ5znzUsaCyQMvgCffAWP3uhQ6hsTMlOY/S1EY08w r/kAn1bR7ktX26gHMjFuQlH38jnRN8Gf =DiFc -----END PGP SIGNATURE----- --------------050504070308090300010802 Content-Type: text/x-patch; name="maia-1.0.3-r1575_1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="maia-1.0.3-r1575_1.diff" diff -Naur maia.orig/Makefile maia/Makefile --- maia.orig/Makefile 2011-08-29 08:57:18.000000000 -0700 +++ maia/Makefile 2011-09-02 21:30:59.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 @@ -272,27 +278,38 @@ .endif post-patch: -.for f in maiad.conf.dist maiad - @${REINPLACE_CMD} "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${f} +.for m in scripts/configtest.pl scripts/expire-quarantine-cache.pl \ + scripts/generate-key.pl scripts/load-sa-rules.pl scripts/maiadbtool.pl \ + scripts/process-quarantine.pl scripts/resend.pl scripts/send-quarantine-digests.pl \ + scripts/send-quarantine-reminders.pl scripts/stats-snapshot.pl + @${REINPLACE_CMD} -e "s|/etc/maia/maia.conf|${PREFIX}/etc/maia.conf|" \ + ${WRKSRC}/${m} + .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} +.for a in maiad.conf.dist + @${REINPLACE_CMD} -e "s|$daemon_user = \'maia\';|$daemon_user = \'${USERS}\';|" \ + -e "s|$daemon_group = \'maia\';|$daemon_group = \'${GROUPS}\';|" \ + -e "s|/var/lib/maia|${MAIADIR}|" \ + -e "s|/var/log/maia|${MAIADIR}|" ${WRKSRC}/${a} .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} +.for i in maia.conf.dist + @${REINPLACE_CMD} -e "s|/etc/maia.conf|${PREFIX}/etc/maia.conf|" \ + -e "s|$username = \'maia\'|$username = \'${USERS}\'|" \ + -e "s|/var/lib/maia|${MAIADIR}/maia|" \ + -e "s|/usr/bin/sa-learn|/usr/local/bin/sa-learn|" \ + -e "s|$local_cf_dir = undef|$local_cf_dir = \'${PREFIX}/etc/mail/spamassassin'|" \ + -e "s|$system_rules_dir = undef|$system_rules_dir = \'/var/db/spamassassin\'|" \ + -e "s|$user_rules_dir = undef|$user_rules_dir = \'${MAIADIR}/.spamassassin\'|" \ + -e "s|$pid_dir = \'/var/run/maia/\'|$pid_dir = \'${MAIADIR}/\'|" \ + -e "s|$log_dir = \'/var/log/maia\'|$log_dir = \'${MAIADIR}\'|" \ + -e "s|$template_dir = \'/etc/maia/templates/\'|$template_dir = \'${MAIADIR}/maia/templates/\'|" \ + ${WRKSRC}/${i} .endfor -.for i in 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} +.for a in maiad + @${REINPLACE_CMD} -e "s|/etc/maia/maiad.conf|${PREFIX}/etc/maiad.conf|" \ + -e "s|/var/lib/maia|${MAIADIR}|" \ + -e "s@'zoo'\]@['zoo','unzoo'] ]@" ${WRKSRC}/${a} .endfor - pre-install: @${FIND} -E ${WRKSRC} -iregex '.*(bak|~)$$' -delete @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL @@ -330,6 +347,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 --------------050504070308090300010802--