[95615] trunk/dports/perl/p5-mail-spamassassin

ryandesign at macports.org ryandesign at macports.org
Tue Jul 17 17:42:34 PDT 2012 

Revision: 95615
          https://trac.macports.org/changeset/95615
Author:   ryandesign at macports.org
Date:     2012-07-17 17:42:34 -0700 (Tue, 17 Jul 2012)
Log Message:
-----------
p5-mail-spamassassin: update to 3.3.2 (#25180); fix path to spamd in startupitem (#35229); fix the vpopmail variant so that its patch actually gets applied; remove other patches no longer needed

Modified Paths:
--------------
    trunk/dports/perl/p5-mail-spamassassin/Portfile
    trunk/dports/perl/p5-mail-spamassassin/files/patch-spamd.raw.diff

Removed Paths:
-------------
    trunk/dports/perl/p5-mail-spamassassin/files/patch-FH_DATE_PAST_20XX_bug.diff
    trunk/dports/perl/p5-mail-spamassassin/files/patch-Makefile.PL.diff

Modified: trunk/dports/perl/p5-mail-spamassassin/Portfile
===================================================================
--- trunk/dports/perl/p5-mail-spamassassin/Portfile	2012-07-18 00:26:31 UTC (rev 95614)
+++ trunk/dports/perl/p5-mail-spamassassin/Portfile	2012-07-18 00:42:34 UTC (rev 95615)
@@ -4,8 +4,7 @@
 PortGroup           perl5 1.0
 
 perl5.branches      5.8 5.10 5.12 5.14 5.16
-perl5.setup         Mail-SpamAssassin 3.2.5
-revision            6
+perl5.setup         Mail-SpamAssassin 3.3.2
 categories-append   mail
 license             Apache-2
 platforms           darwin
@@ -19,9 +18,8 @@
 
 homepage            http://spamassassin.apache.org/
 
-checksums           md5 7fdc1651d0371c4a7f95ac9ae6f828a6 \
-                    sha1 14b1f6eae0221a152176f7f597f55581445e800a \
-                    rmd160 5a72a97d124e72ff4da1627982748377f1e34128
+checksums           rmd160  78e22ba6ba62a48fb7d24c40170124881b975fd9 \
+                    sha256  5323038939a0ef9fc97d5264defce3ae1d95e98b3a94c4c3b583341c927f32df
 
 if {${perl5.major} != ""} {
 depends_lib-append  port:p${perl5.major}-digest-sha1 \
@@ -42,15 +40,11 @@
 startupitem.create      yes
 startupitem.name        spamd
 if {[variant_isset vpopmail]} {
-    startupitem.executable  ${prefix}/bin/spamd -l -v -u vpopmail
-    patchfiles-append       patch-spamd.raw.diff
+    startupitem.executable  ${perl5.bindir}/spamd -l -v -u vpopmail
 } else {
-    startupitem.executable  ${prefix}/bin/spamd -l
+    startupitem.executable  ${perl5.bindir}/spamd -l
 }
 
-patchfiles          patch-Makefile.PL.diff \
-                    patch-FH_DATE_PAST_20XX_bug.diff
-
 post-patch {
     reinplace "s|return ''|return 'PRIV'|" ${worksrcpath}/Makefile.PL
 }
@@ -65,7 +59,7 @@
 destroot.target-append      conf__install data__install
 
 # All configuration files for spamassassin.
-set conf_files      {init.pre local.cf v310.pre v312.pre v320.pre}
+set conf_files      {init.pre local.cf v310.pre v312.pre v320.pre v330.pre}
 
 post-destroot {
     set etc ${destroot}${prefix}/etc/mail/spamassassin
@@ -121,5 +115,6 @@
 
 variant vpopmail description {Use Spamassassin with vpopmail} {
     depends_lib-append      port:vpopmail
+    patchfiles-append       patch-spamd.raw.diff
 }
 }

Deleted: trunk/dports/perl/p5-mail-spamassassin/files/patch-FH_DATE_PAST_20XX_bug.diff
===================================================================
--- trunk/dports/perl/p5-mail-spamassassin/files/patch-FH_DATE_PAST_20XX_bug.diff	2012-07-18 00:26:31 UTC (rev 95614)
+++ trunk/dports/perl/p5-mail-spamassassin/files/patch-FH_DATE_PAST_20XX_bug.diff	2012-07-18 00:42:34 UTC (rev 95615)
@@ -1,13 +0,0 @@
-Fix bug 6269: https://issues.apache.org/SpamAssassin/show_bug.cgi?id=6269
-
---- rules/72_active.cf.orig	2010-01-06 15:19:19.000000000 +0100
-+++ rules/72_active.cf	2010-01-06 15:20:04.000000000 +0100
-@@ -540,7 +540,7 @@
- ##} FH_DATE_IS_19XX
- 
- ##{ FH_DATE_PAST_20XX
--header   FH_DATE_PAST_20XX	Date =~ /20[1-9][0-9]/ [if-unset: 2006]
-+header   FH_DATE_PAST_20XX	Date =~ /20[2-9][0-9]/ [if-unset: 2006]
- describe FH_DATE_PAST_20XX	The date is grossly in the future.
- ##} FH_DATE_PAST_20XX
- 

Deleted: trunk/dports/perl/p5-mail-spamassassin/files/patch-Makefile.PL.diff
===================================================================
--- trunk/dports/perl/p5-mail-spamassassin/files/patch-Makefile.PL.diff	2012-07-18 00:26:31 UTC (rev 95614)
+++ trunk/dports/perl/p5-mail-spamassassin/files/patch-Makefile.PL.diff	2012-07-18 00:42:34 UTC (rev 95615)
@@ -1,35 +0,0 @@
-Add missing DESTDIR, not sure why this is necessary.
-
-Index: Makefile.PL
-===================================================================
---- Makefile.PL.orig	2008-06-10 11:21:07.000000000 +0200
-+++ Makefile.PL	2009-01-18 22:07:10.000000000 +0100
-@@ -1200,18 +1200,18 @@
- #        # $(SYMLINK) $(INST_SCRIPT)/sa-filter $(B_SCRIPTDIR)/spamassassin
- 
- conf__install:
--	-$(MKPATH) $(B_CONFDIR)
--	$(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
--	$(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
--	$(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
--	$(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
--	$(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(B_CONFDIR)/v320.pre}) unless -f q{$(B_CONFDIR)/v320.pre}"
-+	-$(MKPATH) $(DESTDIR)$(B_CONFDIR)
-+	$(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(DESTDIR)$(B_CONFDIR)/local.cf})"
-+	$(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(DESTDIR)$(B_CONFDIR)/init.pre})"
-+	$(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(DESTDIR)$(B_CONFDIR)/v310.pre})"
-+	$(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(DESTDIR)$(B_CONFDIR)/v312.pre})"
-+	$(PERL) -MFile::Copy -e "copy(q{rules/v320.pre}, q{$(DESTDIR)$(B_CONFDIR)/v320.pre})"
- 
- data__install:
--	-$(MKPATH) $(B_DATADIR)
--	$(PERL) -e "map unlink, <$(B_DATADIR)/*>"
--	$(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(B_DATADIR) $(DATAFILES)
--	$(CHMOD) $(PERM_RWX) $(B_DATADIR)
-+	-$(MKPATH) $(DESTDIR)$(B_DATADIR)
-+	$(PERL) -e "map unlink, <$(DESTDIR)$(B_DATADIR)/*>"
-+	$(PREPROCESS) $(FIXVARS) -m$(PERM_RW) -Irules -O$(DESTDIR)$(B_DATADIR) $(DATAFILES)
-+	$(CHMOD) $(PERM_RWX) $(DESTDIR)$(B_DATADIR)
- 
- text_html_doc: made-doc-stamp
- 	$(NOOP)

Modified: trunk/dports/perl/p5-mail-spamassassin/files/patch-spamd.raw.diff
===================================================================
--- trunk/dports/perl/p5-mail-spamassassin/files/patch-spamd.raw.diff	2012-07-18 00:26:31 UTC (rev 95614)
+++ trunk/dports/perl/p5-mail-spamassassin/files/patch-spamd.raw.diff	2012-07-18 00:42:34 UTC (rev 95615)
@@ -1,11 +1,11 @@
---- spamd/spamd.raw.orig	2009-02-02 18:17:10.000000000 -0600
-+++ spamd/spamd.raw	2009-02-02 18:18:48.000000000 -0600
-@@ -2075,7 +2075,7 @@
+--- spamd/spamd.raw.orig	2011-06-06 18:59:19.000000000 -0500
++++ spamd/spamd.raw	2012-07-17 19:29:37.000000000 -0500
+@@ -2167,7 +2167,7 @@
    if ( $opt{'user-config'} ) {
      my $prefsfrom = $username;  # the one passed, NOT $opt{username}
  
 -    if ($prefsfrom eq $suidto) {
 +    if ($prefsfrom eq $suidto || $opt{'vpopmail'}) {
-       $userdir = $suiddir;      # reuse the already-looked-up info
-     } else {
-       $userdir = (getpwnam($prefsfrom))[7];
+       $userdir = $suiddir;  # reuse the already-looked-up info, tainted
+     } elsif ( $opt{'vpopmail'} ) {
+       #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120717/3f31a19c/attachment.html>

More information about the macports-changes mailing list