ports/77397: [PATCH] sysutils/ucspi-tcp: make ucspi-rss.diff patch optional, SIZEify

[Renato Botelho]

>Number:         77397
>Category:       ports
>Synopsis:       [PATCH] sysutils/ucspi-tcp: make ucspi-rss.diff patch optional, SIZEify
>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:   Fri Feb 11 18:40:24 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Renato Botelho
>Release:        FreeBSD 5.3-RELEASE-p5 i386
>Organization:
Galle Folheados
>Environment:
System: FreeBSD srv1.galle.com.br 5.3-RELEASE-p5 FreeBSD 5.3-RELEASE-p5 #6: Mon Jan 17 09:05:47 BRDT 2005
>Description:
- Put an option WITH_RSS_DIFF to apply ucspi-rss.diff, like Volker told on the old PR, this is not a mandatory patch. It´s useful just with qmail. I didn´t change PORTREVISION, is it necessary?
- SIZEify

Removed file(s):
- files/patch-ucspi-rss.diff

Port maintainer (dom at happygiraffe.net) is cc'd.

Generated with FreeBSD Port Tools 0.63
>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 11 16:27:21 2005
+++ /usr/ports/sysutils/ucspi-tcp/Makefile	Fri Feb 11 16:30:18 2005
@@ -12,6 +12,12 @@
 MASTER_SITES=	http://cr.yp.to/ucspi-tcp/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
+.if defined(WITH_RSS_DIFF)
+PATCH_SITES=	http://www.qmail.org/
+PATCHFILES=	ucspi-rss.diff
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER=	dom at happygiraffe.net
 COMMENT=	Command-line tools for building TCP client-server applications
 
@@ -31,6 +37,8 @@
 SCRIPTS_ENV=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \
 		MANMODE="${MANMODE}" CFLAGS="${CFLAGS}"
 
+.include <bsd.port.pre.mk>
+
 post-configure:
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home
 	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
@@ -47,4 +55,4 @@
 	@cd ${WRKSRC}-man; ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/sysutils/ucspi-tcp.orig/distinfo /usr/ports/sysutils/ucspi-tcp/distinfo
--- /usr/ports/sysutils/ucspi-tcp.orig/distinfo	Wed Aug 21 16:51:13 2002
+++ /usr/ports/sysutils/ucspi-tcp/distinfo	Fri Feb 11 16:15:16 2005
@@ -1,2 +1,6 @@
 MD5 (ucspi-tcp-0.88.tar.gz) = 39b619147db54687c4a583a7a94c9163
+SIZE (ucspi-tcp-0.88.tar.gz) = 53019
 MD5 (ucspi-tcp-0.88-man.tar.gz) = d33160cbd43bccbc0963d0499dfcebdb
+SIZE (ucspi-tcp-0.88-man.tar.gz) = 7562
+MD5 (ucspi-rss.diff) = 554ec0eb60f619667efde3fb5325310d
+SIZE (ucspi-rss.diff) = 1828
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	Fri Feb 11 15:40:59 2005
+++ /usr/ports/sysutils/ucspi-tcp/files/patch-ucspi-rss.diff	Wed Dec 31 21:00:00 1969
@@ -1,64 +0,0 @@
-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: