Subversion Repositories sa-exim

Compare Revisions

Ignore whitespace Rev 70 → Rev 88

/tags/4.2.1-16/debian/patches/grey-only-ipv4.patch
File deleted
/tags/4.2.1-16/debian/patches/delete-ext-html-references.patch
0,0 → 1,41
Description: Delete references to images not distributed, and add base URL to make links work.
In particular get rid of the external SourceForce logo, which caused a privacy breach.
 
--- a/sa.html.template
+++ b/sa.html.template
@@ -1,6 +1,7 @@
<html>
<head>
-<title>Exim SpamAssassin at SMTP time</title>
+ <title>Exim SpamAssassin at SMTP time</title>
+ <base href="http://marc.merlins.org/linux/exim/">
</head>
<body>
@@ -113,7 +114,7 @@ threshold (7 for instance). After that,
inspect all the mails you've rejected or /dev/nulled
</ul>
-You can also (and probably should <img src="/gifs/people/smile.happy.gif" alt=":-)" align=TOP WIDTH=16 HEIGHT=16>) use the new greylisting support for even
+You can also (and probably should :-)) use the new greylisting support for even
better spam control
@@ -205,17 +206,5 @@ prefer the use of the
<Acknowledgements>
</Acknowledgements>
-
-<P ALIGN="center">
-<img src="/gifs/lines/misc/lampline.gif" alt="" WIDTH=720 HEIGHT=14>
-</P>
-<br>
-<img src="/gifs/misc/wizard.gif" alt="" align="middle" WIDTH=72 HEIGHT=61>
-<img src="/gifs/linux/damn-powered.gif" alt="" align="right" WIDTH=170 HEIGHT=29>
-<IMG SRC="/gifs/icons/msfree.gif" ALT="[ms free site]" ALIGN="right" WIDTH=95 HEIGHT=31>
-<a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=56124&amp;type=1" width="88" height="31" border="0" align="right" alt="SourceForge.net Logo"></a>
-<A HREF="/perso/contact.html">Email</A><BR>
-<A HREF="/">Link to Home Page</A>
-<P>
</body>
</html>
/tags/4.2.1-16/debian/patches/greylist-lint.patch
0,0 → 1,17
From: Chaskiel Grundman <cg2v@andrew.cmu.edu>
Subject: Prevent warnings during spamassassin --lint
Bug: https://bugs.debian.org/760860
 
--- a/Greylisting.pm
+++ b/Greylisting.pm
@@ -65,6 +65,10 @@ sub greylisting
my $dontcheckscore;
my %option;
+ if ($self->{main}->{lint_rules}) {
+ Mail::SpamAssassin::Plugin::dbg("GREYLISTING: disabled while linting");
+ return 0;
+ }
Mail::SpamAssassin::Plugin::dbg("GREYLISTING: called function");
$optionhash =~ s/;/,/g;
/tags/4.2.1-16/debian/patches/greylisting-ipv6.patch
0,0 → 1,76
Description: Add IPv6 support to the Greylisting SpamAssassin plugin.
The greylistfourthbyte option, for IPv6 addresses, means that all
addresses in the same /64 get whitelisted as a group.
Bug: https://bugs.debian.org/508161
 
--- a/Greylisting.pm
+++ b/Greylisting.pm
@@ -21,6 +21,8 @@ package Greylisting;
use strict;
use Mail::SpamAssassin::Plugin;
+use NetAddr::IP;
+use File::Path qw(mkpath);
our @ISA = qw(Mail::SpamAssassin::Plugin);
sub new
@@ -104,8 +106,12 @@ sub greylisting
}
chomp($connectip);
# Clean up input (for security, if you use files/dirs)
- $connectip =~ /([\d.:]+)/;
- $connectip = ($1 or "");
+
+ $connectip = NetAddr::IP->new($connectip);
+ if (not defined $connectip) {
+ warn "Can only handle IPv4 and IPv6 addresses; skipping greylisting call for message $mesgid\n";
+ return 0;
+ }
# Account for a null envelope from
if (not defined ($envfrom = $permsgstatus->get($option{'envfromhdr'})))
@@ -172,26 +178,27 @@ sub greylisting
# connectip is supposed to be untainted now, but I was still getting
# some insecure dependecy error messages sometimes (perl 5.8 problem apparently)
- $connectip =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)/;
- my ($ipbyte1, $ipbyte2, $ipbyte3, $ipbyte4) = ($1, $2, $3, $4);
- my $ipdir1 = "$option{'dir'}/$ipbyte1";
- my $ipdir2 = "$ipdir1/$ipbyte2";
- my $ipdir3 = "$ipdir2/$ipbyte3";
- my $ipdir4;
- my $tupletdir;
-
- $ipdir4 = "$ipdir3";
- $ipdir4 .= "/$ipbyte4" if ($option{'greylistfourthbyte'});
- $tupletdir = "$ipdir4/$envfrom";
-
+ my $ipdir;
+ if ($connectip->version == 6) {
+ my @components = split ':', $connectip->full, 5;
+ if ($option{'greylistfourthbyte'}) {
+ $ipdir = join '/', @components;
+ } else {
+ $ipdir = join '/', @components[0..3];
+ }
+ } else {
+ my @components = split '\.', $connectip->addr;
+ if ($option{'greylistfourthbyte'}) {
+ $ipdir = join '/', @components;
+ } else {
+ $ipdir = join '/', @components[0..2];
+ }
+ }
+ my $tupletdir = "$option{'dir'}/$ipdir/$envfrom";
$tuplet = "$tupletdir/$rcptto";
# make directory whether it's there or not (faster than test and set)
- mkdir $ipdir1;
- mkdir $ipdir2;
- mkdir $ipdir3;
- mkdir $ipdir4;
- mkdir $tupletdir;
+ mkpath $tupletdir;
if (not -e $tuplet)
{
/tags/4.2.1-16/debian/patches/reproducible-build.patch
0,0 → 1,26
Author: Chris Lamb <lamby@debian.org>
Last-Update: 2016-07-18
 
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ accept.so: accept.c
ACKNOWLEDGEMENTS: Acknowledgements.html
@echo "Generating $@"
- @links -dump $< > $@
+ @links -dump -codepage UTF-8 $< > $@
CHANGELOG: Changelog.html
@echo "Generating $@"
@@ -63,7 +63,11 @@ sa-exim_short.conf: sa-exim.conf
@cat sa-exim.conf | grep -v "^#" | tr '\012' 'ÿ' | sed "s/ÿÿÿ*/ÿÿ/g" | tr 'ÿ' '\012' >> sa-exim_short.conf
sa-exim.h: sa-exim.c version
+ifdef SOURCE_DATE_EPOCH
+ echo "char *version=\"`cat version` (built `LC_ALL=C date --utc -R --date=@$${SOURCE_DATE_EPOCH}`)\";" > sa-exim.h
+else
echo "char *version=\"`cat version` (built `date -R 2>/dev/null || date`)\";" > sa-exim.h
+endif
clean:
@-rm -rf $(OBJECTS) $(DOCS) $(OTHERTARGETS) build-stamp configure-stamp debian/sa-exim debian/sa-exim.postrm.debhelper debian/sa-exim.substvars debian/files 2>/dev/null
/tags/4.2.1-16/debian/patches/series
1,8 → 1,11
api-limitations.patch
spamc-args.patch
grey-only-ipv4.patch
grey-clean-sender.patch
save-path.patch
improved-default-conf.patch
spamd-not-nobody.patch
readme.patch
reproducible-build.patch
greylisting-ipv6.patch
greylist-lint.patch
delete-ext-html-references.patch