From daniel+roe=marvin@roe.ch  Fri Feb 13 12:29:25 2009
Return-Path: <daniel+roe=marvin@roe.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5CCFE106566C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 13 Feb 2009 12:29:25 +0000 (UTC)
	(envelope-from daniel+roe=marvin@roe.ch)
Received: from calvin.ustdmz.roe.ch (calvin.ustdmz.roe.ch [IPv6:2001:41e0:ff17:face::26])
	by mx1.freebsd.org (Postfix) with ESMTP id B4C7D8FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 13 Feb 2009 12:29:24 +0000 (UTC)
	(envelope-from daniel+roe=marvin@roe.ch)
Received: from host-178-185.csnc.ch ([212.254.178.185] helo=marvin.ustcor.roe.ch)
	by calvin.ustdmz.roe.ch (envelope-from <daniel+roe=marvin@roe.ch>)
	with ESMTPSA (auth=roe) (TLSv1:AES256-SHA:256) id 1LXxAZ-0004GS-7S
	for FreeBSD-gnats-submit@freebsd.org; Fri, 13 Feb 2009 13:29:23 +0100
Received: from roe (uid 1001)
	(envelope-from roe@marvin.ustcor.roe.ch)
	id af
	by marvin.ustcor.roe.ch (DragonFly Mail Agent)
	Fri, 13 Feb 2009 13:29:21 +0100
Message-Id: <E1LXxAZ-0004GS-7S@calvin.ustdmz.roe.ch>
Date: Fri, 13 Feb 2009 13:29:23 +0100
From: Daniel Roethlisberger <daniel@roe.ch>
Reply-To: Daniel Roethlisberger <daniel@roe.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: daniel@roe.ch
Subject: [maintainer] mail/dma - fix dma.rb wrapper for ruby w/o oniguruma
X-Send-Pr-Version: 3.113
X-GNATS-Notify: daniel@roe.ch

>Number:         131641
>Category:       ports
>Synopsis:       [maintainer] mail/dma - fix dma.rb wrapper for ruby w/o oniguruma
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 13 12:30:01 UTC 2009
>Closed-Date:    Fri Feb 13 20:19:26 UTC 2009
>Last-Modified:  Fri Feb 13 20:20:01 UTC 2009
>Originator:     Daniel Roethlisberger
>Release:        FreeBSD 7.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD marvin.ustcor.roe.ch 7.1-RELEASE FreeBSD 7.1-RELEASE #0: Thu Jan 1 14:37:25 UTC 2009 root@logan.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
Fix the dma.rb wrapper for sendmail -t support to not require
oniguruma support in ruby by removing the zero-width positive
lookbehind assertion.
>How-To-Repeat:
1) Use ruby with default knobs (i.e. without oniguruma).
2) Use dma.rb instead of dma in mailer.conf.
3) Send mail using sendmail -t (e.g. via send-pr).
>Fix:
--- dma-no-oniguruma.diff begins here ---
diff -ruN dma.orig/Makefile dma/Makefile
--- dma.orig/Makefile	2009-02-12 01:41:34.000000000 +0100
+++ dma/Makefile	2009-02-13 12:19:08.000000000 +0100
@@ -7,6 +7,7 @@
 
 PORTNAME=	dma
 PORTVERSION=	20090208
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://mirror.roe.ch/dist/dma/
 
diff -ruN dma.orig/files/dma.rb dma/files/dma.rb
--- dma.orig/files/dma.rb	2009-02-12 01:41:34.000000000 +0100
+++ dma/files/dma.rb	2009-02-13 12:20:04.000000000 +0100
@@ -35,7 +35,8 @@
 
 if ARGV.delete "-t"
 	msg = STDIN.read
-	head, cr, body = msg.split(/(?<=\n)(\r?)\n/, 2)
+	head, cr, body = msg.split(/\n(\r?)\n/, 2)
+	head = head + "\n"
 	tmphead = head.gsub(/\n\s+/m, ' ')
 	rcpts = []
 	tmphead.gsub(/^(?:to|cc|bcc):\s.*$/i) do |match|
--- dma-no-oniguruma.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: wxs 
Responsible-Changed-When: Fri Feb 13 14:14:23 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131641 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Fri Feb 13 20:19:24 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=131641 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/131641: commit references a PR
Date: Fri, 13 Feb 2009 20:19:13 +0000 (UTC)

 wxs         2009-02-13 20:19:04 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/dma             Makefile 
     mail/dma/files       dma.rb 
   Log:
   - Fix the dma.rb wrapper for sendmail -t support to not require
     oniguruma support in ruby by removing the zero-width positive
     lookbehind assertion.
   
   PR:             ports/131641
   Submitted by:   Daniel Roethlisberger <daniel@roe.ch> (maintainer)
   
   Revision  Changes    Path
   1.2       +1 -0      ports/mail/dma/Makefile
   1.2       +3 -2      ports/mail/dma/files/dma.rb
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
