From olivleh1@kartoffel.salatschuessel.net  Tue Sep 12 05:37:55 2006
Return-Path: <olivleh1@kartoffel.salatschuessel.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BE98F16A415;
	Tue, 12 Sep 2006 05:37:55 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (p5084F9B0.dip.t-dialin.net [80.132.249.176])
	by mx1.FreeBSD.org (Postfix) with ESMTP id BFDDB43D58;
	Tue, 12 Sep 2006 05:37:54 +0000 (GMT)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1])
	by kartoffel.salatschuessel.net (8.13.6/8.13.6) with ESMTP id k8C5bQw3045707;
	Tue, 12 Sep 2006 07:37:26 +0200 (CEST)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: (from olivleh1@localhost)
	by kartoffel.salatschuessel.net (8.13.8/8.13.8/Submit) id k8C5bQF6045706;
	Tue, 12 Sep 2006 07:37:26 +0200 (CEST)
	(envelope-from olivleh1)
Message-Id: <200609120537.k8C5bQF6045706@kartoffel.salatschuessel.net>
Date: Tue, 12 Sep 2006 07:37:26 +0200 (CEST)
From: Oliver Lehmann <oliver@freebsd.org>
Reply-To: Oliver Lehmann <oliver@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <oliver@freebsd.org>
Subject: fix-port mail/vpopmail & mail/vpopmail-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         103177
>Category:       ports
>Synopsis:       fix-port mail/vpopmail & mail/vpopmail-devel
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 12 05:40:12 GMT 2006
>Closed-Date:    Wed Nov 29 17:39:15 GMT 2006
>Last-Modified:  Wed Nov 29 17:40:14 GMT 2006
>Originator:     Oliver Lehmann
>Release:        FreeBSD 6.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 6.1-STABLE FreeBSD 6.1-STABLE #0: Fri Jul 7 18:40:18 CEST 2006 olivleh1@kartoffel.salatschuessel.net:/usr/obj/amd64-athlon64-6.1/usr/src/sys/KARTOFFEL amd64


>Description:
	while adding vpopmail or vpopmail-devel as a package, PKG_PREFIX
	gets defined as ${PREFIX} - not as ${PREFIX} like it is defined
	in the Makefile. This ends up in creating users with /usr/local
	as home dir prefix, not /usr/local/vpopmail. This leads to a
	wrong home dir, and uninstallable other vpopmail-dendant appli-
	cations like vqadmin or courier-authlib-vchkpw because this
	applications are expecting lib_deps and inc_deps in ~vpopmail/etc.
>How-To-Repeat:
>Fix:


--- vpopmail.patch begins here ---
Index: vpopmail/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/vpopmail/Makefile,v
retrieving revision 1.65
diff -u -r1.65 Makefile
--- vpopmail/Makefile	17 Jul 2006 05:51:32 -0000	1.65
+++ vpopmail/Makefile	12 Sep 2006 05:34:43 -0000
@@ -296,7 +296,7 @@
 #
 
 pre-configure:
-	@PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL}
+	@PKG_PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL}
 .if defined(WITH_PGSQL)
 .if defined(WITH_PGSQL_DB)
 	${REINPLACE_CMD} -E -e "s/(#define DB.*)vpopmail(.*)/\1${WITH_PGSQL_DB}\2/" ${WRKSRC}/vpgsql.h
Index: vpopmail/pkg-install
===================================================================
RCS file: /home/pcvs/ports/mail/vpopmail/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- vpopmail/pkg-install	4 Jul 2001 15:34:48 -0000	1.2
+++ vpopmail/pkg-install	12 Sep 2006 05:34:43 -0000
@@ -50,7 +50,7 @@
 	do checkrpw;  # May exit
 
 	$x = "-u $uids{'alias'}";
-	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s /nonexistent $x");
+	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/vpopmail/alias\" -s /nonexistent $x");
 	if ($result) {
 		die "Failed to add user alias as uid $uids{'alias'}\n";
 	}
@@ -61,7 +61,7 @@
 		do checkrpw;  # May exit
 
 		$x = "-u $uids{$user}";
-		$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s /nonexistent $x");
+		$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}/vpopmail\" -s /nonexistent $x");
 		if ($result) {
 			die "Failed to add user $user as uid $uids{$user}\n";
 		}
