ports/98390: [PATCH] sysutils/ucspi-tcp: Add a new qmail related patch

[Renato Botelho]

>Number:         98390
>Category:       ports
>Synopsis:       [PATCH] sysutils/ucspi-tcp: Add a new qmail related 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:   Fri Jun 02 19:00:29 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Renato Botelho
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD data.galle.com.br 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue May 23 18:08:29 BRST 2006
>Description:
Users of qmail uses ucspi-tcp with RSS_DIFF option selected. With this
option, rblsmtpd, if matches the IP, open a fake smtp server.

It's not so good, because if person want to auth on server and prove he is a
valid user he doesn't have chance.

I made this new patch, and, if you set an environment var named RBL2SMTPD,
it accept the connection and call qmail-smtpd with this envvar set, so,
qmail-smtpd will check this.

I'm working now on qmail-smtpd patch to check this.

Added file(s):
- files/extra-patch-rblsmtpd.c

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

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- ucspi-tcp-0.88_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/ucspi-tcp/Makefile,v
retrieving revision 1.24
diff -u -u -r1.24 Makefile
--- Makefile	14 May 2006 13:30:24 -0000	1.24
+++ Makefile	2 Jun 2006 18:45:58 -0000
@@ -40,6 +40,7 @@
 PATCH_SITES+=	http://www.qmail.org/
 PATCHFILES+=	ucspi-rss.diff
 PATCH_DIST_STRIP=	-p1
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-rblsmtpd.c
 .endif
 
 .if defined(WITH_SSL)
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/sysutils/ucspi-tcp/distinfo,v
retrieving revision 1.6
diff -u -u -r1.6 distinfo
--- distinfo	6 Nov 2005 17:43:54 -0000	1.6
+++ distinfo	2 Jun 2006 18:45:58 -0000
@@ -1,8 +1,12 @@
 MD5 (ucspi-tcp-0.88.tar.gz) = 39b619147db54687c4a583a7a94c9163
+SHA256 (ucspi-tcp-0.88.tar.gz) = 4a0615cab74886f5b4f7e8fd32933a07b955536a3476d74ea087a3ea66a23e9c
 SIZE (ucspi-tcp-0.88.tar.gz) = 53019
 MD5 (ucspi-tcp-0.88-man.tar.gz) = d33160cbd43bccbc0963d0499dfcebdb
+SHA256 (ucspi-tcp-0.88-man.tar.gz) = 09b1dd69ca3722b62c030abb27df9560cb72ff5d6247e4628e0c61e957b408ef
 SIZE (ucspi-tcp-0.88-man.tar.gz) = 7562
 MD5 (ucspi-rss.diff) = 554ec0eb60f619667efde3fb5325310d
+SHA256 (ucspi-rss.diff) = 5101354eb86d8e11edefd7b83df4e9c274a55b845f4cb2ce36dda912aced56f4
 SIZE (ucspi-rss.diff) = 1828
 MD5 (ucspi-tcp-ssl-20050405.patch.gz) = cbe2443539d5289ffb5ae2a036e0ba3d
+SHA256 (ucspi-tcp-ssl-20050405.patch.gz) = 931ebeb9ca3ceb9394464aca0c4585048d04fc194fc5a9d4bb49bdd8ac249467
 SIZE (ucspi-tcp-ssl-20050405.patch.gz) = 13173
Index: files/extra-patch-rblsmtpd.c
===================================================================
RCS file: files/extra-patch-rblsmtpd.c
diff -N files/extra-patch-rblsmtpd.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/extra-patch-rblsmtpd.c	2 Jun 2006 18:45:58 -0000
@@ -0,0 +1,18 @@
+--- rblsmtpd.c.orig	Fri Jun  2 15:10:32 2006
++++ rblsmtpd.c	Fri Jun  2 15:33:31 2006
+@@ -229,8 +229,12 @@
+   if (!*argv) usage();
+ 
+   if (flagwantdefaultrbl) rbl("rbl.maps.vix.com");
+-  if (decision >= 2) rblsmtpd();
+-
+-  pathexec_run(*argv,argv,envp);
++  if (env_get("RBL2SMTPD")) {
++    if (decision >= 2) pathexec_env("RBL2SMTPD", text.s);
++    pathexec(argv);
++  } else {
++    if (decision >= 2) rblsmtpd();
++    pathexec_run(*argv,argv,envp);
++  }
+   strerr_die4sys(111,FATAL,"unable to run ",*argv,": ");
+ }
--- ucspi-tcp-0.88_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: