Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: clamav

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 <lucas.kanashiro@canonical.com> Thu, 05 Dec 2019 18:01:14 -0300

Modifications :
  1. Download patch debian/control

    --- 0.102.1+dfsg-1/debian/control 2019-11-24 22:19:28.000000000 +0000 +++ 0.102.1+dfsg-1ubuntu1/debian/control 2019-12-05 21:01:14.000000000 +0000 @@ -1,7 +1,8 @@ Source: clamav Section: utils Priority: optional -Maintainer: ClamAV Team <pkg-clamav-devel@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: ClamAV Team <pkg-clamav-devel@lists.alioth.debian.org> Uploaders: Michael Meskes <meskes@debian.org>, Michael Tautschnig <mt@debian.org>, Scott Kitterman <scott@kitterman.com>,
  2. Download patch debian/patches/series

    --- 0.102.1+dfsg-1/debian/patches/series 2019-11-24 22:19:28.000000000 +0000 +++ 0.102.1+dfsg-1ubuntu1/debian/patches/series 2019-12-05 21:01:14.000000000 +0000 @@ -4,3 +4,4 @@ clamd_dont_depend_on_clamav_demon_socket 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
  3. Download patch debian/patches/Deprecate-unused-options-instead-of-removing-it.patch

    --- 0.102.1+dfsg-1/debian/patches/Deprecate-unused-options-instead-of-removing-it.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.102.1+dfsg-1ubuntu1/debian/patches/Deprecate-unused-options-instead-of-removing-it.patch 2019-12-05 21:01:14.000000000 +0000 @@ -0,0 +1,54 @@ +Description: Deprecate unused options instead of removing it + Refresh Debian patch from Sebastian Andrzej Siewior <sebastian@breakpoint.cc>, + 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 <sebastian@breakpoint.cc> +Origin: upstream +Bug: https://bugs.debian.org/902290 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1783632 +Reviewed-by: Lucas Kanashiro <lucas.kanashiro@canonical.com> +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; +
  1. clamav