3 files changed, 142 insertions, 4 deletions

diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile
index ee7ac14c3e9f..14fadb4ecda0 100644
--- a/mail/rblcheck/Makefile
+++ b/mail/rblcheck/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	rblcheck
-# Version required:	1.2
+# Version required:	1.4
 # Date created:		28 January 1998
 # Whom:			itojun@itojun.org
 #
-# $Id: Makefile,v 1.1.1.1 1998/01/30 04:52:11 itojun Exp $
+# $Id: Makefile,v 1.4 1998/06/27 05:19:14 asami Exp $
 #
 
-DISTNAME=	rblcheck-1.2
+DISTNAME=	rblcheck-1.4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.xnet.com/%7Eemarshal/rblcheck/
 
diff --git a/mail/rblcheck/distinfo b/mail/rblcheck/distinfo
index 8734dad7b8b9..8c992b299d3a 100644
--- a/mail/rblcheck/distinfo
+++ b/mail/rblcheck/distinfo
@@ -1 +1 @@
-MD5 (rblcheck-1.2.tar.gz) = c41492d2c4ad34ab1666c59f03c85568
+MD5 (rblcheck-1.4.tar.gz) = 6e415c34fd249333c057a4aedecd8877
diff --git a/mail/rblcheck/files/patch-aa b/mail/rblcheck/files/patch-aa
new file mode 100644
index 000000000000..41ee5ff34a04
--- /dev/null
+++ b/mail/rblcheck/files/patch-aa
@@ -0,0 +1,138 @@
+--- rblcheck.c.orig	Thu Aug 20 14:47:03 1998
++++ rblcheck.c	Sun Oct 18 00:42:57 1998
+@@ -79,6 +79,7 @@
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>
++#include <arpa/inet.h>
+ #include <resolv.h>
+ #include <netdb.h>
+ 
+@@ -203,7 +204,7 @@
+  * domain. If "txt" is non-zero, we perform a TXT record lookup. We
+  * return the text returned from a TXT match, or an empty string, on
+  * a successful match, or NULL on an unsuccessful match. */
+-char * rblcheck( int a, int b, int c, int d, char * rbldomain, int txt )
++char * rblcheck( struct in_addr a, char * rbldomain, int txt )
+ {
+ 	char * domain;
+ 	char * result = NULL;
+@@ -214,12 +215,15 @@
+ 	const u_char * cend;
+ 	const u_char * rend;
+ 	int len;
++	u_char *p;
++	int i, j;
+ 
+ 	/* 16 characters max in a dotted-quad address, plus 1 for null */
+ 	domain = ( char * )malloc( 17 + strlen( rbldomain ) );
+ 
++	p = (u_char *)&a;
+ 	/* Create a domain name, in reverse. */
+-	sprintf( domain, "%d.%d.%d.%d.%s", d, c, b, a, rbldomain );
++	sprintf( domain, "%d.%d.%d.%d.%s", p[3], p[2], p[1], p[0], rbldomain );
+ 
+ 	/* Make our DNS query. */
+ 	res_init();
+@@ -261,8 +265,8 @@
+ 	cp = answer + sizeof( HEADER );
+ 	while( *cp != '\0' )
+ 	{
+-		a = *cp++;
+-		while( a-- )
++		i = *cp++;
++		while( i-- )
+ 			cp++;
+ 	}
+ 
+@@ -277,8 +281,8 @@
+ 	cp += ( NS_INT16SZ * 2 ) + NS_INT32SZ;
+ 
+ 	/* Get the length and end of the buffer. */
+-	NS_GET16( c, cp );
+-	cend = cp + c;
++	NS_GET16( i, cp );
++	cend = cp + i;
+ 
+ 	/* Iterate over any multiple answers we might have. In
+ 	   this context, it's unlikely, but anyway. */
+@@ -286,10 +290,10 @@
+ 	rend = result + RESULT_SIZE - 1;
+ 	while( cp < cend && rp < rend )
+ 	{
+-		a = *cp++;
+-		if( a != 0 )
+-			for( b = a; b > 0 && cp < cend && rp < rend;
+-			  b-- )
++		i = *cp++;
++		if( i != 0 )
++			for( j = i; j > 0 && cp < cend && rp < rend;
++			  j-- )
+ 			{
+ 				if( *cp == '\n' || *cp == '"' ||
+ 				  *cp == '\\' )
+@@ -308,23 +312,26 @@
+ 	char **argv;
+ {
+ 	extern int optind;
+-	int a, b, c, d;
++	struct hostent *ent;
++	struct in_addr a;
+ 	int quiet = 0;
+ 	int txt = 0;
+ 	int rblfiltered = 0;
+ 	char * response;
+ 	struct rbl * rblsites = NULL;
+ 	struct rbl * ptr;
++	int fail;
++	int c;
+ 
+ 	/* Add more sites you want in the default list of RBL-alike
+ 	   systems here. ### An easier way to change this is needed. ### */
+ 	rblsites = togglesite( "rbl.maps.vix.com", rblsites );
+-	rblsites = togglesite( "rbl.dorkslayers.com", rblsites );
++	rblsites = togglesite( "orbs.dorkslayers.com", rblsites );
+ 
+ 	progname = argv[ 0 ];
+ 
+-	while( ( a = getopt( argc, argv, "qtls:c?hv" ) ) != EOF )
+-		switch( a )
++	while( ( c = getopt( argc, argv, "qtls:c?hv" ) ) != EOF )
++		switch( c )
+ 		{
+ 			case 'q':
+ 				/* Quiet */
+@@ -372,10 +379,20 @@
+ 		return -1;
+ 	}
+ 
+-	if( sscanf( argv[ optind ], "%d.%d.%d.%d", &a, &b, &c, &d ) != 4 ||
+-	  a < 0 || a > 255 || b < 0 || b > 255 || c < 0 || c > 255 ||
+-	  d < 0 || d > 255 )
+-	{
++	fail = 0;
++	if (ent = gethostbyname(argv[optind])) {
++		memcpy(&a, ent->h_addr_list[0], sizeof(a));
++		if (ent->h_addr_list[1]) {
++			fprintf(stderr, "%s resolved to mutiple addresses: ",
++				argv[optind]);
++		}
++		fprintf(stderr, "checking %s\n", inet_ntoa(a));
++	} else {
++		if (!inet_aton(argv[optind], &a))
++			fail++;
++	}
++
++	if (fail) {
+ 		fprintf( stderr, "%s: invalid IP address\n", progname );
+ 		usage();	
+ 		return -1;
+@@ -383,7 +400,7 @@
+ 
+ 	for( ptr = rblsites; ptr != NULL; ptr = ptr->next )
+ 	{
+-		response = rblcheck( a, b, c, d, ptr->site, txt );
++		response = rblcheck( a, ptr->site, txt );
+ 		printf( "%s%s%s%s%s%s", !quiet && !response ? "not " : "",
+ 		  !quiet ? "RBL filtered by " : "", !quiet ? ptr->site : "",
+ 		  txt && response && strlen( response ) && !quiet ? ": " : "",