From 3b6caf5e6d0fd5470f7049b28159c02988f7d334 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 13 Apr 2019 12:36:20 -0700
Subject: Updated to 5.0.7 Add patches to modify ck rather than modifying the
 ck patch directly Sync with upstream Remove needless git commit fingerprint
 Use single line for linux source archive and sig Add missing line to disable
 raid6 algorithm scanning

---
 PKGBUILD | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index e50884f..4cfdc05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Arch version patch script does not apply consistently
 # Arch version lacks ath9k, greysky2, and raid6 patches
 # Arch version lacks ck patches
-# Arch version allows SM3 and SM4
+# Arch version allows SEED, SM3, SM4, and Streebog
 # Arch version is 300 Hz
 # Arch version supports Intel ME
 # Arch version is not configured for openrc
@@ -17,13 +17,12 @@
 
 pkgbase=linux-hardened-ck
 _majver=5.0
-_minver=5
+_minver=7
 _pkgver=${_majver}.${_minver}
 _hardenedver=a
-_ckpatchversion=1
-_ckpatch="patch-${_majver}-ck${_ckpatchversion}"
-_jcpatchversion=1
 _gcc_more_v='20180509'
+_ckpatchversion=1
+_ckpatch="patch-5.0-ck${_ckpatchversion}"
 _srcname=linux-${_pkgver}
 pkgver=${_pkgver}.${_hardenedver}
 pkgrel=1
@@ -34,11 +33,11 @@ license=('GPL2')
 makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
 conflicts=('linux-libre-hardened-ck')
 options=('!strip')
-source=(https://www.kernel.org/pub/linux/kernel/v${_pkgver//.*}.x/linux-${_pkgver}.tar.xz
-        https://www.kernel.org/pub/linux/kernel/v${_pkgver//.*}.x/linux-${_pkgver}.tar.sign
+source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_pkgver.tar".{xz,sign}
         https://github.com/anthraxx/linux-hardened/releases/download/${pkgver}/linux-hardened-${pkgver}.patch{,.sig}
-        patch-${_majver}-ck${_ckpatchversion}-jcmod${_jcpatchversion}.patch
-        #http://ck.kolivas.org/patches/4.0/${_majver}/${_majver}-ck${_ckpatchversion}/${_ckpatch}.xz
+        remove-excess-ck-extraversion.patch
+        modify-ck-for-hardned.patch
+        http://ck.kolivas.org/patches/5.0/${_majver}/${_majver}-ck${_ckpatchversion}/${_ckpatch}.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
         raid6-default-algo.patch
@@ -47,22 +46,23 @@ source=(https://www.kernel.org/pub/linux/kernel/v${_pkgver//.*}.x/linux-${_pkgve
         90-linux.hook  # pacman hook for initramfs regeneration
         linux.preset   # standard config files for mkinitcpio ramdisk
 )
-sha256sums=('5fbd807bf2aa0a80a0bf165692d89aaf3463d03043419b0a9b104f55f12c94d0'
+sha256sums=('16e177662b9fc7255bfc51018513979f6effcbe52e459c543aa83a5b15ef54ec'
             'SKIP'
-            '1bcf266561541fd2f99eeb63b91b8b85f5b3e38a5146ddf4562b931457307fdc'
+            '250494afb2dce0c4805223b32a3abad2c146d628c7b972c361ae3e7fa3ea8ee6'
             'SKIP'
-            'fb18b009a891c0b54c984fc02a01d7b64d2b421e2fcb642a3b9465b0ed519dbd'
+            '2a551169f8cbb424900372fe698ae9003fbcad3614a46ca3f56b103f9c1ea763'
+            'b6defd1ef672b73631ecfa79fc204d6219175f333b53d86af668c1e1a9b6288e'
+            '661f64bbd8bf49afcc7c760c4148b2e2108511a1eadcae917cfe6056a83d8476'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
             '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb'
-            'e34350a870d85d2f45993428ad41ccd25e397a460caecfbedd8725798b8eb72e'
+            'ac3205c67d310da26a03e84874012113fdd4c128ab79449bafd3d248f30365df'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
-              '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
               'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak
              )
 
@@ -83,9 +83,15 @@ prepare() {
   msg2 "Applying hardened patch"
   patch -Np1 < ../linux-hardened-${pkgver}.patch
 
+  # ck hotfixes
+  msg2 "Applying ck patch hotfixes"
+  patch -p1 -i ../remove-excess-ck-extraversion.patch "$srcdir/${_ckpatch}"
+  patch -p1 -i ../modify-ck-for-hardned.patch "$srcdir/${_ckpatch}"
+  sed -i '/-CFLAGS/ s/$/ \$(LIBELF_FLAGS)/' "$srcdir/${_ckpatch}"
+
   # ck patch
   msg2 "Applying ck patch"
-  patch -p1 -i ../patch-${_majver}-ck${_ckpatchversion}-jcmod${_jcpatchversion}.patch
+  patch -F 3 -Np1 -i ../${_ckpatch}
 
   # graysky2 gcc patch
   msg2 "Applying graysky2 cpu patch"
-- 
cgit v1.2.1