Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre

1 files changed, 15 insertions, 21 deletions

diff --git a/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD
index c2346e5ef..7672cab65 100644
--- a/kernels/linux-libre-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-grsec-knock/PKGBUILD
@@ -12,9 +12,9 @@
 
 pkgbase=linux-libre-grsec-knock   # Build kernel with -grsec-knock localname
 _pkgbasever=4.0-gnu
-_pkgver=4.0.1-gnu
+_pkgver=4.0.4-gnu
 _grsecver=3.1
-_timestamp=201505042053
+_timestamp=201505222222
 _knockpatchver=3.18_1
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -34,8 +34,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz.sign"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign"
-        "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch"
-        "https://grsecurity.net/test/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig"
+        "https://repo.parabola.nu/other/grsecurity-libre/test/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch"
+        "https://repo.parabola.nu/other/grsecurity-libre/test/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch.sig"
         "http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver}.diff"
         "tcp_stealth_${_knockpatchver}.diff.sig::http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver%_1}.diff_1.sig"
         # the main kernel config files
@@ -44,31 +44,29 @@ 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-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
-        '4.0-rc7-37af2c8aae-loongson-community.patch')
+        '4.0.2-ae91f13af5-loongson-community.patch')
 sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a'
             'SKIP'
-            'b99335ed7c60ba2701d81923de4e3e9efbbfa3ad0782e7d94cd48b92adb1fbd6'
+            'e447de9a53c5aefd25f0474f3304ab87076b88353badaae20dcbd85712e85e61'
             'SKIP'
-            '9944bf62201fa0ad86bc9d4a5e0368d64967b626933261868b2402547abd039b'
+            '880b46fd8ac5690587aa0a8db8445956bbab62d12b72c28b78a5dfe05d3ef5b7'
             'SKIP'
             '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9'
             'SKIP'
-            '16760abed3851e97991b09efab107ae27b99668a8a6994ae7d9e9b8fe418c953'
-            '2e50c28b0dcb8c90780be6bfb5e117403fefb10ecc97a7fae7c90fefdf95c574'
-            'de68ea79d9339c4d7ef6706dc573badf4c134c1c730df1a628da2dc88e1bb3a8'
+            'df033a9eb5729f61169e3aca092709cf928f820b05fea3efde14d372e2fa607f'
+            'fbf48421ebfb46f09457fe601255a7dd3631f24bba28945dcabc5a8772ab3872'
+            'ee7da446efd8533761aa4e2e07f8bcdb0e196f06bd067f72f29557caa33cb30b'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494'
             '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a'
             '13bd7a8d9ed6b6bc971e4cd162262c5a20448a83796af39ce394d827b0e5de74'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            '66cb2d859b253bc4e793baa3c0b95523d647a773b957dbc79b3eaacccf8692b5'
-            '8a070d193bc54db696b38ac844cfbfd62724f483ad74c9a288ccab462c32f80e')
+            'ac7232b38f5a25a79a23c25c8cd5ed4579ca5402466d3370dd093626998092b3')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
-              'DE9452CE46F42094907F108B44D1C0F82525FE49' # Bradley Spengler
+              'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
               'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch
 )
 
@@ -90,8 +88,8 @@ prepare() {
     patch -p1 -i "${srcdir}/patch-${_pkgbasever}-${_pkgver}"
   fi
 
-  # add grsecurity patches
-  patch -Np1 -i "${srcdir}/grsecurity-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch"
+  # add grsecurity patches (without nonfree bnx2 firmware patching)
+  patch -Np1 -i "${srcdir}/grsecurity-libre-${_grsecver}-${_pkgver%-*}-${_timestamp}.patch"
   rm localversion-grsec
 
   # add knock patch
@@ -109,13 +107,9 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.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"
-
   # Adding loongson-community patch
   if [ "${CARCH}" == "mips64el" ]; then
-    patch -p1 -i ${srcdir}/4.0-rc7-37af2c8aae-loongson-community.patch
+    patch -p1 -i ${srcdir}/4.0.2-ae91f13af5-loongson-community.patch
   fi
 
   cat "${srcdir}/config.${CARCH}" > ./.config