diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2016-01-27 09:26:32 -0600 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2016-01-27 09:26:32 -0600 |
| commit | 62d6d340dfa5117500a2aec05bf68187958f369b (patch) | |
| tree | 371709ca64694a41942e559161eb79a7ff7efcca /kernel.spec | |
| parent | 04cf44e3c826554975d6f91e36402069c8e931b7 (diff) | |
| download | kernel-62d6d340dfa5117500a2aec05bf68187958f369b.tar.gz kernel-62d6d340dfa5117500a2aec05bf68187958f369b.tar.xz kernel-62d6d340dfa5117500a2aec05bf68187958f369b.zip | |
Only apply KEY_FLAG_KEEP to a key if a parent keyring has it set (rhbz 1301099)
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec index b345d7f13..59023550c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,7 +40,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 @@ -605,6 +605,9 @@ Patch640: PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch #Required for some persistent memory options Patch641: disable-CONFIG_EXPERT-for-ZONE_DMA.patch +#rhbz 1301099 +Patch642: KEYS-only-apply-KEY_FLAG_KEEP-to-a-key-if-a-parent.patch + # END OF PATCH DEFINITIONS %endif @@ -2050,6 +2053,9 @@ fi # # %changelog +* Wed Jan 27 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc1.git0.2 +- Only apply KEY_FLAG_KEEP to a key if a parent keyring has it set (rhbz 1301099) + * Mon Jan 25 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc1.git0.1 - Disable debugging options. - Linux v4.5-rc1 |