Updated to 4.16.5.a | Added ath9k hack

1 files changed, 25 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3105efb..0564d73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgbase=linux-libre-hardened
-_majver=4.15
-_minver=16
+_majver=4.16
+_minver=5
 _fullver=${_majver}.${_minver}
 _basever=${_majver}-gnu
 _pkgver=${_fullver}-gnu
@@ -13,15 +13,16 @@ _hardver=a
 _srcname=linux-${_majver}
 pkgver=${_fullver}.${_hardver}
 pkgrel=1
-url='https://github.com/copperhead/linux-hardened'
+url='https://github.com/anthraxx/linux-hardened'
 arch=('x86_64')
 license=('GPL2')
 makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
 options=('!strip')
 source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}/linux-libre-${_basever}.tar.xz{,.sign}
         https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_basever}-${_pkgver}.xz{,.sign}
-        https://github.com/copperhead/linux-hardened/releases/download/${_fullver}.${_hardver}/linux-hardened-${_fullver}.${_hardver}.patch{,.sig}
+        https://github.com/anthraxx/linux-hardened/releases/download/${_fullver}.${_hardver}/linux-hardened-${_fullver}.${_hardver}.patch{,.sig}
         https://github.com/graysky2/kernel_gcc_patch/raw/master/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch
+        regdom-hack-${_fullver}.patch
         config.x86_64  # the main kernel config files
         60-linux.hook  # pacman hook for depmod
         90-linux.hook  # pacman hook for initramfs regeneration
@@ -29,22 +30,30 @@ source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}/linux
 
         # https://bugs.archlinux.org/task/56711
         drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
+        net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+        fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
+        partially-revert-swiotlb-remove-various-exports.patch
 )
-sha256sums=('e6556514286f9cd6b46f5d5769b2cc3c61ac7d6fa9c9c400e3c2fb5949490186'
+sha256sums=('5bd4ee95a0a9d7d2f962504f4b684b441b07f5a136e8bb8ad959f2d29ab9b913'
             'SKIP'
-            'eed237574d984c54d49c9231d1db8dfdb99535e26feadd2960d23b74b7838e00'
+            '6e71ec91c057638ea160ff05860df13e772e8b43a609bc83c518ce0a41db14aa'
             'SKIP'
-            '7387f954f164e29521117cee9bad233557b719b44efaed1e534ca4c51bdf99ef'
+            '65482af87d9bac91d67591bde20ab56162060ea05fad910dbfcb5e5e964c8804'
             'SKIP'
             'f9ccd3b7809b276b39527b2fc8384aaef0028d536118baedb6e079b743637420'
-            '2d320dafdc76672710a2022af2e12009cdc9d421ad93449d9749a7737a7e14f9'
+            'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
+            '98f29f3319e14b1419f4dcd6bc42e994bcaace0162421f739409bafc35e98d3e'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            'c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148')
+            'c08d12c699398ef88b764be1837b9ee11f2efd3188bd1bf4e8f85dfbeee58148'
+            'd7233371fe617895b600ad1939d8b818395276d07b8a7918b955c9590a5d1112'
+            'b1c1cf770b2baab046d52687ec3dd83c543e3f45b4abeae2686c814673e0a1c5'
+            '87a0849079db7bf1deefb687bcf43170f1b209d27af9950f98b049cdf233b447')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
               '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
+              'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak
              )
 _kernelname=${pkgbase#linux-libre}
 : ${_kernelname:=-ARCH}
@@ -58,6 +67,9 @@ prepare() {
 
   # Hotfixes
   patch -p1 -i "${srcdir}/drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch"
+  patch -p1 -i "${srcdir}/net-aquantia-Regression-on-reset-with-1.x-firmware.patch"
+  patch -p1 -i "${srcdir}/fix-vboxguest-on-guests-with-more-than-4G-RAM.patch"
+  patch -p1 -i "${srcdir}/partially-revert-swiotlb-remove-various-exports.patch"
 
   # linux hardened patch
   msg2 "Applying hardened patch"
@@ -66,6 +78,10 @@ prepare() {
   # graysky2 gcc patch
   patch -p1 -i "${srcdir}/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch"
 
+  # Ignore ath9k eeprom patch
+  patch -p1 -i "${srcdir}/regdom-hack-${_fullver}.patch"
+
+
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
@@ -182,9 +198,6 @@ _package-headers() {
   install -Dt "${_builddir}/drivers/md" -m644 drivers/md/*.h
   install -Dt "${_builddir}/net/mac80211" -m644 net/mac80211/*.h
 
-  # http://bugs.archlinux.org/task/9912
-  install -Dt "${_builddir}/drivers/media/dvb-core" -m644 drivers/media/dvb-core/*.h
-
   # http://bugs.archlinux.org/task/13146
   install -Dt "${_builddir}/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h