diff options
| author |   Tom Martin <slarti@gentoo.org> | 2005-10-15 08:55:38 +0000 |
|---|---|---|
| committer | Tom Martin <slarti@gentoo.org> | 2005-10-15 08:55:38 +0000 |
| commit | ee314f33b070176f2df4aca75da80c2a274b6b7a (patch) | |
| tree | 57811720fe14447ba9d72354c61fd0c7c43dcbc0 /mail-filter/gld | |
| parent | Fix dependency on x11-libs/gtk+-1.2 (#108147) (diff) | |
| download | gentoo-2-ee314f33b070176f2df4aca75da80c2a274b6b7a.tar.gz gentoo-2-ee314f33b070176f2df4aca75da80c2a274b6b7a.tar.bz2 gentoo-2-ee314f33b070176f2df4aca75da80c2a274b6b7a.zip | |
Accidentally removed a needed patch in the purge a few days ago. Resolves bug #108900
(Portage version: 2.0.53_rc5)
Diffstat (limited to 'mail-filter/gld')
| -rw-r--r-- | mail-filter/gld/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch | 42 |
2 files changed, 48 insertions, 1 deletions
diff --git a/mail-filter/gld/ChangeLog b/mail-filter/gld/ChangeLog index 59965e7f949c..2160a84ca9e8 100644 --- a/mail-filter/gld/ChangeLog +++ b/mail-filter/gld/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-filter/gld # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.25 2005/10/08 08:36:12 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.26 2005/10/15 08:55:38 slarti Exp $ + + 15 Oct 2005; Tom Martin <slarti@gentoo.org> + +files/gld-1.5.2-mxgrey-fix.patch: + Accidentally removed a needed patch in the purge a few days ago. Resolves + bug #108900. *gld-1.6 (08 Oct 2005) diff --git a/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch b/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch new file mode 100644 index 000000000000..4ec6be79f22e --- /dev/null +++ b/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch @@ -0,0 +1,42 @@ +--- gld-1.5.2/greylist.c.orig 2005-08-17 00:44:06.000000000 +0200 ++++ gld-1.5.2/greylist.c 2005-08-17 00:40:32.000000000 +0200 +@@ -181,10 +181,29 @@ + + if(conf->update==1) + { +- if(conf->lightd==1 && fnotdomain==1) +- snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and +recipient='%s'",ts,ip,osender,orecipient); +- +- snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and +recipient='%s'",ts,ip,sender,recipient); ++ ++ if(ts-n>conf->mini) ++ { ++ if(conf->lightd==1 && fnotdomain==1) ++ snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and +recipient='%s'",ts,ip,osender,orecipient); ++ ++ snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and +recipient='%s'",ts,ip,sender,recipient); ++ } ++ else ++ { ++ // ++ // We have NOT reached the greylist-timeout, so we do NOT increase the message-counter (SQL-field n), ++ // because otherwise we will braek the MXGREY-option. ++ // In fact this means that the THIRD retry will immidiately pass the greylist, as mxgrey checks only for ip and (n>1). ++ // ++ // 2005-08-16 martin@it4linux.de ++ // ++ ++ if(conf->lightd==1 && fnotdomain==1) ++ snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and +recipient='%s'",ts,ip,osender,orecipient); ++ ++ snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and +recipient='%s'",ts,ip,sender,recipient); ++ } + + SQLQuery(query); + if(conf->debug==1) printf("%d: Query=(%s)\n",pid,query); |