cvs commit: ports/sysutils/puppet Makefile distinfo pkg-plist

[Russell Jackson]

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 at 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 <raj at csub.edu>
Network Analyst
California State University, Bakersfield