Date: Fri, 23 Feb 2007 18:00:27 GMT From: Michael Scheidell <scheidell@secnap.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/109434: Spamassassin Makefile needs gpg1. Patch makes it work with gpg2 also. Message-ID: <200702231800.l1NI0Rja031662@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/109434; it has been noted by GNATS. From: Michael Scheidell <scheidell@secnap.net> To: bug-followup@FreeBSD.org Cc: possamai@xs4all.nl, takefu@airport.fm Subject: Re: ports/109434: Spamassassin Makefile needs gpg1. Patch makes it work with gpg2 also. Date: Fri, 23 Feb 2007 12:19:57 -0500 This is a multi-part message in MIME format. --------------060106020703080001010202 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit The following patch takes care of additional upwards compatibility issues when upgrading, reinstalling if different versions installed dependency list looks like it WILL upgrade 4.11 to gpg 2.0 during a portupgrade -R p5-Mail-SpamAssassin. doesn't force a upgrade to 2.0 if you just do a deinstall/reinstall for SA. 1) if no gpg installed, will install gpgv2 (which I have tested in FBSD5.5 and 4.11 and it works) 2) if gpg already installed, will use THAT one (which ever it is) (thanks Michelle for original patch) Mark Martinec (amavisd-new writer) sent me this and patch that fixes it. This is wrong in Makefile: .if defined(WITH_DOMAINKEYS) || defined(WITH_DKIM) RUN_DEPENDS+= p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys .endif Neither DKIM plugin nor the underlying Mail::DKIM module needs mail/p5-Mail-DomainKeys, the DK and DKIM plugins as well as underlying modules are completely independent. Additionally, takefu sent information on a spamassassin bug patch that fixes sa-learn issue with stdin. https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5336 --------------060106020703080001010202 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="sapatch.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="sapatch.diff" diff -bBru /tmp/p5-Mail-SpamAssassin/Makefile p5-Mail-SpamAssassin/Makefile --- /tmp/p5-Mail-SpamAssassin/Makefile Fri Feb 16 03:53:07 2007 +++ p5-Mail-SpamAssassin/Makefile Fri Feb 23 11:05:23 2007 @@ -7,6 +7,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 3.1.8 +PORTREVISION= 1 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan @@ -61,7 +62,7 @@ .endif .if !defined(WITHOUT_GNUPG) -RUN_DEPENDS+= gpgv:${PORTSDIR}/security/gnupg1 +RUN_DEPENDS+= gnupg>=1.4.1:${PORTSDIR}/security/gnupg .endif .if defined(WITH_MYSQL) @@ -80,7 +81,7 @@ RUN_DEPENDS+= ${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM .endif -.if defined(WITH_DOMAINKEYS) || defined(WITH_DKIM) +.if defined(WITH_DOMAINKEYS) RUN_DEPENDS+= p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys .endif @@ -184,14 +185,24 @@ -e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \ -e 's/require DBI/0/' \ ${WRKSRC}/Makefile.PL +# I cant' seem to get these to work, patches or suggestions welcome .if defined(WITH_RAZOR) ${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre .endif .if defined(WITH_DOMAINKEYS) - ${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre + ${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre .endif .if defined(WITH_RELAY_COUNTRY) - ${REINPLACE_CMD} -e '/RelayCountry/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre + ${REINPLACE_CMD} -e '/RelayCountry/s/^# ?loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre +.endif +.if defined(WITH_DKIM) + ${REINPLACE_CMD} -e '/DKIM/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre +.endif +.if !defined(WITH_SPF_QUERY) + ${REINPLACE_CMD} -e '/SPF/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/init.pre +.endif +.if defined(WITH_DCC) + ${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre .endif pre-install: diff -bBru /tmp/p5-Mail-SpamAssassin/files/patch-sa-learn-raw p5-Mail-SpamAssassin/files/patch-sa-learn-raw --- /tmp/p5-Mail-SpamAssassin/files/patch-sa-learn-raw Fri Feb 23 11:50:31 2007 +++ p5-Mail-SpamAssassin/files/patch-sa-learn-raw Fri Feb 23 08:51:15 2007 @@ -0,0 +1,14 @@ +--- sa-learn.raw (revision 507745) ++++ sa-learn.raw (working copy) +@@ -402,7 +402,10 @@ + + # make sure the target list is in the normal AI format + if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) { +- $targets[$elem] = target($targets[$elem]); ++ my $item = splice @targets, $elem, 1; ++ $elem--; # go back to this element again ++ target($item); # add back to the list ++ next; + } + } + --------------060106020703080001010202--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702231800.l1NI0Rja031662>