summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-04-16 12:38:16 -0400
committergraysky2020-04-16 12:38:16 -0400
commita4a93e0426bd0ddb8978b064c4f5a9db7205a22a (patch)
tree3ad6e3bd09b735e04401455a11d500c5bb9babf2
parent0b46963ff702239708ab4da1db505ec2ba5fe2ef (diff)
downloadaur-a4a93e0426bd0ddb8978b064c4f5a9db7205a22a.tar.gz
Update to 5.6.5rc1-1
-rw-r--r--.SRCINFO18
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch2
-rw-r--r--0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch42
-rw-r--r--PKGBUILD10
4 files changed, 13 insertions, 59 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c20456d0267..7925dcda986 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rc
- pkgver = 5.6.4rc1
+ pkgver = 5.6.5rc1
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -9,22 +9,20 @@ pkgbase = linux-rc
makedepends = bc
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.6.4-rc1.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.6.4-rc1.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.3.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.3.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.6.5-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.6.5-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.4.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.4.tar.sign
source = config
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- source = 0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- sha256sums = 9ff0aabccd0c4e5b59ef7350c9e88473c4d7deedc64fd36d7e6ccb84e4fd83de
+ sha256sums = 11172f889b1660f0c0de38d69f17b45fb3f064cbe5cce58ff20345d64b3dadc9
sha256sums = SKIP
- sha256sums = 1d13689abbcab59250a8231a5871747be25a1d2fe431cf263395de35780c50aa
+ sha256sums = 5df1741e550cb6fa7471530f42da98bac5093e693e2c4f3aef4393d8135b9d91
sha256sums = SKIP
sha256sums = 0b414b6974b732cfb71b6f45b6210d127528aa6452132e9b9338719ac021bf06
- sha256sums = 0e5124563d5413e6ae7e6f21c100c32575f099272aa6d0957616fd3aeb888a1d
- sha256sums = b38f5c127f75ae7ced2cfa350147bebb72ae56ebfb191a6393f2edcc94e557ae
+ sha256sums = 1f4cebcd41f497b2d8680d5001ce6036a1142973ad68b1421a10a2ddf99d568b
pkgname = linux-rc
pkgdesc = The release candidate kernel and modules
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 542e82dcf8d..9d57643a88e 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,4 +1,4 @@
-From e1293fa8ca1b8ef89c8c3eddf4fecd6c25119aeb Mon Sep 17 00:00:00 2001
+From cdc8cdae459c2ca60fd4d3ddf78e4568bb741d2d Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 16 Sep 2019 04:53:20 +0200
Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged
diff --git a/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch b/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch
deleted file mode 100644
index 6f4873f1c41..00000000000
--- a/0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.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: [PATCH 2/3] 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;
- }
---
-2.26.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 73c45ca8bd6..736ce215d4b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _srcname=linux-5.6
_major=5.6
### on initial release this is null otherwise it is the current stable subversion
### ie 1,2,3 corresponding $_major.1, $_major.3 etc.
-_minor=3
+_minor=4
### on initial release comment this out and set to =1
_minorc=$((_minor+1))
#_minorc=1
@@ -31,19 +31,17 @@ source=(
https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_fullver.tar.{xz,sign}
config # the main kernel config file
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- 0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-sha256sums=('9ff0aabccd0c4e5b59ef7350c9e88473c4d7deedc64fd36d7e6ccb84e4fd83de'
+sha256sums=('11172f889b1660f0c0de38d69f17b45fb3f064cbe5cce58ff20345d64b3dadc9'
'SKIP'
- '1d13689abbcab59250a8231a5871747be25a1d2fe431cf263395de35780c50aa'
+ '5df1741e550cb6fa7471530f42da98bac5093e693e2c4f3aef4393d8135b9d91'
'SKIP'
'0b414b6974b732cfb71b6f45b6210d127528aa6452132e9b9338719ac021bf06'
- '0e5124563d5413e6ae7e6f21c100c32575f099272aa6d0957616fd3aeb888a1d'
- 'b38f5c127f75ae7ced2cfa350147bebb72ae56ebfb191a6393f2edcc94e557ae')
+ '1f4cebcd41f497b2d8680d5001ce6036a1142973ad68b1421a10a2ddf99d568b')
_kernelname=${pkgbase#linux}