From c11a72ae82987971d9b19b40eaafbc3f2c656964 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sun, 12 Apr 2020 15:11:00 -0700
Subject: Updated to 5.6.3.a

---
 PKGBUILD | 64 +++++++++++++++-------------------------------------------------
 1 file changed, 15 insertions(+), 49 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index b30d272..dd3fd4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,9 +18,9 @@
 _pkgbase=linux-hardened
 pkgbase=linux-libre-hardened
 _supver=5
-_majver=5
-_minver=13
-_hardenedver=b
+_majver=6
+_minver=3
+_hardenedver=a
 _gccpatchver='20191217'
 _gccpatchger='9.1'
 _gccpatchker='5.5'
@@ -48,22 +48,13 @@ _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-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
-  0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
-  0004-drm_915_Serialise_i915_active_acquire_with__active_retire.patch
-  0005-drm_i915_gem_Take_runtime-pm_wakeref_prior_to_unbinding.patch
-  0006-drm-915-gem-Avoid-parking-the-vma-as-we-unbind.patch
-  0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
-  0008-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch
-  0009-drm-i915-Add-a-simple-is-bound-check-before-unbinding.patch
-  0010-drm-i915-Introduce-a-vma.kref.patch
-  0011-iwlwifi-dont-send-GEO_TX_POWER_LIMIT-if-no-wgds-table.patch
-  0012-Revert-bpf-Provide-better-register-bounds-after-jmp32-instructions.patch
+  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
   raid6-default-algo.patch
   config         # the main kernel config file
+  sphinx-workaround.patch
 )
   if [ "$_minver" != "0" ]; then
     source+=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.xz{,.sign})
@@ -72,27 +63,18 @@ validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7'  # Alexandre Oliva
   'E240B57E2C4630BA768E2F26FC1B547C8D8172C8'  # Levente Polyak
 )
