diff -Nru sosreport-4.0/debian/changelog sosreport-4.0/debian/changelog --- sosreport-4.0/debian/changelog 2021-02-16 19:30:09.000000000 +0000 +++ sosreport-4.0/debian/changelog 2021-03-03 20:20:25.000000000 +0000 @@ -1,3 +1,11 @@ +sosreport (4.0-1~ubuntu0.20.04.5) focal; urgency=medium + + [Ponnuvel Palaniyappan] + * d/p/0018-make-independent-plugin-work.patch: + Make IndependentPlugin work again (LP: #1917651) + + -- Ponnuvel Palaniyappan Wed, 03 Mar 2021 20:20:25 +0000 + sosreport (4.0-1~ubuntu0.20.04.4) focal; urgency=medium [Ponnuvel Palaniyappan] diff -Nru sosreport-4.0/debian/patches/0018-make-independent-plugin-work.patch sosreport-4.0/debian/patches/0018-make-independent-plugin-work.patch --- sosreport-4.0/debian/patches/0018-make-independent-plugin-work.patch 1970-01-01 01:00:00.000000000 +0100 +++ sosreport-4.0/debian/patches/0018-make-independent-plugin-work.patch 2021-03-03 20:20:23.000000000 +0000 @@ -0,0 +1,449 @@ +Description: Fix Independent plugin + IndepedentPlugin is broken and has been fixed upstream. + This commit picks up the fix from commit a36e1b83. +Author: Ponnuvel Palaniyappan, pponnuvel@gmail.com +Origin: upstream, https://github.com/sosreport/sos/pull/2224 +Bug: https://github.com/sosreport/sos/pull/2018 +Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/1917651 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: sosreport-4.0/sos/policies/__init__.py +=================================================================== +--- sosreport-4.0.orig/sos/policies/__init__.py ++++ sosreport-4.0/sos/policies/__init__.py +@@ -819,26 +819,11 @@ any third party. + self.case_id = None + self.probe_runtime = probe_runtime + self.package_manager = PackageManager() +- self._valid_subclasses = [] ++ self.valid_subclasses = [IndependentPlugin] + self.set_exec_path() + self._host_sysroot = sysroot + self.register_presets(GENERIC_PRESETS) + +- def get_valid_subclasses(self): +- return [IndependentPlugin] + self._valid_subclasses +- +- def set_valid_subclasses(self, subclasses): +- self._valid_subclasses = subclasses +- +- def del_valid_subclasses(self): +- del self._valid_subclasses +- +- valid_subclasses = property(get_valid_subclasses, +- set_valid_subclasses, +- del_valid_subclasses, +- "list of subclasses that this policy can " +- "process") +- + def check(self, remote=''): + """ + This function is responsible for determining if the underlying system +Index: sosreport-4.0/sos/policies/cos.py +=================================================================== +--- sosreport-4.0.orig/sos/policies/cos.py ++++ sosreport-4.0/sos/policies/cos.py +@@ -8,7 +8,7 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import CosPlugin ++from sos.report.plugins import CosPlugin, IndependentPlugin + from sos.policies import LinuxPolicy + + +@@ -30,7 +30,7 @@ class CosPolicy(LinuxPolicy): + distro = "Container-Optimized OS" + vendor = "Google Cloud Platform" + vendor_url = "https://cloud.google.com/container-optimized-os/" +- valid_subclasses = [CosPlugin] ++ valid_subclasses = [CosPlugin, IndependentPlugin] + PATH = "/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin" + + @classmethod +Index: sosreport-4.0/sos/policies/debian.py +=================================================================== +--- sosreport-4.0.orig/sos/policies/debian.py ++++ sosreport-4.0/sos/policies/debian.py +@@ -29,8 +29,7 @@ class DebianPolicy(LinuxPolicy): + verify_filter=self._debv_filter, + chroot=sysroot, + remote_exec=remote_exec) +- +- self.valid_subclasses = [DebianPlugin] ++ self.valid_subclasses += [DebianPlugin] + + def _get_pkg_name_for_binary(self, binary): + # for binary not specified inside {..}, return binary itself +Index: sosreport-4.0/sos/policies/ibmkvm.py +=================================================================== +--- sosreport-4.0.orig/sos/policies/ibmkvm.py ++++ sosreport-4.0/sos/policies/ibmkvm.py +@@ -10,7 +10,7 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import PowerKVMPlugin, ZKVMPlugin, RedHatPlugin ++from sos.report.plugins import PowerKVMPlugin, ZKVMPlugin + from sos.policies.redhat import RedHatPolicy + + import os +@@ -26,7 +26,7 @@ class PowerKVMPolicy(RedHatPolicy): + super(PowerKVMPolicy, self).__init__(sysroot=sysroot, init=init, + probe_runtime=probe_runtime, + remote_exec=remote_exec) +- self.valid_subclasses = [PowerKVMPlugin, RedHatPlugin] ++ self.valid_subclasses += [PowerKVMPlugin] + + @classmethod + def check(cls, remote=''): +@@ -54,7 +54,7 @@ class ZKVMPolicy(RedHatPolicy): + + def __init__(self, sysroot=None): + super(ZKVMPolicy, self).__init__(sysroot=sysroot) +- self.valid_subclasses = [ZKVMPlugin, RedHatPlugin] ++ self.valid_subclasses += [ZKVMPlugin] + + @classmethod + def check(cls, remote=''): +Index: sosreport-4.0/sos/policies/redhat.py +=================================================================== +--- sosreport-4.0.orig/sos/policies/redhat.py ++++ sosreport-4.0/sos/policies/redhat.py +@@ -61,7 +61,7 @@ class RedHatPolicy(LinuxPolicy): + chroot=sysroot, + remote_exec=remote_exec) + +- self.valid_subclasses = [RedHatPlugin] ++ self.valid_subclasses += [RedHatPlugin] + + self.pkgs = self.package_manager.all_pkgs() + +Index: sosreport-4.0/sos/policies/suse.py +=================================================================== +--- sosreport-4.0.orig/sos/policies/suse.py ++++ sosreport-4.0/sos/policies/suse.py +@@ -29,7 +29,7 @@ class SuSEPolicy(LinuxPolicy): + self.package_manager = PackageManager( + 'rpm -qa --queryformat "%{NAME}|%{VERSION}\\n"', + remote_exec=remote_exec) +- self.valid_subclasses = [SuSEPlugin, RedHatPlugin] ++ self.valid_subclasses += [SuSEPlugin, RedHatPlugin] + + pkgs = self.package_manager.all_pkgs() + +Index: sosreport-4.0/sos/policies/ubuntu.py +=================================================================== +--- sosreport-4.0.orig/sos/policies/ubuntu.py ++++ sosreport-4.0/sos/policies/ubuntu.py +@@ -1,4 +1,4 @@ +-from sos.report.plugins import UbuntuPlugin, DebianPlugin ++from sos.report.plugins import UbuntuPlugin + from sos.policies.debian import DebianPolicy + + import os +@@ -20,7 +20,7 @@ class UbuntuPolicy(DebianPolicy): + super(UbuntuPolicy, self).__init__(sysroot=sysroot, init=init, + probe_runtime=probe_runtime, + remote_exec=remote_exec) +- self.valid_subclasses = [UbuntuPlugin, DebianPlugin] ++ self.valid_subclasses += [UbuntuPlugin] + + @classmethod + def check(cls, remote=''): +Index: sosreport-4.0/sos/report/plugins/block.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/block.py ++++ sosreport-4.0/sos/report/plugins/block.py +@@ -6,10 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Block(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ++class Block(Plugin, IndependentPlugin): + + short_desc = 'Block device information' + +Index: sosreport-4.0/sos/report/plugins/date.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/date.py ++++ sosreport-4.0/sos/report/plugins/date.py +@@ -8,10 +8,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Date(Plugin, RedHatPlugin, DebianPlugin): ++class Date(Plugin, IndependentPlugin): + + short_desc = 'Basic system time information' + +Index: sosreport-4.0/sos/report/plugins/hardware.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/hardware.py ++++ sosreport-4.0/sos/report/plugins/hardware.py +@@ -6,10 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Hardware(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ++class Hardware(Plugin, IndependentPlugin): + + short_desc = 'General hardware information' + +Index: sosreport-4.0/sos/report/plugins/host.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/host.py ++++ sosreport-4.0/sos/report/plugins/host.py +@@ -8,10 +8,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Host(Plugin, RedHatPlugin, DebianPlugin): ++class Host(Plugin, IndependentPlugin): + + short_desc = 'Host information' + +Index: sosreport-4.0/sos/report/plugins/kernel.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/kernel.py ++++ sosreport-4.0/sos/report/plugins/kernel.py +@@ -6,13 +6,12 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, +- UbuntuPlugin, CosPlugin) ++from sos.report.plugins import Plugin, IndependentPlugin + import os + import glob + + +-class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin): ++class Kernel(Plugin, IndependentPlugin): + + short_desc = 'Linux kernel' + +Index: sosreport-4.0/sos/report/plugins/libraries.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/libraries.py ++++ sosreport-4.0/sos/report/plugins/libraries.py +@@ -6,10 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Libraries(Plugin, RedHatPlugin, UbuntuPlugin): ++class Libraries(Plugin, IndependentPlugin): + + short_desc = 'Dynamic shared libraries' + +Index: sosreport-4.0/sos/report/plugins/logs.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/logs.py ++++ sosreport-4.0/sos/report/plugins/logs.py +@@ -8,11 +8,10 @@ + + import os + import glob +-from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, +- UbuntuPlugin, CosPlugin) ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Logs(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin): ++class Logs(Plugin, IndependentPlugin): + + short_desc = 'System logs' + +Index: sosreport-4.0/sos/report/plugins/memory.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/memory.py ++++ sosreport-4.0/sos/report/plugins/memory.py +@@ -6,11 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, +- UbuntuPlugin, CosPlugin) ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin): ++class Memory(Plugin, IndependentPlugin): + + short_desc = 'Memory configuration and use' + +Index: sosreport-4.0/sos/report/plugins/nvidia.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/nvidia.py ++++ sosreport-4.0/sos/report/plugins/nvidia.py +@@ -9,10 +9,10 @@ + # See the LICENSE file in the source distribution for further information. + + +-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Nvidia(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ++class Nvidia(Plugin, IndependentPlugin): + + short_desc = 'Nvidia GPU information' + +Index: sosreport-4.0/sos/report/plugins/opencl.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/opencl.py ++++ sosreport-4.0/sos/report/plugins/opencl.py +@@ -6,10 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class OpenCL(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ++class OpenCL(Plugin, IndependentPlugin): + + short_desc = 'OpenCL' + +Index: sosreport-4.0/sos/report/plugins/opengl.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/opengl.py ++++ sosreport-4.0/sos/report/plugins/opengl.py +@@ -6,10 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class OpenGL(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ++class OpenGL(Plugin, IndependentPlugin): + + short_desc = 'OpenGL' + +Index: sosreport-4.0/sos/report/plugins/pci.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/pci.py ++++ sosreport-4.0/sos/report/plugins/pci.py +@@ -6,11 +6,11 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + import os + + +-class Pci(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): ++class Pci(Plugin, IndependentPlugin): + + short_desc = 'PCI devices' + +Index: sosreport-4.0/sos/report/plugins/process.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/process.py ++++ sosreport-4.0/sos/report/plugins/process.py +@@ -6,11 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin, +- UbuntuPlugin, CosPlugin) ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Process(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin): ++class Process(Plugin, IndependentPlugin): + + short_desc = 'process information' + +Index: sosreport-4.0/sos/report/plugins/processor.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/processor.py ++++ sosreport-4.0/sos/report/plugins/processor.py +@@ -6,10 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Processor(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): ++class Processor(Plugin, IndependentPlugin): + + short_desc = 'CPU information' + +Index: sosreport-4.0/sos/report/plugins/system.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/system.py ++++ sosreport-4.0/sos/report/plugins/system.py +@@ -6,10 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class System(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ++class System(Plugin, IndependentPlugin): + + short_desc = 'core system information' + +Index: sosreport-4.0/sos/report/plugins/vulkan.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/vulkan.py ++++ sosreport-4.0/sos/report/plugins/vulkan.py +@@ -6,10 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class Vulkan(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ++class Vulkan(Plugin, IndependentPlugin): + + short_desc = 'Vulkan' + +Index: sosreport-4.0/sos/report/plugins/x11.py +=================================================================== +--- sosreport-4.0.orig/sos/report/plugins/x11.py ++++ sosreport-4.0/sos/report/plugins/x11.py +@@ -6,10 +6,10 @@ + # + # See the LICENSE file in the source distribution for further information. + +-from sos.report.plugins import Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin ++from sos.report.plugins import Plugin, IndependentPlugin + + +-class X11(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): ++class X11(Plugin, IndependentPlugin): + + short_desc = 'X windowing system' + diff -Nru sosreport-4.0/debian/patches/series sosreport-4.0/debian/patches/series --- sosreport-4.0/debian/patches/series 2021-02-16 19:29:46.000000000 +0000 +++ sosreport-4.0/debian/patches/series 2021-03-03 20:06:17.000000000 +0000 @@ -15,3 +15,4 @@ 0015-k8s-fix-cdk-related-file-paths.patch 0016-systemd-prefer-resolvectl-over-systemd-resolve.patch 0017-ovn-extend-information.patch +0018-make-independent-plugin-work.patch