From 8991916615b816a520ebec5a88386e7bc3b2ecb4 Mon Sep 17 00:00:00 2001 From: Tom Martin Date: Sun, 21 Aug 2005 11:44:07 +0000 Subject: Applied patch from bbbbmartinsw@linux-net.dnsalias.net to resolve bug 102769. Package-Manager: portage-2.0.51.22-r2 --- mail-filter/gld/ChangeLog | 6 +++- mail-filter/gld/Manifest | 25 +++++++++++----- mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch | 36 ++++++++++++++++++++++++ mail-filter/gld/gld-1.5.2.ebuild | 10 ++++++- 4 files changed, 68 insertions(+), 9 deletions(-) create mode 100644 mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch (limited to 'mail-filter') diff --git a/mail-filter/gld/ChangeLog b/mail-filter/gld/ChangeLog index 217549244086..adea2191a105 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.23 2005/08/14 10:10:58 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.24 2005/08/21 11:44:07 slarti Exp $ + + 21 Aug 2005; Tom Martin + +files/gld-1.5.2-mxgrey-fix.patch, gld-1.5.2.ebuild: + Applied patch from martinsw@linux-net.dnsalias.net to resolve bug 102769. 14 Aug 2005; Michael Hanselmann gld-1.5.2.ebuild: Stable on ppc. diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest index 4bffd01cc20e..790b06310c04 100644 --- a/mail-filter/gld/Manifest +++ b/mail-filter/gld/Manifest @@ -1,14 +1,25 @@ -MD5 4135724e156f76bcaffcfa53a79e766d gld-1.5.2.ebuild 1464 -MD5 8a1c6c5f4c13a4109f6f4198fdd1874b metadata.xml 223 -MD5 fd1a136fe1866eb522142c76feafa47e gld-1.4.ebuild 1159 -MD5 7b9caf05507e67af71c88d413433cb03 ChangeLog 3689 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 974cd6869dfa50025d5a8f8097f29b3f ChangeLog 3867 MD5 ee053a16e9eae0a66bd394e135dbe16b gld-1.5-r1.ebuild 1595 +MD5 fd1a136fe1866eb522142c76feafa47e gld-1.4.ebuild 1159 MD5 9b90c83173d174bf703b7cd1962b298f gld-1.5.ebuild 1363 MD5 c06c8a7fc6d211a8f437ee1f1023b230 gld-1.5-r2.ebuild 1592 +MD5 8a1c6c5f4c13a4109f6f4198fdd1874b metadata.xml 223 +MD5 92553e000dd0a23d31042352b053cbdf gld-1.5.2.ebuild 1562 +MD5 916c55bdbe2dcf1a53507a6d0028158c files/gld-1.5.2-mxgrey-fix.patch 1696 +MD5 408be3de93fe18f0361ad976ab36589f files/digest-gld-1.4 55 MD5 4ec33dbb0fd9c8a61e86f738deb457e4 files/digest-gld-1.5 55 -MD5 96d50f09283d0a87235b23ce0795499e files/Makefile.in 980 MD5 4ec33dbb0fd9c8a61e86f738deb457e4 files/digest-gld-1.5-r2 55 -MD5 63658f0d53451dbb79e4330fd997bfab files/digest-gld-1.5.2 57 +MD5 96d50f09283d0a87235b23ce0795499e files/Makefile.in 980 MD5 4e2b779070d26c7675574fe2420541b8 files/gld.rc 544 -MD5 408be3de93fe18f0361ad976ab36589f files/digest-gld-1.4 55 +MD5 63658f0d53451dbb79e4330fd997bfab files/digest-gld-1.5.2 57 MD5 4ec33dbb0fd9c8a61e86f738deb457e4 files/digest-gld-1.5-r1 55 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.2 (GNU/Linux) + +iD8DBQFDCHdZCHk4+ZoBpvsRAgukAJ9xBrEFIH26v54pJ2WF0EcQ+mp+WgCeKZ9J +Pc+6zcYVsnu4Jv0NmHR6M9o= +=C0hJ +-----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 new file mode 100644 index 000000000000..c13e4dc8f971 --- /dev/null +++ b/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch @@ -0,0 +1,36 @@ +--- 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); diff --git a/mail-filter/gld/gld-1.5.2.ebuild b/mail-filter/gld/gld-1.5.2.ebuild index 1a9792f89721..95221f4f154c 100644 --- a/mail-filter/gld/gld-1.5.2.ebuild +++ b/mail-filter/gld/gld-1.5.2.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.5.2.ebuild,v 1.3 2005/08/14 10:10:58 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.5.2.ebuild,v 1.4 2005/08/21 11:44:07 slarti Exp $ + +inherit eutils DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix" HOMEPAGE="http://www.gasmi.net/gld.html" @@ -19,6 +21,12 @@ DEPEND="virtual/libc RDEPEND="${DEPEND} >=mail-mta/postfix-2.1" +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-mxgrey-fix.patch +} + src_compile() { # It's kind of weird. $(use_with postgres pgsql) won't work... if use postgres ; then -- cgit v1.2.3-65-gdbad