File ucspi-tcp-0.88.nodefaultrbl.patch of Package ucspi-tcp
diff -rNU3 ucspi-tcp-0.88.orig/rblsmtpd.c ucspi-tcp-0.88/rblsmtpd.c
--- ucspi-tcp-0.88.orig/rblsmtpd.c 2012-10-04 13:06:57.000000000 +0200
+++ ucspi-tcp-0.88/rblsmtpd.c 2012-10-04 13:07:37.000000000 +0200
@@ -213,7 +213,6 @@
main(int argc,char **argv,char **envp)
{
- int flagwantdefaultrbl = 1;
char *x;
int opt;
unsigned long Timeout=0;
@@ -260,14 +259,13 @@
case 'c': flagfailclosed = 1; break;
case 'C': flagfailclosed = 0; break;
case 't': scan_ulong(optarg,&timeout); break;
- case 'r': lastrbl=optarg;rbl(optarg); flagwantdefaultrbl = 0; break;
+ case 'r': lastrbl=optarg;rbl(optarg); break;
case 'a': lastrbl=optarg;antirbl(optarg); break;
default: usage();
}
if (Timeout) { alarm(0); sig_uncatch(sig_alarm); }
- if (flagwantdefaultrbl) rbl("rbl.maps.vix.com");
if (decision >= 2) rblsmtpd();
run();
}
diff -rNU3 ucspi-tcp-0.88.orig/rts.tests ucspi-tcp-0.88/rts.tests
--- ucspi-tcp-0.88.orig/rts.tests 2000-03-18 16:18:42.000000000 +0100
+++ ucspi-tcp-0.88/rts.tests 2012-10-04 13:07:37.000000000 +0200
@@ -23,6 +23,7 @@
echo TCPREMOTEIP="${TCPREMOTEIP-unset}"
echo TCPREMOTEPORT="${TCPREMOTEPORT-unset}"
echo TCPREMOTEINFO="${TCPREMOTEINFO-unset}"
+ sleep 1
' > print
chmod 755 print
@@ -93,23 +94,28 @@
echo '--- tcpserver sets basic environment variables'
tcpclient -p 50017 -R -H -T 10 -l Local 0 50016 sh -c 'cat <&6'
echo $?
+sleep 1
echo '--- tcpclient recognizes -D, -i, -r, -h, -t'
tcpclient -Di 127.0.0.1 -p 50018 -hrt1 -l Local \
127.0.0.1 50016 sh -c 'cat <&6'
echo $?
+sleep 1
echo '--- tcpclient sets basic environment variables'
tcpclient -p 50019 -R -H -l Local 0 50016 ./print
echo $?
+sleep 1
echo '--- tcpclient looks up host names properly'
tcpclient -p 50020 -R 0 50016 ./print
echo $?
+sleep 1
echo '--- tcpclient -v works'
-tcpclient -v -R -H -l Local 0 50016 echo ok
+tcpclient -v -R -H -l Local 0 50016 sh -c 'echo ok; sleep 1'
echo $?
+sleep 1
echo '--- tcpserver prints error message with used port'
tcpserver -R -H -l Local 127.0.0.1 50016 echo wrong
@@ -118,6 +124,7 @@
echo '--- tcpcat works'
tcpcat 0 50016 | grep -v TCPREMOTEPORT
echo $?
+sleep 1
echo '--- mconnect works'
mconnect 0 50016 </dev/null | grep -v TCPREMOTEPORT
@@ -288,27 +295,27 @@
echo '--- rblsmtpd does not find 127.0.0.1 on the RBL'
( echo help; echo quit ) \
-| ( TCPREMOTEIP=127.0.0.1 rblsmtpd echo ok 2>&1; echo $? ) \
+| ( TCPREMOTEIP=127.0.0.1 rblsmtpd -r zen.spamhaus.org echo ok 2>&1; echo $? ) \
| sed 's/pid [0-9]*/pid x/'
echo '--- rblsmtpd finds 127.0.0.2 on the RBL'
( echo help; echo quit ) \
-| ( TCPREMOTEIP=127.0.0.2 rblsmtpd echo whoops 2>&1; echo $? ) \
+| ( TCPREMOTEIP=127.0.0.2 rblsmtpd -r zen.spamhaus.org echo whoops 2>&1; echo $? ) \
| sed 's/pid [0-9]*/pid x/'
echo '--- rblsmtpd -b uses a permanent error code'
( echo help; echo quit ) \
-| ( TCPREMOTEIP=127.0.0.2 rblsmtpd -b echo whoops 2>&1; echo $? ) \
+| ( TCPREMOTEIP=127.0.0.2 rblsmtpd -b -r zen.spamhaus.org echo whoops 2>&1; echo $? ) \
| sed 's/pid [0-9]*/pid x/'
echo '--- rblsmtpd quits after a timeout'
sleep 2 \
-| ( TCPREMOTEIP=127.0.0.2 rblsmtpd -cBt1 echo whoops 2>&1; echo $? ) \
+| ( TCPREMOTEIP=127.0.0.2 rblsmtpd -cBt1 -r zen.spamhaus.org echo whoops 2>&1; echo $? ) \
| sed 's/pid [0-9]*/pid x/'
echo '--- rblsmtpd prints an immediate error message with -t0'
sleep 2 \
-| ( TCPREMOTEIP=127.0.0.2 rblsmtpd -Ct0 echo whoops 2>&1; echo $? ) \
+| ( TCPREMOTEIP=127.0.0.2 rblsmtpd -Ct0 -r zen.spamhaus.org echo whoops 2>&1; echo $? ) \
| sed 's/pid [0-9]*/pid x/'
echo '--- rblsmtpd understands an empty $RBLSMTPD'
diff -rNU3 ucspi-tcp-0.88.orig/rts.exp ucspi-tcp-0.88/rts.exp
--- ucspi-tcp-0.88.orig/rts.exp 2000-03-18 16:18:42.000000000 +0100
+++ ucspi-tcp-0.88/rts.exp 2012-10-04 13:07:37.000000000 +0200
@@ -355,24 +355,24 @@
ok
0
--- rblsmtpd finds 127.0.0.2 on the RBL
-rblsmtpd: 127.0.0.2 pid x: 451 Blackholed - see <URL:http://mail-abuse.org/cgi-bin/lookup?127.0.0.2>
+rblsmtpd: 127.0.0.2 pid x: 451 http://www.spamhaus.org/SBL/sbl.lasso?query=SBL233http://www.spamhaus.org/query/bl?ip=127.0.0.2
220 rblsmtpd.local^M
-451 Blackholed - see <URL:http://mail-abuse.org/cgi-bin/lookup?127.0.0.2>^M
+451 http://www.spamhaus.org/SBL/sbl.lasso?query=SBL233http://www.spamhaus.org/query/bl?ip=127.0.0.2^M
221 rblsmtpd.local^M
0
--- rblsmtpd -b uses a permanent error code
-rblsmtpd: 127.0.0.2 pid x: 553 Blackholed - see <URL:http://mail-abuse.org/cgi-bin/lookup?127.0.0.2>
+rblsmtpd: 127.0.0.2 pid x: 553 http://www.spamhaus.org/SBL/sbl.lasso?query=SBL233http://www.spamhaus.org/query/bl?ip=127.0.0.2
220 rblsmtpd.local^M
-553 Blackholed - see <URL:http://mail-abuse.org/cgi-bin/lookup?127.0.0.2>^M
+553 http://www.spamhaus.org/SBL/sbl.lasso?query=SBL233http://www.spamhaus.org/query/bl?ip=127.0.0.2^M
221 rblsmtpd.local^M
0
--- rblsmtpd quits after a timeout
-rblsmtpd: 127.0.0.2 pid x: 451 Blackholed - see <URL:http://mail-abuse.org/cgi-bin/lookup?127.0.0.2>
+rblsmtpd: 127.0.0.2 pid x: 451 http://www.spamhaus.org/SBL/sbl.lasso?query=SBL233http://www.spamhaus.org/query/bl?ip=127.0.0.2
220 rblsmtpd.local^M
0
--- rblsmtpd prints an immediate error message with -t0
-rblsmtpd: 127.0.0.2 pid x: 451 Blackholed - see <URL:http://mail-abuse.org/cgi-bin/lookup?127.0.0.2>
-451 Blackholed - see <URL:http://mail-abuse.org/cgi-bin/lookup?127.0.0.2>^M
+rblsmtpd: 127.0.0.2 pid x: 451 http://www.spamhaus.org/SBL/sbl.lasso?query=SBL233http://www.spamhaus.org/query/bl?ip=127.0.0.2
+451 http://www.spamhaus.org/SBL/sbl.lasso?query=SBL233http://www.spamhaus.org/query/bl?ip=127.0.0.2^M
0
--- rblsmtpd understands an empty $RBLSMTPD
ok
