Merge ~lucaskanashiro/ubuntu/+source/clamav:focal-merge into ubuntu/+source/clamav:debian/sid

[Lucas Kanashiro]

Merge version 0.102.2+dfsg2-2 from Debian. The entire delta we carry was dropped after merging this version. However, a small change was introduced in d/NEWS to warn users about the removal of some clamav-daemon options. We use to carry a patch to avoid a failure when those options are used, but after some discussion between the Server and Security teams we decided to drop this change now. After 20.04 we should be able to drop this small delta and then make it a sync from Debian.

Here is the PPA where build in all arches was successful:

https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-clamav-merge-0.102.2+dfsg-1/+packages

[Marc Deslauriers (mdeslaur)]

Perhaps "Some of clamav-daemon's options" instead of "Some clamav-daemon's options".

[Lucas Kanashiro (lucaskanashiro)]

> Perhaps "Some of clamav-daemon's options" instead of "Some clamav-daemon's
> options".

Thanks for catching this, already fixed.

[Christian Ehrhardt  (paelzer)]

Changelog:
- [√] old content match as expected
- [√] changelog entry correct version and targeted codename (I wanted to criticize until I saw it was the d/NEWS file :-) )
- [√] changelog entries correct
- [√] update-maintainer has been run

Actual changes:
- [√] debian and upstream changes look safe

Old Delta:
- [√] dropped changes are ok to be dropped
- [√] nothing else to drop (ack that we have to wait post 20.04)
- [√] changes forwarded upstream/debian (not needed)

New Delta:
- [√] only new delta is the NEWS entry and that looks ok

Build/Test:
- [√] build is ok
- [√] verified PPA package installs/uninstalls
- [√] a few sanity checks test fine

So far all is fine, I'm running autopkgtests now, will let you know in a bit ...

[Christian Ehrhardt  (paelzer)]

autopkgtest [09:33:28]: @@@@@@@@@@@@@@@@@@@@ summary
clamd PASS
client PASS
milter PASS
qemu-system-x86_64: terminating on signal 15 from pid 3309 (/usr/bin/python3)

I think you are good to go.
Please catch any of us for sponsoring once you are active and there are no last-minute changes you want to make :-)

review: Approve

[Christian Ehrhardt  (paelzer)]

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/clamav
 * [new tag] upload/0.102.2+dfsg-1ubuntu1 -> upload/0.102.2+dfsg-1ubuntu1

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading clamav_0.102.2+dfsg-1ubuntu1.dsc: done.
  Uploading clamav_0.102.2+dfsg.orig.tar.xz: done.
  Uploading clamav_0.102.2+dfsg-1ubuntu1.debian.tar.xz: done.
  Uploading clamav_0.102.2+dfsg-1ubuntu1_source.buildinfo: done.
  Uploading clamav_0.102.2+dfsg-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
index 5daa868..dc831d3 100644
--- a/debian/NEWS.Debian
+++ b/debian/NEWS.Debian
@@ -1,3 +1,19 @@
+clamav (0.102.2+dfsg-1ubuntu1) focal; urgency=medium
+
+  Some of clamav-daemon's options were removed by upstream for a while and from
+  now on their usage will cause a failure during the start up process of this
+  service. The following options are no longer supported:
+    - StatsHostID
+    - StatsEnabled
+    - StatsPEDisabled
+    - StatsTimeout
+    - SubmitDetectionStats
+    - DetectionStatsCountry
+    - DetectionStatsHostID
+  Make sure you are not using the options above.
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 10 Feb 2020 13:39:26 -0300
+
 clamav (0.97.5+dfsg-1) unstable; urgency=medium
 
   This release of clamav no longer ships signature files in clamav-base so
