From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 8 22:10:03 2007 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00C2016A418 for ; Sat, 8 Sep 2007 22:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C544213C478 for ; Sat, 8 Sep 2007 22:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.1/8.14.1) with ESMTP id l88MA2H7077973 for ; Sat, 8 Sep 2007 22:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.1/8.14.1/Submit) id l88MA2nq077972; Sat, 8 Sep 2007 22:10:02 GMT (envelope-from gnats) Resent-Date: Sat, 8 Sep 2007 22:10:02 GMT Resent-Message-Id: <200709082210.l88MA2nq077972@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, TAOKA Fumiyoshi Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 321FF16A419 for ; Sat, 8 Sep 2007 22:07:21 +0000 (UTC) (envelope-from fmysh@quad.dyndns.org) Received: from xeon.quad.dyndns.org (unknown [IPv6:2001:240:66e::2]) by mx1.freebsd.org (Postfix) with ESMTP id 940A013C46A for ; Sat, 8 Sep 2007 22:07:20 +0000 (UTC) (envelope-from fmysh@quad.dyndns.org) Received: by xeon.quad.dyndns.org (Postfix, from userid 1001) id A9F1815344C; Sun, 9 Sep 2007 07:07:19 +0900 (JST) Message-Id: <20070908220719.A9F1815344C@xeon.quad.dyndns.org> Date: Sun, 9 Sep 2007 07:07:19 +0900 (JST) From: TAOKA Fumiyoshi To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: TAOKA Fumiyoshi Subject: ports/116207: japanese/p5-Mail-SpamAssassin: Sync with mail/p5-Mail-SpamAssassin port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: TAOKA Fumiyoshi List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Sep 2007 22:10:03 -0000 >Number: 116207 >Category: ports >Synopsis: japanese/p5-Mail-SpamAssassin: Sync with mail/p5-Mail-SpamAssassin port >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Sep 08 22:10:02 GMT 2007 >Closed-Date: >Last-Modified: >Originator: TAOKA Fumiyoshi >Release: >Organization: >Environment: >Description: Synchronize with mail/p5-Mail-SpamAssassin port, which is currently 3.2.3. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/p5-Mail-SpamAssassin/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- Makefile 7 Sep 2007 04:27:13 -0000 1.1 +++ Makefile 8 Sep 2007 21:31:45 -0000 @@ -6,6 +6,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 3.1.8 +PORTREVISION= 1 CATEGORIES= japanese mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \ ${PATCH_SITES} @@ -25,7 +26,7 @@ CONFLICTS= p5-Mail-SpamAssassin-[0-9]* -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 \ @@ -35,33 +36,41 @@ 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 \ - ${SITE_PERL}/${PERL_ARCH}/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect + ${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}" \ - BUILD_SPAMC=yes + LOCALSTATEDIR="/var/db/spamassassin" # You can override it if you like CONTACT_ADDRESS?= The administrator of that system OPTIONS= AS_ROOT "Run spamd as root (recommended)" on \ - DOMAINKEYS "DomainKeys support" off \ - DKIM "DomainKeys Identified Mail" off \ + SPAMC "Build spamd/spamc (not for amavisd)" on \ + DKIM "DKIM/DomainKeys Identified Mail" off \ SSL "Build with SSL support for spamd/spamc" on \ GNUPG "Install GnuPG (for sa-update)" on \ MYSQL "Add MySQL support" off \ PGSQL "Add PostreSQL support" off \ RAZOR "Add Vipul's Razor support" on \ SPF_QUERY "Add SPF query support" off \ - RELAY_COUNTRY "Relay country support" off \ - TOOLS "Install SpamAssassin tools" off + RELAY_COUNTRY "Relay country support" off .include +.if defined (WITH_SPAMC) +CONFIGURE_ARGS+= BUILD_SPAMC=yes +.else +CONFIGURE_ARGS+= BUILD_SPAMC=no +WITH_AS_ROOT= +WITHOUT_SSL=1 +.endif + .if defined(WITH_SPF_QUERY) -RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF/Query.pm:${PORTSDIR}/mail/p5-Mail-SPF-Query +RUN_DEPENDS+= p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP +RUN_DEPENDS+= ${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF .endif .if !defined(WITHOUT_SSL) @@ -71,12 +80,14 @@ 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) -RUN_DEPENDS+= gnupg>=1.4.1:${PORTSDIR}/security/gnupg +RUN_DEPENDS+= gnupg>=1.4.7:${PORTSDIR}/security/gnupg .endif .if defined(WITH_MYSQL) @@ -88,30 +99,19 @@ .endif .if defined(WITH_RAZOR) -RUN_DEPENDS+= razor-agents>=2.81:${PORTSDIR}/mail/razor-agents +RUN_DEPENDS+= razor-agents>=2.84:${PORTSDIR}/mail/razor-agents .endif .if defined(WITH_DKIM) -RUN_DEPENDS+= ${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM -.endif - -.if defined(WITH_DOMAINKEYS) -RUN_DEPENDS+= p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys +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_RELAY_COUNTRY) RUN_DEPENDS+= ${SITE_PERL}/IP/Country/Fast.pm:${PORTSDIR}/net/p5-IP-Country .endif -.if defined(WITH_TOOLS) -RUN_DEPENDS+= ${SITE_PERL}/Parse/Syslog.pm:${PORTSDIR}/textproc/p5-Parse-Syslog \ - ${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \ - ${SITE_PERL}/Net/CIDR/Lite.pm:${PORTSDIR}/net/p5-Net-CIDR-Lite -TOOLS= "" -.else -TOOLS= "@comment " -.endif - MAN3= Mail::SpamAssassin.3 \ Mail::SpamAssassin::AICache.3 \ Mail::SpamAssassin::ArchiveIterator.3 \ @@ -172,16 +172,13 @@ MAN1= spamd.1 spamassassin.1 spamc.1 sa-learn.1 sa-update.1 \ spamassassin-run.1 -PLIST_SUB+= TOOLS=${TOOLS} - DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${PREFIX}/share/spamassassin -DOCS= BUGS CREDITS Changes INSTALL LICENSE NOTICE PACKAGING README STATUS TRADEMARK UPGRADE USAGE procmailrc.example +DOCS= CREDITS Changes INSTALL LICENSE NOTICE PACKAGING README STATUS TRADEMARK UPGRADE USAGE procmailrc.example DOCSSQL= README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql -DOCSCONTRIB= mbox-to-check run-corpora run-masses DOCSLDAP= README README.testing sa_test.ldif DOCJA= spamassassin-3.1.8-normalize-test8.txt -PORTDOCS= ${DOCS} sql contrib ldap ${DOCJA} +PORTDOCS= ${DOCS} sql ldap ${DOCJA} USE_RC_SUBR= sa-spamd.sh @@ -204,13 +201,11 @@ -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 + @${REINPLACE_CMD} -e '/^CC =/d' ${WRKSRC}/spamc/Makefile.in + .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/v310.pre -.endif .if defined(WITH_RELAY_COUNTRY) ${REINPLACE_CMD} -e '/RelayCountry/s/^# ?loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre .endif @@ -224,11 +219,26 @@ ${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.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: +.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 @@ -238,33 +248,23 @@ @[ -f ${PREFIX}/etc/mail/spamassassin/v312.pre ] || \ ${CP} ${PREFIX}/etc/mail/spamassassin/v312.pre.sample \ ${PREFIX}/etc/mail/spamassassin/v312.pre + @PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL + @${CP} ${DISTDIR}/${DIST_SUBDIR}/tokenizer.pre ${PREFIX}/etc/mail/spamassassin/tokenizer.pre.sample @[ -f ${PREFIX}/etc/mail/spamassassin/tokenizer.pre ] || \ ${CP} ${PREFIX}/etc/mail/spamassassin/tokenizer.pre.sample \ ${PREFIX}/etc/mail/spamassassin/tokenizer.pre -.if defined(WITH_TOOLS) - @${MKDIR} ${DATADIR}/tools - @for f in ${WRKSRC}/tools/*; do \ - ${INSTALL} $${f} ${DATADIR}/tools; \ - done -.endif .if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} ${DOCSDIR}/sql ${DOCSDIR}/contrib ${DOCSDIR}/ldap + @${MKDIR} ${DOCSDIR} ${DOCSDIR}/sql ${DOCSDIR}/ldap @${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${DOCSDIR} @${INSTALL_DATA} ${DOCSSQL:S|^|${WRKSRC}/sql/|} ${DOCSDIR}/sql - @${INSTALL_DATA} ${DOCSCONTRIB:S|^|${WRKSRC}/contrib/|} ${DOCSDIR}/contrib @${INSTALL_DATA} ${DOCSLDAP:S|^|${WRKSRC}/ldap/|} ${DOCSDIR}/ldap - @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DOCJA} ${DOCSDIR} .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 Index: pkg-message =================================================================== RCS file: /home/ncvs/ports/japanese/p5-Mail-SpamAssassin/pkg-message,v retrieving revision 1.1 diff -u -r1.1 pkg-message --- pkg-message 7 Sep 2007 04:27:13 -0000 1.1 +++ pkg-message 8 Sep 2007 20:49:48 -0000 @@ -18,14 +18,26 @@ * (but harmless) error messages may result. Read the * * files listed above. * * * -* For Japanese users, see document in * -* PREFIX/share/doc/ja-p5-Mail-SpamAssassin. * -* * -* Tokenizer::MeCab uses UTF-8 encoding. You may have to * -* manually (re)install the following ports with the build * -* options for UTF-8: * -* japanese/mecab WITH_CHARSET=utf-8 * -* japanese/mecab-ipadic WITH_CHARSET=utf-8 * -* japanese/p5-Text-MeCab ENCODING=utf8 * -* * ************************************************************************* +You may wish to run sa-update now to obtain the latest rules. + +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" + +For Japanese users, see document in +PREFIX/share/doc/ja-p5-Mail-SpamAssassin/ + +Tokenizer::MeCab uses UTF-8 encoding. You may have to manually +(re)install the following ports with the build options for UTF-8: + japanese/mecab WITH_CHARSET=utf-8 + japanese/mecab-ipadic WITH_CHARSET=utf-8 + japanese/p5-Text-MeCab ENCODING=utf8 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/japanese/p5-Mail-SpamAssassin/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 7 Sep 2007 04:27:13 -0000 1.1 +++ pkg-plist 8 Sep 2007 21:27:24 -0000 @@ -5,13 +5,19 @@ 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 etc/mail/spamassassin/init.pre.sample @exec [ -f %B/init.pre ] || cp %B/%f %B/init.pre @unexec if cmp -s %B/tokenizer.pre.sample %B/tokenizer.pre; then rm -f %B/tokenizer.pre; fi etc/mail/spamassassin/tokenizer.pre.sample -@exec [ -f %B/tokenizer.pre ] || cp %B/%f %B/init.pre +@exec [ -f %B/tokenizer.pre ] || cp %B/%f %B/tokenizer.pre @unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi etc/mail/spamassassin/v310.pre.sample @exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre @@ -144,18 +150,9 @@ %%DATADIR%%/triplets.txt %%DATADIR%%/sa-update-pubkey.txt %%DATADIR%%/user_prefs.template -%%TOOLS%%%%DATADIR%%/tools/README.speedtest -%%TOOLS%%%%DATADIR%%/tools/check_whitelist -%%TOOLS%%%%DATADIR%%/tools/convert_awl_dbm_to_sql -%%TOOLS%%%%DATADIR%%/tools/desc_length.pl -%%TOOLS%%%%DATADIR%%/tools/mboxsplit -%%TOOLS%%%%DATADIR%%/tools/sa-stats.pl -%%TOOLS%%%%DATADIR%%/tools/speedtest -%%TOOLS%%%%DATADIR%%/tools/split_corpora -%%TOOLS%%%%DATADIR%%/tools/sysreport -%%TOOLS%%%%DATADIR%%/tools/test_extract -%%TOOLS%%%%DATADIR%%/tools/triplets.pl -%%TOOLS%%@dirrm %%DATADIR%%/tools +@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 @dirrm %%DATADIR%% @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail >Release-Note: >Audit-Trail: >Unformatted: