From a65b751ecfb0b71e0d5c56fc26797215faa5296a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 17 May 2016 14:44:35 +0100 Subject: [PATCH] Add Forwarded/Origin headers to patches as appropriate --- debian/patches/bugfix/all/KVM-MTRR-remove-MSR-0x2f8.patch | 1 + .../fs-add-module_softdep-declarations-for-hard-coded-cr.patch | 1 + .../patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch | 1 + debian/patches/bugfix/all/lockdep-add-missing-macros.patch | 1 + debian/patches/bugfix/all/lockdep-fix-oot-build.patch | 1 + debian/patches/bugfix/all/lockdep-fix-soname.patch | 1 + .../bugfix/all/scripts-fix-x.509-pem-support-in-sign-file.patch | 1 + .../tools-build-remove-bpf-run-time-check-at-build-time.patch | 1 + debian/patches/bugfix/all/tools-lib-lockdep-use-ldflags.patch | 1 + ...ools-lib-traceevent-fix-use-of-uninitialized-variables.patch | 1 + .../patches/bugfix/all/tools-lib-traceevent-use-ldflags.patch | 1 + debian/patches/bugfix/all/tools-perf-man-date.patch | 1 + debian/patches/bugfix/all/tools-perf-remove-shebangs.patch | 1 + .../bugfix/all/usbip-include-uninstalled-linux-usbip-h.patch | 1 + .../videobuf2-core-fix-crash-after-fixing-cve-2016-4568.patch | 1 + .../revert-perf-build-fix-libunwind-feature-detection-on.patch | 1 + .../revert-perf-tools-x86-build-perf-on-older-user-space.patch | 2 +- .../revert-sp5100_tco-fix-the-device-check-for-SB800-and.patch | 1 + .../bugfix/x86/tools-hv-fix-fortify-format-warning.patch | 1 + 19 files changed, 19 insertions(+), 1 deletion(-) diff --git a/debian/patches/bugfix/all/KVM-MTRR-remove-MSR-0x2f8.patch b/debian/patches/bugfix/all/KVM-MTRR-remove-MSR-0x2f8.patch index d46c7826d..4e372505b 100644 --- a/debian/patches/bugfix/all/KVM-MTRR-remove-MSR-0x2f8.patch +++ b/debian/patches/bugfix/all/KVM-MTRR-remove-MSR-0x2f8.patch @@ -1,5 +1,6 @@ From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PATCH] KVM: MTRR: remove MSR 0x2f8 +Origin: http://article.gmane.org/gmane.comp.security.oss.general/19584 MSR 0x2f8 accessed the 124th Variable Range MTRR ever since MTRR support was introduced by 9ba075a664df ("KVM: MTRR support"). diff --git a/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch b/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch index d8f0e5a2f..bde2c1f1c 100644 --- a/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch +++ b/debian/patches/bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch @@ -2,6 +2,7 @@ From: Ben Hutchings Date: Wed, 13 Apr 2016 21:48:06 +0100 Subject: fs: Add MODULE_SOFTDEP declarations for hard-coded crypto drivers Bug-Debian: https://bugs.debian.org/819725 +Forwarded: http://mid.gmane.org/20160517133631.GF7555@decadent.org.uk This helps initramfs builders and other tools to find the full dependencies of a module. diff --git a/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch b/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch index 65ca43e1d..da988700b 100644 --- a/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch +++ b/debian/patches/bugfix/all/kbuild-fix-recordmcount-dependency.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Subject: kbuild: Fix recordmcount dependency for OOT modules Date: Mon, 08 Sep 2014 18:31:24 +0100 +Forwarded: no We never rebuild anything in-tree when building an out-of-tree modules, so external modules should not depend on the recordmcount diff --git a/debian/patches/bugfix/all/lockdep-add-missing-macros.patch b/debian/patches/bugfix/all/lockdep-add-missing-macros.patch index 42f0589dc..be41cc20f 100644 --- a/debian/patches/bugfix/all/lockdep-add-missing-macros.patch +++ b/debian/patches/bugfix/all/lockdep-add-missing-macros.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Thu, 18 Feb 2016 03:34:25 +0000 Subject: lockdep: Add missing macros +Forwarded: no liblockdep is broken again due to lockdep using kernel macros that it doesn't have substitutes for. diff --git a/debian/patches/bugfix/all/lockdep-fix-oot-build.patch b/debian/patches/bugfix/all/lockdep-fix-oot-build.patch index 2d2efd2ad..b22569aff 100644 --- a/debian/patches/bugfix/all/lockdep-fix-oot-build.patch +++ b/debian/patches/bugfix/all/lockdep-fix-oot-build.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Thu, 13 Aug 2015 20:48:12 +0200 Subject: liblockdep: Fix object file paths used in an out-of-tree build +Forwarded: no Signed-off-by: Ben Hutchings --- diff --git a/debian/patches/bugfix/all/lockdep-fix-soname.patch b/debian/patches/bugfix/all/lockdep-fix-soname.patch index a65b198f7..ed6078193 100644 --- a/debian/patches/bugfix/all/lockdep-fix-soname.patch +++ b/debian/patches/bugfix/all/lockdep-fix-soname.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Thu, 13 Aug 2015 20:48:12 +0200 Subject: liblockdep: Remove double-quotes from soname +Forwarded: no Signed-off-by: Ben Hutchings --- diff --git a/debian/patches/bugfix/all/scripts-fix-x.509-pem-support-in-sign-file.patch b/debian/patches/bugfix/all/scripts-fix-x.509-pem-support-in-sign-file.patch index 3f235d185..a01580948 100644 --- a/debian/patches/bugfix/all/scripts-fix-x.509-pem-support-in-sign-file.patch +++ b/debian/patches/bugfix/all/scripts-fix-x.509-pem-support-in-sign-file.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Mon, 04 Apr 2016 12:53:35 +0100 Subject: scripts: Fix X.509 PEM support in sign-file +Forwarded: http://mid.gmane.org/20160517132056.GD7555@decadent.org.uk sign-file originally required the X.509 certificate to be in DER format, but now has a fallback to PEM format. It expects BIO_reset() diff --git a/debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch b/debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch index 8c7980b7a..c09e9e1e7 100644 --- a/debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch +++ b/debian/patches/bugfix/all/tools-build-remove-bpf-run-time-check-at-build-time.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Sun, 21 Feb 2016 15:33:15 +0000 Subject: tools/build: Remove bpf() run-time check at build time +Forwarded: no It is not correct to test that a syscall works on the build system's kernel. We might be building on an earlier kernel version or with diff --git a/debian/patches/bugfix/all/tools-lib-lockdep-use-ldflags.patch b/debian/patches/bugfix/all/tools-lib-lockdep-use-ldflags.patch index 7ab950f71..dc3dd7fac 100644 --- a/debian/patches/bugfix/all/tools-lib-lockdep-use-ldflags.patch +++ b/debian/patches/bugfix/all/tools-lib-lockdep-use-ldflags.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Fri, 25 Sep 2015 21:36:29 +0100 Subject: tools/lib/lockdep: Use LDFLAGS +Forwarded: no Signed-off-by: Ben Hutchings --- diff --git a/debian/patches/bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch b/debian/patches/bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch index 82a841845..a3564d77c 100644 --- a/debian/patches/bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch +++ b/debian/patches/bugfix/all/tools-lib-traceevent-fix-use-of-uninitialized-variables.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Sun, 20 Mar 2016 21:09:02 +0000 Subject: tools lib traceevent: Fix use of uninitialized variables +Forwarded: no Fix a number of correct warnings from gcc: diff --git a/debian/patches/bugfix/all/tools-lib-traceevent-use-ldflags.patch b/debian/patches/bugfix/all/tools-lib-traceevent-use-ldflags.patch index bd6c5c0b6..fe0248c1f 100644 --- a/debian/patches/bugfix/all/tools-lib-traceevent-use-ldflags.patch +++ b/debian/patches/bugfix/all/tools-lib-traceevent-use-ldflags.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Fri, 25 Sep 2015 21:26:48 +0100 Subject: tools/lib/traceevent: Use LDFLAGS +Forwarded: no Signed-off-by: Ben Hutchings --- diff --git a/debian/patches/bugfix/all/tools-perf-man-date.patch b/debian/patches/bugfix/all/tools-perf-man-date.patch index e4f30d4fd..00eb46644 100644 --- a/debian/patches/bugfix/all/tools-perf-man-date.patch +++ b/debian/patches/bugfix/all/tools-perf-man-date.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Mon, 13 Jul 2015 20:29:20 +0100 Subject: perf tools: Use $KBUILD_BUILD_TIMESTAMP as man page date +Forwarded: http://mid.gmane.org/20160517132809.GE7555@decadent.org.uk This allows man pages to be built reproducibly. diff --git a/debian/patches/bugfix/all/tools-perf-remove-shebangs.patch b/debian/patches/bugfix/all/tools-perf-remove-shebangs.patch index f9bb858d2..07953ca7e 100644 --- a/debian/patches/bugfix/all/tools-perf-remove-shebangs.patch +++ b/debian/patches/bugfix/all/tools-perf-remove-shebangs.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Fri, 25 Sep 2015 20:09:23 +0100 Subject: tools/perf: Remove shebang lines from perf scripts +Forwarded: no perf scripts need to be invoked through perf, not directly through perl (or other language interpreter). So including shebang lines in diff --git a/debian/patches/bugfix/all/usbip-include-uninstalled-linux-usbip-h.patch b/debian/patches/bugfix/all/usbip-include-uninstalled-linux-usbip-h.patch index aec6cb898..dc6191f27 100644 --- a/debian/patches/bugfix/all/usbip-include-uninstalled-linux-usbip-h.patch +++ b/debian/patches/bugfix/all/usbip-include-uninstalled-linux-usbip-h.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Fri, 17 Oct 2014 13:55:16 +0200 Subject: usbip: Include uninstalled +Forwarded: no We need to include from the current kernel source, not the installed linux-libc-dev. The clean way to diff --git a/debian/patches/bugfix/all/videobuf2-core-fix-crash-after-fixing-cve-2016-4568.patch b/debian/patches/bugfix/all/videobuf2-core-fix-crash-after-fixing-cve-2016-4568.patch index 8c80f98ef..c94f1842a 100644 --- a/debian/patches/bugfix/all/videobuf2-core-fix-crash-after-fixing-cve-2016-4568.patch +++ b/debian/patches/bugfix/all/videobuf2-core-fix-crash-after-fixing-cve-2016-4568.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Mon, 16 May 2016 03:26:30 +0100 Subject: videobuf2-core: Fix crash after fixing CVE-2016-4568 +Forwarded: no Commit 2c1f6951a8a8 "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing" was reverted upstream by commit 93f0750dcdae. diff --git a/debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch b/debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch index 6787fa2ea..9deb462a6 100644 --- a/debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch +++ b/debian/patches/bugfix/x86/revert-perf-build-fix-libunwind-feature-detection-on.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Fri, 25 Sep 2015 22:50:50 +0100 Subject: Revert "perf build: Fix libunwind feature detection on 32-bit x86" +Forwarded: no This reverts commit 05b41775e2edd69a83f592e3534930c934d4038e. It broke feature detection that was working just fine for us. diff --git a/debian/patches/bugfix/x86/revert-perf-tools-x86-build-perf-on-older-user-space.patch b/debian/patches/bugfix/x86/revert-perf-tools-x86-build-perf-on-older-user-space.patch index c4e2e272a..f8b64043c 100644 --- a/debian/patches/bugfix/x86/revert-perf-tools-x86-build-perf-on-older-user-space.patch +++ b/debian/patches/bugfix/x86/revert-perf-tools-x86-build-perf-on-older-user-space.patch @@ -1,8 +1,8 @@ -From d9ea89d8408f647c05c720bf35a1fba4992dd4a8 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 18 Feb 2016 23:37:19 +0000 Subject: [PATCH] Revert "perf tools, x86: Build perf on older user-space as well" +Forwarded: no This reverts commit eae7a755ee81129370c8f555b0d5672e6673735d. The empty unistd_{32,64}.h headers prevent building on sh, which also diff --git a/debian/patches/bugfix/x86/revert-sp5100_tco-fix-the-device-check-for-SB800-and.patch b/debian/patches/bugfix/x86/revert-sp5100_tco-fix-the-device-check-for-SB800-and.patch index 92000052c..6a499d429 100644 --- a/debian/patches/bugfix/x86/revert-sp5100_tco-fix-the-device-check-for-SB800-and.patch +++ b/debian/patches/bugfix/x86/revert-sp5100_tco-fix-the-device-check-for-SB800-and.patch @@ -3,6 +3,7 @@ Date: Mon, 2 May 2016 21:15:00 +0200 Subject: Revert "sp5100_tco: fix the device check for SB800 and later chipsets" Bug: https://bugzilla.kernel.org/show_bug.cgi?id=114201 Bug-Debian: https://bugs.debian.org/823146 +Forwarded: no This reverts commit bdecfcdb5461834aab24002bb18d3cbdd907b7fb, which caused log flooding and hung CPUs on some systems. diff --git a/debian/patches/bugfix/x86/tools-hv-fix-fortify-format-warning.patch b/debian/patches/bugfix/x86/tools-hv-fix-fortify-format-warning.patch index a5e0ba6c1..dd8b9039a 100644 --- a/debian/patches/bugfix/x86/tools-hv-fix-fortify-format-warning.patch +++ b/debian/patches/bugfix/x86/tools-hv-fix-fortify-format-warning.patch @@ -1,6 +1,7 @@ From: Ben Hutchings Date: Fri, 25 Sep 2015 20:28:10 +0100 Subject: tools/hv: Fix fortify format warning +Forwarded: no With fortify enabled, gcc warns: