[Pkg-clamav-devel] [mom at ubuntu.com: Ubuntu clamav 0.96.3+dfsg-1ubuntu3]

[Scott Kitterman]

Sorry, I should have mailed this to the list.  I've snipped it down to the 
relevant bit below.  This is a change aCaB gave me via IRC.  The test should 
only be applied on some FreeBSD (not sure if it's relevant to Debian's or 
not).  So yes, I think this change is relevant to Debian.  There are more 
details in the mentioned clamav bug.

Scott K

On Saturday, September 25, 2010 05:19:09 am Michael Tautschnig wrote:
> Hi Scott,
> 
> Could you elaborate on that change? #1941 does not contain any patches and
> in fact states that there is a bug in FreeBSD code, not in clamav!? But
> probably I just got something wrong, so could you maybe also state whether
> this change is relevant for Debian?
> 
> Thanks a lot,
> Michael
> 
> ----- Forwarded message from Ubuntu Merge-o-Matic <mom at ubuntu.com> -----
> 
> Date: Thu, 23 Sep 2010 14:05:32 -0000
> From: Ubuntu Merge-o-Matic <mom at ubuntu.com>
> To: clamav at packages.qa.debian.org
> Subject: Ubuntu clamav 0.96.3+dfsg-1ubuntu3
> 
> This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
> changes.  It contains the difference between the new version and the
> previous version of the same source package in Ubuntu.
> 
> Format: 1.8
> Date: Wed, 22 Sep 2010 20:09:07 -0400
> Source: clamav
> Binary: clamav-base clamav-docs clamav-dbg clamav libclamav-dev libclamav6
> clamav-daemon clamav-testfiles clamav-freshclam clamav-milter
> Architecture: source
> Version: 0.96.3+dfsg-1ubuntu3
> Distribution: maverick
> Urgency: low
> Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
> Changed-By: Scott Kitterman <scott at kitterman.com>
> Description:
>  clamav     - anti-virus utility for Unix - command-line interface
>  clamav-base - anti-virus utility for Unix - base package
>  clamav-daemon - anti-virus utility for Unix - scanner daemon
>  clamav-dbg - debug symbols for ClamAV
>  clamav-docs - anti-virus utility for Unix - documentation
>  clamav-freshclam - anti-virus utility for Unix - virus database update
> utility clamav-milter - anti-virus utility for Unix - sendmail integration
> clamav-testfiles - anti-virus utility for Unix - test files
>  libclamav-dev - anti-virus utility for Unix - development files
>  libclamav6 - anti-virus utility for Unix - library
> Changes:
>  clamav (0.96.3+dfsg-1ubuntu3) maverick; urgency=low
>  .
>    * Change from upstream to fix clamd/clamd.c to only check RLIMIT_DATA on
>      FreeBSD since the check is not relevant to Linux (See clamav bug #1941
> for details)
> Checksums-Sha1:
>  e14b5563c74e9522d30ea489fa2906537251f7b8 1643
> clamav_0.96.3+dfsg-1ubuntu3.dsc af968dff8c5ada206c2bdd78df1a4027140095ed
> 285513 clamav_0.96.3+dfsg-1ubuntu3.diff.gz Checksums-Sha256:
>  f4358854936ecdc196f0d82f6a0a00b6e86e3b0b0fef9be169ce9bb18929a006 1643
> clamav_0.96.3+dfsg-1ubuntu3.dsc
> 105348718c2a2ff2ca377f598b764ca6228056681bbe36a1dffa85eea3ec60d8 285513
> clamav_0.96.3+dfsg-1ubuntu3.diff.gz Files:
>  21c888d4ab101fa41567bd30bda7ee14 1643 utils optional
> clamav_0.96.3+dfsg-1ubuntu3.dsc b0e9047a23fdb6da859165e74fe07495 285513
> utils optional clamav_0.96.3+dfsg-1ubuntu3.diff.gz Original-Maintainer:
> ClamAV Team <pkg-clamav-devel at lists.alioth.debian.org>
> 
> diff -pruN 0.96.3+dfsg-1ubuntu2/clamd/clamd.c
> 0.96.3+dfsg-1ubuntu3/clamd/clamd.c ---
> 0.96.3+dfsg-1ubuntu2/clamd/clamd.c	2010-08-31 14:06:43.000000000 +0100 +++
> 0.96.3+dfsg-1ubuntu3/clamd/clamd.c	2010-09-23 14:34:47.000000000 +0100 @@
> -297,7 +297,7 @@ int main(int argc, char **argv)
>  	logg("#Running as user %s (UID %u, GID %u)\n", user->pw_name,
> user->pw_uid, user->pw_gid); #endif
> 
> -#ifdef RLIMIT_DATA
> +#if defined(RLIMIT_DATA) && defined(C_BSD)
>      if (getrlimit(RLIMIT_DATA, &rlim) == 0) {
>         /* bb #1941.
>          * On 32-bit FreeBSD if you set ulimit -d to >2GB then mmap() will
> fail diff -pruN 0.96.3+dfsg-1ubuntu2/debian/changelog