From 934011e7a2857c5321b9d16cdd29a672c91ce74d Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Mon, 13 Apr 2015 13:07:14 -0300
Subject: linux-libre-grsec{,-knock}-3.19.3_gnu.201504021826-1: updating
 version

---
 kernels/linux-libre-grsec-knock/PKGBUILD | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'kernels/linux-libre-grsec-knock/PKGBUILD')

diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD
index 5ca3fa25f..510e7368b 100644
--- a/kernels/linux-libre-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-grsec-knock/PKGBUILD
@@ -14,7 +14,7 @@ pkgbase=linux-libre-grsec-knock   # Build kernel with -grsec-knock localname
 _pkgbasever=3.19-gnu
 _pkgver=3.19.3-gnu
 _grsecver=3.1
-_timestamp=201503270049
+_timestamp=201504021826
 _knockpatchver=3.18_1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -24,7 +24,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}.${_timestamp}
 pkgver=${_pkgver//-/_}.${_timestamp}
-pkgrel=1.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="https://wiki.parabola.nu/Grsecurity%2BKnock"
 license=('GPL2')
@@ -44,6 +44,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         'linux.preset'
         'logo_linux_'{clut224.ppm,vga16.ppm,mono.pbm}
         'change-default-console-loglevel.patch'
+        '0001-fix-btrfs-mount-deadlock.patch'
+        '0001-fixup-drm.patch'
         '0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch'
         # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
         # Note: Makefile patching was removed due which we are using specific flags from grsecurity patch
@@ -52,7 +54,7 @@ sha256sums=('2a60ec99ae498e7cdafac63ecca1c0ca07643eaa6c9a1a83f19e4daa3e75b9d9'
             'SKIP'
             'a8d04a9fc441edfa5fbdc9727743d584e7103d97ca13da4c667a894c4eff5a58'
             'SKIP'
-            '8029a7d334c892fab588047fc9fc977d46e2ee3a43acdecdc40be47748bae654'
+            'f553a2ad03a1f939506b413d8f5cc66bc2e152fc9c6562d3fb73a54e14d46f64'
             'SKIP'
             '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9'
             'SKIP'
@@ -64,6 +66,8 @@ sha256sums=('2a60ec99ae498e7cdafac63ecca1c0ca07643eaa6c9a1a83f19e4daa3e75b9d9'
             '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
             '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+            '5967cf53cb9db9f070e8f346c3d7045748e4823a7fe2ee330acd18c9d02bbb77'
+            '911872ef7000af471e649aaeb3490094a0b4c1514ca1024757ca2e90ac1d2a3d'
             '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5'
             'bbb03bc36982b37ff51ac1314e8ba4d01ad6416b032a18afd5eb3bb05caa4914')
 validpgpkeys=(
@@ -109,6 +113,13 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix #44495 and #44385 deadlock on btrfs mount
+  # https://btrfs.wiki.kernel.org/index.php/Gotchas
+  patch -Np1 -i "${srcdir}/0001-fix-btrfs-mount-deadlock.patch"
+
+  # fix #44491
+  patch -Np1 -i "${srcdir}/0001-fixup-drm.patch"
+
   # drm/i915: Stop gathering error states for CS error interrupts
   # https://bugzilla.kernel.org/show_bug.cgi?id=93171
   patch -p1 -i "${srcdir}/0001-drm-i915-Dont-enable-CS_PARSER_ERROR-interrupts-at-all.patch"
-- 
cgit v1.2.3