From nobody@FreeBSD.org  Thu Jun 14 07:44:15 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (unknown [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6C2A2106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Jun 2012 07:44:15 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [69.147.83.34])
	by mx1.freebsd.org (Postfix) with ESMTP id 56BAD8FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Jun 2012 07:44:15 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id q5E7iFj1079614
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Jun 2012 07:44:15 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id q5E7iE8o079613;
	Thu, 14 Jun 2012 07:44:14 GMT
	(envelope-from nobody)
Message-Id: <201206140744.q5E7iE8o079613@red.freebsd.org>
Date: Thu, 14 Jun 2012 07:44:14 GMT
From: Makoto Kishimoto <ksmakoto@dd.iij4u.or.jp>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] argument of pkg_create --prefix option always resolved
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         169053
>Category:       bin
>Synopsis:       [PATCH] pkg_create(1): argument of pkg_create --prefix option always resolved
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jun 14 07:50:01 UTC 2012
>Closed-Date:    
>Last-Modified:  Sun Apr 20 02:52:02 UTC 2014
>Originator:     Makoto Kishimoto
>Release:        8-STABLE
>Organization:
n/a
>Environment:
FreeBSD norikura.localdomain 8.3-STABLE FreeBSD 8.3-STABLE #0 r235428: Wed May 16 18:32:03 JST 2012     ksmakoto@norikura.localdomain:/export/obj/usr/src/sys/NORIKURA20120516  amd64
>Description:
Since revision 233686, argument of pkg_create --prefix option always resolved.
My /usr/local is symlink to /export/local, and resolved, packages prefix become
/export/local, instead of /usr/local .

I propose the patch (following) .
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: usr.sbin/pkg_install/create/perform.c
===================================================================
--- usr.sbin/pkg_install/create/perform.c	(revision 235428)
+++ usr.sbin/pkg_install/create/perform.c	(working copy)
@@ -215,10 +215,16 @@
 
     /* Prefix should add an @cwd to the packing list */
     if (Prefix) {
-        char resolved_prefix[PATH_MAX];
-        if (realpath(Prefix, resolved_prefix) == NULL)
-	    err(EXIT_FAILURE, "couldn't resolve path for prefix: %s", Prefix);
-	add_plist_top(&plist, PLIST_CWD, resolved_prefix);
+	if (*Prefix == '/') {
+	    /* if looks absolute, don't resolve. (symlink not resolved) */
+	    add_plist_top(&plist, PLIST_CWD, Prefix);
+	} else {
+	    /* when relative path, resolved */
+	    char resolved_prefix[PATH_MAX];
+	    if (realpath(Prefix, resolved_prefix) == NULL)
+		err(EXIT_FAILURE, "couldn't resolve path for prefix: %s", Prefix);
+	    add_plist_top(&plist, PLIST_CWD, resolved_prefix);
+	}
     }
 
     /* Add the origin if asked, at the top */


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