Index: vpopmail-devel/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/vpopmail-devel/Makefile,v
retrieving revision 1.51
diff -u -r1.51 Makefile
--- vpopmail-devel/Makefile	10 May 2006 22:37:04 -0000	1.51
+++ vpopmail-devel/Makefile	12 Sep 2006 05:34:44 -0000
@@ -269,7 +269,7 @@
 #
 
 pre-configure:
-	@PKG_PREFIX=${PREFIX}/vpopmail ${PERL5} ${PKGINSTALL}
+	@PKG_PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL}
 .if defined(WITH_PGSQL)
 .if defined(WITH_PGSQL_DB)
 	${REINPLACE_CMD} -E -e "s/(#define DB.*)vpopmail(.*)/\1${WITH_PGSQL_DB}\2/" ${WRKSRC}/vpgsql.h
Index: vpopmail-devel/pkg-install
===================================================================
RCS file: /home/pcvs/ports/mail/vpopmail-devel/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- vpopmail-devel/pkg-install	4 Jul 2001 15:34:48 -0000	1.2
+++ vpopmail-devel/pkg-install	12 Sep 2006 05:34:44 -0000
@@ -50,7 +50,7 @@
 	do checkrpw;  # May exit
 
 	$x = "-u $uids{'alias'}";
-	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/alias\" -s /nonexistent $x");
+	$result = system ("/usr/sbin/pw useradd alias -g qnofiles -d \"$ENV{PKG_PREFIX}/vpopmail/alias\" -s /nonexistent $x");
 	if ($result) {
 		die "Failed to add user alias as uid $uids{'alias'}\n";
 	}
@@ -61,7 +61,7 @@
 		do checkrpw;  # May exit
 
 		$x = "-u $uids{$user}";
-		$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}\" -s /nonexistent $x");
+		$result = system ("/usr/sbin/pw useradd $user -g $users{$user} -d \"$ENV{PKG_PREFIX}/vpopmail\" -s /nonexistent $x");
 		if ($result) {
 			die "Failed to add user $user as uid $uids{$user}\n";
 		}
--- vpopmail.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->roam 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Sep 12 05:40:24 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103177: commit references a PR
Date: Sat, 23 Sep 2006 12:38:08 +0000 (UTC)

 roam        2006-09-23 12:38:03 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/vpopmail        Makefile pkg-install 
   Log:
   Fix package installation - in most cases, the vpopmail package (if built)
   would be installed with the wrong home directory for the vpopmail user.
   
   PR:             103177
   Submitted by:   oliver
   
   Revision  Changes    Path
   1.66      +1 -1      ports/mail/vpopmail/Makefile
   1.3       +2 -2      ports/mail/vpopmail/pkg-install
 _______________________________________________
 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"
 
Responsible-Changed-From-To: roam->ale 
Responsible-Changed-By: roam 
Responsible-Changed-When: Sat Sep 23 12:49:52 UTC 2006 
Responsible-Changed-Why:  
Over to the maintainer of the vpopmail-devel port now that I've made 
the change to the vpopmail one. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=103177 
State-Changed-From-To: open->closed 
State-Changed-By: oliver 
State-Changed-When: Wed Nov 29 17:39:02 UTC 2006 
State-Changed-Why:  
committed due to maintainer timeout 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/103177: commit references a PR
Date: Wed, 29 Nov 2006 17:39:10 +0000 (UTC)

 oliver      2006-11-29 17:38:45 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/vpopmail-devel  Makefile pkg-install 
   Log:
   while adding vpopmail-devel as a package, PKG_PREFIX
   gets defined as ${PREFIX} - not as ${PREFIX}/vpopmail like it is defined
   in the Makefile. This ends up in creating users with /usr/local
   as home dir prefix, not /usr/local/vpopmail. This leads to a
   wrong home dir, and uninstallable other vpopmail-dendant appli-
   cations like vqadmin or courier-authlib-vchkpw because this
   applications are expecting lib_deps and inc_deps in ~vpopmail/etc.
   
   PR:             ports/103177
   Approved by:    maintainer timeout (66 days)
   
   Revision  Changes    Path
   1.52      +1 -1      ports/mail/vpopmail-devel/Makefile
   1.3       +2 -2      ports/mail/vpopmail-devel/pkg-install
 _______________________________________________
 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:
