Attachment #79121 for bug #113719

View | Details | Raw Unified | Return to bug 113719
Collapse All | Expand All




#

PORTNAME=	Mail-SpamAssassin
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

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

RUN_DEPENDS=	${BUILD_DEPENDS} \
		${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
		p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar
		${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect

PERL_CONFIGURE=	yes
CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \


.include <bsd.port.pre.mk>

USE_LDCONFIG=yes

.if ${OSVERSION} > 500000
RUN_DEPENDS+= ${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect
.else
WITH_SACOMPILE=''
.endif

.if defined (WITH_SPAMC)
CONFIGURE_ARGS+=	BUILD_SPAMC=yes
.else

.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


.endif

.if defined(WITH_RAZOR)
RUN_DEPENDS+=	razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
# see http://www.freebsd.org/cgi/query-pr.cgi?pr=112522
# really needs razor-agents>=2.82_1
.endif

.if defined(WITH_DKIM)

	${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
.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_DATA} ${WRKSRC}/spamc/libspamc.so ${PREFIX}/lib
	${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${PREFIX}/include
.if !defined(WITHOUT_SSL)
	${INSTALL_DATA} ${WRKSRC}/spamc/libsslspamc.so ${PREFIX}/lib
.endif

.if ${OSVERSION} < 500000
	@${SED} -i "" "s| /etc/rc.subr| ${PREFIX}/etc/rc.subr|" work/sa-spamd.sh
.endif

post-install:
	@${STRIP_CMD} ${PREFIX}/bin/spamc

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	MD5 (Mail-SpamAssassin-3.2.0.tar.gz) = aed988bb6cf463afc868a64d4cd771a3	1	MD5 (Mail-SpamAssassin-3.2.1.tar.gz) = a7d51294c565999da01f212e5ad2a031
2	SHA256 (Mail-SpamAssassin-3.2.0.tar.gz) = 4690d2639075dfd376acb3540697861e167a917fd6332bf62b2e754d26ee99be	2	SHA256 (Mail-SpamAssassin-3.2.1.tar.gz) = e0925d9c490bb8f1e56c3b850b50b12b124536dfe581b23d3c25715b1ce9ebf7
3	SIZE (Mail-SpamAssassin-3.2.0.tar.gz) = 1290995	3	SIZE (Mail-SpamAssassin-3.2.1.tar.gz) = 1193561




--- sa-compile.raw.orig	Tue May  1 09:54:33 2007
+++ sa-compile.raw	Thu May  3 13:35:23 2007
@@ -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
@@ -692,12 +692,12 @@
   -V, --version			Print version
@@ -683,12 +683,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 C<@@DEF_RULES_DIR@@> or similar).
 
 =item B<--siteconfigpath>=I<path>
 

-the default directories (usually C</etc/mail/spamassassin> or similar).
+the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
 
 =item B<--updatedir>
 




--- 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)


Lines 25-27 Link Here

(-)./pkg-message (+7 lines)
25	that sa-update now places state files in /var/db/spamassassin	25	that sa-update now places state files in /var/db/spamassassin
26	and not the default /var/lib/spamassassin. This is to be consistant	26	and not the default /var/lib/spamassassin. This is to be consistant
27	with Freebsd file directory conventions	27	with Freebsd file directory conventions
		28
		29	If you are running with spamd, you must add the following to rc.conf:
		30	spamd_enable="YES"
		31
		32	Security Note: If you did NOT deselected AS_ROOT, spamd will be running
		33	as root. To change this, also add this to rc.conf:
		34	spamd_flags="-u spamd -H /var/spool/spamd"

Lines 6-11 Link Here

(-)./pkg-plist (+3 lines)
6	bin/spamassassin	6	bin/spamassassin
7	bin/spamc	7	bin/spamc
8	bin/spamd	8	bin/spamd
		9	lib/libspamc.so
		10	lib/libsslspamc.so
		11	include/libspamc.h
9	@unexec rm -rf %D/etc/mail/spamassassin/sa-update-keys \|\| true	12	@unexec rm -rf %D/etc/mail/spamassassin/sa-update-keys \|\| true
10	etc/mail/spamassassin/local.cf.sample	13	etc/mail/spamassassin/local.cf.sample
11	@unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi	14	@unexec if cmp -s %B/init.pre.sample %B/init.pre; then rm -f %B/init.pre; fi

Return to bug 113719

Lines 6-12 Link Here

(-)./Makefile (-6 / +30 lines)
6	#	6	#
7		7
8	PORTNAME= Mail-SpamAssassin	8	PORTNAME= Mail-SpamAssassin
9	PORTVERSION= 3.2.0	9	PORTVERSION= 3.2.1
10	CATEGORIES= mail perl5	10	CATEGORIES= mail perl5
11	MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}	11	MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
12	MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan	12	MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan
Lines 19-31 Link Here
19	BUILD_DEPENDS= p5-Net-DNS>=0.58:${PORTSDIR}/dns/p5-Net-DNS \	19	BUILD_DEPENDS= p5-Net-DNS>=0.58:${PORTSDIR}/dns/p5-Net-DNS \
20	p5-IO-Zlib>=1.04:${PORTSDIR}/archivers/p5-IO-Zlib \	20	p5-IO-Zlib>=1.04:${PORTSDIR}/archivers/p5-IO-Zlib \
21	p5-HTML-Parser>=3.43:${PORTSDIR}/www/p5-HTML-Parser \	21	p5-HTML-Parser>=3.43:${PORTSDIR}/www/p5-HTML-Parser \
		22	p5-IO-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-IO-Compress-Zlib \
22	p5-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-Compress-Zlib \	23	p5-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
23	${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools	24	${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
24		25
25	RUN_DEPENDS= ${BUILD_DEPENDS} \	26	RUN_DEPENDS= ${BUILD_DEPENDS} \
26	${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \	27	${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
27	p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar \	28	p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar
28	${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect
29		29
30	PERL_CONFIGURE= yes	30	PERL_CONFIGURE= yes
31	CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \	31	CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \
Lines 49-54 Link Here
49		49
50	.include <bsd.port.pre.mk>	50	.include <bsd.port.pre.mk>
51		51
		52	USE_LDCONFIG=yes
		53
		54	.if ${OSVERSION} > 500000
		55	RUN_DEPENDS+= ${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect
		56	.else
		57	WITH_SACOMPILE=''
		58	.endif
		59
52	.if defined (WITH_SPAMC)	60	.if defined (WITH_SPAMC)
53	CONFIGURE_ARGS+= BUILD_SPAMC=yes	61	CONFIGURE_ARGS+= BUILD_SPAMC=yes
54	.else	62	.else
Lines 58-63 Link Here
58	.endif	66	.endif
59		67
60	.if defined(WITH_SPF_QUERY)	68	.if defined(WITH_SPF_QUERY)
		69	RUN_DEPENDS+= p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
		70	# see http://www.freebsd.org/cgi/query-pr.cgi?pr=113638
61	RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF	71	RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
62	.endif	72	.endif
63		73
Lines 85-93 Link Here
85	.endif	95	.endif
86		96
87	.if defined(WITH_RAZOR)	97	.if defined(WITH_RAZOR)
88	RUN_DEPENDS+= razor-agents>=2.81:${PORTSDIR}/mail/razor-agents	98	RUN_DEPENDS+= razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
89	# see http://www.freebsd.org/cgi/query-pr.cgi?pr=112522	99	# see http://www.freebsd.org/cgi/query-pr.cgi?pr=112522
90	# really needs razor-agents>=2.82_1
91	.endif	100	.endif
92		101
93	.if defined(WITH_DKIM)	102	.if defined(WITH_DKIM)
Lines 217-227 Link Here
217	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre	226	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
218	.endif	227	.endif
219	.if defined(WITH_SACOMPILE)	228	.if defined(WITH_SACOMPILE)
220	${REINPLACE_CMD} -e '/Rule2XSBody/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre	229	${REINPLACE_CMD} -e '/Rule2XSBody/s/^# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
		230	.endif
		231
		232	post-build:
		233	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libspamc.so)
		234	.if !defined(WITHOUT_SSL)
		235	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libsslspamc.so)
221	.endif	236	.endif
222		237
223	pre-install:	238	pre-install:
224	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL	239	@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
		240	${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.so ${PREFIX}/lib
		241	${INSTALL_DATA} ${WRKSRC}/spamc/libspamc.h ${PREFIX}/include
		242	.if !defined(WITHOUT_SSL)
		243	${INSTALL_DATA} ${WRKSRC}/spamc/libsslspamc.so ${PREFIX}/lib
		244	.endif
		245
		246	.if ${OSVERSION} < 500000
		247	@${SED} -i "" "s\| /etc/rc.subr\| ${PREFIX}/etc/rc.subr\|" work/sa-spamd.sh
		248	.endif
225		249
226	post-install:	250	post-install:
227	@${STRIP_CMD} ${PREFIX}/bin/spamc	251	@${STRIP_CMD} ${PREFIX}/bin/spamc

Lines 1-20 Link Here

(-)./files/patch-sa-compile.raw (-6 / +7 lines)
1	--- sa-compile.raw.orig Tue May 1 09:54:33 2007	1	--- sa-compile.raw.orig Tue May 1 09:54:33 2007
2	+++ sa-compile.raw Thu May 3 13:35:23 2007	2	+++ sa-compile.raw Thu May 3 13:35:23 2007
3	@@ -636,7 +636,7 @@	3	@@ -643,7 +643,7 @@
4	-p prefs, --prefspath=file, --prefs-file=file	4	-p prefs, --prefspath=file, --prefs-file=file
5	Set user preferences file	5	Set user preferences file
6	--siteconfigpath=path Path for site configs	6	--siteconfigpath=path Path for site configs
7	- (default: /etc/mail/spamassassin)	7	- (default: /etc/mail/spamassassin)
8	+ (default: @@LOCAL_RULES_DIR@@)	8	+ (default: @@LOCAL_RULES_DIR@@)
		9	--updatedir=path Directory to place updates
		10	- (default: /var/lib/spamassassin/compiled/<version>)
		11	+ (default: @@LOCAL_STATE_DIR@@/compiled/<version>)
9	--cf='config line' Additional line of configuration	12	--cf='config line' Additional line of configuration
10	-D, --debug [area=n,...] Print debugging messages	13	@@ -692,12 +692,12 @@
11	-V, --version Print version
12	@@ -683,12 +683,12 @@
13	=item B<-C> I<path>, B<--configpath>=I<path>, B<--config-file>=I<path>	14	=item B<-C> I<path>, B<--configpath>=I<path>, B<--config-file>=I<path>
14		15
15	Use the specified path for locating the distributed configuration files.	16	Use the specified path for locating the distributed configuration files.
16	-Ignore the default directories (usually C</usr/share/spamassassin> or similar).	17	-Ignore the default directories (usually C</usr/share/spamassassin> or similar).
17	+Ignore the default directories (usually <@@DEF_RULES_DIR@@> or similar).	18	+Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar).
18		19
19	=item B<--siteconfigpath>=I<path>	20	=item B<--siteconfigpath>=I<path>
20		21
Lines 22-26 Link Here
22	-the default directories (usually C</etc/mail/spamassassin> or similar).	23	-the default directories (usually C</etc/mail/spamassassin> or similar).
23	+the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).	24	+the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
24		25
25	=item B<--cf='config line'>	26	=item B<--updatedir>
26		27

Line 0 Link Here

(-)./files/patch-spamc-Makefile.in (+20 lines)
	1	--- spamc/Makefile.in~ Fri Jun 8 14:56:02 2007
	2	+++ spamc/Makefile.in Thu Jun 14 00:41:37 2007
	3	@@ -7,4 +7,5 @@
	4	LDFLAGS = @LDFLAGS@
	5	LDDLFLAGS = @LDDLFLAGS@
	6	+SHLIBFLAGS = -fPIC
	7
	8	LIBS = @LIBS@
	9	@@ -33,9 +34,9 @@
	10
	11	spamc/libspamc$(SHLIBEXT): $(LIBSPAMC_FILES)
	12	- $(CC) $(CCDLFLAGS) $(LIBSPAMC_FILES) \
	13	+ $(CC) $(CCDLFLAGS) $(SHLIBFLAGS) $(LIBSPAMC_FILES) \
	14	-o $@ $(LDDLFLAGS) $(LIBS)
	15
	16	spamc/libsslspamc$(SHLIBEXT): $(LIBSPAMC_FILES)
	17	- $(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(LIBSPAMC_FILES) \
	18	+ $(CC) $(SSLCFLAGS) $(CCDLFLAGS) $(SHLIBFLAGS) $(LIBSPAMC_FILES) \
	19	-o $@ $(LDDLFLAGS) $(SSLLIBS) $(LIBS)
	20