diff --git a/debian/changelog b/debian/changelog
index cea0072..303bf2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+clamav (0.102.2+dfsg-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - d/NEWS.Debian: Warn users about the removal of some clamav-daemon options
+  * Dropped:
+    - clamav-daemon may fail to start due to options removed in new version
+      and manually edited configuration file. (LP #1783632)
+      + debian/patches/Deprecate-unused-options-instead-of-removing-it.patch:
+        add patch from Debian stretch to simply warn about removed options.
+    - Update PO files. There is no need to carry a delta for this.
+    - clamav-daemon: Correct error from ScanOnAccess option removal so that
+      setting LogFile options via DebConf works again (Closes: #950296)
+      (LP #1861497)
+      [Applied by Debian in version 0.102.1+dfsg-3]
+
+ -- Lucas Kanashiro <[e-mail]>  Mon, 10 Feb 2020 15:35:03 -0300
+
 clamav (0.102.2+dfsg-1) unstable; urgency=medium
 
   * Import 0.102.2
@@ -18,6 +35,24 @@ clamav (0.102.1+dfsg-3) unstable; urgency=medium
 
  -- Scott Kitterman <[e-mail]>  Fri, 31 Jan 2020 16:49:37 -0500
 
+clamav (0.102.1+dfsg-2ubuntu2) focal; urgency=medium
+
+  * d/clamav-daemon.config.in: Correct error from ScanOnAccess option
+    removal so that setting LogFile options via DebConf works again.
+    (Closes: #950296) (LP: #1860217)
+
+ -- Eric Desrochers <[e-mail]>  Thu, 06 Feb 2020 13:56:53 +0000
+
+clamav (0.102.1+dfsg-2ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - clamav-daemon may fail to start due to options removed in new version
+      and manually edited configuration file. (LP #1783632)
+      + debian/patches/Deprecate-unused-options-instead-of-removing-it.patch:
+        add patch from Debian stretch to simply warn about removed options.
+
+ -- Lucas Kanashiro <[e-mail]>  Wed, 22 Jan 2020 09:37:47 -0300
+
 clamav (0.102.1+dfsg-2) unstable; urgency=medium
 
   * Add the clamonacc binary to the clamav-daemon package.
@@ -25,6 +60,16 @@ clamav (0.102.1+dfsg-2) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Mon, 23 Dec 2019 20:54:21 +0100
 
+clamav (0.102.1+dfsg-1ubuntu1) focal; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - clamav-daemon may fail to start due to options removed in new version
+      and manually edited configuration file. (LP #1783632)
+      + debian/patches/Deprecate-unused-options-instead-of-removing-it.patch:
+        add patch from Debian stretch to simply warn about removed options.
+
+ -- Lucas Kanashiro <[e-mail]>  Thu, 05 Dec 2019 18:01:14 -0300
+
 clamav (0.102.1+dfsg-1) unstable; urgency=medium
 
   * Import 0.102.1 (Closes: #945265)
@@ -36,6 +81,16 @@ clamav (0.102.1+dfsg-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sat, 30 Nov 2019 19:22:15 +0100
 
+clamav (0.101.4+dfsg-1ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - clamav-daemon may fail to start due to options removed in new version
+      and manually edited configuration file. (LP #1783632)
+      + debian/patches/Deprecate-unused-options-instead-of-removing-it.patch:
+        add patch from Debian stretch to simply warn about removed options.
+
+ -- Gianfranco Costamagna <[e-mail]>  Sun, 25 Aug 2019 23:25:27 +0200
+
 clamav (0.101.4+dfsg-1) unstable; urgency=medium
 
   * Import 0.101.4
@@ -47,6 +102,16 @@ clamav (0.101.4+dfsg-1) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Sun, 25 Aug 2019 12:38:25 +0200
 
+clamav (0.101.2+dfsg-3ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - clamav-daemon may fail to start due to options removed in new version
+      and manually edited configuration file. (LP #1783632)
+      + debian/patches/Deprecate-unused-options-instead-of-removing-it.patch:
+        add patch from Debian stretch to simply warn about removed options.
+
+ -- Gianfranco Costamagna <[e-mail]>  Wed, 07 Aug 2019 08:54:47 +0200
+
 clamav (0.101.2+dfsg-3) unstable; urgency=medium
 
   * Cherry-pick a fix from 0.101.3 to address a vulnerability to
@@ -54,6 +119,16 @@ clamav (0.101.2+dfsg-3) unstable; urgency=medium
 
  -- Sebastian Andrzej Siewior <[e-mail]>  Tue, 06 Aug 2019 21:42:06 +0200
 
+clamav (0.101.2+dfsg-2ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - clamav-daemon may fail to start due to options removed in new version
+      and manually edited configuration file. (LP #1783632)
+      + debian/patches/Deprecate-unused-options-instead-of-removing-it.patch:
+        add patch from Debian stretch to simply warn about removed options.
+
+ -- Gianfranco Costamagna <[e-mail]>  Sat, 03 Aug 2019 10:20:31 +0200
+
 clamav (0.101.2+dfsg-2) unstable; urgency=medium
 
   * Remove python from build-depends:
@@ -63,6 +138,22 @@ clamav (0.101.2+dfsg-2) unstable; urgency=medium
 
  -- Scott Kitterman <[e-mail]>  Fri, 02 Aug 2019 09:20:43 -0400
 
+clamav (0.101.2+dfsg-1ubuntu2) eoan; urgency=medium
+
+  * Rebuild against new libjson-c4.
+
+ -- Gianfranco Costamagna <[e-mail]>  Sat, 29 Jun 2019 13:48:24 +0200
+
+clamav (0.101.2+dfsg-1ubuntu1) eoan; urgency=medium
+
+  * Sync with Debian. Remaining change:
+    - clamav-daemon may fail to start due to options removed in new version
+      and manually edited configuration file. (LP #1783632)
+      + debian/patches/Deprecate-unused-options-instead-of-removing-it.patch:
+        add patch from Debian stretch to simply warn about removed options.
+
+ -- Marc Deslauriers <[e-mail]>  Tue, 23 Apr 2019 11:40:41 -0400
+
 clamav (0.101.2+dfsg-1) unstable; urgency=high
 
   * Import 0.101.2
diff --git a/debian/control b/debian/control
index a635cf6..1e1cd53 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: clamav
 Section: utils
 Priority: optional
-Maintainer: ClamAV Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: ClamAV Team <[e-mail]>
 Uploaders: Michael Meskes <[e-mail]>,
            Michael Tautschnig <[e-mail]>,
            Scott Kitterman <[e-mail]>,