Please merge clamav (0.91.2-1) from Debian unstable (main)

This patch is to be applied to the clamav_0.91.2-0ubuntu1 version.

This patch is to be applied to the clamav_0.91.2-1 version.

Scott: can you please review this one?

The patches were not done with dpatch-edit-patch and some patches are missing

the change to debian/clamav-base.postinst.in since the changed proposed there it's already in the gutsy version
the change to debian/clamav-freshclam.init.in it's not in the patch and not in the gutsy version

Thanks for your work Leonel.

Few words of clarifications:

These patches are not dpatch patches, they are debdiff patches. They apply to the source package (actually, to the source package tree) to make a new package from an old existing one.

The two patches above are merge patches, ie. they will apply to the "old" Ubuntu version (the first) or the new Debian version (the second) to make the "new" Ubuntu version.
To make it clear what these patches do, lets have a look at the first patch.
You will see 3 changes:

1) changes to debian/control
2) changes to debian/clamav-base.postinst.in
3) changes to debian/changelog

This means that the "new" Ubuntu version will be the same as the "old" Ubuntu version + these changes.
The reason for these changes is given in the changelog, but in general will be:

 * changes that will come from the "new" Debian package (remember that we base our packages on the Debian ones, if they exist).
 * changes that fix bugs or other needs which are not covered by the "old" Ubuntu version or the "New" Debian one.

Let us now see these one by one:

1) this change changes:

- the Build-Depends from libcurl-dev to libcurl4-gnutls-dev

libcurl-dev being a virtual package which is provided by either this or libcurl4-openssl-dev. I explicitly specify now this as the ClamAV package is licensed with the GPL.

- The Depends from libcurl3-dev to libcurl4-gnutls-dev in libclamav-dev

see above. Note that libcurl3-dev is a virtual package which is provided by libcurl4-openssl-dev.

- The Depends from libcurl3 to libcurl3-gnutls in clamav-freshclam, clamav-milter and clamav-daemon

see above.

Note that this change is not coming from the "new" Debian package; its a new change.

2) This change changes the way DetectPUA is initialised. In the "old" Ubuntu version was initialised to no. In the "new" Debian version is initialised to false. I'm applying the change from Debian; both are valid and parsed correctly, however we prefer to keep the Debian version so that we minimise the number of changes w.r.t them.

3) The changelog is changed to reflect the above.
Note that the changelog will not list the changes in patch 1. It will list the changes in patch 2, since this is the patch that applies to the Debian version.

I hope this clarify what these patches are about. Please feel free to ask any questions you may still have.

Thanks again for your work.

Thank you for making me clear this.
I'm still Learning .. and the updates I've done were with dpatch

Thank you

clamav (0.91.2-2ubuntu1) gutsy; urgency=low

  * Merge from Debian unstable (LP: #135846). Remaining Ubuntu changes:
    - Update debian/watch so it works
    - Add libcurl3-gnutls depends for clamav-freshclam, clamav-milter,
      clamav-daemon
    - In debian/clamav-base.postinst.in add test on upgrade to create
      /var/run/clamav if it does not exist
    - debian/control: Maintainers updated for Ubuntu.
    - debian/clamav-freshclam.init.in specify pidfile when starting.
  * Add an explicit Build-Depends on libcurl4-gnutls-dev (was libcurl-dev).
  * Change Build-Depends in libclamav-dev to libcurl4-gnutls-dev
    (was libcurl3-dev).

clamav (0.91.2-2) unstable; urgency=low

  * Use the correct variable for $user (closes: #439253)
  * Guard against unset $DatabaseDirectory (closes: #439913)
  * Make it easier to use clamav-milter with postfix (closes: #434995)
  * Fix shebang paths in contrib directories (closes: #439352)
  * Quiet clamav-milter startup (closes: #438454)

clamav (0.91.2-1) unstable; urgency=low

  * New upstream version
    - fix call to tolower() which led to a crash in libclamav
    - fix possible NULL dereference, e.g. when parsing email with RFC2397
      URI
    - fix floating point exception when using ScanOLE2
    - fix possible NULL dereference in rtf.c

 -- Cesare Tirabassi <email address hidden> Thu, 1 Sep 2007 20:54:07 +0200