ports/68828: [PATCH] sysutils/ucspi-tcp: Apply ucspi-rss.diff patch
Renato Botelho
garga at brainsoft.com.br
Thu Jul 8 19:20:24 UTC 2004
>Number: 68828
>Category: ports
>Synopsis: [PATCH] sysutils/ucspi-tcp: Apply ucspi-rss.diff patch
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 08 19:20:23 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Renato Botelho
>Release: FreeBSD 5.2.1-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD srv2.galle.com.br 5.2.1-RELEASE-p9 FreeBSD 5.2.1-RELEASE-p9 #8: Thu Jul 1 10:59:34 BRT
>Description:
- Apply ucspi-rss.diff patch
- Remove FATAL messages from portlint
- Bump PORTREVISION
Port maintainer (dom at happygiraffe.net) is cc'd.
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- ucspi-tcp-0.88_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/ucspi-tcp.orig/Makefile /usr/ports/sysutils/ucspi-tcp/Makefile
--- /usr/ports/sysutils/ucspi-tcp.orig/Makefile Fri Feb 21 10:28:55 2003
+++ /usr/ports/sysutils/ucspi-tcp/Makefile Thu Jul 8 16:14:24 2004
@@ -7,10 +7,14 @@
PORTNAME= ucspi-tcp
PORTVERSION= 0.88
+PORTREVISION= 1
CATEGORIES= sysutils net
MASTER_SITES= http://cr.yp.to/ucspi-tcp/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+MAINTAINER= dom at happygiraffe.net
+COMMENT= Command-line tools for building TCP client-server applications
+
.if !defined(WITHOUT_MAN)
MASTER_SITES+= http://smarden.org/pape/djb/manpages/:1
DISTFILES+= ${DISTNAME}-man.tar.gz:1
@@ -20,9 +24,6 @@
tcpclient.1 tcprules.1 tcprulescheck.1 tcpserver.1 who at .1
.endif
-MAINTAINER= dom at happygiraffe.net
-COMMENT= Command-line tools for building TCP client-server applications
-
NO_PACKAGE= "Unsure of djb\'s license"
ALL_TARGET= prog install instcheck
@@ -36,11 +37,11 @@
@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
do-install:
-.for file in addcr argv0 delcr fixcrio mconnect-io rblsmtpd recordio tcpclient tcprules tcprulescheck tcpserver
- @${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
+.for file_name in addcr argv0 delcr fixcrio mconnect-io rblsmtpd recordio tcpclient tcprules tcprulescheck tcpserver
+ @${INSTALL_PROGRAM} ${WRKSRC}/${file_name} ${PREFIX}/bin
.endfor
-.for file in date@ finger@ http@ mconnect who@ tcpcat
- @${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin
+.for file_name in date@ finger@ http@ mconnect who@ tcpcat
+ @${INSTALL_SCRIPT} ${WRKSRC}/${file_name} ${PREFIX}/bin
.endfor
.if !defined(WITHOUT_MAN)
@cd ${WRKSRC}-man; ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/
diff -ruN --exclude=CVS /usr/ports/sysutils/ucspi-tcp.orig/files/patch-ucspi-rss.diff /usr/ports/sysutils/ucspi-tcp/files/patch-ucspi-rss.diff
--- /usr/ports/sysutils/ucspi-tcp.orig/files/patch-ucspi-rss.diff Wed Dec 31 21:00:00 1969
+++ /usr/ports/sysutils/ucspi-tcp/files/patch-ucspi-rss.diff Thu Jul 8 16:01:47 2004
@@ -0,0 +1,64 @@
+diff -ruN --exclude conf-* ucspi-tcp-0.88/rblsmtpd.c ucspi-tcp-0.88.fix/rblsmtpd.c
+--- rblsmtpd.c.orig Sat Mar 18 10:18:42 2000
++++ rblsmtpd.c Wed Aug 9 16:42:33 2000
+@@ -60,16 +60,54 @@
+
+ void rbl(char *base)
+ {
++ int i;
++ char *altreply = 0;
+ if (decision) return;
+ if (!stralloc_copy(&tmp,&ip_reverse)) nomem();
++ i = str_chr(base, ':');
++ if (base[i]) {
++ base[i] = 0;
++ altreply = base+i+1;
++ }
+ if (!stralloc_cats(&tmp,base)) nomem();
+- if (dns_txt(&text,&tmp) == -1) {
+- flagmustnotbounce = 1;
+- if (flagfailclosed) {
+- if (!stralloc_copys(&text,"temporary RBL lookup error")) nomem();
+- decision = 2;
++ if (altreply) {
++ if (dns_ip4(&text,&tmp) == -1) {
++ flagmustnotbounce = 1;
++ if (flagfailclosed) {
++ if (!stralloc_copys(&text,"temporary RBL lookup error")) nomem();
++ decision = 2;
++ }
++ return;
++ }
++ if (text.len) {
++ if(!stralloc_copys(&text, "")) nomem();
++ while(*altreply) {
++ char *x;
++ i = str_chr(altreply, '%');
++ if(!stralloc_catb(&text, altreply, i)) nomem();
++ if(altreply[i] &&
++ altreply[i+1]=='I' &&
++ altreply[i+2]=='P' &&
++ altreply[i+3]=='%') {
++ if(!stralloc_catb(&text, ip_env, str_len(ip_env))) nomem();
++ altreply+=i+4;
++ } else if(altreply[i]) {
++ if(!stralloc_cats(&text, "%")) nomem();
++ altreply+=i+1;
++ } else {
++ altreply+=i;
++ }
++ }
++ }
++ } else {
++ if (dns_txt(&text,&tmp) == -1) {
++ flagmustnotbounce = 1;
++ if (flagfailclosed) {
++ if (!stralloc_copys(&text,"temporary RBL lookup error")) nomem();
++ decision = 2;
++ }
++ return;
+ }
+- return;
+ }
+ if (text.len)
+ if (flagrblbounce)
--- ucspi-tcp-0.88_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list