From owner-cvs-ports@FreeBSD.ORG Sat Dec 11 22:57:52 2010 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7808B1065670; Sat, 11 Dec 2010 22:57:52 +0000 (UTC) (envelope-from raj@csub.edu) Received: from mh1.csub.edu (mh1.csub.edu [136.168.1.95]) by mx1.freebsd.org (Postfix) with ESMTP id 50D318FC08; Sat, 11 Dec 2010 22:57:52 +0000 (UTC) Received: from [136.168.251.248] ([136.168.251.248]) (authenticated bits=0) by mh1.csub.edu (8.14.3/8.14.3) with ESMTP id oBBMvnhB027129 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 11 Dec 2010 14:57:50 -0800 (PST) (envelope-from raj@csub.edu) X-DKIM: Sendmail DKIM Filter v2.8.3 mh1.csub.edu oBBMvnhB027129 DKIM-Signature: v=1; a=rsa-sha1; c=simple/simple; d=csub.edu; s=mailhub.csub.edu; t=1292108271; bh=Z9/HJrEFmSmuTIXEuMDApzFjXwE=; h=Message-ID:Date:From:MIME-Version:To:CC:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=xxIwOdbp4BrEZY7kQqfxUGiQA24xV0jW8XP9Srub7KxFMlzezYoSe2kcdyyR1OBf3 L8xg35MGbvL9zP6LzU8L0s53W897q4bSNAYp/UqQ/y1XZt1gm5zXVhWSp0Rkjtifgc ELKH+69B6ay5oztPpZ5Tyjb6Jyq0taldX9+XOAIs= Message-ID: <4D0401EC.9070209@csub.edu> Date: Sat, 11 Dec 2010 14:57:48 -0800 From: Russell Jackson User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.12) Gecko/20101027 Thunderbird/3.1.6 MIME-Version: 1.0 To: ohauer@FreeBSD.org References: <201012102307.oBAN7OKW063350@repoman.freebsd.org> <20101211021158.0C25F5A9660@jester1b.ixsystems.com> <4D02EED9.3050208@csub.edu> <4D03B850.8000406@p6m7g8.com> <4D03F48D.2060309@FreeBSD.org> In-Reply-To: <4D03F48D.2060309@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: QAT@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org, "Philip M. Gollucci" , cvs-ports@FreeBSD.org, pgollucci@FreeBSD.org Subject: Re: cvs commit: ports/sysutils/puppet Makefile distinfo pkg-plist X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Dec 2010 22:57:52 -0000 On 12/11/2010 02:00 PM, Olli Hauer wrote: > On 2010-12-11 18:43, Philip M. Gollucci wrote: >> On 12/11/10 03:24, Russell Jackson wrote: >>> On 12/10/2010 06:11 PM, QAT@FreeBSD.org wrote: >>>> >>>> ===> Building package for puppet-2.6.4 >>>> tar: etc/puppet/auth.conf: Cannot stat: No such file or directory >>>> tar: Error exit delayed from previous errors. >>>> pkg_create: make_dist: tar command failed with code 256 >>>> *** Error code 1 >>>> >>>> Stop in /a/ports/sysutils/puppet. >>>> Deleting puppet-2.6.4 >>>> pkg_delete: file '/usr/local/etc/puppet/auth.conf' doesn't exist >>>> pkg_delete: couldn't entirely delete package (perhaps the packing list is >>>> incorrectly specified?) >>>> => Deleting /var/run/puppet if empty... >>>> => Deleting /var/puppet if empty... >>>> ================================================================ >>>> >>>> === Checking filesystem state >>>> list of extra files and directories in / (not present before this port >>>> was installed but present after it was deinstalled) >>>> 43293100 4 drwxr-xr-x 2 root >>>> wheel 512 Dec 11 02:11 etc/puppet >>>> 43293101 8 -rw-r--r-- 1 root >>>> wheel 2346 Dec 11 02:11 etc/puppet/auth.conf >>>> ================================================================ >>>> build of /usr/ports/sysutils/puppet ended at Sat Dec 11 02:11:56 UTC 2010 >> >> I got this error in my tb too. Which is why I added the >> etc/puppet/auth.conf to pkg-plist; then it worked fine. >> >> >> I'm quite confused by the error though. Tar can't find it, but later >> mtree says it wasn't there before but is now. >> > > Indeed, the port installs this file but to "/etc/pupped" > instead "${prefix}/etc/puppet". > > There is a new option in install.rb (--[no]-configs and --configdir=) > and they defaults to "/etc/puppet" and do install. > > The following patch disables the install of auth.conf and for safekeeping > change the patch in install.rb. > > Index: Makefile > =================================================================== > RCS file: /home/pcvs/ports/sysutils/puppet/Makefile,v > retrieving revision 1.21 > diff -u -r1.21 Makefile > --- Makefile 10 Dec 2010 23:07:24 -0000 1.21 > +++ Makefile 11 Dec 2010 21:49:01 -0000 > @@ -51,6 +51,7 @@ > > post-patch: > @${REINPLACE_CMD} -e "s|/etc/puppet|${PREFIX}/etc/puppet|" \ > + ${WRKSRC}/install.rb \ > ${WRKSRC}/lib/puppet/reference/configuration.rb \ > ${WRKSRC}/lib/puppet/defaults.rb \ > ${WRKSRC}/lib/puppet/util/run_mode.rb > @@ -66,7 +67,7 @@ > @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL > > do-install: > - @cd ${WRKSRC}&& ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb > + @cd ${WRKSRC}&& ${SETENV} PREFIX=${PREFIX} ${RUBY} ${WRKSRC}/install.rb > --no-configs > > post-install: > ${INSTALL} -d ${PREFIX}/etc/${PORTNAME} > Index: pkg-plist > =================================================================== > RCS file: /home/pcvs/ports/sysutils/puppet/pkg-plist,v > retrieving revision 1.9 > diff -u -r1.9 pkg-plist > --- pkg-plist 10 Dec 2010 23:07:24 -0000 1.9 > +++ pkg-plist 11 Dec 2010 21:49:01 -0000 > @@ -9,6 +9,5 @@ > sbin/puppetmasterd > sbin/puppetqd > sbin/puppetrun > -etc/puppet/puppet.conf-dist > -etc/puppet/auth.conf > +%%ETCDIR%%/puppet.conf-dist > @dirrmtry etc/puppet Sorry about this. I was in too much of a rush to get this out and didn't notice this change in behavior in install.rb. I think the above patch is fine for now. My puppet installs are working without auth.conf. Do I need to submit another PR with this patch? -- Russell A. Jackson Network Analyst California State University, Bakersfield