- Update to 3.2.1

- Security fix.

PR:		ports/113719
Submitted by:	Michael Scheidell <scheidell@secnap.net> (maintainer)
Approved by:	sat (mentor)
Security:	CVE-2007-2873

6 files changed, 64 insertions, 20 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index b6b39556aab7..5c3ba6bc9267 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.2.0
+PORTVERSION=	3.2.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
@@ -19,6 +19,7 @@ COMMENT=	A highly efficient mail filter for identifying spam
 BUILD_DEPENDS=	p5-Net-DNS>=0.58:${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 \
 		p5-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
 
@@ -28,6 +29,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect
 
 PERL_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
 	       	CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
 		LOCALSTATEDIR="/var/db/spamassassin"
@@ -58,6 +60,8 @@ WITHOUT_SSL=1
 .endif
 
 .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
 
@@ -68,8 +72,10 @@ USE_OPENSSL=	yes
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 CONFIGURE_ARGS+=	ENABLE_SSL=yes
+PLIST_SUB+=	SSL=""
 .else
 CONFIGURE_ARGS+=	ENABLE_SSL=no
+PLIST_SUB+=	SSL="@comment "
 .endif
 
 .if !defined(WITHOUT_GNUPG)
@@ -85,9 +91,7 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-P
 .endif
 
 .if defined(WITH_RAZOR)
-RUN_DEPENDS+=	razor-agents>=2.81:${PORTSDIR}/mail/razor-agents
-# see http://www.freebsd.org/cgi/query-pr.cgi?pr=112522
-# really needs razor-agents>=2.82_1
+RUN_DEPENDS+=	razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
 .endif
 
 .if defined(WITH_DKIM)
@@ -96,8 +100,6 @@ RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SS
 .endif
 
 .if defined(WITH_SACOMPILE)
-# if this fails, you need re2c .12.0:
-# http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/112501
 RUN_DEPENDS+=	re2c>=.12.0:${PORTSDIR}/devel/re2c
 .endif
 
@@ -217,11 +219,24 @@ post-patch:
 	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
 .endif
 .if defined(WITH_SACOMPILE)
-	${REINPLACE_CMD} -e '/Rule2XSBody/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
+	${REINPLACE_CMD} -e '/Rule2XSBody/s/^# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
+.endif
+
+post-build:
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libspamc.so)
+.if !defined(WITHOUT_SSL)
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libsslspamc.so)
 .endif
 
 pre-install:
 	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
+	@${INSTALL_PROGRAM} ${WRKSRC}/spamc/libspamc.so ${PREFIX}/lib/libspamc.so.0
+	@${LN} -sf libspamc.so.0 ${PREFIX}/lib/libspamc.so
+.if !defined(WITHOUT_SSL)
+	@${INSTALL_PROGRAM} ${WRKSRC}/spamc/libsslspamc.so ${PREFIX}/lib/libsslspamc.so.0
+	@${LN} -sf libsslspamc.so.0 ${PREFIX}/lib/libsslspamc.so
+.endif
+	@${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${PREFIX}/include
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/spamc
@@ -247,10 +262,6 @@ post-install:
 .endif
 	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
 
-.if ${PERL_LEVEL} < 500600
-IGNORE=	needs perl 5.6.1 or higher, install lang/perl5.8 and try again
-.endif
-
 .if ${PERL_LEVEL} < 500800
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index 51b8ed8edbff..acfd2d97defa 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-3.2.0.tar.gz) = aed988bb6cf463afc868a64d4cd771a3
-SHA256 (Mail-SpamAssassin-3.2.0.tar.gz) = 4690d2639075dfd376acb3540697861e167a917fd6332bf62b2e754d26ee99be
-SIZE (Mail-SpamAssassin-3.2.0.tar.gz) = 1290995
+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
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw b/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
index aa27ed66a606..9b8bdaa0b4e4 100644
--- a/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
+++ b/mail/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
@@ -1,20 +1,21 @@
 --- sa-compile.raw.orig	Tue May  1 09:54:33 2007
 +++ sa-compile.raw	Thu May  3 13:35:23 2007
