/trunk/debian/changelog |
---|
1,37 → 1,3 |
sa-exim (4.2.1-15) unstable; urgency=low |
* reproducible-build.patch (new): Make build reproducible by replacing |
the build date with the source date via ${SOURCE_DATE_EPOCH} when |
available (Closes: #831649). Thanks to Chris Lamb. |
* greylisting-ipv6.patch (new): Finally add IPv6 support to the |
greylisting plugin (Closes: #508161). Replaces grey-only-ipv4.patch. |
Based on Robert Tasarz's patch, though I decided to do things a little |
differently by keeping the greylistfourthbyte option for backwards |
compatibility and not adding separate options for IPv4 and IPv6 at |
this time. Also, with that option enabled, there will only be one |
directory level for all the last 64 bits of an IPv6 address. |
* delete-ext-html-references.patch (new): sa.html, which is shipped in |
the doc directory, is a copy of the author's webpage on sa-exim from |
his website, but without the images or linked pages, which means that |
most of the images and links don't work, except the SourceForge logo, |
which was fetched from sourceforge.net, causing a privacy concern. We |
drop the images and make the non-absolute links relative to |
http://marc.merlins.org/linux/exim/. |
* postinst, postrm: Remove hard-coded path to invoke-rc.d. |
* postrm: On purge, always delete the greylisting tuplets directory |
first. Normally, /var/spool/sa-exim is then empty and can be removed |
without asking the user, avoiding leaving unowned files (Closes: |
#657140). |
* greylist-lint.patch: disable greylisting plugin during spamassassin |
--lint to avoid warnings about missing headers (Closes: #760860). |
Thanks to Chaskiel Grundman. |
* Use dpkg-buildflags. |
* Bump Standards-Version to 3.9.8. |
* Override Lintian warning about virtual exim4-localscanapi dependency |
regardless of API version. |
-- Magnus Holmgren <holmgren@debian.org> Fri, 22 Jul 2016 11:26:45 +0200 |
sa-exim (4.2.1-14) unstable; urgency=low |
* Updated Danish and Dutch Debconf template translations (Closes: |
/trunk/debian/control |
---|
3,7 → 3,7 |
Priority: optional |
Maintainer: Magnus Holmgren <holmgren@debian.org> |
Build-Depends: debhelper (>= 7), links, exim4-dev |
Standards-Version: 3.9.8 |
Standards-Version: 3.9.2 |
Vcs-Svn: svn://svn.kibibyte.se/sa-exim/trunk |
Vcs-Browser: http://svn.kibibyte.se/sa-exim |
Homepage: http://marc.merlins.org/linux/exim/sa.html |
11,7 → 11,7 |
Package: sa-exim |
Architecture: any |
Depends: ${exim:Depends}, spamc, ${shlibs:Depends}, ${misc:Depends}, |
debconf (>= 1.2.0) | debconf-2.0, libnetaddr-ip-perl |
debconf (>= 1.2.0) | debconf-2.0 |
Recommends: ${perl:Depends} |
Suggests: spamassassin |
Description: SpamAssassin filter for Exim |
/trunk/debian/patches/greylisting-ipv6.patch |
---|
File deleted |
/trunk/debian/patches/delete-ext-html-references.patch |
---|
File deleted |
/trunk/debian/patches/greylist-lint.patch |
---|
File deleted |
/trunk/debian/patches/reproducible-build.patch |
---|
File deleted |
/trunk/debian/patches/grey-only-ipv4.patch |
---|
0,0 → 1,33 |
Description: Bail out if a non-IPv4 address is encountered |
Author: Magnus Holmgren <holmgren@debian.org> |
Bug-Debian: http://bugs.debian.org/300103 |
Bug-Debian: http://bugs.debian.org/479955 |
--- sa-exim-4.2.1.orig/Greylisting.pm |
+++ sa-exim-4.2.1/Greylisting.pm |
@@ -170,16 +172,19 @@ 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"; |
+ unless ($connectip =~ /(\d+)\.(\d+)\.(\d+)\.(\d+)/) { |
+ warn "Can only handle IPv4 addresses; skipping greylisting call for message $mesgid\n"; |
+ return 0; |
+ } |
+ |
+ my $ipdir1 = "$option{'dir'}/$1"; |
+ my $ipdir2 = "$ipdir1/$2"; |
+ my $ipdir3 = "$ipdir2/$3"; |
my $ipdir4; |
my $tupletdir; |
$ipdir4 = "$ipdir3"; |
- $ipdir4 .= "/$ipbyte4" if ($option{'greylistfourthbyte'}); |
+ $ipdir4 .= "/$4" if ($option{'greylistfourthbyte'}); |
$tupletdir = "$ipdir4/$envfrom"; |
$tuplet = "$tupletdir/$rcptto"; |
/trunk/debian/patches/series |
---|
1,11 → 1,8 |
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 |
/trunk/debian/rules |
---|
5,10 → 5,14 |
# Uncomment this to turn on verbose mode. |
#export DH_VERBOSE=1 |
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) |
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS) |
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) |
CFLAGS = -Wall -g |
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) |
CFLAGS += -O0 |
else |
CFLAGS += -O2 |
endif |
build: build-arch |
build-indep: |
16,8 → 20,7 |
build-arch: build-stamp |
build-stamp: |
dh_testdir |
$(MAKE) BUILDCFLAGS='-I/usr/include/exim4 -fPIC $$(CPPFLAGS) $$(CFLAGS)' \ |
CPPFLAGS='$(CPPFLAGS)' CFLAGS='$(CFLAGS)' LDFLAGS='-shared $(LDFLAGS)' SUFF='' |
$(MAKE) BUILDCFLAGS='-I/usr/include/exim4 -fPIC $$(CFLAGS)' SUFF='' |
touch build-stamp |
clean: |
/trunk/debian/postinst |
---|
39,7 → 39,7 |
rm ${LOCALSCANCONF}.rul |
fi |
if [ -x /etc/init.d/exim4 ]; then |
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then |
if [ -x /usr/sbin/invoke-rc.d ]; then |
invoke-rc.d exim4 reload || true |
else |
/etc/init.d/exim4 reload || true |
/trunk/debian/README.Debian |
---|
124,14 → 124,13 |
loadplugin line, but fixing it is probably not worth the disruption of |
existing installations.) |
If two messages from the same /24 IPv4 network or /64 IPv6 network (or |
individual IP address, depending on greylistfourthbyte), with the same |
sender, with the same list of recipient, and with a score below |
dontgreylistthreshold are seen at least greylistsecs apart, the |
triplet will be whitelisted and the GREYLIST_ISWHITE rule will be |
considered to match thenceforth. That will signal to the local_scan |
library to raise SAtempreject to let the message through, in addition |
to the negative spam score it carries. |
If two messages from the same /24 network (or IP address, depending on |
greylistfourthbyte), with the same sender, with the same list of |
recipient, and with a score below dontgreylistthreshold are seen at |
least greylistsecs apart, the triplet will be whitelisted and the |
GREYLIST_ISWHITE rule will be considered to match thenceforth. That |
will signal to the local_scan library to raise SAtempreject to let the |
message through, in addition to the negative spam score it carries. |
Notice that messages can be permanently rejected (score above |
SApermreject) and still get a triplet whitelisted if the score is |
220,4 → 219,4 |
file specifies conflicting options, it will prevent SA-Exim from |
working. For now, you'll have to make sure that it doesn't. |
-- Magnus Holmgren <holmgren@debian.org>, Fri, 22 Jul 2016 09:58:32 +0200 |
-- Magnus Holmgren <holmgren@debian.org>, Sun, 18 Sep 2011 00:11:18 +0200 |
/trunk/debian/sa-exim.lintian-overrides |
---|
1,0 → 0,0 |
sa-exim: virtual-package-depends-without-real-package-depends depends: exim4-localscanapi-* |
sa-exim: virtual-package-depends-without-real-package-depends depends: exim4-localscanapi-1.1 |
/trunk/debian/postrm |
---|
16,7 → 16,7 |
echo "${DISABLELOCALSCANTEXT}" > ${LOCALSCANCONF}.rul |
fi |
if [ -x /etc/init.d/exim4 ]; then |
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then |
if [ -x /usr/sbin/invoke-rc.d ]; then |
invoke-rc.d exim4 reload || true |
else |
/etc/init.d/exim4 reload || true |
31,14 → 31,12 |
rm ${LOCALSCANCONF}.rul |
fi |
if [ -x /etc/init.d/exim4 ]; then |
if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then |
if [ -x /usr/sbin/invoke-rc.d ]; then |
invoke-rc.d exim4 reload || true |
else |
/etc/init.d/exim4 reload || true |
fi |
fi |
rm -rf /var/spool/sa-exim/tuplets |
# In the rather uncommon event that debconf has been removed before |
# us, we have no choice but leaving the spool directory alone. |
if [ -e /var/spool/sa-exim ] && |