summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2020-11-11 06:11:05 -0500
committergraysky2020-11-11 06:11:05 -0500
commit362b462d9d9a267bbbaf1d6d6c699e542a762110 (patch)
treee87c1e13dce05f1d6fd465a56b6b164e10ddd3e9
parentb33f8197a063e290505e8c9ec5750b3d01938eca (diff)
downloadaur-362b462d9d9a267bbbaf1d6d6c699e542a762110.tar.gz
Update to 5.9.8-1
-rw-r--r--.SRCINFO16
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch20
-rw-r--r--PKGBUILD6
3 files changed, 21 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ad4df7b2ee..4c7a5399cbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-ck
- pkgver = 5.9.7
+ pkgver = 5.9.8
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
@@ -8,8 +8,8 @@ pkgbase = linux-ck
makedepends = kmod
makedepends = libelf
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.7.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.7.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.8.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.9.8.tar.sign
source = config
source = enable_additional_cpu_optimizations-20200615.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20200615.tar.gz
source = http://ck.kolivas.org/patches/5.0/5.9/5.9-ck1/patch-5.9-ck1.xz
@@ -17,13 +17,13 @@ pkgbase = linux-ck
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- b2sums = 27fa82f1b174a43e1771ec322521c1f1425a042da2cbf1aa4b76bf0ac66172c8e104c1bf942ee0ecf3c3da1b16906c4d007bf45dbb7d2013b2326a592da3547e
+ b2sums = 27b8820bbd7ea278b47e1c208efeeb41c890276ae59d33971ab0d8ba0081d45e57c579f9390c5e3019a4f3beebaf17a29a959e1b6cadb9e1824ea4e568f90205
b2sums = SKIP
b2sums = 834e3290b80055fb99855cebb175152d42800c0e4750e7e1c1e65448783772174c4b6d9194fea7d59a6b41dca8a438628b2692a308ccdfd2d1ced3e0af422d4c
b2sums = c8d0697f99fe6105815217b8ec059d8f587415ea8dd2b88a65e1087feedf697341a64cd56810fde9e7aeada79125fc8235faccc7e7b06492c099e27a8abbe99c
b2sums = c19099ad66168db4608dee44e1913c07c035bc002a91267abc2e1eadf1788ddb5be3b17e3fdfeddcba96526dfa2b9fcc43a5dd0f8236d94c864e6477924a6718
b2sums = b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95
- b2sums = 065c46b01678f8f177e93652600bd0967592a5962a78ba1c77f7e0e4028ddaf0ad05ccacdce50d33176330e7e9adb5083ca747d86c01dc11a3bbabb3ac7e9f24
+ b2sums = 942add319120f9b20df7a4b9b6c5fed2c028db71686647b98b787d8459e6528bbfa51275900856f633875a8ce1bd6669405454f7d5e7385af28271c99b1dccaa
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler
@@ -32,11 +32,11 @@ pkgname = linux-ck
depends = initramfs
optdepends = crda: to set the correct wireless channels of your country
optdepends = linux-firmware: firmware images needed for some devices
- provides = linux-ck=5.9.7
+ provides = linux-ck=5.9.8
pkgname = linux-ck-headers
pkgdesc = Headers and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=5.9.7
- provides = linux-headers=5.9.7
+ provides = linux-ck-headers=5.9.8
+ provides = linux-headers=5.9.8
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 e8550eddf23..5b7e34d7ee8 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,7 +1,7 @@
-From 9dda33cd8d3d2feb086a5cb7f7392cda483939ee Mon Sep 17 00:00:00 2001
+From b182b41dde931e1a8e9e2756f1934b3a1c62dc17 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
+Subject: [PATCH 1/2] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
@@ -36,10 +36,10 @@ index 6ef1c7109fc4..2140091b0b8d 100644
{
return &init_user_ns;
diff --git a/init/Kconfig b/init/Kconfig
-index d6a0b31b13dc..2420d38cbfb9 100644
+index 2a5df1cf838c..bdaf777b9976 100644
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -1168,6 +1168,22 @@ config USER_NS
+@@ -1169,6 +1169,22 @@ config USER_NS
If unsure, say N.
@@ -63,12 +63,12 @@ index d6a0b31b13dc..2420d38cbfb9 100644
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
-index a9ce750578ca..0da8704c3d91 100644
+index 5fe09d4e6d6a..36756b715103 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
-@@ -96,6 +96,10 @@
- #include <linux/kasan.h>
+@@ -97,6 +97,10 @@
#include <linux/scs.h>
+ #include <linux/io_uring.h>
+#ifdef CONFIG_USER_NS
+#include <linux/user_namespace.h>
@@ -77,7 +77,7 @@ index a9ce750578ca..0da8704c3d91 100644
#include <asm/pgalloc.h>
#include <linux/uaccess.h>
#include <asm/mmu_context.h>
-@@ -1860,6 +1864,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -1862,6 +1866,10 @@ static __latent_entropy struct task_struct *copy_process(
if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
return ERR_PTR(-EINVAL);
@@ -88,7 +88,7 @@ index a9ce750578ca..0da8704c3d91 100644
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -2921,6 +2929,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -2927,6 +2935,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
@@ -150,5 +150,5 @@ index 87804e0371fe..66b5afb0d0ee 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.29.1
+2.29.2
diff --git a/PKGBUILD b/PKGBUILD
index f37b7e8c93e..b0e80aa15e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,7 +64,7 @@ _localmodcfg=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=5.9.7
+pkgver=5.9.8
pkgrel=1
_ckpatchversion=1
arch=(x86_64)
@@ -88,13 +88,13 @@ validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-b2sums=('27fa82f1b174a43e1771ec322521c1f1425a042da2cbf1aa4b76bf0ac66172c8e104c1bf942ee0ecf3c3da1b16906c4d007bf45dbb7d2013b2326a592da3547e'
+b2sums=('27b8820bbd7ea278b47e1c208efeeb41c890276ae59d33971ab0d8ba0081d45e57c579f9390c5e3019a4f3beebaf17a29a959e1b6cadb9e1824ea4e568f90205'
'SKIP'
'834e3290b80055fb99855cebb175152d42800c0e4750e7e1c1e65448783772174c4b6d9194fea7d59a6b41dca8a438628b2692a308ccdfd2d1ced3e0af422d4c'
'c8d0697f99fe6105815217b8ec059d8f587415ea8dd2b88a65e1087feedf697341a64cd56810fde9e7aeada79125fc8235faccc7e7b06492c099e27a8abbe99c'
'c19099ad66168db4608dee44e1913c07c035bc002a91267abc2e1eadf1788ddb5be3b17e3fdfeddcba96526dfa2b9fcc43a5dd0f8236d94c864e6477924a6718'
'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95'
- '065c46b01678f8f177e93652600bd0967592a5962a78ba1c77f7e0e4028ddaf0ad05ccacdce50d33176330e7e9adb5083ca747d86c01dc11a3bbabb3ac7e9f24')
+ '942add319120f9b20df7a4b9b6c5fed2c028db71686647b98b787d8459e6528bbfa51275900856f633875a8ce1bd6669405454f7d5e7385af28271c99b1dccaa')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase