From: Tom Martin Date: Fri, 21 Oct 2005 16:31:21 +0000 (+0000) Subject: Updated patch, #108900. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=24a521edbbddb17abc40e3c374fc0e0ad4ac16e7;p=gentoo.git Updated patch, #108900. Package-Manager: portage-2.0.53_rc6 --- diff --git a/mail-filter/gld/ChangeLog b/mail-filter/gld/ChangeLog index 2160a84ca9e8..218968e2ca06 100644 --- a/mail-filter/gld/ChangeLog +++ b/mail-filter/gld/ChangeLog @@ -1,6 +1,10 @@ # 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.26 2005/10/15 08:55:38 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.27 2005/10/21 16:31:21 slarti Exp $ + + 21 Oct 2005; Tom Martin + files/gld-1.5.2-mxgrey-fix.patch: + Updated patch. Thanks to in bug #108900. 15 Oct 2005; Tom Martin +files/gld-1.5.2-mxgrey-fix.patch: diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest index ad929a870233..392e3f15438a 100644 --- a/mail-filter/gld/Manifest +++ b/mail-filter/gld/Manifest @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 2912126307110b5621bb18f47979433e ChangeLog 4298 +MD5 94ffdd47b0e8b275ed299208e7fdf8b8 ChangeLog 4450 MD5 96d50f09283d0a87235b23ce0795499e files/Makefile.in 980 MD5 63658f0d53451dbb79e4330fd997bfab files/digest-gld-1.5.2 57 MD5 f91281c6461e403a77e5351e89e398be files/digest-gld-1.6 55 -MD5 135d0ec2459d5f7c3bbeb4cea3381364 files/gld-1.5.2-mxgrey-fix.patch 1702 +MD5 27b82bb6cc99d52bb22a2e19b4d100c9 files/gld-1.5.2-mxgrey-fix.patch 1675 MD5 4e2b779070d26c7675574fe2420541b8 files/gld.rc 544 MD5 92553e000dd0a23d31042352b053cbdf gld-1.5.2.ebuild 1562 MD5 c82f4d42b6f4cb1d4a64e6d031b018d6 gld-1.6.ebuild 1554 @@ -13,7 +13,7 @@ MD5 8a1c6c5f4c13a4109f6f4198fdd1874b metadata.xml 223 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDUMQgCHk4+ZoBpvsRAroZAJ9GFnBVmxGhUw5ezOv2tU0btvwSdACbBsxa -9Xrhn9FavCqZ0qfXMsRqHfE= -=i7Hj +iD8DBQFDWSYMCHk4+ZoBpvsRAphHAKCJFfNletmYcom3e6rdV7mQIX91ygCglEj8 +H+FmCHProSohmLqnUDbzFAE= +=qWqE -----END PGP SIGNATURE----- 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 index 4ec6be79f22e..c33644abb83b 100644 --- a/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch +++ b/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch @@ -1,24 +1,18 @@ ---- 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 @@ +--- gld-1.5.2/greylist.c 2005-04-21 05:41:09.000000000 -0400 ++++ gld-1.5.2/greylist.c 2005-10-20 14:05:05.000000000 -0400 +@@ -181,10 +181,28 @@ else 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); -+ +- 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); + 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); ++ 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); ++ 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 + { @@ -28,14 +22,12 @@ recipient='%s'",ts,ip,sender,recipient); + // 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,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); ++ 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);