Date: Fri, 20 Jun 2014 18:28:42 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358624 - in head: japanese/spamassassin mail/spamassassin mail/spamassassin/files Message-ID: <201406201828.s5KISgof055359@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Jun 20 18:28:41 2014 New Revision: 358624 URL: http://svnweb.freebsd.org/changeset/ports/358624 QAT: https://qat.redports.org/buildarchive/r358624/ Log: * Add a patch from SA bug 7057 to fix compatibility with Net::DNS >= 0.76 [1] * Verify that /var/run/spamd exists before starting [2] * While here, reformat Makefile PR: ports/191101 [1], ports/189912 [1], ports/190005 [2] Submitted by: Daniel Austin <freebsd-ports@dan.me.uk> and pi [1a], brian@behlendorf.com [1b], Trond.Endrestol@ximalas.info [2] Added: head/mail/spamassassin/files/patch-bug7057 (contents, props changed) Modified: head/japanese/spamassassin/Makefile head/mail/spamassassin/Makefile head/mail/spamassassin/files/sa-spamd.in Modified: head/japanese/spamassassin/Makefile ============================================================================== --- head/japanese/spamassassin/Makefile Fri Jun 20 18:24:38 2014 (r358623) +++ head/japanese/spamassassin/Makefile Fri Jun 20 18:28:41 2014 (r358624) @@ -1,7 +1,7 @@ # Created by: TAOKA Fumiyoshi # $FreeBSD$ -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= japanese mail perl5 PKGNAMEPREFIX= ja- Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Fri Jun 20 18:24:38 2014 (r358623) +++ head/mail/spamassassin/Makefile Fri Jun 20 18:28:41 2014 (r358624) @@ -1,29 +1,29 @@ # Created by: Anthony Kim # $FreeBSD$ -PORTNAME= spamassassin +PORTNAME= spamassassin PORTVERSION= 3.4.0 -PORTREVISION?= 10 # also bump japanese/spamassassin +PORTREVISION?= 11 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan -DISTNAME= Mail-SpamAssassin-${PORTVERSION} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:apache,cpan +DISTNAME= Mail-SpamAssassin-${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:apache,cpan MAINTAINER?= adamw@FreeBSD.org -COMMENT?= Highly efficient mail filter for identifying spam +COMMENT?= Highly efficient mail filter for identifying spam -LICENSE= APACHE20 +LICENSE= APACHE20 ALL_DEPENDS= p5-Encode-Detect>=0:${PORTSDIR}/converters/p5-Encode-Detect \ - p5-HTML-Parser>=3.46:${PORTSDIR}/www/p5-HTML-Parser \ - p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \ - p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP \ - p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \ - p5-NetAddr-IP>=4.010:${PORTSDIR}/net-mgmt/p5-NetAddr-IP + p5-HTML-Parser>=3.46:${PORTSDIR}/www/p5-HTML-Parser \ + p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \ + p5-IO-Socket-IP>=0:${PORTSDIR}/net/p5-IO-Socket-IP \ + p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \ + p5-NetAddr-IP>=4.010:${PORTSDIR}/net-mgmt/p5-NetAddr-IP BUILD_DEPENDS= ${ALL_DEPENDS} RUN_DEPENDS= ${ALL_DEPENDS} \ - re2c>=.12.0:${PORTSDIR}/devel/re2c + re2c>=.12.0:${PORTSDIR}/devel/re2c CONFLICTS?= ja-spamassassin-[0-9]* @@ -40,9 +40,9 @@ SPAMASSASSIN_CONTACT_ADDRESS?= The admin USERS?= spamd GROUPS?= spamd CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \ - CONTACT_ADDRESS="${SPAMASSASSIN_CONTACT_ADDRESS}" \ - LOCALSTATEDIR="${DBDIR}/spamassassin" \ - BUILD_SPAMC=yes + CONTACT_ADDRESS="${SPAMASSASSIN_CONTACT_ADDRESS}" \ + LOCALSTATEDIR="${DBDIR}/spamassassin" \ + BUILD_SPAMC=yes OPTIONS_DEFINE= AS_ROOT GNUPG SSL UPDATE_AND_COMPILE OPTIONS_GROUP= DATABASE PLUGINS @@ -50,7 +50,7 @@ OPTIONS_GROUP_DATABASE= MYSQL PGSQL OPTIONS_GROUP_PLUGINS= DCC DKIM PYZOR RAZOR RELAY_COUNTRY SPF_QUERY OPTIONS_DEFAULT=AS_ROOT GNUPG SSL UPDATE_AND_COMPILE -AS_ROOT_DESC= Run spamd as root (recommended) +AS_ROOT_DESC= Run spamd as root (recommended) GNUPG_DESC= Install GnuPG (for sa-update, optional) SSL_DESC= Build spamd/spamc with SSL support UPDATE_AND_COMPILE_DESC= Download and compile rulesets (recommended) @@ -58,21 +58,21 @@ UPDATE_AND_COMPILE_DESC= Download and co DATABASE_DESC= Optional user-config/bayes database backends PLUGINS_DESC= Optional SpamAssassin plugins -DCC_DESC= Add DCC support (mail/dcc-dccd) -DKIM_DESC= DKIM/DomainKeys Identified Mail (mail/p5-Mail-DKIM) -PYZOR_DESC= Add Pyzor support (mail/pyzor) -RAZOR_DESC= Add Vipul's Razor support (mail/razor-agents) +DCC_DESC= Add DCC support (mail/dcc-dccd) +DKIM_DESC= DKIM/DomainKeys Identified Mail (mail/p5-Mail-DKIM) +PYZOR_DESC= Add Pyzor support (mail/pyzor) +RAZOR_DESC= Add Vipul's Razor support (mail/razor-agents) RELAY_COUNTRY_DESC= Relay country support (net/p5-Geo-IP) SPF_QUERY_DESC= Add SPF query support (mail/p5-Mail-SPF) SUB_FILES= pkg-message PLIST_SUB+= USER=${USERS} GROUP=${GROUPS} -OPTIONS_SUB=yes +OPTIONS_SUB= yes DCC_RUN_DEPENDS= dcc-dccd>=1.3.111:${PORTSDIR}/mail/dcc-dccd DKIM_RUN_DEPENDS= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \ - p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM \ - p5-Crypt-OpenSSL-RSA>=0.26_1:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA + p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM \ + p5-Crypt-OpenSSL-RSA>=0.26_1:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:${PORTSDIR}/security/gnupg1 MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg @@ -81,18 +81,18 @@ RAZOR_RUN_DEPENDS= razor-agents>=2.84:${ RELAY_COUNTRY_RUN_DEPENDS= p5-Geo-IP>=0:${PORTSDIR}/net/p5-Geo-IP SPF_QUERY_RUN_DEPENDS= p5-Mail-SPF>=0:${PORTSDIR}/mail/p5-Mail-SPF -SSL_USE= OPENSSL=yes +SSL_USE= OPENSSL=yes SSL_RUN_DEPENDS= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL SSL_CONFIGURE_ON= ENABLE_SSL=yes SSL_CONFIGURE_OFF= ENABLE_SSL=no # plugin names in rules/*.pre, for enabling/disabling -DCC_INITVAR= DCC -DKIM_INITVAR= DKIM -PYZOR_INITVAR= Pyzor -RAZOR_INITVAR= Razor2 +DCC_INITVAR= DCC +DKIM_INITVAR= DKIM +PYZOR_INITVAR= Pyzor +RAZOR_INITVAR= Razor2 RELAY_COUNTRY_INITVAR= RelayCountry -SPF_QUERY_INITVAR= SPF +SPF_QUERY_INITVAR= SPF DOCS= CREDITS Changes INSTALL NOTICE PACKAGING README TRADEMARK UPGRADE USAGE procmailrc.example 3.4.0-RELEASE-NOTES.txt DOCSSQL= README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql Added: head/mail/spamassassin/files/patch-bug7057 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/spamassassin/files/patch-bug7057 Fri Jun 20 18:28:41 2014 (r358624) @@ -0,0 +1,15 @@ +--- lib/Mail/SpamAssassin/DnsResolver.pm.orig 2014/06/18 16:47:04 1603517 ++++ lib/Mail/SpamAssassin/DnsResolver.pm 2014/06/18 16:48:04 1603518 +@@ -204,8 +204,10 @@ + @ns_addr_port = @{$self->{conf}->{dns_servers}}; + dbg("dns: servers set by config to: %s", join(', ',@ns_addr_port)); + } elsif ($res) { # default as provided by Net::DNS, e.g. /etc/resolv.conf +- @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}), +- @{$res->{nameservers}}); ++ my @ns = $res->UNIVERSAL::can('nameservers') ? $res->nameservers ++ : @{$res->{nameservers}}; ++ my $port = $res->UNIVERSAL::can('port') ? $res->port : $res->{port}; ++ @ns_addr_port = map(untaint_var("[$_]:" . $port), @ns); + dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port)); + } + return @ns_addr_port; Modified: head/mail/spamassassin/files/sa-spamd.in ============================================================================== --- head/mail/spamassassin/files/sa-spamd.in Fri Jun 20 18:24:38 2014 (r358623) +++ head/mail/spamassassin/files/sa-spamd.in Fri Jun 20 18:28:41 2014 (r358624) @@ -40,6 +40,6 @@ load_rc_config $name pidfile=${spamd_pidfile:-"/var/run/${name}/${name}.pid"} command=%%PREFIX%%/bin/${name} command_args="-d -r ${pidfile}" -required_dirs=%%PREFIX%%/share/spamassassin +required_dirs="%%PREFIX%%/share/spamassassin /var/run/${name}" run_rc_command "$1"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406201828.s5KISgof055359>