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: sosreport

sosreport (3.6-1ubuntu2) disco; urgency=medium * d/p/dont-collect-some-tracing-instance-files.patch: (LP: #1775195) - Ignoring some kernel files as the copy of them make sosreport hangs in situation where kernel tracing events is in used. -- Eric Desrochers <eric.desrochers@canonical.com> Fri, 16 Nov 2018 08:45:40 -0500 sosreport (3.6-1ubuntu1) disco; urgency=medium * d/p/fix-string-substitution-method.patch: (LP: #1775195) - Fix plugin string substitution methods to fail. -- Eric Desrochers <eric.desrochers@canonical.com> Tue, 13 Nov 2018 15:37:27 -0500

Modifications :
  1. Download patch debian/patches/fix-string-substitution-method.patch

    --- 3.6-1/debian/patches/fix-string-substitution-method.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.6-1ubuntu2/debian/patches/fix-string-substitution-method.patch 2018-11-13 20:36:12.000000000 +0000 @@ -0,0 +1,87 @@ +Description: [archive] fix add_string()/do_*_sub() regression + A change in the handling of add_string() operations in the archive + class causes the Plugin string substitution methods to fail (since + the archive was enforcing a check that the path did not already + exist - for substitutions this is always the case). + + Maintain the check for content that is being copied into the + archive anew, but make the add_string() method override this and + disable the existence checks. + +Author: Bryn M. Reeves <bmr@redhat.com> +Origin: upstream, https://github.com/sosreport/sos/commit/b96bdab03f06408e162b1733b20e8ba9fbf8e012 +Bug-ubuntu: https://bugs.launchpad.net/bugs/1775195 +Index: sosreport-3.6/sos/archive.py +=================================================================== +--- sosreport-3.6.orig/sos/archive.py ++++ sosreport-3.6/sos/archive.py +@@ -158,7 +158,7 @@ class FileCacheArchive(Archive): + name = name.lstrip(os.sep) + return (os.path.join(self._archive_root, name)) + +- def _check_path(self, src, path_type, dest=None): ++ def _check_path(self, src, path_type, dest=None, force=False): + """Check a new destination path in the archive. + + Since it is possible for multiple plugins to collect the same +@@ -185,6 +185,7 @@ class FileCacheArchive(Archive): + :param src: the source path to be copied to the archive + :param path_type: the type of object to be copied + :param dest: an optional destination path ++ :param force: force file creation even if the path exists + :returns: An absolute destination path if the path should be + copied now or `None` otherwise + """ +@@ -208,6 +209,9 @@ class FileCacheArchive(Archive): + stat.S_ISSOCK(mode) + ]) + ++ if force: ++ return dest ++ + # Check destination path presence and type + if os.path.exists(dest): + # Use lstat: we care about the current object, not the referent. +@@ -274,9 +278,11 @@ class FileCacheArchive(Archive): + with self._path_lock: + src = dest + +- dest = self._check_path(dest, P_FILE) +- if not dest: +- return ++ # add_string() is a special case: it must always take precedence ++ # over any exixting content in the archive, since it is used by ++ # the Plugin postprocessing hooks to perform regex substitution ++ # on file content. ++ dest = self._check_path(dest, P_FILE, force=True) + + f = codecs.open(dest, 'w', encoding='utf-8') + if isinstance(content, bytes): +Index: sosreport-3.6/tests/archive_tests.py +=================================================================== +--- sosreport-3.6.orig/tests/archive_tests.py ++++ sosreport-3.6/tests/archive_tests.py +@@ -94,21 +94,13 @@ class TarFileArchiveTest(unittest.TestCa + self.assertEquals('this is my content', afp.read()) + + def test_rewrite_file(self): +- """Test that re-writing a file does not modify the content. +- +- In sos we do not have a use for overwriting archive content +- in-place (it is an error if different plugins attempt to +- store different content at the same path). +- +- We do not enforce the content check at runtime since it +- would be prohibitively costly: instead just verify in the +- unit suite that the original content is preserved. ++ """Test that re-writing a file with add_string() modifies the content. + """ + self.tf.add_string('this is my content', 'tests/string_test.txt') + self.tf.add_string('this is my new content', 'tests/string_test.txt') + + afp = self.tf.open_file('tests/string_test.txt') +- self.assertEquals('this is my content', afp.read()) ++ self.assertEquals('this is my new content', afp.read()) + + def test_make_link(self): + self.tf.add_file('tests/ziptest')
  2. Download patch debian/patches/dont-collect-some-tracing-instance-files.patch

    --- 3.6-1/debian/patches/dont-collect-some-tracing-instance-files.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.6-1ubuntu2/debian/patches/dont-collect-some-tracing-instance-files.patch 2018-11-16 13:45:08.000000000 +0000 @@ -0,0 +1,22 @@ +Description: [kernel] dont collect some tracing instance files + As copying of them hangs. +Author: Pavel Moravec <pmoravec@redhat.com> +Origin: upstream, https://github.com/sosreport/sos/pull/1445/commits/d6379b5ba0f381ea8ec2403b9985100a946a5866 +Bug: https://github.com/sosreport/sos/pull/1445 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1775195 +Index: sosreport-3.6/sos/plugins/kernel.py +=================================================================== +--- sosreport-3.6.orig/sos/plugins/kernel.py ++++ sosreport-3.6/sos/plugins/kernel.py +@@ -93,7 +93,10 @@ class Kernel(Plugin, RedHatPlugin, Debia + '/sys/kernel/debug/tracing/events/*', + '/sys/kernel/debug/tracing/free_buffer', + '/sys/kernel/debug/tracing/trace_marker', +- '/sys/kernel/debug/tracing/trace_marker_raw' ++ '/sys/kernel/debug/tracing/trace_marker_raw', ++ '/sys/kernel/debug/tracing/instances/*/per_cpu/*/snapshot_raw', ++ '/sys/kernel/debug/tracing/instances/*/per_cpu/*/trace_pipe*', ++ '/sys/kernel/debug/tracing/instances/*/trace_pipe' + ]) + + self.add_copy_spec([
  3. Download patch debian/patches/series

    --- 3.6-1/debian/patches/series 2018-09-24 09:24:07.000000000 +0000 +++ 3.6-1ubuntu2/debian/patches/series 2018-11-16 13:38:37.000000000 +0000 @@ -1,3 +1,5 @@ 0001-skip-py2-only-tests.patch avoid-distutils.diff archive-fix-stat-typo.patch +fix-string-substitution-method.patch +dont-collect-some-tracing-instance-files.patch
  1. sosreport