Update to 1.6:

16/09/2005 : V 1.6

	- Removed the algorithm lightgreydomain as the new mxgrey
	  does better and simpler

	- Removed the UPDATE option, now gld always update triplets.

	- Fixed a minor flaw in the MXGREY algorithm.

	- Now you can configure MXGREY to consider an ip as a safe
	  MX after X succesful greylists instead of only 1 . (read
	  gld.conf for details)

	- Now gld updates the counters only when mail is not
	  greylisted

	- Added Training mode, read gld.conf for details

	- Now gld verify that if you supply a custom smtp code,
	  it's a 4XX code otherwise gld discard it and use 450 .

	- If gld cannot connect to MySQL server on startup
	  it will not refuse to run anymore, but will set keepdbopen
	  to 0 and accept to run .

	- The sample config file provided now only listen to loopback
	  only accept connection from localhost and runs as nobody/
	  nobody.

	WARNING: if you were using lightgreydomain algorithm, it
	has been discontinued use MXGREY in place, please read
	gld.conf for details.

8 files changed, 61 insertions, 83 deletions

diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 479d531af8a..be6f35dd27b 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2006/03/02 20:48:56 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/02 21:03:39 wiz Exp $
 #
 
-DISTNAME=		gld-1.5.2
-PKGREVISION=		2
+DISTNAME=		gld-1.6
 CATEGORIES=		mail
 MASTER_SITES=		http://www.gasmi.net/down/
 EXTRACT_SUFX=		.tgz
diff --git a/mail/gld/distinfo b/mail/gld/distinfo
index 0e84552869d..b1b30ebbd67 100644
--- a/mail/gld/distinfo
+++ b/mail/gld/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2006/03/02 20:49:39 wiz Exp $
+$NetBSD: distinfo,v 1.12 2006/03/02 21:03:39 wiz Exp $
 
-SHA1 (gld-1.5.2.tgz) = db6dd26df7645b62beec8cd5731359bb37f0258e
-RMD160 (gld-1.5.2.tgz) = 9e8b7f986eab14b001834d774e3624b8fd58cd48
-Size (gld-1.5.2.tgz) = 39135 bytes
-SHA1 (patch-aa) = 3fca941c005bc37aa5275e9d0193c51f315b4212
-SHA1 (patch-ab) = 629b99be25d536ceb646d47f079455a4b092fe24
-SHA1 (patch-ac) = 8d484c0d6a5cbc88f2c4c66143e6aa9a91131bf1
-SHA1 (patch-ad) = 1083bdc0040696a5ac014204c1a4a8e35fdeda53
-SHA1 (patch-ae) = d27cefd2784223792942bd0b5b95fb810972d308
-SHA1 (patch-af) = bde3756d6d8180f13c87a36b69264de5ff385c7c
+SHA1 (gld-1.6.tgz) = 09a87119b376e370c63444e2bcd1111288b78267
+RMD160 (gld-1.6.tgz) = 72ff4363f3813f421e64e7644142cf227a43885d
+Size (gld-1.6.tgz) = 40333 bytes
+SHA1 (patch-aa) = 2dcd261ff37dc6ab8343060ad711d98427d10d7f
+SHA1 (patch-ab) = 9622bd744acd326a679e9c25007bffff9241dd2e
+SHA1 (patch-ac) = 876f896412a48d18c0ca314af59f82b4c9d915e2
+SHA1 (patch-ad) = 7d810a935677022953d01b7a146881d8cf86162b
+SHA1 (patch-ae) = e610e20acee890ae9a53eb84382fb1d741736bb3
+SHA1 (patch-af) = 9d5a06fa399963937fc8a0c94a80ac85528f872d
diff --git a/mail/gld/patches/patch-aa b/mail/gld/patches/patch-aa
index 2dff6efd012..31679078b1f 100644
--- a/mail/gld/patches/patch-aa
+++ b/mail/gld/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2006/03/02 20:49:39 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2006/03/02 21:03:39 wiz Exp $
 
 --- Makefile.in.orig	2004-10-12 14:41:49.000000000 +0200
-+++ Makefile.in	2005-04-13 19:10:29.000000000 +0200
++++ Makefile.in
 @@ -1,8 +1,8 @@
  all: gld
  
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.6 2006/03/02 20:49:39 wiz Exp $
  
  sockets.o: sockets.c sockets.h
  	@CC@ -O2 @DEFS@ -Wall -c sockets.c
-@@ -23,11 +23,15 @@
+@@ -23,11 +23,15 @@ clean:
  	rm -f  gld *.o
  
  install: gld gld.conf
diff --git a/mail/gld/patches/patch-ab b/mail/gld/patches/patch-ab
index 0aa167728aa..4a3b1b2b157 100644
--- a/mail/gld/patches/patch-ab
+++ b/mail/gld/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2005/04/13 17:00:14 salo Exp $
+$NetBSD: patch-ab,v 1.4 2006/03/02 21:03:39 wiz Exp $
 
