From owner-cvs-ports@FreeBSD.ORG Sat Dec 11 21:58:37 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 A325A106564A; Sat, 11 Dec 2010 21:58:37 +0000 (UTC) (envelope-from ohauer@FreeBSD.org) Received: from u18-124.dslaccess.de (unknown [194.231.39.124]) by mx1.freebsd.org (Postfix) with ESMTP id 0C9748FC1D; Sat, 11 Dec 2010 21:58:37 +0000 (UTC) Received: from [172.20.1.100] (unknown [172.20.1.100]) by u18-124.dslaccess.de (Postfix) with ESMTPSA id 156E820539; Sat, 11 Dec 2010 22:58:32 +0100 (CET) Message-ID: <4D03F48D.2060309@FreeBSD.org> Date: Sat, 11 Dec 2010 23:00:45 +0100 From: Olli Hauer User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.13) Gecko/20101207 Thunderbird/3.1.7 MIME-Version: 1.0 To: "Philip M. Gollucci" References: <201012102307.oBAN7OKW063350@repoman.freebsd.org> <20101211021158.0C25F5A9660@jester1b.ixsystems.com> <4D02EED9.3050208@csub.edu> <4D03B850.8000406@p6m7g8.com> In-Reply-To: <4D03B850.8000406@p6m7g8.com> X-Enigmail-Version: 1.1.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: QAT@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org, Russell Jackson , 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 Reply-To: ohauer@FreeBSD.org 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 21:58:37 -0000 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