Attachment 118114 Details for Bug 160282 – file.diff

[patch] file.diff

file.diff (text/plain), 2.66 KB, created by Michael Scheidell on 2011-08-29 16:10:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Scheidell

Created: 2011-08-29 16:10:10 UTC

Size: 2.66 KB

patch

obsolete

>diff -bBru sa.orig/Makefile sa.new/Makefile
>--- sa.orig/Makefile	2011-08-01 21:06:48.000000000 +0000
>+++ sa.new/Makefile	2011-08-29 14:18:12.000000000 +0000
>@@ -7,11 +7,11 @@
> 
> PORTNAME=	Mail-SpamAssassin
> PORTVERSION=	3.3.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	mail perl5
> MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
> MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
>-PKGNAMEPREFIX=	p5-
>+PKGNAMEPREFIX?=	p5-
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:apache,cpan
> 
> MAINTAINER=	scheidell@secnap.net
>@@ -266,9 +266,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
>diff -bBru sa.orig/files/patch-bug6655 sa.new/files/patch-bug6655
>--- sa.orig/files/patch-bug6655	2011-08-29 14:41:56.000000000 +0000
>+++ sa.new/files/patch-bug6655	2011-08-29 14:29:11.000000000 +0000
>@@ -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");
>+

Actions: View | Diff

Attachments on bug 160282: 118114