-b2sums=('a4d4c927af24f61aba451cc21117c5a508ab2037b81ca6add19b4838940f8f321c8bf14b2d35e388f93801d92b296a998c15d2aac92dc2df761322e7ea37dd1d'
+b2sums=('921a3836ffbd5ababb897b8d923ab3e97c10c39b8d01060fe41742005f8111b5c2c9e76c9b7bcf4fe59a056454a364eca5df8006ca8a174205df152007e18dff'
         'SKIP'
-        '0675b661107ccef3c8e61fe5d96d285d92cee67bdf7ea6ad9b972bf1409b141111e0f5ee6ae898e43154b4416fb693fa361249158833b48a322ae58c513d0859'
+        '47a8ba59ad90afc51a6e3c6c02dc54af2da3b27093859f30d33e799bc5103261f3bca91a89b201ff9b6acddcb610f8da3764eddf64c4b2ce80b9009557301340'
         'SKIP'
-        '2e822cf7d4ff8b7458e22d3ce110fd8534e17a9aac2feace41c591f70697e1fab7bd9ce307c60a6361fbe525d10dab74c8b76fcb5276cd27f6e945f8fdfcc25c'
-        'd8027cd96a447ea0987a67f3e65d157bb3d396069a944b140610f74c663677fe45e171e96a92dfd5eda8f71a5c715fd8114ee0e60b7620bc401a2a548bcf83cc'
-        'df41200d86f1fd493861d4b4a091ec5f853ce7668ec9712f57e574ce2c1a94c7054ec8abcdf947086e5f98b0cdde73523521552536c91373dacdd10c4ecf4c1a'
-        'f4d5f82c5deb981f475fd18a408e23b5f170e23c7a49c3563171e55abd78c07c475a7a9c67850c4a3665ce3447cd7b5fb3171e47af8cd8077822f2a6679cfd9b'
-        '70d02b7fc8b26c783eaabafb9bef5d3895c0031642dc8b71d8737762722695221340315576433d1544b79b37446212ce5e3d0936f695af307b3344a717274ba8'
-        '5909775c40e31588072e052d28daa4472b7b0e0cb124d631bfa967ce398b9cf44afb6937f5f4ec709b0430f0a27262ce876c7d3ca71fae821138671bc492176f'
-        'c1410e2d53dd7afb6d68f75c557774e37f466a5b5b7432ec6802b2c2a9644c8a6b5fcd38a76781b9229a9cb2cf4c0c55129ee050918577937d91dd7ee789f3b8'
-        '63e9e6ceda80243910c073ec81555f2781d75ac4b3cb5000c1328f2624f7be840684b0f383768020e82bce502aa90a1c8729f7b3e91c099652075a42da2187cf'
-        '078bb20a03b7e43ad0685b0c3f6a54f1c4bd32d25e0f6c6434100c6f5f5bc27cd6281bf2134b7c7034e6aa448d895d23c20d32f7d1cc40e55f0735af777694a3'
-        '7b56fe6d171bc9f5154fd6dd89e6678f7e65f26d53551ebc758142a3440cb796b8f7badc361b1e19ff70dfc842dce235fb3b476d35994cb0022157ae64e28cf3'
-        '152bdc0b317a91a8d822bcb9fc7e5d0af158e5f8095ca88af9e9c03d9c1d6ff64c412be2849d5912f5e593eb890655da630bfe3e903a29aff3fd8de3634af004'
+        '4d0a521668223e00d0c7a7e4359ae18a5506b65b3394f3050ea20e304cc37c2c73f757a09b70737118bffe95db23a02d4da7640a3726ce9c88966c3a8c5ceb11'
         '1892bd22775eac3bcc4d37f4fd30c95346bf3a0888cbbff57fd614973b525390dff2e315ce35b2e498523cceaab94ff21a80475dee8df3de4dd8fc0fab07d74e'
         'd76bd0bf237ea2bb7999fd3715cb664d89148cb0ade8057d57cdb40bc0a7954336e50ee077312e5e192398b0f35f055786deb98af9130d57e60f2ea040fbb66f'
         '2e58bb89b247b1678355368956e67c1de51fcde97a227b2162f6771e30f17fa5520faafe7be4b6816a542e7ae10d05f64c6b6354f352c12746d4b8da632936dd'
         'fde132f3705d908e6f2147c78a2193289916d72304ca5efa2229d79fc3e57a857314ce94e71425caef2f7f7b6cf87f05ef86335dc8bd4be78e7035afe608005a'
-        'f97be5da0e531ace7d6a0c1afa02a247d7bbf40c1d458709e648c0360c9d487b629ef76bde87f24c30e0ad42701d18e587f3f621d19d3bd1d4c7446ef223854c'
-        'd10810b3f96821965cfb106a53302329a346815b78ef5720dbd3b9065a0542034a4e071133459e4288304de5658c5509847ee8e6770a4d553593ed815034a0fb'
+        'e617e416336217aa8868c8baa6371236362f35663a49b974b1decc2701584c9b197cc642080c13248a4cf28e3ba2f9ba70af87b3116ee9ff4480ad6de702d35a'
+        'b4e1377d97ad7e8144d6e55b6d43731e3271a5aec65b65ca6d81026a95f15f549b9303fb3c6f492099ca691e3f65f4cf7f0c3aa742df03b396d7f6d81813aa95'
+        '33ce93ba7c83909f992a7bfa72ff9eebd82e70f4c5b4124ab450aea250748f3a429e436a045350aba547656897659be89a4f5cedd63e4c85f7af125510b9291d'
         'SKIP')
 
 export KBUILD_BUILD_HOST=$pkgbase
@@ -111,17 +93,8 @@ prepare() {
 
   # Hotfixes
   echo "Applying hotfixes"
-  patch -p1 -i ../0002-iwlwifi-pcie-restore-support-for-Killer-Qu-C0-NICs.patch
-  patch -p1 -i ../0003-drm-Remove-PageReserved-manipulation-from-drm_pci_al.patch
-  patch -p1 -i ../0004-drm_915_Serialise_i915_active_acquire_with__active_retire.patch
-  patch -p1 -i ../0005-drm_i915_gem_Take_runtime-pm_wakeref_prior_to_unbinding.patch
-  patch -p1 -i ../0006-drm-915-gem-Avoid-parking-the-vma-as-we-unbind.patch
-  patch -p1 -i ../0007-drm-i915-gem-Try-to-flush-pending-unbind-events.patch
-  patch -p1 -i ../0008-drm-i915-gem-Reinitialise-the-local-list-before-repeating.patch
-  patch -p1 -i ../0009-drm-i915-Add-a-simple-is-bound-check-before-unbinding.patch
-  patch -p1 -i ../0010-drm-i915-Introduce-a-vma.kref.patch
-  patch -p1 -i ../0011-iwlwifi-dont-send-GEO_TX_POWER_LIMIT-if-no-wgds-table.patch
-  patch -p1 -i ../0012-Revert-bpf-Provide-better-register-bounds-after-jmp32-instructions.patch
+  patch -p1 -i ../0002-ALSA-hda-Fix-potential-access-overflow-in-beep-helper.patch
+  patch -p1 -i ../sphinx-workaround.patch
 
 
   # linux hardened patch
@@ -202,6 +175,8 @@ _package() {
   optdepends=('crda: to set the correct wireless channels of your country'
               'linux-libre-firmware: firmware images needed for some devices'
               'usbctl-libre: deny_new_usb control')
+  provides=(WIREGUARD-MODULE)
+  replaces=(wireguard-arch)
 
   cd $_srcname
   local kernver="$(<version)"
@@ -220,9 +195,6 @@ _package() {
 
   # remove build and source links
   rm "$modulesdir"/{source,build}
-
-  echo "Fixing permissions..."
-  chmod -Rc u=rwX,go=rX "$pkgdir"
 }
 
 _package-headers() {
@@ -300,9 +272,6 @@ _package-headers() {
   echo "Adding symlink..."
   mkdir -p "$pkgdir/usr/src"
   ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
-
-  echo "Fixing permissions..."
-  chmod -Rc u=rwX,go=rX "$pkgdir"
 }
 
 _package-docs() {
@@ -322,9 +291,6 @@ _package-docs() {
   echo "Adding symlink..."
   mkdir -p "$pkgdir/usr/share/doc"
   ln -sr "$builddir/Documentation" "$pkgdir/usr/share/doc/$pkgbase"
-
-  echo "Fixing permissions..."
-  chmod -Rc u=rwX,go=rX "$pkgdir"
 }
 
 pkgname=("$pkgbase" "$pkgbase-headers" "$pkgbase-docs")
-- 
cgit v1.2.1