Date: Wed, 31 Aug 2011 16:07:26 +0900 From: Takefu <takefu@airport.fm> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/160323: [PATCH] japanese/p5-Mail-SpamAssassin. fix sa-update, allow cascading port Message-ID: <4E5DDDAE.3020108@airport.fm> Resent-Message-ID: <201108310710.p7V7A8F7084370@freefall.freebsd.org> In-Reply-To: <201108310546.p7V5kI00046352@unbound.local.ae-osaka.co.jp> References: <201108310546.p7V5kI00046352@unbound.local.ae-osaka.co.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
>Number: 160323
>Category: ports
>Synopsis: [PATCH] japanese/p5-Mail-SpamAssassin. fix sa-update, allow cascading port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 31 07:10:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Takefu
>Release:
>Organization:
FOX Amateur Radio Club
>Environment:
>Description:
PR 160282 was followed
portlint(1) reduced the warning
To do so, append %%BASEDIR%%
>How-To-Repeat:
>Fix:
--- ja-p5-Mail-SpamAssassin.patch begins here ---
diff -ruN /usr/ports/japanese/p5-Mail-SpamAssassin/Makefile japanese/p5-Mail-SpamAssassin/Makefile
--- /usr/ports/japanese/p5-Mail-SpamAssassin/Makefile 2011-08-17 08:15:06.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/Makefile 2011-08-31 14:41:44.000000000 +0900
@@ -20,7 +20,6 @@
PATCH_SITES= http://spamassassin.emaillab.jp/pub/ja-patch/sa${PORTVERSION:R}/:JA
PATCHFILES= spamassassin-${PORTVERSION}-ja-${PATCHLEVEL}.patch:JA
-PATCHLEVEL= 1
PATCH_DIST_STRIP= -p1
MAINTAINER= fmysh@iijmio-mail.jp
@@ -33,12 +32,7 @@
p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
ja-p5-MeCab>=0.98:${PORTSDIR}/japanese/p5-MeCab
-BUILD_DEPENDS= p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
- p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
- p5-HTML-Parser>=3.46:${PORTSDIR}/www/p5-HTML-Parser \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
- p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \
- p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
+BUILD_DEPENDS= ${RUN_DEPENDS}
CONFLICTS= p5-Mail-SpamAssassin-[0-9]*
@@ -46,12 +40,16 @@
USE_PERL5_RUN= 5.8.8+
USE_LDCONFIG= yes
CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \
- CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
- LOCALSTATEDIR="/var/db/spamassassin"
+ CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
+ LOCALSTATEDIR="${BASEDIR}/var/db/spamassassin"
USERS= spamd
GROUPS= spamd
+BASEDIR= # none
+PATCHLEVEL= 1
+PLIST_SUB+= BASEDIR=${BASEDIR}
+
# You can override it if you like
CONTACT_ADDRESS?= The administrator of that system
@@ -93,15 +91,15 @@
.endif
.if defined(WITH_SPF_QUERY)
-RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
+RUN_DEPENDS+= p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF
.endif
.if !defined(WITHOUT_IPV6)
-RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6
+RUN_DEPENDS+= p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
.endif
.if !defined(WITHOUT_SSL)
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
-RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
+RUN_DEPENDS+= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
CONFIGURE_ARGS+= ENABLE_SSL=yes
@@ -116,17 +114,17 @@
.endif
.if defined(WITH_MYSQL)
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql
+RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
.endif
.if defined(WITH_PGSQL)
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
+RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
.endif
.if defined(WITH_RAZOR)
RUN_DEPENDS+= razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
.else
-.if ${PERL_LEVEL} < 501000
+.if ${PERL_LEVEL} < 501000
.if !defined(WITH_DKIM)
RUN_DEPENDS+= p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
.endif
@@ -134,20 +132,24 @@
.endif
.if defined(WITH_DKIM)
-RUN_DEPENDS+= ${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
-. if ${PERL_LEVEL} < 501000
-RUN_DEPENDS+= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA
-. endif
+RUN_DEPENDS+= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL
+.if ${PERL_LEVEL} < 501000
+RUN_DEPENDS+= p5-Digest-SHA>=0:${PORTSDIR}/security/p5-Digest-SHA
+.endif
RUN_DEPENDS+= p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM
+.if ${PERL_LEVEL} < 501400
+RUN_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
+.else
RUN_DEPENDS+= p5-Crypt-OpenSSL-RSA>=0.26_1:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
.endif
+.endif
.if defined(WITH_SACOMPILE)
RUN_DEPENDS+= re2c>=.12.0:${PORTSDIR}/devel/re2c
.endif
.if defined(WITH_RELAY_COUNTRY)
-RUN_DEPENDS+= ${SITE_PERL}/IP/Country/Fast.pm:${PORTSDIR}/net/p5-IP-Country
+RUN_DEPENDS+= p5-IP-Country>=0:${PORTSDIR}/net/p5-IP-Country
.endif
.if defined(WITH_DCC)
@@ -237,7 +239,7 @@
DOCJA= ${PATCHFILES:S/.patch:JA/.txt/}
TOKENIZER_PRE= tokenizer.pre
-USE_RC_SUBR= sa-spamd.sh
+USE_RC_SUBR= sa-spamd
.if defined(WITH_MYSQL) || defined(WITH_PGSQL)
SUB_LIST+= SQL_FLAG="-Q"
@@ -245,7 +247,7 @@
SUB_LIST+= SQL_FLAG=""
.endif
.if !defined(WITH_AS_ROOT)
-SUB_LIST+= RUN_AS_USER="-u ${USERS} -H /var/spool/spamd"
+SUB_LIST+= RUN_AS_USER="-u ${USERS} -H ${BASEDIR}/var/spool/spamd"
.else
SUB_LIST+= RUN_AS_USER=""
.endif
@@ -278,9 +280,6 @@
.if defined(WITH_DCC)
${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
.endif
-.if !defined(WITH_AWL)
- ${REINPLACE_CMD} -e '/AWL/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/v310.pre
-.endif
.if defined(WITH_SACOMPILE)
${REINPLACE_CMD} -e '/Rule2XSBody/s/^# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
.endif
@@ -338,6 +337,7 @@
@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DOCJA} ${DOCSDIR}
.endif
- @${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
+ @${SED} -e 's#PREFIX#${PREFIX}#' \
+ -e 's#%%BASEDIR%%#${BASEDIR}#' ${PKGMESSAGE}
.include <bsd.port.post.mk>
diff -ruN /usr/ports/japanese/p5-Mail-SpamAssassin/files/patch-bug6624 japanese/p5-Mail-SpamAssassin/files/patch-bug6624
--- /usr/ports/japanese/p5-Mail-SpamAssassin/files/patch-bug6624 1970-01-01 09:00:00.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/files/patch-bug6624 2011-06-27 11:44:36.000000000 +0900
@@ -0,0 +1,88 @@
+--- lib/Mail/SpamAssassin/BayesStore/MySQL.pm (revision 1138970)
++++ lib/Mail/SpamAssassin/BayesStore/MySQL.pm (working copy)
+@@ -840,14 +840,28 @@
+ return 0;
+ }
+
++ # With ON DUPLICATE KEY UPDATE, the affected-rows value per row is 1 if
++ # the row is inserted as a new row and 2 if an existing row is updated.
++ #
++ # Due to a MySQL server bug a value of 3 can be seen.
++ # See: http://bugs.mysql.com/bug.php?id=46675
++ # When executing the INSERT ... ON DUPLICATE KEY UPDATE statement
++ # and checking the rows return count:
++ # mysql_client_found_rows = 0: The second INSERT returns a row count
++ # of 2 in all MySQL versions.
++ # mysql_client_found_rows = 1: The second INSERT returns this row count:
++ # Before MySQL 5.1.20: 2
++ # MySQL 5.1.20: undef on Mac OS X, 139775481 on Linux (garbage?)
++ # MySQL 5.1.21 and up: 3
++ #
+ my $num_rows = $rc;
+
+ $sth->finish();
+
+- if ($num_rows == 1 || $num_rows == 2) {
++ if ($num_rows == 1 || $num_rows == 2 || $num_rows == 3) {
+ my $token_count_update = '';
+
+- $token_count_update = "token_count = token_count + 1," if ($num_rows == 1);
++ $token_count_update = "token_count = token_count + 1," if $num_rows == 1;
+ $sql = "UPDATE bayes_vars SET
+ $token_count_update
+ newest_token_age = GREATEST(newest_token_age, ?),
+@@ -872,7 +886,11 @@
+ }
+ else {
+ # $num_rows was not what we expected
+- dbg("bayes: _put_token: Updated an unexpected number of rows.");
++ my $token_displ = $token;
++ $token_displ =~ s/(.)/sprintf('%02x',ord($1))/egs;
++ dbg("bayes: _put_token: Updated an unexpected number of rows: %s, ".
++ "id: %s, token (hex): %s",
++ $num_rows, $self->{_userid}, $token_displ);
+ $self->{_dbh}->rollback();
+ return 0;
+ }
+@@ -987,8 +1005,24 @@
+ else {
+ my $num_rows = $rc;
+
+- $need_atime_update_p = 1 if ($num_rows == 1 || $num_rows == 2);
+- $new_tokens++ if ($num_rows == 1);
++ # With ON DUPLICATE KEY UPDATE, the affected-rows value per row is 1 if
++ # the row is inserted as a new row and 2 if an existing row is updated.
++ # But see MySQL bug (as above): http://bugs.mysql.com/bug.php?id=46675
++
++ if ($num_rows == 1) {
++ $new_tokens++;
++ $need_atime_update_p = 1;
++ } elsif ($num_rows == 2 || $num_rows == 3) {
++ $need_atime_update_p = 1;
++ } else {
++ # $num_rows was not what we expected
++ my $token_displ = $token;
++ $token_displ =~ s/(.)/sprintf('%02x',ord($1))/egs;
++ dbg("bayes: _put_tokens: Updated an unexpected number of rows: %s, ".
++ "id: %s, token (hex): %s",
++ $num_rows, $self->{_userid}, $token_displ);
++ $error_p = 1;
++ }
+ }
+ }
+
+@@ -1026,10 +1060,10 @@
+ }
+ }
+ else {
+- # $num_rows was not what we expected
+- dbg("bayes: _put_tokens: Updated an unexpected number of rows.");
+- $self->{_dbh}->rollback();
+- return 0;
++ info("bayes: _put_tokens: no atime updates needed? Num of tokens: %d",
++ scalar keys %{$tokens});
++# $self->{_dbh}->rollback();
++# return 0;
+ }
+ }
+
diff -ruN /usr/ports/japanese/p5-Mail-SpamAssassin/files/patch-bug6655 japanese/p5-Mail-SpamAssassin/files/patch-bug6655
--- /usr/ports/japanese/p5-Mail-SpamAssassin/files/patch-bug6655 1970-01-01 09:00:00.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/files/patch-bug6655 2011-08-30 15:33:51.000000000 +0900
@@ -0,0 +1,47 @@
+--- lib/Mail/SpamAssassin/Util.pm 2011-06-06 19:59:17.000000000 -0400
++++ lib/Mail/SpamAssassin/Util.pm 2011-08-26 17:12:19.000000000 -0400
+@@ -1025,6 +1024,8 @@
+ return;
+ }
+
++ opendir(my $dh, $tmpdir) || die "Could not open $tmpdir: $!";
++ closedir $dh;
+ my ($reportfile, $tmpfile);
+ my $umask = umask 077;
+
+@@ -1052,7 +1053,10 @@
+
+ # ensure the file handle is not semi-open in some way
+ if ($tmpfile) {
+- close $tmpfile or info("error closing $reportfile: $!");
++ if (! close $tmpfile) {
++ info("error closing $reportfile: $!");
++ $tmpfile=undef;
++ }
+ }
+ }
+
+
+--- sa-update.raw 2011-06-24 13:38:50.000000000 -0400
++++ sa-update.raw 2011-08-29 09:38:50.000000000 -0400
+@@ -677,9 +677,9 @@
+
+ # Write the content out to a temp file for GPG/Archive::Tar interaction
+ dbg("channel: populating temp content file");
+- open(TMP, ">$content_file") || die "fatal: can't write to content temp file $content_file: $!\n";
++ open(TMP, ">$content_file") || die "fatal: couldn't create content temp file $content_file: $!\n";
+ binmode TMP;
+- print TMP $content;
++ print TMP $content || die "fatal: can't write to content temp file $content_file: $!\n";
+ close(TMP);
+
+ # to sign : gpg -bas file
+@@ -695,7 +695,7 @@
+ die "fatal: couldn't create temp file for GPG signature: $!\n";
+ }
+ binmode $tfh;
+- print $tfh $GPG;
++ print $tfh $GPG || die "fatal: can't write temp file for GPG signature: $!\n";
+ close($tfh);
+
+ dbg("gpg: calling gpg");
diff -ruN /usr/ports/japanese/p5-Mail-SpamAssassin/files/sa-spamd.in japanese/p5-Mail-SpamAssassin/files/sa-spamd.in
--- /usr/ports/japanese/p5-Mail-SpamAssassin/files/sa-spamd.in 1970-01-01 09:00:00.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/files/sa-spamd.in 2011-08-31 11:13:58.000000000 +0900
@@ -0,0 +1,43 @@
+#!/bin/sh
+#
+# $FreeBSD: ports/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in,v 1.3 2010/03/27 00:13:08 dougb Exp $
+#
+
+# PROVIDE: spamd
+# REQUIRE: LOGIN
+# BEFORE: mail
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable spamd:
+#
+#spamd_enable="YES"
+#
+# See spamd(8) for flags
+#
+
+. /etc/rc.subr
+
+name=spamd
+rcvar=`set_rcvar`
+
+extra_commands="reload"
+load_rc_config $name
+
+# Set defaults
+: ${spamd_enable:="NO"}
+: ${spamd_flags="-c %%SQL_FLAG%% %%RUN_AS_USER%%"}
+
+pidfile=${spamd_pidfile:-"%%BASEDIR%%/var/run/spamd/spamd.pid"}
+command=%%PREFIX%%/bin/spamd
+command_args="-d -r ${pidfile}"
+required_dirs=%%PREFIX%%/share/spamassassin
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+ rm -f $pidfile
+}
+
+run_rc_command "$1"
diff -ruN /usr/ports/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
--- /usr/ports/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in 2010-07-21 16:56:10.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in 1970-01-01 09:00:00.000000000 +0900
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in,v 1.3 2010/03/27 00:13:08 dougb Exp $
-#
-
-# PROVIDE: spamd
-# REQUIRE: LOGIN
-# BEFORE: mail
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable spamd:
-#
-#spamd_enable="YES"
-#
-# See spamd(8) for flags
-#
-
-. /etc/rc.subr
-
-name=spamd
-rcvar=`set_rcvar`
-
-extra_commands="reload"
-load_rc_config $name
-
-# Set defaults
-: ${spamd_enable:="NO"}
-: ${spamd_flags="-c %%SQL_FLAG%% %%RUN_AS_USER%%"}
-
-pidfile=${spamd_pidfile:-"/var/run/spamd/spamd.pid"}
-command=%%PREFIX%%/bin/spamd
-command_args="-d -r ${pidfile}"
-required_dirs=%%PREFIX%%/share/spamassassin
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
- rm -f $pidfile
-}
-
-run_rc_command "$1"
diff -ruN /usr/ports/japanese/p5-Mail-SpamAssassin/pkg-deinstall japanese/p5-Mail-SpamAssassin/pkg-deinstall
--- /usr/ports/japanese/p5-Mail-SpamAssassin/pkg-deinstall 2010-07-21 16:56:10.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/pkg-deinstall 2011-08-31 14:07:32.000000000 +0900
@@ -4,8 +4,8 @@
exit 0
fi
-if [ -d /var/db/spamassassin ]; then
- echo "To delete /var/db/spamassassin, use 'rm -rf /var/db/spamassassin'"
+if [ -d ${BASEDIR}/var/db/spamassassin ]; then
+ echo "To delete ${BASEDIR}/var/db/spamassassin, use 'rm -rf ${BASEDIR}/var/db/spamassassin'"
fi
USER=spamd
diff -ruN /usr/ports/japanese/p5-Mail-SpamAssassin/pkg-install japanese/p5-Mail-SpamAssassin/pkg-install
--- /usr/ports/japanese/p5-Mail-SpamAssassin/pkg-install 2011-08-17 08:15:07.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/pkg-install 2011-08-31 11:42:44.000000000 +0900
@@ -2,7 +2,8 @@
PKG_PREFIX=${PKG_PREFIX:-/usr/local}
USER=${USER:-spamd}
GROUP=${GROUP:-spamd}
-HOME=/var/spool/${USER}
+HOME=${BASEDIR}/var/spool/${USER}
+SU=${SU_CMD:-/usr/bin/su root -c}
if [ "$2" = "POST-INSTALL" ];then
ask() {
@@ -32,8 +33,8 @@
}
# Create pid directory
- install -d -o ${USER} -g ${GROUP} /var/run/spamd
- /usr/bin/su root -c "${PKG_PREFIX}/bin/spamassassin -x -L --lint"
+ install -d -o ${USER} -g ${GROUP} ${BASEDIR}/var/run/spamd
+ ${SU} "${PKG_PREFIX}/bin/spamassassin -x -L --lint"
if [ ${?} -eq 9 ];then
echo "***********************************************"
@@ -51,7 +52,7 @@
else
echo ""
fi
- /usr/bin/su root -c "${PKG_PREFIX}/bin/spamassassin -x -L --lint"
+ ${SU} "${PKG_PREFIX}/bin/spamassassin -x -L --lint"
if [ ${?} -eq 0 ] && grep '^load.*Rule2XSBody' ${PKG_PREFIX}/etc/mail/spamassassin/v320.pre > /dev/null ;then
if yesno "Do you wish to compile rules with re2c (will take a long time)" "N";then
${PKG_PREFIX}/bin/sa-compile || true
diff -ruN /usr/ports/japanese/p5-Mail-SpamAssassin/pkg-message japanese/p5-Mail-SpamAssassin/pkg-message
--- /usr/ports/japanese/p5-Mail-SpamAssassin/pkg-message 2010-08-24 08:19:34.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/pkg-message 2011-08-31 11:58:29.000000000 +0900
@@ -1,9 +1,9 @@
*************************************************************************
-* _ _____ _____ _____ _ _ _____ ___ ___ _ _ *
-* / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | *
-* / _ \ | | | | | _| | \| | | | | | | | | \| | *
-* / ___ \| | | | | |___| |\ | | | | | |_| | |\ | *
-* /_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| *
+* _ _____ _____ _____ _ _ _____ ___ ___ _ _ *
+* / \|_ _|_ _| ____| \ | |_ _|_ _/ _ \| \ | | *
+* / _ \ | | | | | _| | \| | | | | | | | | \| | *
+* / ___ \| | | | | |___| |\ | | | | | |_| | |\ | *
+* ./_/ \_\_| |_| |_____|_| \_| |_| |___\___/|_| \_| *
* *
* See PREFIX/share/doc/p5-Mail-SpamAssassin/INSTALL, *
* and PREFIX/share/doc/p5-Mail-SpamAssassin/UPGRADE, *
@@ -22,13 +22,13 @@
You may wish to run sa-update now to obtain the latest rules.
NOTE: FREEBSD users: If you are updating from a version prior to 3.20.
-sa-update now places state files in /var/db/spamassassin and not
-/var/lib/spamassassin. This is to be consistant with Freebsd file
+sa-update now places state files in %%BASEDIR%%/var/db/spamassassin and not
+%%BASEDIR%%/var/lib/spamassassin. This is to be consistant with Freebsd file
directory conventions.
If you run sa-compile, you will notice that files are in
-/var/db/spamassassin/compiled/<perlversion>/<version> instead of
-/var/db/spamassassin/compiled/<version>.
+%%BASEDIR%%/var/db/spamassassin/compiled/<perlversion>/<version> instead of
+%%BASEDIR%%/var/db/spamassassin/compiled/<version>.
No attempts have been made to move old versions over. You must recompile.
If you are running with spamd, you must add the following to rc.conf:
@@ -36,7 +36,7 @@
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"
+spamd_flags="-u spamd -H %%BASEDIR%%/var/spool/spamd"
************************************************************************
For Japanese users, see document in
diff -ruN /usr/ports/japanese/p5-Mail-SpamAssassin/pkg-plist japanese/p5-Mail-SpamAssassin/pkg-plist
--- /usr/ports/japanese/p5-Mail-SpamAssassin/pkg-plist 2011-08-17 08:15:07.000000000 +0900
+++ japanese/p5-Mail-SpamAssassin/pkg-plist 2011-08-31 11:56:24.000000000 +0900
@@ -137,10 +137,10 @@
%%DATADIR%%/languages
%%DATADIR%%/sa-update-pubkey.txt
%%DATADIR%%/user_prefs.template
-@unexec rm -rf /var/lib/spamassassin/2* || true
-@unexec rmdir /var/lib/spamassassin 2>/dev/null || true
-@unexec rmdir /var/lib 2>/dev/null || true
-@unexec rmdir /var/db/spamassassin || true
+@unexec rm -rf %%BASEDIR%%/var/lib/spamassassin/2* || true
+@unexec rmdir %%BASEDIR%%/var/lib/spamassassin 2>/dev/null || true
+@unexec rmdir %%BASEDIR%%/var/lib 2>/dev/null || true
+@unexec rmdir %%BASEDIR%%/var/db/spamassassin 2>/dev/null || true
@dirrm %%DATADIR%%
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail
@@ -154,8 +154,8 @@
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Conf
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/BayesStore
@dirrm %%SITE_PERL%%/Mail/SpamAssassin/Bayes
-@dirrmtry %%SITE_PERL%%/Mail/SpamAssassin
+@dirrm %%SITE_PERL%%/Mail/SpamAssassin
@dirrmtry %%SITE_PERL%%/Mail
@dirrmtry etc/mail/spamassassin
@dirrmtry etc/mail
-@unexec rm -rf /var/run/spamd || true
+@unexec rm -rf %%BASEDIR%%/var/run/spamd || true
--- ja-p5-Mail-SpamAssassin.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4E5DDDAE.3020108>