---- greylist.c.orig	2005-04-13 05:26:10.000000000 -0400
-+++ greylist.c	2005-04-13 12:03:39.000000000 -0400
-@@ -21,8 +21,11 @@
+--- greylist.c.orig	2005-09-16 11:52:41.000000000 +0200
++++ greylist.c
+@@ -20,8 +20,11 @@ pid=getpid();
  
  ts=time(0);
  strncpy(oip,ip,sizeof(oip)-1);
@@ -14,41 +14,20 @@ $NetBSD: patch-ab,v 1.3 2005/04/13 17:00:14 salo Exp $
  
  if(conf->debug==1) printf("%d: Starting the greylist algo\n",pid);
  
-@@ -68,10 +71,18 @@
-         if(conf->debug==1) printf("%d: lightgrey on domain is on, let's keep the domain only on recipient and sender\n",pid);
+@@ -97,6 +100,7 @@ if(conf->whitelist==1)
+ 	if(domain==NULL) domain=osender;
  
-         domain=(char *)strstr(osender,"@");
--	if(domain!=NULL) strncpy(sender,domain,BLEN-1);
-+	if(domain!=NULL)
-+		{
-+		strncpy(sender,domain,BLEN-1);
-+		sender[BLEN-1] = '\0';
-+		}
- 
-         domain=(char *)strstr(orecipient,"@");
--	if(domain!=NULL) strncpy(recipient,domain,BLEN-1);
-+	if(domain!=NULL)
-+		{
-+		strncpy(recipient,domain,BLEN-1);
-+		recipient[BLEN-1] = '\0';
-+		}
-         }
- 
- //
-@@ -119,6 +130,7 @@
- 		if(domain==NULL) domain=osender;
- 
- 		strncpy(netw,oip,sizeof(netw)-1);
-+		netw[sizeof(netw)-1] = '\0';
- 		l=strlen(netw);
- 		for(i=l-1;i>=0;i--)
- 			if(netw[i]=='.')
-@@ -148,7 +160,7 @@
- 		if(x==4)
- 			{
- 			snprintf(query,sizeof(query)-1,"%d.%d.%d.%d.%s",d,c,b,a,conf->dnswl);
--			n=DnsIp(query,NULL);
-+			n=DnsIp(query,NULL, 0);
- 			if(conf->debug==1) printf("%d: DNSQuery=(%s) result=%ld\n",pid,query,n);
- 			if(n==0)
- 				{
+ 	strncpy(netw,oip,sizeof(netw)-1);
++	netw[sizeof(netw)-1] = '\0';
+ 	l=strlen(netw);
+ 	for(i=l-1;i>=0;i--)
+ 	{
+@@ -127,7 +131,7 @@ if(conf->dnswl[0]!=0)
+ 	if(x==4)
+ 	{
+ 		snprintf(query,sizeof(query)-1,"%d.%d.%d.%d.%s",d,c,b,a,conf->dnswl);
+-		n=DnsIp(query,NULL);
++		n=DnsIp(query,NULL, 0);
+ 		if(conf->debug==1) printf("%d: DNSQuery=(%s) result=%ld\n",pid,query,n);
+ 		if(n==0)
+ 		{
diff --git a/mail/gld/patches/patch-ac b/mail/gld/patches/patch-ac
index 9ed12e7727d..ceb731e2352 100644
--- a/mail/gld/patches/patch-ac
+++ b/mail/gld/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2005/04/13 16:36:07 salo Exp $
+$NetBSD: patch-ac,v 1.2 2006/03/02 21:03:39 wiz Exp $
 
---- cnf.c.orig	2005-04-13 12:06:54.000000000 -0400
-+++ cnf.c	2005-04-13 12:11:51.000000000 -0400
-@@ -36,11 +36,16 @@
+--- cnf.c.orig	2005-09-16 12:02:44.000000000 +0200
++++ cnf.c
+@@ -36,11 +36,16 @@ if(fic==(FILE *)NULL) return(-1);
  
  // We set the default values
  
@@ -21,10 +21,10 @@ $NetBSD: patch-ac,v 1.1 2005/04/13 16:36:07 salo Exp $
 +conf->sqlpasswd[sizeof(conf->sqlpasswd)-1] = '\0';
 +strncpy(conf->message,"Greylisted",sizeof(conf->message)-1);
 +conf->message[sizeof(conf->message)-1] = '\0';
+ conf->training=0;
  conf->port=2525;
  conf->maxcon=100;
- conf->mini=60;
-@@ -73,14 +78,46 @@
+@@ -72,14 +77,46 @@ while(fgets(buffer,1024,fic)!=NULL)
  		buffer[strlen(buffer)-1]=0;
                  *p=0;
                  if(strcmp(buffer,"CLIENTS")==0) ReadClients(conf,p+1);
@@ -78,4 +78,4 @@ $NetBSD: patch-ac,v 1.1 2005/04/13 16:36:07 salo Exp $
 +			}
                  if(strcmp(buffer,"PORT")==0) conf->port=atoi(p+1);
                  if(strcmp(buffer,"MAXCON")==0) conf->maxcon=atoi(p+1);
-                 if(strcmp(buffer,"MINTIME")==0) conf->mini=atol(p+1);
+                 if(strcmp(buffer,"TRAINING")==0) conf->training=atoi(p+1);
diff --git a/mail/gld/patches/patch-ad b/mail/gld/patches/patch-ad
index 685196c1e0a..5ff878ff85a 100644
--- a/mail/gld/patches/patch-ad
+++ b/mail/gld/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2005/04/13 16:36:07 salo Exp $
+$NetBSD: patch-ad,v 1.2 2006/03/02 21:03:39 wiz Exp $
 
---- server.c.orig	2005-04-13 03:28:29.000000000 -0400
-+++ server.c	2005-04-13 12:15:36.000000000 -0400
-@@ -208,7 +208,7 @@
+--- server.c.orig	2005-09-16 12:17:59.000000000 +0200
++++ server.c
+@@ -208,7 +208,7 @@ long ts;
  int pid;
  
  pid=getpid();
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1 2005/04/13 16:36:07 salo Exp $
  
  //
  // We check if this IP is authorized to connect to us
-@@ -261,21 +261,34 @@
+@@ -261,21 +261,34 @@ while(1==1)
  	// Now, we are sure our buffer string length is no more than BLEN
  	// as all parameters are defined also as buffers with a BLEN size
  	// no buffer overflow is possible using strcpy .
@@ -50,7 +50,7 @@ $NetBSD: patch-ad,v 1.1 2005/04/13 16:36:07 salo Exp $
  
  	}
  
-@@ -300,7 +313,11 @@
+@@ -300,7 +313,11 @@ Quote(sender);
  // Now, we can safely use, str** functions
  //
  
diff --git a/mail/gld/patches/patch-ae b/mail/gld/patches/patch-ae
index 66f35278cbe..2ccec646d27 100644
--- a/mail/gld/patches/patch-ae
+++ b/mail/gld/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2005/04/13 16:36:07 salo Exp $
+$NetBSD: patch-ae,v 1.2 2006/03/02 21:03:39 wiz Exp $
 
---- sockets.c.orig	2004-10-12 08:39:34.000000000 -0400
-+++ sockets.c	2005-04-13 12:06:13.000000000 -0400
-@@ -540,7 +540,7 @@
+--- sockets.c.orig	2004-10-12 14:39:34.000000000 +0200
++++ sockets.c
+@@ -540,7 +540,7 @@ int CloseSocket(int s)
  /*                                              */
  /************************************************/
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1 2005/04/13 16:36:07 salo Exp $
  {
  struct hostent *hostptr;
  struct in_addr *ptr;
-@@ -552,7 +552,11 @@
+@@ -552,7 +552,11 @@ if(hostptr->h_addrtype != AF_INET) retur
  
  ptr=(struct in_addr *) *hostptr->h_addr_list;
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ae,v 1.1 2005/04/13 16:36:07 salo Exp $
  return(0);
  }
  
-@@ -572,13 +576,14 @@
+@@ -572,13 +576,14 @@ return(0);
  /*                                              */
  /************************************************/
  
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.1 2005/04/13 16:36:07 salo Exp $
  return(0);
  
  }
-@@ -599,7 +604,7 @@
+@@ -599,7 +604,7 @@ return(0);
  /*                                              */
  /************************************************/
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.1 2005/04/13 16:36:07 salo Exp $
  {
  
  struct hostent *hostptr;
-@@ -609,7 +614,8 @@
+@@ -609,7 +614,8 @@ addr.s_addr=inet_addr(ip);
  
  if((hostptr=(struct hostent *)gethostbyaddr((char *)&addr,sizeof(struct in_addr),AF_INET))==NULL) return(S_HOST_ERR);
  
@@ -60,7 +60,7 @@ $NetBSD: patch-ae,v 1.1 2005/04/13 16:36:07 salo Exp $
  
  return(0);
  }
-@@ -631,20 +637,27 @@
+@@ -631,20 +637,27 @@ return(0);
  /*                                              */
  /************************************************/
  
diff --git a/mail/gld/patches/patch-af b/mail/gld/patches/patch-af
index 1d0c3fd7480..2adcc7a915f 100644
--- a/mail/gld/patches/patch-af
+++ b/mail/gld/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2005/04/13 16:36:07 salo Exp $
+$NetBSD: patch-af,v 1.2 2006/03/02 21:03:39 wiz Exp $
 
---- sockets.h.orig	2005-04-13 12:13:23.000000000 -0400
-+++ sockets.h	2005-04-13 12:06:34.000000000 -0400
-@@ -118,10 +118,10 @@
+--- sockets.h.orig	2004-10-12 14:07:27.000000000 +0200
++++ sockets.h
+@@ -118,10 +118,10 @@ int CloseSocket(int sock);
  
  /* DNS functions */