Re: CVS commit amavis

Mike Tremaine wrote:
> On May 3, 2008, at 9:19 AM, Mike Tremaine wrote:
> 
>> Added this patch
>>
>> [mgt@dwarfstar services]$ cvs diff amavis
>> Index: amavis
>> ===================================================================
>> RCS file: /var/cvs/logwatch/scripts/services/amavis,v
>> retrieving revision 1.51
>> diff -r1.51 amavis
>> 551a552
>>>         or ($p1 =~ /skip local delivery\([0-9]\): <> ->
>> <(spam|bad-header)-quarantine>*/)
>>
>>
>>
> 
> Should have read the next patch first... I have updated to this diff  
> set. MrC you might want to run through it and make sure it is doing  
> what it is suppose to.

We're out of sync.  I have been using the CVS revision as the basis of 
amavis/amavis-logwatch's version numbers (eg cvs 1.49 is 1.49.xx for my 
releases, where xx is my release number).  There have been several 
revisions checked into CVS since my last check in.

The recent patches checked in for the amavis filter are already covered 
in my versions (but handle differently).  I have not checked in any new 
releases in a while.

MrC

> 
> Rigel:~/Projects/logwatch_cvs/logwatch/scripts/services mgt$ cvs diff  
> amavis
> Index: amavis
> ===================================================================
> RCS file: /var/cvs/logwatch/scripts/services/amavis,v
> retrieving revision 1.52
> diff -r1.52 amavis
> 555c555,559
> <         or ($p1 =~ /skip local delivery\([0-9]\): <> -> <(spam|bad- 
> header)-quarantine>*/)
> ---
>  >         or ($p1 =~ /skip local delivery\([0-9]\): <> -> <(spam|bad- 
> header|banned|virus)-quarantine>*/)
>  >         or ($p1 =~ /config files read: .*amavisd.conf/)
>  >         or ($p1 =~ /mangling by .* \([0-9]\) done, new size: [0-9] 
> *, orig [0-9]* bytes/)
>  >         or ($p1 =~ /mangling by: [0-9], <.*>/)
>  >         or ($p1 =~ /mangling YES: [0-9] \(orig: [0-9]\),  
> discl_allowed=.*, <.*> -> <.*>/
> 
> -Mik