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

[Lucas Kanashiro]

Merge version 0.102.1+dfsg-1 from Debian. We carry a small delta and I kept it to avoid possible issues when users upgrade their system from old Ubuntu releases (we might want to drop it after LTS release). Following is the delta:

   - 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.

The existent patch didn't apply in the new upstream release, so I refreshed it but the content is still the same.

It built fine in all architectures: https://launchpad.net/~lucaskanashiro/+archive/ubuntu/focal-clamav-merge/

And the DEP-8 tests are also passing successfully in a local setup (amd64):

autopkgtest [18:41:05]: @@@@@@@@@@@@@@@@@@@@ summary
clamd PASS
client PASS
milter PASS

[Christian Ehrhardt  (paelzer)]

Changelog:
- [√] old content and logical tag match as expected
      You had none but it was easy enought to check still.
- [√] changelog entry correct version and targeted codename
- [√] changelog entries correct
- [√] update-maintainer has been run
      Interesting here is that 0.101.4+dfsg-1ubuntu1 didn't have that :-/

Actual changes:
- [√] no major upstream changes to consider
- [√] no further upstream version to consider
- [√] debian changes look safe

Old Delta:
- [√] nothing to drop yet
- [√] changes forwarded upstream/debian (n/a in this case)

New Delta:
- [√] refreshed patch LGTM (thanks for keeping patch and refresh separate commits and adding headers)

Build/Test:
- [√] build is ok
- [√] sanity checks test fine

Once this is complete you might ping security as they usually push the new versions to all active releases.

review: Approve

[Marc Deslauriers (mdeslaur)]

Thanks for the merge!

[Christian Ehrhardt  (paelzer)]

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

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

[Andreas Hasenack (ahasenack)]

This migrated in focal.

diff --git a/debian/changelog b/debian/changelog
index 693e59c..b7c1c89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+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)
@@ -9,6 +19,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
@@ -20,6 +40,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
@@ -27,6 +57,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:
@@ -36,6 +76,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 e37ebab..5b5f5dc 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]>,
diff --git a/debian/patches/Deprecate-unused-options-instead-of-removing-it.patch b/debian/patches/Deprecate-unused-options-instead-of-removing-it.patch
 new file mode 100644
index 0000000..2a005ae
--- /dev/null
+++ b/debian/patches/Deprecate-unused-options-instead-of-removing-it.patch
@@ -0,0 +1,54 @@
+Description: Deprecate unused options instead of removing it
+ Refresh Debian patch from Sebastian Andrzej Siewior <[e-mail]>,
+ original description below:
+ .
+ The following options were removed:
+ - StatsHostID
+ - StatsEnabled
+ - StatsPEDisabled
+ - StatsTimeout
+ - SubmitDetectionStats
+ - DetectionStatsCountry
+ - DetectionStatsHostID
+ .
+ and if they remain in the config file (during automatic upgrade without
+ user action which would be required by ucf) then clamav will refuse the
+ start. By marking them as deprecated clamav will point it out and
+ continue. This patch will be dropped by moving to next Debian stable
+ version (the user is expected to edit the config manually at this
+ point if it did not happen earlier).
+Author: Sebastian Andrzej Siewior <[e-mail]>
+Origin: upstream
+Bug: https://bugs.debian.org/902290
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1783632
+Reviewed-by: Lucas Kanashiro <[e-mail]>
+Last-Update: 2019-12-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/shared/optparser.c
++++ b/shared/optparser.c
+@@ -587,6 +587,23 @@
+     {"TCPSocket", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", ""},
+     {"TemporaryDirectory", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER | OPT_DEPRECATED, "", ""},
+ 
++    /* Deprecated stats options - avoid breakage during upgrades from old Ubuntu releases */
++
++    { "StatsHostID", "stats-host-id", 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_CLAMD | OPT_CLAMSCAN | OPT_DEPRECATED, "HostID in the form of an UUID to use when submitting statistical information. See the clamscan manpage for more information.", "default" },
++
++    { "StatsEnabled", "enable-stats", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_DEPRECATED, "Enable submission of statistical data", "yes" },
++
++    { "StatsPEDisabled", "disable-pe-stats", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN | OPT_DEPRECATED, "Disable submission of PE section statistical data", "no" },
++
++    { "StatsTimeout", "stats-timeout", 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, -1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN | OPT_FRESHCLAM | OPT_DEPRECATED, "Timeout in seconds to timeout communication with the stats server.", "10" },
++
++    { "SubmitDetectionStats", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "When enabled freshclam will submit statistics to the ClamAV Project about\nthe latest virus detections in your environment. The ClamAV maintainers\nwill then use this data to determine what types of malware are the most\ndetected in the field and in what geographic area they are.\nFreshclam will connect to clamd in order to get recent statistics.", "/path/to/clamd.conf" },
++
++    { "DetectionStatsCountry", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "Country of origin of malware/detection statistics (for statistical\npurposes only). The statistics collector at ClamAV.net will look up\nyour IP address to determine the geographical origin of the malware\nreported by your installation. If this installation is mainly used to\nscan data which comes from a different location, please enable this\noption and enter a two-letter code (see http://www.iana.org/domains/root/db/)\nof the country of origin.", "country-code" },
++
++    { "DetectionStatsHostID", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "This option enables support for our \"Personal Statistics\" service.\nWhen this option is enabled, the information on malware detected by\nyour clamd installation is made available to you through our website.\nTo get your HostID, log on http://www.stats.clamav.net and add a new\nhost to your host list. Once you have the HostID, uncomment this option\nand paste the HostID here. As soon as your freshclam starts submitting\ninformation to our stats collecting service, you will be able to view\nthe statistics of this clamd installation by logging into\nhttp://www.stats.clamav.net with the same credentials you used to\ngenerate the HostID. For more information refer to:\nhttp://www.clamav.net/doc/cctts.html\nThis feature requires SubmitDetectionStats to be enabled.", "unique-id" },
++
++
+     {NULL, NULL, 0, 0, NULL, 0, NULL, 0, 0, NULL, NULL}};
+ const struct clam_option *clam_options = __clam_options;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 28004d0..1e4a08e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ clamd_dont_depend_on_clamav_demon_socket.patch
 Add-support-for-LLVM-3.7.patch
 Add-support-for-LLVM-3.8.patch
 Add-support-for-LLVM-3.9.patch
+Deprecate-unused-options-instead-of-removing-it.patch