From 69bb0aff02beaedae64624df1f20cc83d70ddb35c48a99bb2f0269878fd244d0 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 16 Dec 2019 16:25:40 +0000 Subject: [PATCH] commit 135fe73ec1fccde19d8e39dc37b9f450e57014df OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1217 --- dtb-aarch64.changes | 13 +++++++++++++ dtb-aarch64.spec | 2 +- dtb-armv6l.changes | 13 +++++++++++++ dtb-armv6l.spec | 2 +- dtb-armv7l.changes | 13 +++++++++++++ dtb-armv7l.spec | 2 +- kernel-64kb.changes | 13 +++++++++++++ kernel-64kb.spec | 8 ++++---- kernel-debug.changes | 13 +++++++++++++ kernel-debug.spec | 8 ++++---- kernel-default.changes | 13 +++++++++++++ kernel-default.spec | 8 ++++---- kernel-docs.changes | 13 +++++++++++++ kernel-docs.spec | 4 ++-- kernel-kvmsmall.changes | 13 +++++++++++++ kernel-kvmsmall.spec | 8 ++++---- kernel-lpae.changes | 13 +++++++++++++ kernel-lpae.spec | 8 ++++---- kernel-obs-build.changes | 13 +++++++++++++ kernel-obs-build.spec | 4 ++-- kernel-obs-qa.changes | 13 +++++++++++++ kernel-obs-qa.spec | 2 +- kernel-pae.changes | 13 +++++++++++++ kernel-pae.spec | 8 ++++---- kernel-source.changes | 13 +++++++++++++ kernel-source.spec | 4 ++-- kernel-subpackage-spec | 6 +++++- kernel-syms.changes | 13 +++++++++++++ kernel-syms.spec | 4 ++-- kernel-vanilla.changes | 13 +++++++++++++ kernel-vanilla.spec | 8 ++++---- kernel-zfcpdump.changes | 13 +++++++++++++ kernel-zfcpdump.spec | 8 ++++---- patches.suse.tar.bz2 | 4 ++-- series.conf | 1 + source-timestamp | 4 ++-- 36 files changed, 262 insertions(+), 49 deletions(-) diff --git a/dtb-aarch64.changes b/dtb-aarch64.changes index b3df1d7b..55589d34 100644 --- a/dtb-aarch64.changes +++ b/dtb-aarch64.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/dtb-aarch64.spec b/dtb-aarch64.spec index 8c714e2f..2f02f3c7 100644 --- a/dtb-aarch64.spec +++ b/dtb-aarch64.spec @@ -31,7 +31,7 @@ Name: dtb-aarch64 Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif diff --git a/dtb-armv6l.changes b/dtb-armv6l.changes index b3df1d7b..55589d34 100644 --- a/dtb-armv6l.changes +++ b/dtb-armv6l.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/dtb-armv6l.spec b/dtb-armv6l.spec index 7029ca47..6ca977ef 100644 --- a/dtb-armv6l.spec +++ b/dtb-armv6l.spec @@ -31,7 +31,7 @@ Name: dtb-armv6l Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif diff --git a/dtb-armv7l.changes b/dtb-armv7l.changes index b3df1d7b..55589d34 100644 --- a/dtb-armv7l.changes +++ b/dtb-armv7l.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/dtb-armv7l.spec b/dtb-armv7l.spec index 32c2916e..1d0a763e 100644 --- a/dtb-armv7l.spec +++ b/dtb-armv7l.spec @@ -31,7 +31,7 @@ Name: dtb-armv7l Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif diff --git a/kernel-64kb.changes b/kernel-64kb.changes index b3df1d7b..55589d34 100644 --- a/kernel-64kb.changes +++ b/kernel-64kb.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-64kb.spec b/kernel-64kb.spec index b0b57527..5fc6603d 100644 --- a/kernel-64kb.spec +++ b/kernel-64kb.spec @@ -67,7 +67,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -172,10 +172,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d -Provides: kernel-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: kernel-%build_flavor-base-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df +Provides: kernel-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df # END COMMON DEPS -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-debug.changes b/kernel-debug.changes index b3df1d7b..55589d34 100644 --- a/kernel-debug.changes +++ b/kernel-debug.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-debug.spec b/kernel-debug.spec index 34183b3d..f6afab7a 100644 --- a/kernel-debug.spec +++ b/kernel-debug.spec @@ -67,7 +67,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -172,10 +172,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d -Provides: kernel-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: kernel-%build_flavor-base-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df +Provides: kernel-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df # END COMMON DEPS -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df %ifarch ppc64 Provides: kernel-kdump = 2.6.28 Obsoletes: kernel-kdump <= 2.6.28 diff --git a/kernel-default.changes b/kernel-default.changes index b3df1d7b..55589d34 100644 --- a/kernel-default.changes +++ b/kernel-default.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-default.spec b/kernel-default.spec index 23be1e96..2de51b45 100644 --- a/kernel-default.spec +++ b/kernel-default.spec @@ -67,7 +67,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -172,10 +172,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d -Provides: kernel-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: kernel-%build_flavor-base-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df +Provides: kernel-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df # END COMMON DEPS -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df %ifarch %ix86 Provides: kernel-smp = 2.6.17 Obsoletes: kernel-smp <= 2.6.17 diff --git a/kernel-docs.changes b/kernel-docs.changes index b3df1d7b..55589d34 100644 --- a/kernel-docs.changes +++ b/kernel-docs.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-docs.spec b/kernel-docs.spec index 848d53dc..c76a8be0 100644 --- a/kernel-docs.spec +++ b/kernel-docs.spec @@ -33,7 +33,7 @@ License: GPL-2.0 Group: Documentation/Man Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -63,7 +63,7 @@ BuildRequires: texlive-zapfding %endif Url: http://www.kernel.org/ Provides: %name = %version-%source_rel -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-kvmsmall.changes b/kernel-kvmsmall.changes index b3df1d7b..55589d34 100644 --- a/kernel-kvmsmall.changes +++ b/kernel-kvmsmall.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-kvmsmall.spec b/kernel-kvmsmall.spec index b8d15633..fdce92e5 100644 --- a/kernel-kvmsmall.spec +++ b/kernel-kvmsmall.spec @@ -67,7 +67,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -172,10 +172,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d -Provides: kernel-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: kernel-%build_flavor-base-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df +Provides: kernel-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df # END COMMON DEPS -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-lpae.changes b/kernel-lpae.changes index b3df1d7b..55589d34 100644 --- a/kernel-lpae.changes +++ b/kernel-lpae.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-lpae.spec b/kernel-lpae.spec index 7cb7572f..36f66bef 100644 --- a/kernel-lpae.spec +++ b/kernel-lpae.spec @@ -67,7 +67,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -172,10 +172,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d -Provides: kernel-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: kernel-%build_flavor-base-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df +Provides: kernel-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df # END COMMON DEPS -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-obs-build.changes b/kernel-obs-build.changes index b3df1d7b..55589d34 100644 --- a/kernel-obs-build.changes +++ b/kernel-obs-build.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-obs-build.spec b/kernel-obs-build.spec index e0c4e296..bdcc42f1 100644 --- a/kernel-obs-build.spec +++ b/kernel-obs-build.spec @@ -45,7 +45,7 @@ BuildRequires: util-linux %endif %endif %endif -BuildRequires: kernel%kernel_flavor-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +BuildRequires: kernel%kernel_flavor-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df %if 0%{?rhel_version} BuildRequires: kernel @@ -66,7 +66,7 @@ License: GPL-2.0 Group: SLES Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif diff --git a/kernel-obs-qa.changes b/kernel-obs-qa.changes index b3df1d7b..55589d34 100644 --- a/kernel-obs-qa.changes +++ b/kernel-obs-qa.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-obs-qa.spec b/kernel-obs-qa.spec index 1ad80935..11b1bd60 100644 --- a/kernel-obs-qa.spec +++ b/kernel-obs-qa.spec @@ -38,7 +38,7 @@ License: GPL-2.0 Group: SLES Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif diff --git a/kernel-pae.changes b/kernel-pae.changes index b3df1d7b..55589d34 100644 --- a/kernel-pae.changes +++ b/kernel-pae.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-pae.spec b/kernel-pae.spec index dee1a297..aa8f5de9 100644 --- a/kernel-pae.spec +++ b/kernel-pae.spec @@ -67,7 +67,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -172,10 +172,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d -Provides: kernel-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: kernel-%build_flavor-base-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df +Provides: kernel-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df # END COMMON DEPS -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df %ifarch %ix86 Provides: kernel-bigsmp = 2.6.17 Obsoletes: kernel-bigsmp <= 2.6.17 diff --git a/kernel-source.changes b/kernel-source.changes index b3df1d7b..55589d34 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-source.spec b/kernel-source.spec index ba30e245..718f919e 100644 --- a/kernel-source.spec +++ b/kernel-source.spec @@ -32,7 +32,7 @@ License: GPL-2.0 Group: Development/Sources Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -43,7 +43,7 @@ BuildRequires: fdupes BuildRequires: sed Requires(post): coreutils sed Provides: %name = %version-%source_rel -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df Provides: linux Provides: multiversion(kernel) Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz diff --git a/kernel-subpackage-spec b/kernel-subpackage-spec index 0bd20617..b97806b5 100644 --- a/kernel-subpackage-spec +++ b/kernel-subpackage-spec @@ -1,6 +1,8 @@ %define rpm_kver %(rpm -q --qf '%%{VERSION}' %kernel_package_name) %define rpm_krel %(rpm -q --qf '%%{RELEASE}' %kernel_package_name) +%define kernel_base_recommends %(rpm -q --queryformat '[%%{RECOMMENDNEVRS}\n]' %kernel_package_name | grep -v '^kernel-firmware' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )') + # Force bzip2 instead of lzma compression to # 1) allow install on older dist versions, and # 2) decrease build times (bsc#962356) @@ -37,7 +39,9 @@ Requires(postun):%kernel_requires_postun Provides: %(rpm -q --queryformat '[%%{PROVIDENEVRS}\n]' %kernel_package_name | sed -E 's/^%kernel_package_name(-srchash| =)/%name\1/g' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )') Obsoletes: %(rpm -q --queryformat '[%%{OBSOLETENEVRS}\n]' %kernel_package_name | sed -E 's/^%kernel_package_name(-srchash| =)/%name\1/g' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )') Conflicts: %(rpm -q --queryformat '[%%{CONFLICTNEVRS}\n]' %kernel_package_name | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )') -Recommends: %(rpm -q --queryformat '[%%{RECOMMENDNEVRS}\n]' %kernel_package_name | grep -v '^kernel-firmware' | grep -vE '^(ksym|kmod|firmware)[(]' | tr '\n' ' )') +%if "%{kernel_base_recommends}" != "" +Recommends: %{kernel_base_recommends} +%endif # This is in place of obsolete_rebuilds. This should give Conflicts: %%kernel_package_name = %%source_rel as old kernel-default-base did. Conflicts: %(rpm -q --queryformat '[%%{PROVIDENEVRS}\n]' %kernel_package_name | grep '^%kernel_package_name =' | sort -V | head -n 1) diff --git a/kernel-syms.changes b/kernel-syms.changes index b3df1d7b..55589d34 100644 --- a/kernel-syms.changes +++ b/kernel-syms.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-syms.spec b/kernel-syms.spec index bca6c200..fa283713 100644 --- a/kernel-syms.spec +++ b/kernel-syms.spec @@ -27,7 +27,7 @@ Group: Development/Sources Version: 5.4.3 %if %using_buildservice %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -52,7 +52,7 @@ Requires: kernel-pae-devel = %version-%source_rel %endif Requires: pesign-obs-integration Provides: %name = %version-%source_rel -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df Provides: multiversion(kernel) Source: README.KSYMS Requires: kernel-devel%variant = %version-%source_rel diff --git a/kernel-vanilla.changes b/kernel-vanilla.changes index b3df1d7b..55589d34 100644 --- a/kernel-vanilla.changes +++ b/kernel-vanilla.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index b13336ac..877943be 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -67,7 +67,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -172,10 +172,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d -Provides: kernel-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: kernel-%build_flavor-base-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df +Provides: kernel-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df # END COMMON DEPS -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/kernel-zfcpdump.changes b/kernel-zfcpdump.changes index b3df1d7b..55589d34 100644 --- a/kernel-zfcpdump.changes +++ b/kernel-zfcpdump.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Dec 16 12:10:39 CET 2019 - tiwai@suse.de + +- rpm/kernel-subpackage-spec: Fix empty Recommends tag (bsc#1143959) +- commit 3fd22e2 + +------------------------------------------------------------------- +Mon Dec 16 10:30:06 CET 2019 - bp@suse.de + +- crypto: ccp - Release all allocated memory if sha type is + invalid (bsc#1156259 CVE-2019-18808). +- commit c8b14a1 + ------------------------------------------------------------------- Fri Dec 13 12:10:13 CET 2019 - jslaby@suse.cz diff --git a/kernel-zfcpdump.spec b/kernel-zfcpdump.spec index 2a6df8c6..5b15abcc 100644 --- a/kernel-zfcpdump.spec +++ b/kernel-zfcpdump.spec @@ -67,7 +67,7 @@ License: GPL-2.0 Group: System/Kernel Version: 5.4.3 %if 0%{?is_kotd} -Release: .ge16f7d4 +Release: .g135fe73 %else Release: 0 %endif @@ -172,10 +172,10 @@ Conflicts: hyper-v < 4 Conflicts: libc.so.6()(64bit) %endif Provides: kernel = %version-%source_rel -Provides: kernel-%build_flavor-base-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d -Provides: kernel-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: kernel-%build_flavor-base-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df +Provides: kernel-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df # END COMMON DEPS -Provides: %name-srchash-e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +Provides: %name-srchash-135fe73ec1fccde19d8e39dc37b9f450e57014df %obsolete_rebuilds %name Source0: http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz Source2: source-post.sh diff --git a/patches.suse.tar.bz2 b/patches.suse.tar.bz2 index ba144f78..3423e61c 100644 --- a/patches.suse.tar.bz2 +++ b/patches.suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:535998abe572bff75be1137eeec078897e07c99de44d252db6e0b13977e3ad77 -size 112204 +oid sha256:3710b145f2268ec2dac04842db7ba6c85eeccee10ff9db3710f3c145c869ebae +size 112375 diff --git a/series.conf b/series.conf index f08c386f..88d9d8e4 100644 --- a/series.conf +++ b/series.conf @@ -378,6 +378,7 @@ ######################################################## # crypto + patches.suse/crypto-ccp-release-all-allocated-memory-if-sha-type-is-invalid.patch # AppArmor patches.suse/apparmor-compatibility-with-v2.x-net.patch diff --git a/source-timestamp b/source-timestamp index 7e4d48ec..b299a36c 100644 --- a/source-timestamp +++ b/source-timestamp @@ -1,3 +1,3 @@ -2019-12-13 11:10:13 +0000 -GIT Revision: e16f7d410c94f7c0aeebc96ca73d320b1ece0a7d +2019-12-16 16:03:27 +0000 +GIT Revision: 135fe73ec1fccde19d8e39dc37b9f450e57014df GIT Branch: stable