From tony@lava.net  Sun Jul 19 01:44:07 2009
Return-Path: <tony@lava.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1AD16106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 19 Jul 2009 01:44:07 +0000 (UTC)
	(envelope-from tony@lava.net)
Received: from outgoing02.lava.net (pie.lava.net [IPv6:2001:1888:0:1:230:48ff:fe5b:3b8c])
	by mx1.freebsd.org (Postfix) with ESMTP id C5ED88FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 19 Jul 2009 01:44:06 +0000 (UTC)
	(envelope-from tony@lava.net)
Received: from guriguri.lava.net (guriguri.lava.net [IPv6:2001:1888:0:1:2d0:b7ff:fe7d:bed6])
	by outgoing02.lava.net (Postfix) with ESMTP id 03E3F170642
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 18 Jul 2009 15:44:04 -1000 (HST)
Received: by guriguri.lava.net (Postfix, from userid 2489)
	id 77FEF564A0; Sat, 18 Jul 2009 15:44:04 -1000 (HST)
Message-Id: <20090719014404.77FEF564A0@guriguri.lava.net>
Date: Sat, 18 Jul 2009 15:44:04 -1000 (HST)
From: Antonio Querubin <tony@lava.net>
Reply-To: Antonio Querubin <tony@lava.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Fixup username in prayer-cyclog
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         136892
>Category:       ports
>Synopsis:       mail/prayer: fixup username in prayer-cyclog
>Confidential:   no
>Severity:       serious
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 19 01:50:02 UTC 2009
>Closed-Date:    Wed Sep 16 16:34:03 UTC 2009
>Last-Modified:  Wed Sep 16 16:34:03 UTC 2009
>Originator:     Antonio Querubin
>Release:        FreeBSD 7.1-RELEASE-p6 i386
>Organization:
LavaNet
>Environment:
System: FreeBSD guriguri.lava.net 7.1-RELEASE-p6 FreeBSD 7.1-RELEASE-p6 #0: Tue Jun 9 16:26:47 UTC 2009 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


>Description:
	prayer-cyclog uses a different username from the default config
	and what is created by pkg-install.  The current Makefile and 
	pkg-install install a username of '_prayer'.  However,
	prayer-cyclog assumes a username of 'prayer'.  This causes 
	run-time errors when prayer-cyclog is run.
	
>How-To-Repeat:
	Install prayer on a clean system.
	Run prayer-cyclog.

>Fix:
	Update the ports/prayer Makefile so that the username used 
	by prayer-cyclog matches the installed username:

--- Makefile.orig	2009-07-18 15:03:01.000000000 -1000
+++ Makefile	2009-07-18 15:07:20.000000000 -1000
@@ -47,8 +47,9 @@
 post-patch:
 	# correct chroot
 	@${REINPLACE_CMD} "s#\"/chroot/prayer\"#config->var_prefix#" ${WRKSRC}/servers/prayer_chroot.c
-	# change the user in the default config
+	# change the user in the default config and cyclog util
 	@${REINPLACE_CMD} "s#prayer_user           = \"prayer\"#prayer_user           = \"_prayer\"#" ${WRKSRC}/files/etc/prayer.cf.SRC
+	@${REINPLACE_CMD} "s#\"prayer\" \"prayer\"#\"_prayer\" \"prayer\"#" ${WRKSRC}/utils/prayer-cyclog.SRC
 	@${REINPLACE_CMD} "s#%%PREFIX%%#${PREFIX}#" ${WRKSRC}/Config
 
 post-configure:
>Release-Note:
>Audit-Trail:

From: Antonio Querubin <tony@lava.net>
To: bug-followup@FreeBSD.org,
 tony@lava.net
Cc:  
Subject: Re: ports/136892: Fixup username in prayer-cyclog
Date: Sun, 19 Jul 2009 01:22:04 -1000

 This applies to the mail/prayer port.

From: Baptiste Daroussin <baptiste.daroussin@gmail.com>
To: bug-followup@FreeBSD.org, tony@lava.net
Cc:  
Subject: Re: ports/136892: mail/prayer: fixup username in prayer-cyclog
Date: Fri, 21 Aug 2009 21:29:08 +0200

 --001517473644c8dbb90471abe194
 Content-Type: text/plain; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 the patch is ok for me and can be applied,
 
 thanks,
 Bapt
 
 --001517473644c8dbb90471abe194
 Content-Type: text/html; charset=ISO-8859-1
 Content-Transfer-Encoding: 7bit
 
 the patch is ok for me and can be applied, <br><br>thanks,<br>Bapt<br>
 
 --001517473644c8dbb90471abe194--
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Wed Sep 16 16:34:03 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=136892 
>Unformatted:
