Updated to 5.6.5.a

2 files changed, 3 insertions, 48 deletions

diff --git a/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch b/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch
deleted file mode 100644
index 48dfbf5..0000000
--- a/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 28a3a4bec629ccb9cef64c546998052e0806cb1b Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 7 Apr 2020 10:36:22 +0200
-Subject: ALSA: hda: Fix potential access overflow in beep helper
-
-The beep control helper function blindly stores the values in two
-stereo channels no matter whether the actual control is mono or
-stereo.  This is practically harmless, but it annoys the recently
-introduced sanity check, resulting in an error when the checker is
-enabled.
-
-This patch corrects the behavior to store only on the defined array
-member.
-
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207139
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- sound/pci/hda/hda_beep.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
-index f5fd62ed4df5..841523f6b88d 100644
---- a/sound/pci/hda/hda_beep.c
-+++ b/sound/pci/hda/hda_beep.c
-@@ -290,8 +290,12 @@ int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,
- {
- 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
- 	struct hda_beep *beep = codec->beep;
-+	int chs = get_amp_channels(kcontrol);
-+
- 	if (beep && (!beep->enabled || !ctl_has_mute(kcontrol))) {
--		ucontrol->value.integer.value[0] =
-+		if (chs & 1)
-+			ucontrol->value.integer.value[0] = beep->enabled;
-+		if (chs & 2)
- 			ucontrol->value.integer.value[1] = beep->enabled;
- 		return 0;
- 	}
--- 
-cgit v1.2.3-1-gf6bb5
-
diff --git a/PKGBUILD b/PKGBUILD
index 776a9fd..8162ec6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ _pkgbase=linux-hardened
 pkgbase=linux-libre-hardened
 _supver=5
 _majver=6
-_minver=4
+_minver=5
 _hardenedver=a
 _gccpatchver='20191217'
 _gccpatchger='9.1'
@@ -48,7 +48,6 @@ _gnupkgver=${_pkgver}-gnu
 source=(
   https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
   https://github.com/anthraxx/${_pkgbase}/releases/download/${pkgver}/${_pkgbase}-${pkgver}.patch{,.sig}
-  0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch
   graysky_bdver2-hotfix.patch
   kernel_gcc_patch-${_gccpatchver}.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/${_gccpatchver}.tar.gz
   ath9k-regdom-hack.patch
@@ -65,16 +64,15 @@ validpgpkeys=(
 )
 b2sums=('921a3836ffbd5ababb897b8d923ab3e97c10c39b8d01060fe41742005f8111b5c2c9e76c9b7bcf4fe59a056454a364eca5df8006ca8a174205df152007e18dff'
         'SKIP'
-        '5604a9d1da09d7b68bff0e8e50a8e32b24e2f949edfbfe2cf2af56ecab80c749e2b71d83f9f2fe2ef7b9d28538e2cd530e5fb9e548dbcb3f12faa3f238aece94'
+        '86ff46b8d3505b5c3116d1fa11c60757e172984bb8efbabd4f04b667e287dbcd25f03fb9b62ed993290d079c513616a93094eec97ce3700fdff99400236ead8b'
         'SKIP'
-        '4d0a521668223e00d0c7a7e4359ae18a5506b65b3394f3050ea20e304cc37c2c73f757a09b70737118bffe95db23a02d4da7640a3726ce9c88966c3a8c5ceb11'
         '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e'
         'd76bd0bf237ea2bb7999fd3715cb664d89148cb0ade8057d57cdb40bc0a7954336e50ee077312e5e192398b0f35f055786deb98af9130d57e60f2ea040fbb66f'
         '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
         'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
         'e617e416336217aa8868c8baa6371236362f35663a49b974b1decc2701584c9b197cc642080c13248a4cf28e3ba2f9ba70af87b3116ee9ff4480ad6de702d35a'
         'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95'
-        'cdbea46eb2da46d2331b7277404c49465686f7bfe7fcbfe3a72ded0074c876f72299dd747bbf5deeae21046b937e76a9ee80b660afda6cabe0c5f555cd70b036'
+        'dfa458eea739916884b3a606f845d44bed661589abe89502b3cf35cfa911683e8715b9ce198645f48c57ee3bf4b9cc26ac0722a2e0a6c01d5cd1017ed199a880'
         'SKIP')
 
 export KBUILD_BUILD_HOST=$pkgbase
@@ -93,7 +91,6 @@ prepare() {
 
   # Hotfixes
   echo "Applying hotfixes"
-  patch -p1 -i ../0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch
   patch -p1 -i ../sphinx-workaround.patch