From 900b4e3896514a765a066930dbebb381bda73d4c Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Sat, 13 Apr 2019 12:48:16 -0700
Subject: Updated to 5.0.7 Add patches to modify ck rather than modifying the
 ck patch directly Sync with upstream Add missing line to disable raid6
 algorithm scanning

---
 PKGBUILD | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'PKGBUILD')

diff --git a/PKGBUILD b/PKGBUILD
index 9e690ab..57fc872 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,23 +9,21 @@
 # Parabola version patch script does not apply consistently
 # Parabola version lacks ath9k, greysky2, and raid6 patches
 # Parabola version lacks ck patches
-# Parabola version allows SM3 and SM4
+# Parabola version allows SEED, SM3, SM4, and Streebog
 # Parabola version is 300 Hz
 # Parabola version supports Intel ME
 # Parabola version is not configured for openrc
 # Parabola version builds docs using python and graphviz
-# Parabola version is out-of-date
 
 pkgbase=linux-libre-hardened-ck
 _majver=5.0
-_minver=5
+_minver=7
 _pkgver=${_majver}.${_minver}
 _gnumajver=${_majver}-gnu
 _gnupkgver=${_pkgver}-gnu
 _hardenedver=a
 _ckpatchversion=1
-_ckpatch="patch-${_majver}-ck${_ckpatchversion}"
-_jcpatchversion=1
+_ckpatch="patch-5.0-ck${_ckpatchversion}"
 _gcc_more_v='20180509'
 _srcname=linux-${_majver}
 pkgver=${_pkgver}.${_hardenedver}
@@ -40,8 +38,9 @@ options=('!strip')
 source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/linux-libre-${_gnumajver}.tar.xz{,.sign}
         https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnupkgver}/patch-${_gnumajver}-${_gnupkgver}.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
@@ -52,21 +51,22 @@ source=(https://linux-libre.fsfla.org/pub/linux-libre/releases/${_gnumajver}/lin
 )
 sha256sums=('7df5025d1960520bfea158054130467770eca379999d5ac48175ed5ee804faa1'
             'SKIP'
-            'a59d0826ac9673bc8aa43c7fcd2d9cffc766e09d9bb0afab58a1232bca32ff6c'
+            'e4db17f7499016ae9f073e41ed684fa3eee5fdc0aace5d96b6ea567e613bdc23'
             'SKIP'
-            '1bcf266561541fd2f99eeb63b91b8b85f5b3e38a5146ddf4562b931457307fdc'
+            '250494afb2dce0c4805223b32a3abad2c146d628c7b972c361ae3e7fa3ea8ee6'
             'SKIP'
-            'fb18b009a891c0b54c984fc02a01d7b64d2b421e2fcb642a3b9465b0ed519dbd'
+            '2a551169f8cbb424900372fe698ae9003fbcad3614a46ca3f56b103f9c1ea763'
+            'b6defd1ef672b73631ecfa79fc204d6219175f333b53d86af668c1e1a9b6288e'
+            '661f64bbd8bf49afcc7c760c4148b2e2108511a1eadcae917cfe6056a83d8476'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
             'e7ebf050c22bcec0028c0b3c79fd6d3913b0370ecc6a23dfe78ce475630cf503'
             '0f81d6e4158b7beeb0eb514f1b9401f7e23699cb0f7b0d513e25dae1815daaeb'
-            'ab12c293c10ca19947f0513b7e03acf1eeb305c9a7bcd5f374ec3e4879eeef58'
+            '42372f522f8655f43d3d95db2aa83edfd9e8210999bcecaed521b37884771277'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
-              '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
               'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak
              )
 
@@ -87,9 +87,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