diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2001-08-18 06:04:35 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2001-08-18 06:04:35 +0000 |
commit | 79ece2819a6cec530f8ee1cb98f1284c96431092 (patch) | |
tree | 700f2711c8b07b00bb82a009582c0fc8c54f8f27 /mail/rblcheck | |
parent | Upgrade to 1.2.2 (diff) |
ORBS is no longer in existence, so we need to remove it from rblcheck
PR: 29029
Submitted by: Scot W. Hetzel <root@gifw.genroco.com>
Notes
Notes:
svn path=/head/; revision=46409
Diffstat (limited to 'mail/rblcheck')
-rw-r--r-- | mail/rblcheck/Makefile | 17 | ||||
-rw-r--r-- | mail/rblcheck/files/patch-aa | 33 | ||||
-rw-r--r-- | mail/rblcheck/scripts/configure.rbl | 102 |
3 files changed, 130 insertions, 22 deletions
diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile index e691f0c6420e..874da2c07aa9 100644 --- a/mail/rblcheck/Makefile +++ b/mail/rblcheck/Makefile @@ -7,12 +7,29 @@ PORTNAME= rblcheck PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org +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 + +pre-build +.if exists(${WRKDIRPREFIX}${.CURDIR}/local.sites) + ${CAT} ${WRKDIRPREFIX}${.CURDIR}/local.sites >> ${WRKSRC}/rblsites.h +.endif + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rblcheck ${PREFIX}/bin .if !defined(NOPORTDOCS) diff --git a/mail/rblcheck/files/patch-aa b/mail/rblcheck/files/patch-aa index 1ecf5d6a2ddd..4caceae9bc30 100644 --- a/mail/rblcheck/files/patch-aa +++ b/mail/rblcheck/files/patch-aa @@ -1,5 +1,5 @@ ---- rblcheck.c Tue May 22 18:49:03 2001 -+++ rblcheck.c Tue May 22 18:49:47 2001 +--- 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> @@ -74,7 +74,7 @@ { if( *cp == '\n' || *cp == '"' || *cp == '\\' ) -@@ -308,23 +313,40 @@ +@@ -308,23 +313,27 @@ char **argv; { extern int optind; @@ -91,25 +91,14 @@ + 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. ### */ +- /* 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 ); -+ -+ /* MAPS: Mail Abuse Protection System - http://mail-abuse.org */ -+ rblsites = togglesite( "blackholes.mail-abuse.org", rblsites ); -+ rblsites = togglesite( "relays.mail-abuse.org", rblsites ); -+ rblsites = togglesite( "dialups.mail-abuse.org", rblsites ); -+ -+ /* ORBS: Open Relay Behaviour-modification System - http://www.orbs.org */ -+ rblsites = togglesite( "inputs.orbs.org", rblsites ); -+ rblsites = togglesite( "outputs.orbs.org", rblsites ); -+ rblsites = togglesite( "delayed-outputs.orbs.org", rblsites ); -+ rblsites = togglesite( "manual.orbs.org", rblsites ); -+ rblsites = togglesite( "spamsources.orbs.org", rblsites ); -+ rblsites = togglesite( "untestable-netblocks.orbs.org", rblsites ); -+ rblsites = togglesite( "spamsource-netblocks.orbs.org", rblsites ); -+ rblsites = togglesite( "testing.orbs.org", 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 ]; @@ -120,7 +109,7 @@ { case 'q': /* Quiet */ -@@ -372,10 +394,23 @@ +@@ -372,10 +381,23 @@ return -1; } @@ -148,7 +137,7 @@ fprintf( stderr, "%s: invalid IP address\n", progname ); usage(); return -1; -@@ -383,7 +418,7 @@ +@@ -383,7 +405,7 @@ for( ptr = rblsites; ptr != NULL; ptr = ptr->next ) { diff --git a/mail/rblcheck/scripts/configure.rbl b/mail/rblcheck/scripts/configure.rbl new file mode 100644 index 000000000000..3bb5edabf756 --- /dev/null +++ b/mail/rblcheck/scripts/configure.rbl @@ -0,0 +1,102 @@ +#!/bin/sh +# $FreeBSD: /tmp/pcvs/ports/mail/rblcheck/scripts/Attic/configure.rbl,v 1.1 2001-08-18 06:04:35 ijliao 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 |