[Pkg-clamav-devel] clamav 0.98.3 released

[Sebastian Andrzej Siewior]

On 2014-05-18 18:38:32 [+0200], Sebastian Andrzej Siewior wrote:
> It built fine on wheezy-i386 and it just failed here on sid-i386.
> Upstream might be innocent on this one.

hehe. You can argue who's fault it is. In sid the include stack changed a
little bit. In sid I see
"/usr/include/i386-linux-gnu/sys/param.h"
=> "/usr/include/signal.h"
   => /usr/include/i386-linux-gnu/sys/ucontext.h

and ucontext defines (and defined in wheezy as well) REG_EAX to
something else. In wheezy however we never include signal.h so we never
get into including ucontext.h and running into that clash.

A quick fix would be to

diff --git a/libclamav/others.h b/libclamav/others.h
index e70baab..fe64559 100644
--- a/libclamav/others.h
+++ b/libclamav/others.h
@@ -86,7 +86,7 @@ extern uint8_t cli_always_gen_section_hash;
 #define CLI_MAX_ALLOCATION (182*1024*1024)
 
 #ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h> /* for NAME_MAX */
+//#include <sys/param.h>       /* for NAME_MAX */
 #endif
 
 /* Maximum filenames under various systems - njh */

and simply not include sys/param.h so we don't get into that naem clash.
In the longterm we probably want either a smaller include chain or a
separate name space and I think the latter is easier. I'm off for dinner
now and maybe I get sometime for the namespace later…

Sebastian