[Pkg-puppet-devel] The 0.24.5-3 changelog

[Micah Anderson]

* Andrew Pollock <apollock at debian.org> [2009-05-27 11:42-0400]:
> On Wed, May 27, 2009 at 09:58:24AM -0400, Micah Anderson wrote:
> > * Andrew Pollock <apollock at debian.org> [2009-05-27 07:45-0400]:
> > > On Tue, May 26, 2009 at 05:59:06PM -0400, Micah Anderson wrote:
>
> > So looking at the items:
> > 
> > > >     * Set wait for cert timeout to 5 secs, to avoid resource abuse
> > > >     (Closes: #509566)                                                         
> > 
> > This caused some flak, and I'm not finding it set in the repository
> > (although I might be looking in the wrong places). 
> 
> That would be
> 
> --- puppet-0.24.5/debian/puppet.default 2009-05-27 10:29:31.000000000 +0200
> +++ puppet-0.24.5/debian/puppet.default 2009-05-27 15:47:05.000000000 +0200
> @@ -4,4 +4,4 @@
>  START=yes
>  
>  # Startup options
> -DAEMON_OPTS="-w 0"
> +DAEMON_OPTS="-w 5"
> 
> from my debdiff that I cooked up, if we do want to put it back in. What
> specifically caused flak about this change? Reading the man page, it seems
> to default to 120 seconds, but it looks like we'd previously had it turned
> off altogether. Is there any reason to deviate from the upstream
> default?

The basis of the complaint was that with -w 5 it caused syslog to fill
up with noise. I think we should go with the upstream default.

> > > >     * Place vim syntax in the correct location (LP: #181960)
>
> So for this, the relevant bits of the debdiff are:
> 
> --- puppet-0.24.5/debian/puppet.dirs    2009-05-27 10:29:31.000000000 +0200
> +++ puppet-0.24.5/debian/puppet.dirs    2009-05-27 15:47:05.000000000 +0200
> @@ -3,5 +3,5 @@
>  var/log/puppet
>  etc/puppet/files
>  usr/share/vim/addons/ftdetect
> -usr/share/vim/vim71/syntax
> +usr/share/vim/addons/syntax
>  var/lib/puppet
> 
> and 
> 
> 
> --- puppet-0.24.5/debian/rules  2009-05-27 13:54:20.000000000 +0200
> +++ puppet-0.24.5/debian/rules  2009-05-27 15:47:05.000000000 +0200
> @@ -65,7 +65,7 @@
>  
>         # Vim auto-syntax-highlighting stuff
>         $(INSTALL) -m0644 ext/vim/syntax/puppet.vim                             \
> -               $(CURDIR)/debian/puppet/usr/share/vim/vim71/syntax/
> +               $(CURDIR)/debian/puppet/usr/share/vim/addons/syntax/
>         $(INSTALL) -m0644 ext/vim/ftdetect/puppet.vim                           \
>                 $(CURDIR)/debian/puppet/usr/share/vim/addons/ftdetect/
>  
> which looks a bit different to what you ended up doing just now, and sounds
> like it'd address the concerns you raised in your other email.

I think we should go with what you came up here, instead of what I
just pushed which I know know is wrong.
  
> > Based on the above, I think we can forget about the missing changelog
> > entries. What do you think?
> 
> I'd say yes, except it was in stable, and for historical reasons it'd be
> preferable to retain that changelog entry, I'd think.

I agree... if you have all these parceled out, I think you should go
ahead with them!

micah
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-puppet-devel/attachments/20090527/c8ade7b5/attachment.pgp>