Updated to 4.17.3.a

1 files changed, 17 insertions, 15 deletions

diff --git a/PKGBUILD b/PKGBUILD
index e819948..41a52b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,19 +4,21 @@
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgbase=linux-libre-hardened-ck
-_majver=4.16
-_minver=15
+_majver=4.17
+_minver=3
 _fullver=${_majver}.${_minver}
 _basever=${_majver}-gnu
 _pkgver=${_fullver}-gnu
 _hardver=a
 _NUMAdisable=y
 _ckpatchversion=1
-_ckpatchname="patch-4.16-ck${_ckpatchversion}"
+_ckpatchname="patch-${_majver}-ck${_ckpatchversion}"
+_jcpatchversion="jcmod1"
 _gcc_more_v='20180509'
 _srcname=linux-${_majver}
 pkgver=${_fullver}.${_hardver}
 pkgrel=1
+conflicts=('linux-hardened-ck')
 url='https://github.com/anthraxx/linux-hardened'
 #url='http://ck.kolivas.org/patches/'
 arch=('x86_64')
@@ -26,8 +28,8 @@ 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/anthraxx/linux-hardened/releases/download/${_fullver}.${_hardver}/linux-hardened-${_fullver}.${_hardver}.patch{,.sig}
-        patch-4.16-ck1.patch
-        #http://ck.kolivas.org/patches/4.0/4.16/4.16-ck${_ckpatchversion}/${_ckpatchname}.xz
+        patch-${_majver}-ck${_ckpatchversion}-${_jcpatchversion}.patch
+        #http://ck.kolivas.org/patches/4.0/${_majver}/${_majver}-ck${_ckpatchversion}/${_ckpatchname}.xz
         enable_additional_cpu_optimizations-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/$_gcc_more_v.tar.gz
         ath9k-regdom-hack.patch
         config.x86_64  # the main kernel config files
@@ -36,24 +38,24 @@ source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}/linux
         linux.preset   # standard config files for mkinitcpio ramdisk
 
         # https://bugs.archlinux.org/task/56780
-        ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
+        ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch
         # https://bugs.archlinux.org/task/56711
         Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
 )
-sha256sums=('5bd4ee95a0a9d7d2f962504f4b684b441b07f5a136e8bb8ad959f2d29ab9b913'
+sha256sums=('eb221b36ac19cba3c11734b09230dc89c2f33054c45501b23cc94e9370c66b29'
             'SKIP'
-            'ccfef3474d999dd80768fbbd022c10a31e75597f0581f2110dfef0d748f817b5'
+            '6b02c24a1ee68df418a6f58930f674bc883d6292d5215adfa3f7d3c17d2541db'
             'SKIP'
-            'e259a51bb01bf5b4b0ae7bccae844c0c2e4b11d0932e552e9e82eed80372cea5'
+            '512495fb6812c5e1da762ab8aeee4b5a752a37179120e8eb7306c492da799da6'
             'SKIP'
-            'be8b6d11af7f0c99f2f601b179eaab4409184fcc3db22f8616e28f5a443f5323'
-            '0d22651dbe27eeadd269706fc80c8a6caf22ceac81cbecc37d70e8e8fb00fef0'
+            '27b96297102a9ccf690c1bdc5f21bc10308f6de90396385dce7341fb8e5a2116'
+            '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
-            'dde08c49759c5d637bb145091137a30284b2e6fd0f0844cababee3cec1233fa2'
+            'a9be204e8a62968952d882fc9c7b55124d56331c66b662c837e5ca527787ff3c'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            '655534c9dda90ff8cea6f48f114bf3cd9118826bd6cb7bd24734dabde9997221'
+            'd744e7f4552896670bc8b99361534eec7ba095bebc2462ef0e5ee433e6341a0a'
             '8114295b8c07795a15b9f8eafb0f515c34661a1e05512da818a34581dd30f87e')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -72,7 +74,7 @@ prepare() {
 
   # Hotfixes
   msg2 "Applying hotfixes"
-  patch -p1 -i "${srcdir}/ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch"
+  patch -p1 -i "${srcdir}/ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch"
   patch -p1 -i "${srcdir}/Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch"
   
   # fix naming schema in EXTRAVERSION of ck patch set
@@ -85,7 +87,7 @@ prepare() {
   # Patch source with ck patchset
   msg2 "Applying ck patch"
   #patch -p1 -i "${srcdir}/${_ckpatchname}"
-  patch -p1 -i "${srcdir}/${_ckpatchname}.patch"
+  patch -p1 -i "${srcdir}/${_ckpatchname}-${_jcpatchversion}.patch"
 
   # Patch source to unlock additional gcc CPU optimizatons
   # https://github.com/graysky2/kernel_gcc_patch