[Midnightbsd-cvs] mports: mail/p5-Mail-SpamAssassin: security patches in 3.22 plus

[laffer1 at midnightbsd.org]

Log Message:
-----------
security patches in 3.22 plus stability fixes in 3.23.

Don't wack /var/lib in the plist on uninstall.

Require a newer version of p5-Net-DNS for stability. (already in ports)

Modified Files:
--------------
    mports/mail/p5-Mail-SpamAssassin:
        Makefile (r1.3 -> r1.4)
        distinfo (r1.2 -> r1.3)
        pkg-plist (r1.2 -> r1.3)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/mail/p5-Mail-SpamAssassin/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lmail/p5-Mail-SpamAssassin/pkg-plist -Lmail/p5-Mail-SpamAssassin/pkg-plist -u -r1.2 -r1.3
--- mail/p5-Mail-SpamAssassin/pkg-plist
+++ mail/p5-Mail-SpamAssassin/pkg-plist
@@ -169,9 +169,9 @@
 %%DATADIR%%/languages
 %%DATADIR%%/sa-update-pubkey.txt
 %%DATADIR%%/user_prefs.template
- at unexec rm -rf %D/libdata/spamassassin || true
- at unexec rm -rf /var/lib/spamassassin || true
- at unexec rm -rf /var/lib || true
+ at unexec rm -rf %D/libdata/spamassassin/2* || true
+ at unexec rm -rf /var/lib/spamassassin 2>/dev/null || true
+ at unexec rmdir /var/lib 2>/dev/null || true
 @dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lmail/p5-Mail-SpamAssassin/Makefile -Lmail/p5-Mail-SpamAssassin/Makefile -u -r1.3 -r1.4
--- mail/p5-Mail-SpamAssassin/Makefile
+++ mail/p5-Mail-SpamAssassin/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.2.1
+PORTVERSION=	3.2.3
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
@@ -17,7 +17,7 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A highly efficient mail filter for identifying spam
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.58:${PORTSDIR}/dns/p5-Net-DNS \
+BUILD_DEPENDS=	p5-Net-DNS>=0.60:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-IO-Zlib>=1.04:${PORTSDIR}/archivers/p5-IO-Zlib \
 		p5-HTML-Parser>=3.43:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-IO-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-IO-Compress-Zlib \
@@ -62,7 +62,6 @@
 
 .if defined(WITH_SPF_QUERY)
 RUN_DEPENDS+=	p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
-# see http://www.freebsd.org/cgi/query-pr.cgi?pr=113638
 RUN_DEPENDS+=	${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
 .endif
 
@@ -98,6 +97,7 @@
 .if defined(WITH_DKIM)
 RUN_DEPENDS+=	p5-Mail-DKIM>=.20:${PORTSDIR}/mail/p5-Mail-DKIM
 RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
+RUN_DEPENDS+=	p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
 .endif
 
 .if defined(WITH_SACOMPILE)
@@ -240,7 +240,9 @@
 	@${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${PREFIX}/include
 
 post-install:
+.if defined (WITH_SPAMC)
 	@${STRIP_CMD} ${PREFIX}/bin/spamc
+.endif
 	@[ -f ${PREFIX}/etc/mail/spamassassin/init.pre ] || \
 		${CP} ${PREFIX}/etc/mail/spamassassin/init.pre.sample \
 			${PREFIX}/etc/mail/spamassassin/init.pre
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/mail/p5-Mail-SpamAssassin/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lmail/p5-Mail-SpamAssassin/distinfo -Lmail/p5-Mail-SpamAssassin/distinfo -u -r1.2 -r1.3
--- mail/p5-Mail-SpamAssassin/distinfo
+++ mail/p5-Mail-SpamAssassin/distinfo
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-3.2.1.tar.gz) = a7d51294c565999da01f212e5ad2a031
-SHA256 (Mail-SpamAssassin-3.2.1.tar.gz) = e0925d9c490bb8f1e56c3b850b50b12b124536dfe581b23d3c25715b1ce9ebf7
-SIZE (Mail-SpamAssassin-3.2.1.tar.gz) = 1193561
+MD5 (Mail-SpamAssassin-3.2.3.tar.gz) = 2e356b70b9458b44a828c19f6e816521
+SHA256 (Mail-SpamAssassin-3.2.3.tar.gz) = 2bf7635555dea4912512a32c7c567094ef264770b86029c49f653e97352efad8
+SIZE (Mail-SpamAssassin-3.2.3.tar.gz) = 1202082