Merge lp://staging/~louis/ubuntu/trusty/clamav/lp799623_fix_logrotate into lp://staging/ubuntu/trusty/clamav

This looks like it could easily introduce a regression, especially on config files which look "normal", i. e. only use one space to separate words. Are you sure that instead of

  value=`grep ^$variable[[:space:]] $CLAMAVCONF | head -n1 | awk '{print $2}'`

you don't mean

  value=`grep ^$variable[[:space:]]* $CLAMAVCONF | head -n1 | awk '{print $2}'`

?

Oh, the $CLAMAVCONF is not part of the search string indeed. This really ought to be quoted, like

value=`grep "^$variable " $CLAMAVCONF | head -n1 | awk '{print $2}'`

On Wed, Feb 12, 2014 at 03:12:52PM -0000, Martin Pitt wrote:
> value=`grep ^$variable[[:space:]]* $CLAMAVCONF | head -n1 | awk '{print $2}'`

Also surely that regex should be double-quoted? Otherwise that might
happen to expand to something in the current working directory and weird
stuff would ensue.

Makes perfect sense to me. I was too trusty of the patch proposed in the bug.

I will rework according to the suggestions

Uploaded with

- value=`grep ^$variable $CLAMAVCONF | head -n1 | awk '{print $2}'`
+ value=`grep "^$variable[[:space:]]" $CLAMAVCONF | head -n1 | awk '{print $2}'`

now. I didn't actually use UDD, that branch takes abysmally long to check out (I killed it after 10 mins or so).

Thanks!

Before I go any further, the addition of [[:space:]] was to discriminate on word boundary. When the CLAMAVCONF file has entries like this :

StreamMaxLength 25M
LogFileMaxSize 0
LogFile /var/log/clamav/clamav.log

the grep could not discriminate b/w LogFileMaxSize & LogFile, so the LogFile variable ended up with 0.

Revisiting the expression, I think that using \b would be more appropriate to discriminate on word boudaries so the expression would be :

value=`grep "^$variable\b" $CLAMAVCONF | head -n1 | awk '{print $2}'`

Unless you see an issue with this, I will go ahead with that fix, since the [[:space:]] was not intended to identify single space, but word boundaries