This one time, at band camp, Andreas Metzler said: > On 2005-06-18 Stephen Gran <[EMAIL PROTECTED]> wrote: > > I think we can do this in clamav-milter.c: > > #ifundef SENDMAIL_VERSION_A > > #define SENDMAIL_VERSION_A 8 > > #endif > > > #ifundef SENDMAIL_VERSION_B > > #define SENDMAIL_VERSION_B 13 > > #endif > > > after including clamav-config.h, without introducing any breakage. In > > combination with the Conflicts: above, I think this will produce the > > correct behavior. > > > Does this seem reasonable to you? > > If /usr/sbin/sendmail=exim you currently get empty definitions of > SENDMAIL_VERSION_A in clamav-config.h: > > /* major version of Sendmail */ > #define SENDMAIL_VERSION_A > > so this will not work. > cu andreas
OK, just for the record, what I have done is: patch configure.in to only fill out SENDMAIL_VERSION_A & B if test -n $sendmail_version. This gives /* #undef SENDMAIL_VERSION_A */ in clamav-config.h, which is correct so far. Then I have patched clamav-milter.c: #include clamav-config.h #ifundef SENDMAIL_VERSION_A #define SENDMAIL_VERSION_A 8 #endif (and repeat for SENDMAIL_VERSION_B) Then, finally, I have wrapped the parts that actually use this in an #if defined SENDMAIL_VERSION_A && defined SENDMAIL_VERSION_B ... #endif (this is to address the FTBFS due to no left operand error on gcc-4.0 in #314914) These have been submitted upstream, so will be in 0.86rc2 or 0.86 final, hopefully. Thanks for the report. -- ----------------------------------------------------------------- | ,''`. Stephen Gran | | : :' : [EMAIL PROTECTED] | | `. `' Debian user, admin, and developer | | `- http://www.debian.org | -----------------------------------------------------------------
signature.asc
Description: Digital signature