-@@ -636,7 +636,7 @@
+@@ -643,7 +643,7 @@
    -p prefs, --prefspath=file, --prefs-file=file
                                  Set user preferences file
    --siteconfigpath=path         Path for site configs
 -                                (default: /etc/mail/spamassassin)
 +                                (default: @@LOCAL_RULES_DIR@@)
+   --updatedir=path              Directory to place updates
+-                     (default: /var/lib/spamassassin/compiled/<version>)
++                     (default: @@LOCAL_STATE_DIR@@/compiled/<version>)
    --cf='config line'            Additional line of configuration
-   -D, --debug [area=n,...]	Print debugging messages
-   -V, --version			Print version
-@@ -683,12 +683,12 @@
+@@ -692,12 +692,12 @@
  =item B<-C> I<path>, B<--configpath>=I<path>, B<--config-file>=I<path>
  
  Use the specified path for locating the distributed configuration files.
 -Ignore the default directories (usually C</usr/share/spamassassin> or similar).
-+Ignore the default directories (usually <@@DEF_RULES_DIR@@> or similar).
++Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar).
  
  =item B<--siteconfigpath>=I<path>
  
@@ -22,5 +23,5 @@
 -the default directories (usually C</etc/mail/spamassassin> or similar).
 +the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
  
- =item B<--cf='config line'>
+ =item B<--updatedir>
  
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-spamc-Makefile.in b/mail/p5-Mail-SpamAssassin/files/patch-spamc-Makefile.in
new file mode 100644
index 000000000000..f26c62f343fb
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin/files/patch-spamc-Makefile.in
@@ -0,0 +1,20 @@
+--- spamc/Makefile.in~	Fri Jun  8 14:56:02 2007
++++ spamc/Makefile.in	Thu Jun 14 00:41:37 2007
+@@ -7,4 +7,5 @@
+ LDFLAGS = @LDFLAGS@
+ LDDLFLAGS = @LDDLFLAGS@
++SHLIBFLAGS = -fPIC
+ 
+ LIBS = @LIBS@
+@@ -33,9 +34,9 @@
+ 
+ spamc/libspamc$(SHLIBEXT): $(LIBSPAMC_FILES)
+-	$(CC) $(CCDLFLAGS) $(LIBSPAMC_FILES) \
++	$(CC) $(CCDLFLAGS) $(SHLIBFLAGS) $(LIBSPAMC_FILES) \
+ 		-o $@ $(LDDLFLAGS) $(LIBS)
+ 
+ spamc/libsslspamc$(SHLIBEXT): $(LIBSPAMC_FILES)
+-	$(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(LIBSPAMC_FILES) \
++	$(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(SHLIBFLAGS) $(LIBSPAMC_FILES) \
+ 		-o $@ $(LDDLFLAGS) $(SSLLIBS) $(LIBS)
+
diff --git a/mail/p5-Mail-SpamAssassin/pkg-message b/mail/p5-Mail-SpamAssassin/pkg-message
index c600e35de546..9946219b7e27 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-message
+++ b/mail/p5-Mail-SpamAssassin/pkg-message
@@ -25,3 +25,10 @@ NOTE:  FREEBSD users: If you are updating to 3.20 you will find
 that sa-update now places state files in /var/db/spamassassin
 and not the default /var/lib/spamassassin.  This is to be consistant
 with Freebsd file directory conventions
+
+If you are running with spamd, you must add the following to rc.conf:
+spamd_enable="YES"
+
+Security Note:  If you did NOT deselected AS_ROOT, spamd will be running
+as root. To change this, also add this to rc.conf:
+spamd_flags="-u spamd -H /var/spool/spamd"
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index b9b3cf4952de..99518266f5c2 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -6,6 +6,11 @@ bin/sa-update
 bin/spamassassin
 bin/spamc
 bin/spamd
+lib/libspamc.so
+lib/libspamc.so.0
+%%SSL%%lib/libsslspamc.so
+%%SSL%%lib/libsslspamc.so.0
+include/libspamc.h
 @unexec rm -rf %D/etc/mail/spamassassin/sa-update-keys || true
 etc/mail/spamassassin/local.cf.sample
 @unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi