From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jun 2 19:00:31 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1EAD916A52F for ; Fri, 2 Jun 2006 19:00:31 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AE4C43D53 for ; Fri, 2 Jun 2006 19:00:30 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k52J0UMK055909 for ; Fri, 2 Jun 2006 19:00:30 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k52J0U9x055908; Fri, 2 Jun 2006 19:00:30 GMT (envelope-from gnats) Resent-Date: Fri, 2 Jun 2006 19:00:30 GMT Resent-Message-Id: <200606021900.k52J0U9x055908@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Renato Botelho Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9545F16A427 for ; Fri, 2 Jun 2006 18:51:52 +0000 (UTC) (envelope-from garga@data.galle.com.br) Received: from data.galle.com.br (data.galle.com.br [200.246.25.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7DFEC43D78 for ; Fri, 2 Jun 2006 18:51:47 +0000 (GMT) (envelope-from garga@data.galle.com.br) Received: from data.galle.com.br (data.galle.com.br [200.246.25.10]) by data.galle.com.br (8.13.6/8.13.6) with ESMTP id k52IpjhQ078465; Fri, 2 Jun 2006 15:51:45 -0300 (BRST) (envelope-from garga@data.galle.com.br) Received: (from garga@localhost) by data.galle.com.br (8.13.6/8.13.6/Submit) id k52Ipck4078455; Fri, 2 Jun 2006 15:51:38 -0300 (BRST) (envelope-from garga) Message-Id: <200606021851.k52Ipck4078455@data.galle.com.br> Date: Fri, 2 Jun 2006 15:51:38 -0300 (BRST) From: Renato Botelho To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dom@happygiraffe.net Subject: ports/98390: [PATCH] sysutils/ucspi-tcp: Add a new qmail related patch X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Jun 2006 19:00:33 -0000 >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@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: