upgpkg: linux-prjc 5.18.5-1

upstream release

2 files changed, 24 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31a729b7d9da..31772125afae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,43 +1,40 @@
 pkgbase = linux-prjc
 	pkgdesc = Linux
-	pkgver = 5.18.3
+	pkgver = 5.18.5
 	pkgrel = 1
 	url = https://gitlab.com/alfredchen/linux-prjc
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
-	makedepends = kmod
 	makedepends = libelf
-	makedepends = pahole
 	makedepends = cpio
-	makedepends = xmlto
-	makedepends = python-sphinx
-	makedepends = python-sphinx_rtd_theme
-	makedepends = graphviz
-	makedepends = imagemagick
-	makedepends = git
+	makedepends = perl
+	makedepends = tar
+	makedepends = xz
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.3.tar.sign
-	source = linux-prjc-5.18.3-config::https://raw.githubusercontent.com/archlinux/svntogit-packages/b4cfe6ae8029f4d58b72a8565ea95ddfcd43c0df/trunk/config
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.5.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.18.5.tar.sign
+	source = linux-prjc-5.18.5-config::https://raw.githubusercontent.com/archlinux/svntogit-packages/65b8d97deef9185ec16a39f5391c36f3364761e9/trunk/config
 	source = prjc_v5.18-r1.patch::https://gitlab.com/alfredchen/projectc/raw/master/5.18/prjc_v5.18-r1.patch
 	source = more-uarches-20220315.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20220315.tar.gz
-	source = 0001-linux-prjc-5.18.3-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch::https://github.com/archlinux/linux/commit/8ea8e5623d987f068a6dc037032fa667a57d79bc.patch
+	source = 0001-linux-prjc-5.18.5-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch::https://github.com/archlinux/linux/commit/9baf57b4c2d9348bd5adecbb893870d1d79fade1.patch
+	source = 0002-linux-prjc-5.18.5-HID-apple-Properly-handle-function-keys-on-Keychron-.patch::https://github.com/archlinux/linux/commit/e410435c977a01e386fda83b5215540365a0086f.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
-	b2sums = 141cc47585905cab087910ece010c69b9f5985484df58f08da99558e51cd3707ea8ea6b12a2f6eb75a208a178724b66eb61166611ec933333b15965bc4382033
+	b2sums = d2670e53d72fc5f0cf637394452a701c7ab41473be526d29deba7b60789dc56e1c369f3ae05a76f67890822588a36d0b497f267b4b75c33d0a98ad5131c697c9
 	b2sums = SKIP
-	b2sums = c7d8a6dbf653bb294a81f6522d692fa783806fce1bd9185f1fb52c694dabd5f32972e6a7a5d03a1cfd35825e90963fdac5bdaf2ed75daa8b85ed00a1b07d2d9c
+	b2sums = eab78c88e45d9c8c365b12369f0e787fd70554c4e7efb8ce5d3360eaf5ef6036bed484b673ecc1ad58c7d120c261b0bcc71f443dcbd96665d06ae545f119d608
 	b2sums = 81000dd93c038389ab1bbe04e1e9706062244e70571da03388c2ab0d382bd817d86d8b12adfe607b49adf7bbab3624640a70ba6df2e97bd7f55f9d2def73e88f
 	b2sums = 20674a8fcc0a85726e06460a7dbccfe731c46bf377cc3bf511b7591175e7df892f271bc1909e77d9a02913c753d241493502c5ab15d9f78e95f31aa4399c2c27
-	b2sums = 7502bc3c044c81118a5ba75f31582d65978ca4106a91fa20defa067e5d8455c397327a9d3c42c69b02bafc1cb267ab88f7b7ef43e67406d8874a9809491dc592
+	b2sums = 610fb62adbaf1ca851071840f400b31e3c53efd09adcb700d4775736127b59f12c477edcff7a3a81f760f4e866c61c08fb62bbb445af8e357c46ac4093d7b430
+	b2sums = 71651890d29033ee2fe8d180681802d07806b8f0b245d8132ecc6633ec0964e04253f8c1ab02417cafce8d4b084fa4b1a3ad0cd5a3dc1f20104e2e6c16aec5ea
 
 pkgname = linux-prjc
 	pkgdesc = The Linux-prjc kernel and modules with the Project C patch set
 	depends = coreutils
 	depends = kmod
 	depends = initramfs
-	optdepends = crda: to set the correct wireless channels of your country
+	optdepends = wireless-regdb: to set the correct wireless channels of your country
 	optdepends = linux-firmware: firmware images needed for some devices
 
 pkgname = linux-prjc-headers
diff --git a/PKGBUILD b/PKGBUILD
index fed929fe26c5..e568aa2bc002 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -70,17 +70,17 @@ _subarch=36
 ### IMPORTANT: Do no edit below this line unless you know what you're doing
 
 pkgbase=linux-prjc
-pkgver=5.18.3
+pkgver=5.18.5
 pkgrel=1
 pkgdesc='Linux'
 url="https://gitlab.com/alfredchen/linux-prjc"
 arch=(x86_64)
 license=(GPL2)
-makedepends=(bc kmod libelf pahole cpio xmlto python-sphinx python-sphinx_rtd_theme graphviz imagemagick git)
+makedepends=(bc libelf cpio perl tar xz)
 [[ -n "$_clangbuild" ]] && makedepends+=(clang llvm lld python)
 options=('!strip')
 _srcname=linux-${pkgver}
-_arch_config_commit=b4cfe6ae8029f4d58b72a8565ea95ddfcd43c0df
+_arch_config_commit=65b8d97deef9185ec16a39f5391c36f3364761e9
 _prjc_version=5.18-r1
 _prjc_patch="prjc_v${_prjc_version}.patch"
 _gcc_more_v=20220315
@@ -89,18 +89,20 @@ source=(
   "${pkgbase}-${pkgver}-config::https://raw.githubusercontent.com/archlinux/svntogit-packages/${_arch_config_commit}/trunk/config"
   "${_prjc_patch}::https://gitlab.com/alfredchen/projectc/raw/master/${_prjc_version%-*}/${_prjc_patch}"
   "more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz"
-  "0001-${pkgbase}-${pkgver}-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch::https://github.com/archlinux/linux/commit/8ea8e5623d987f068a6dc037032fa667a57d79bc.patch"
+  "0001-${pkgbase}-${pkgver}-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch::https://github.com/archlinux/linux/commit/9baf57b4c2d9348bd5adecbb893870d1d79fade1.patch"
+  "0002-${pkgbase}-${pkgver}-HID-apple-Properly-handle-function-keys-on-Keychron-.patch::https://github.com/archlinux/linux/commit/e410435c977a01e386fda83b5215540365a0086f.patch"
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
 )
-b2sums=('141cc47585905cab087910ece010c69b9f5985484df58f08da99558e51cd3707ea8ea6b12a2f6eb75a208a178724b66eb61166611ec933333b15965bc4382033'
+b2sums=('d2670e53d72fc5f0cf637394452a701c7ab41473be526d29deba7b60789dc56e1c369f3ae05a76f67890822588a36d0b497f267b4b75c33d0a98ad5131c697c9'
         'SKIP'
-        'c7d8a6dbf653bb294a81f6522d692fa783806fce1bd9185f1fb52c694dabd5f32972e6a7a5d03a1cfd35825e90963fdac5bdaf2ed75daa8b85ed00a1b07d2d9c'
+        'eab78c88e45d9c8c365b12369f0e787fd70554c4e7efb8ce5d3360eaf5ef6036bed484b673ecc1ad58c7d120c261b0bcc71f443dcbd96665d06ae545f119d608'
         '81000dd93c038389ab1bbe04e1e9706062244e70571da03388c2ab0d382bd817d86d8b12adfe607b49adf7bbab3624640a70ba6df2e97bd7f55f9d2def73e88f'
         '20674a8fcc0a85726e06460a7dbccfe731c46bf377cc3bf511b7591175e7df892f271bc1909e77d9a02913c753d241493502c5ab15d9f78e95f31aa4399c2c27'
-        '7502bc3c044c81118a5ba75f31582d65978ca4106a91fa20defa067e5d8455c397327a9d3c42c69b02bafc1cb267ab88f7b7ef43e67406d8874a9809491dc592')
+        '610fb62adbaf1ca851071840f400b31e3c53efd09adcb700d4775736127b59f12c477edcff7a3a81f760f4e866c61c08fb62bbb445af8e357c46ac4093d7b430'
+        '71651890d29033ee2fe8d180681802d07806b8f0b245d8132ecc6633ec0964e04253f8c1ab02417cafce8d4b084fa4b1a3ad0cd5a3dc1f20104e2e6c16aec5ea')
 
 _kernelname=${pkgbase#linux}
 : ${_kernelname:=-prjc}
@@ -206,7 +208,7 @@ build() {
 _package() {
   pkgdesc="The ${pkgbase/linux/Linux} kernel and modules with the Project C patch set"
   depends=(coreutils kmod initramfs)
-  optdepends=('crda: to set the correct wireless channels of your country'
+  optdepends=('wireless-regdb: to set the correct wireless channels of your country'
               'linux-firmware: firmware images needed for some devices')
 
   cd $_srcname