[Pkg-clamav-devel] Processing of clamav_0.98.4+dfsg-1_i386.changes

Scott Kitterman debian at kitterman.com
Sat Jun 21 18:34:31 UTC 2014


On June 21, 2014 2:31:41 PM EDT, Andreas Cadhalpun <andreas.cadhalpun at googlemail.com> wrote:
>Hi,
>
>On 21.06.2014 18:33, Scott Kitterman wrote:
>> I had a good discussion yesterday with a couple of the upstream
>developers.
>> Here's what we came up with:
>>
>> 0001-Change-paths-in-sample-conf-file-to-match-Debian.patch
>>
>> I asked them if they would consider a configure option to set these
>values so
>> we wouldn't have to do it via patch.  They agree that was a
>reasonable
>> request, so I'll file a bug.
>
>That's nice.
>
>> 0002-Fix-STAT64-definition-and-add-missing-includes.patch
>>
>> They didn't agree with this patch.  I checked and i386 now builds
>without it,
>> so I dropped it.  As written, the patch may affect large file
>scanning since
>> (according to them) on 32bit systems glibc doesn't handle switching
>to STAT64
>> despite claims that it does (they specifically disagreed this was
>Windows only
>> code).
>
>Indeed this patch is not needed anymore, but I have no clue why it
>works 
>now, but didn't in the past.
>
>> 0003-Add-an-additional-n-after-the-number-in-the-pidfile.patch
>>
>> They agreed to upstream this.
>
>Good.
>
>> 0004-unit_tests-increment-test-timeout-from-40secs-to-5mi.patch
>>
>> I asked for some kind of a switch to control this so we could do it
>per-
>> architecture if needed.  They agreed and in fact had run into some
>similar
>> issues in their powerpc testing.  They plan to add this as a make
>variable
>> that we can override if needed.
>
>That's probably the best solution.
>
>> 0005-Fix-FTBFS-with-LLVM-3.1-3.4.patch
>> 0007-Fix-underlinking-with-llvm-in-libclamav-c-Makefile.a.patch
>>
>> They have a branch that uses system LLVM that used our patches as a
>starting
>> point.  This may or may not make 0.98.5 as they have other things
>they are
>> working on for 0.98.5 and limited time.
>
>OK.
>
>> 0006-enable-llvm-jit-on-kfreebsd.patch
>>
>> They will probably change this to be *bsd* since all BDSs can support
>> JIT/LLVM.  I asked about other archs where we have LLVM and their may
>problem
>> was lack of hardware to test.
>
>That's also a solution.
>
>> My dropping of the STAT64 patch did collide with your changes.   I
>think I
>> fixed it up in git, but please check after you pull again.
>
>Your merge broke git-dpm, which I fixed now.

Thanks for fixing, 

Scott K




More information about the Pkg-clamav-devel mailing list