diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-09 07:38:02 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-09 07:38:02 +0100 |
| commit | e01b928da0e1984b498a8e5a054d6e7067adadfa (patch) | |
| tree | 4db3f96f8dd2f4da72fe1dc4b2bb2813fe98af43 /kernel.spec | |
| parent | dfe5d795000eb53b0f56696f7be9e8a12cd76275 (diff) | |
| parent | a8888fabaccfcf1fd0885834045f81a7a2b24e6a (diff) | |
| download | kernel-e01b928da0e1984b498a8e5a054d6e7067adadfa.tar.gz kernel-e01b928da0e1984b498a8e5a054d6e7067adadfa.tar.xz kernel-e01b928da0e1984b498a8e5a054d6e7067adadfa.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc27kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc26kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc25kernel-4.11.0-0.rc1.git1.2.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec index 8bfbb341c..2fa64187c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,7 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -77,7 +77,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -133,7 +133,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} @@ -613,6 +613,9 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch # grabbed from mailing list Patch667: v3-Revert-tty-serial-pl011-add-ttyAMA-for-matching-pl011-console.patch +# CVE-2017-2636 rhbz 1430049 +Patch668: 0001-tty-n_hdlc-get-rid-of-racy-n_hdlc.tbuf.patch + # END OF PATCH DEFINITIONS %endif @@ -2180,6 +2183,18 @@ fi # # %changelog +* Thu Mar 09 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc1.git1.2 +- Bump and build for updated buildroot + +* Wed Mar 08 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc1.git1.1 +- Linux v4.11-rc1-88-gec3b93a + +* Wed Mar 08 2017 Laura Abbott <labbott@fedoraproject.org> +- Reenable debugging options. + +* Tue Mar 07 2017 Laura Abbott <labbott@fedoraproject.org> +- CVE-2017-2636 Race condition access to n_hdlc.tbuf causes double free in n_hdlc_release (rhbz 1430049) + * Mon Mar 06 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc1.git0.1 - Linux v4.11-rc1 |