Attachment 21426 Details for Bug 37575 – rblcheck.diff

[patch] rblcheck.diff

rblcheck.diff (text/plain), 10.49 KB, created by Yen-Ming Lee on 2002-04-29 19:30:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yen-Ming Lee

Created: 2002-04-29 19:30:01 UTC

Size: 10.49 KB

patch

obsolete

>diff -ruN --exclude CVS /usr/ports/mail/rblcheck/Makefile rblcheck/Makefile
>--- /usr/ports/mail/rblcheck/Makefile	Sat Aug 25 00:08:10 2001
>+++ rblcheck/Makefile	Tue Apr 30 01:56:38 2002
>@@ -6,35 +6,31 @@
> #
> 
> PORTNAME=	rblcheck
>-PORTVERSION=	1.4
>-PORTREVISION=	2
>+PORTVERSION=	1.5
> CATEGORIES=	mail
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	leeym@leeym.com
> 
>-post-configure:
>-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.rbl
>-.if !defined(BATCH)
>-	@${ECHO} "NOTE: You can pre-compile your own sites into rblcheck by"
>-	@${ECHO} "      creating ${WRKDIRPREFIX}${.CURDIR}/local.sites.  The"
>-	@${ECHO} "      format of this file is:"
>-	@${ECHO}
>-	@${ECHO} "             SITE(\"my.rbl.site\")"
>-	@${ECHO} "             SITE(\"another.rbl.site\")"
>-.endif
>+USE_GMAKE=	yes
>+GNU_CONFIGURE=	yes
> 
>-pre-build:
>-.if exists(${WRKDIRPREFIX}${.CURDIR}/local.sites)
>-	${CAT} ${WRKDIRPREFIX}${.CURDIR}/local.sites >> ${WRKSRC}/rblsites.h
>-.endif
>+post-build:
>+	@${PERL} -pi -e 's,/usr/local,${PREFIX},g' ${WRKSRC}/rbl
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${PREFIX}/bin
>+	@${INSTALL_SCRIPT} ${WRKSRC}/rbl ${PREFIX}/bin
>+	@${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${PREFIX}/bin
>+	@${INSTALL_DATA} ${FILESDIR}/rblcheckrc.sample ${PREFIX}/etc
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${PREFIX}/share/doc/rblcheck
>-	${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/rblcheck
>+	@${MKDIR} ${DOCSDIR}
>+.for file in AUTHORS COPYING ChangeLog INSTALL NEWS README
>+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
>+.endfor
> .endif
>+
>+post-install:
>+	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.mk>
>diff -ruN --exclude CVS /usr/ports/mail/rblcheck/distinfo rblcheck/distinfo
>--- /usr/ports/mail/rblcheck/distinfo	Tue Oct 20 00:51:12 1998
>+++ rblcheck/distinfo	Sat Mar 16 01:26:45 2002
>@@ -1 +1 @@
>-MD5 (rblcheck-1.4.tar.gz) = 6e415c34fd249333c057a4aedecd8877
>+MD5 (rblcheck-1.5.tar.gz) = fb7ee9adc0e09eee9dda195f9b9e7ca4
>diff -ruN --exclude CVS /usr/ports/mail/rblcheck/files/patch-aa rblcheck/files/patch-aa
>--- /usr/ports/mail/rblcheck/files/patch-aa	Sat Aug 18 14:04:35 2001
>+++ rblcheck/files/patch-aa	Thu Jan  1 08:00:00 1970
>@@ -1,148 +0,0 @@
>---- rblcheck.c.orig	Thu Aug 20 00:47:03 1998
>-+++ rblcheck.c	Mon Jul 16 16:40:55 2001
>-@@ -79,8 +79,10 @@
>- #include <sys/types.h>
>- #include <netinet/in.h>
>- #include <arpa/nameser.h>
>-+#include <arpa/inet.h>
>- #include <resolv.h>
>- #include <netdb.h>
>-+#include <unistd.h>
>- 
>- #define VERSION "1.4"
>- 
>-@@ -203,7 +205,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 +216,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 +266,8 @@
>- 	cp = answer + sizeof( HEADER );
>- 	while( *cp != '\0' )
>- 	{
>--		a = *cp++;
>--		while( a-- )
>-+		i = *cp++;
>-+		while( i-- )
>- 			cp++;
>- 	}
>- 
>-@@ -277,8 +282,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 +291,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 +313,27 @@
>- 	char **argv;
>- {
>- 	extern int optind;
>--	int a, b, c, d;
>-+	extern char *optarg;
>-+	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 );
>-+/* Hack to handle the easy addition of sites at compile time */
>-+#define SITE(x) rblsites = togglesite( (x), rblsites);
>-+#include "rblsites.h"
>-+#undef SITE
>- 
>- 	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 +381,23 @@
>- 		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])) != NULL) {
>-+		memcpy(&a, ent->h_addr_list[0], sizeof(a));
>-+		if (ent->h_addr_list[1]) {
>-+			if (!quiet)
>-+				fprintf(stderr,
>-+				    "%s resolved to mutiple addresses: ",
>-+				    argv[optind]);
>-+		}
>-+		if (!quiet)
>-+			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 +405,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 ? ": " : "",
>diff -ruN --exclude CVS /usr/ports/mail/rblcheck/files/patch-ab rblcheck/files/patch-ab
>--- /usr/ports/mail/rblcheck/files/patch-ab	Thu Nov  5 20:18:26 1998
>+++ rblcheck/files/patch-ab	Thu Jan  1 08:00:00 1970
>@@ -1,8 +0,0 @@
>---- Makefile.orig	Thu Aug 20 01:47:03 1998
>-+++ Makefile	Wed Nov  4 15:56:48 1998
>-@@ -41,4 +41,3 @@
>- # below for an entry for your system.
>--CC=gcc
>--CFLAGS=-O -Wall
>-+CFLAGS+=-Wall
>- LDFLAGS=-s
>diff -ruN --exclude CVS /usr/ports/mail/rblcheck/files/rblcheckrc.sample rblcheck/files/rblcheckrc.sample
>--- /usr/ports/mail/rblcheck/files/rblcheckrc.sample	Thu Jan  1 08:00:00 1970
>+++ rblcheck/files/rblcheckrc.sample	Tue Apr 30 01:49:58 2002
>@@ -0,0 +1,9 @@
>+-s dev.null.dk
>+-s blackholes.mail-abuse.org
>+-s relays.mail-abuse.org
>+-s dialups.mail-abuse.org
>+-s 3y.spam.mrs.kithrup.com
>+-s or.orbl.org
>+-s orbz.gst-group.co.uk
>+-s manual.orbz.gst-group.co.uk
>+-s relays.ordb.org
>diff -ruN --exclude CVS /usr/ports/mail/rblcheck/pkg-message rblcheck/pkg-message
>--- /usr/ports/mail/rblcheck/pkg-message	Thu Jan  1 08:00:00 1970
>+++ rblcheck/pkg-message	Tue Apr 30 01:55:07 2002
>@@ -0,0 +1,3 @@
>+
>+Please copy rblcheckrc.sample to rblcheckrc and modify it as you wish.
>+
>diff -ruN --exclude CVS /usr/ports/mail/rblcheck/pkg-plist rblcheck/pkg-plist
>--- /usr/ports/mail/rblcheck/pkg-plist	Mon Mar  5 00:56:32 2001
>+++ rblcheck/pkg-plist	Tue Apr 30 01:55:50 2002
>@@ -1,8 +1,10 @@
>+bin/rbl
> bin/rblcheck
>-%%PORTDOCS%%share/doc/rblcheck/BUGS
>-%%PORTDOCS%%share/doc/rblcheck/CHANGES
>-%%PORTDOCS%%share/doc/rblcheck/CREDITS
>+etc/rblcheckrc.sample
>+%%PORTDOCS%%share/doc/rblcheck/AUTHORS
>+%%PORTDOCS%%share/doc/rblcheck/COPYING
>+%%PORTDOCS%%share/doc/rblcheck/ChangeLog
> %%PORTDOCS%%share/doc/rblcheck/INSTALL
>-%%PORTDOCS%%share/doc/rblcheck/PLATFORMS
>-%%PORTDOCS%%share/doc/rblcheck/TODO
>+%%PORTDOCS%%share/doc/rblcheck/NEWS
>+%%PORTDOCS%%share/doc/rblcheck/README
> %%PORTDOCS%%@dirrm share/doc/rblcheck
>diff -ruN --exclude CVS /usr/ports/mail/rblcheck/scripts/configure.rbl rblcheck/scripts/configure.rbl
>--- /usr/ports/mail/rblcheck/scripts/configure.rbl	Sat Aug 25 00:08:10 2001
>+++ rblcheck/scripts/configure.rbl	Thu Jan  1 08:00:00 1970
>@@ -1,102 +0,0 @@
>-#!/bin/sh
>-# $FreeBSD: ports/mail/rblcheck/scripts/configure.rbl,v 1.4 2001/08/24 16:08:10 dwcjr Exp $
>-
>-if [ -f ${WRKSRC}/rblsites.h ]; then
>-	exit
>-fi
>-
>-tempfile=`mktemp -t checklist`
>-
>-SET_MAPS_RBL="OFF"
>-SET_MAPS_DUL="OFF"
>-SET_MAPS_RSS="OFF"
>-SET_ORBL="OFF"
>-SET_ORBZ="OFF"
>-SET_ORBZ_MAN="OFF"
>-SET_ORDB="OFF"
>-
>-TODAY=`date "+%Y%m%d"`
>-
>-if [ "${BATCH}" ]; then
>-	# MAPS is changing to a subscription service on 20010731
>-	if [ ${TODAY} -lt 20010801 ]; then
>-		OPTIONS="\"MAPS_RBL\" \"MAPS_DUL\" \"MAPS_RSS\""
>-	else
>-		OPTIONS="\"ORBZ\""
>-	fi
>-	if [ "x${OPTIONS}" != "x" ]; then
>-		set ${OPTIONS}
>-	fi
>-else
>-	# MAPS is changing to a subscription service on 20010731
>-	if [ ${TODAY} -lt 20010801 ]; then
>-		SET_MAPS_RBL="ON"
>-		SET_MAPS_DUL="ON"
>-		SET_MAPS_RSS="ON"
>-	else
>-		SET_ORBZ="ON"
>-	fi
>-
>-	/usr/bin/dialog --title "RBL Sites" --clear \
>-		--checklist "\n\
>-Please select desired options:" -1 -1 16 \
>-MAPS_RBL	"MAPS Blackhole list   www.mail-abuse.org" ${SET_MAPS_RBL} \
>-MAPS_DUL	"MAPS DialUp List      www.mail-abuse.org" ${SET_MAPS_DUL} \
>-MAPS_RSS	"MAPS Open Relay list  www.mail-abuse.org" ${SET_MAPS_RSS} \
>-ORBL		"ORBL Open Relay list  www.orbl.org" ${SET_ORBL} \
>-ORBZ		"ORBZ Open Relay list  orbz.gst-group.co.uk" ${SET_ORBZ} \
>-ORBZ_MAN	"ORBZ Manual list      orbz.gst-group.co.uk" ${SET_ORBZ_MAN} \
>-ORDB		"ORDB Open Relay list  www.ordb.org" ${SET_ORDB} \
>-2> $tempfile
>-
>-	retval=$?
>-
>-	if [ -s $tempfile ]; then
>-		set `cat $tempfile`
>-	fi
>-	rm -f $tempfile
>-
>-	case $retval in
>-		0)	if [ -z "$*" ]; then
>-				echo "Nothing selected"
>-			fi
>-			;;
>-		1)	echo "Cancel pressed."
>-			exit 1
>-			;;
>-	esac
>-fi
>-
>-exec > ${WRKSRC}/rblsites.h
>-
>-while [ "$1" ]; do
>-	case $1 in
>-		\"MAPS_RBL\")
>-			echo "SITE(\"blackholes.mail-abuse.org\")"
>-			;;
>-		\"MAPS_DUL\")
>-			echo "SITE(\"dialups.mail-abuse.org\")"
>-			;;
>-		\"MAPS_RSS\")
>-			echo "SITE(\"relays.mail-abuse.org\")"
>-			;;
>-		\"ORBL\")
>-			echo "SITE(\"or.orbl.org\")"
>-			;;
>-		\"ORBZ\")
>-			echo "SITE(\"orbz.gst-group.co.uk\")"
>-			;;
>-		\"ORBZ_MAN\")
>-			echo "SITE(\"manual.orbz.gst-group.co.uk\")"
>-			;;
>-		\"ORDB\")
>-			echo "SITE(\"relays.ordb.org\")"
>-			;;
>-		*)
>-			echo "Invalid option(s): $*" > /dev/stderr
>-			rm -f ${WRKSRC}/rblsites.h
>-			exit 1
>-			;;
>-	esac
>-	shift
>-done

Actions: View | Diff

Attachments on bug 37575: 21426 | 21427