From a4d68fc9ade9c1723d116092a2ada50be51fb8f1 Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Thu, 26 Apr 2018 23:03:59 -0300
Subject: upgpkg: libre/linux-libre-hardened 4.16.5_gnu.a-1

Signed-off-by: David P <megver83@parabola.nu>
---
 libre/linux-libre-hardened/PKGBUILD | 47 +++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 15 deletions(-)

(limited to 'libre/linux-libre-hardened/PKGBUILD')

diff --git a/libre/linux-libre-hardened/PKGBUILD b/libre/linux-libre-hardened/PKGBUILD
index bd57b75e4..51ee63163 100644
--- a/libre/linux-libre-hardened/PKGBUILD
+++ b/libre/linux-libre-hardened/PKGBUILD
@@ -7,11 +7,9 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: Luke R. <g4jc@openmailbox.org>
 
-# Based on linux-hardened package
-
 pkgbase=linux-libre-hardened
-_pkgbasever=4.15-gnu
-_pkgver=4.15.18-gnu
+_pkgbasever=4.16-gnu
+_pkgver=4.16.5-gnu
 _hardenedver=a
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
@@ -23,7 +21,7 @@ _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}.${_hardenedver}
 pkgrel=1
 arch=('x86_64')
-url="https://jxself.org/git/?p=linux-libre-hardened.git"
+url="https://jxself.org/git/linux-libre-hardened.git"
 license=('GPL2')
 makedepends=('xmlto' 'kmod' 'inetutils' 'bc' 'libelf')
 makedepends_armv7h=('git')
@@ -31,7 +29,7 @@ options=('!strip')
 source=(
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/linux-libre-${_pkgbasever}.tar.xz"{,.sign}
   "https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz"{,.sign}
-  "https://github.com/copperhead/linux-hardened/releases/download/${_pkgver%-*}.${_hardenedver}/linux-hardened-${_pkgver%-*}.${_hardenedver}.patch"{,.sig}
+  "https://github.com/anthraxx/linux-hardened/releases/download/${_pkgver%-*}.${_hardenedver}/linux-hardened-${_pkgver%-*}.${_hardenedver}.patch"{,.sig}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm"{,.sig}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_mono.pbm"{,.sig}
   "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig}
@@ -42,20 +40,25 @@ source=(
   # standard config files for mkinitcpio ramdisk
   'linux.preset'
   # other patches
+  'change-console-loglevel-motormouth.patch'
   '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
   '0002-fix-Atmel-maXTouch-touchscreen-support.patch'
   'drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch'
+  'net-aquantia-Regression-on-reset-with-1.x-firmware.patch'
+  'fix-vboxguest-on-guests-with-more-than-4G-RAM.patch'
+  'partially-revert-swiotlb-remove-various-exports.patch'
 )
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
   '65EEFE022108E2B708CBFCF7F9E712E59AF5F22A' # Daniel Micay
   '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P.
+  'E240B57E2C4630BA768E2F26FC1B547C8D8172C8' # Levente Polyak
 )
-sha512sums=('a55cc663c6fb1e1cfa7905282b368b5d5888bc2398f0acf37e5bb9a232ded04fd566b1980e654da26aaec005332e458581495184d6bd4cec669181085d4d78a5'
+sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7610e7d4ae8a2230fa7483466636465ed9744444464a078de37b41c3db23e0'
             'SKIP'
-            '28e585a1da5933c9b117f7159ab6ac15ac509b07a86a870c9f722c26183cb0bbcd739a73ea31c5d0018e622d808dd2e39c9371014ebb627c3dc7be3096cff4b1'
+            '0696f81eccf4c47acd4074f50a6f7dcae38171bbe91d3df14ddaa9692192dfcd9bfa715dfea714460ed3dc59683c7a1fbf9eca0982fffc23537942ad76f0bf72'
             'SKIP'
-            '2fcae37b56805c66f9cc69a77a70b58a7b8ea6ffa3a348faa23f10a0e38e2eb6581cfffb1d66673d9659960e1d8269d342293a25b766b6d713edae023b7220c7'
+            'e6f8a00cffb758925cddd7f1f40616c72cf1dce8f25d484b444b891b5cb1f308b87e0eb31478a6cfcf4a2968569a80f0d908b46eccfc55777ef991138f03c14c'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -63,13 +66,17 @@ sha512sums=('a55cc663c6fb1e1cfa7905282b368b5d5888bc2398f0acf37e5bb9a232ded04fd56
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            'dc603826cb95bc6be3d590c53be5b77636fa116ea52c09742d890730f37cd33ed42f0064aa2d6d7a70636e4617224af687dddff762a411165002d3760905b65a'
+            '5643b3fc465a6f1e238cb32f037f04a8f4d11961a31962fac2c2f0a7e6c372575868d2491643076906de0fa4f51e4a8f051af19362cb2d7b8b1fd8209f18fe0a'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
+            '0a1a18aa8a6cbf1bab406d356786d2c35fe52608c25bef8beefe440b8a015ba59375106f8b04051ae2225e158420875a82ee07d5b88a2f2087afeb102e8966c0'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            '46f470d6f4df2b697db656e262d20c198e623da7332da5e35299834480a6f1ef9d3567b4827a4f3a3bd83ef4c3082d95045a437fea1f22f83a76e07bed508e2d')
+            '46f470d6f4df2b697db656e262d20c198e623da7332da5e35299834480a6f1ef9d3567b4827a4f3a3bd83ef4c3082d95045a437fea1f22f83a76e07bed508e2d'
+            'f606cbdda4f7a6481d9eb7ffa47890aad8c813debb4bb26835c511aa9109604e45b511a73d0716da87e2bfe2f623ad4a7e8ff4aa9aa96eb40dcabd5313612d55'
+            '71408629596f01141ac45a9a8592dd91f4e3a6ed68c88cfe016fcc8128a3d770adedc4d0fe7f025d55afa67b8c0961d6d716256ef57e4aed473f788233244442'
+            '4905635c0d94dedcc098a902b731cbfb63b2cbcdf35404a769cb71f257aead0977a526887e8d55badf9fd029ed2d125c9b8c38b0980bda028a667be0ebc0821b')
   
 _kernelname=${pkgbase#linux-libre}
 _grsecname=-grsec
@@ -99,7 +106,16 @@ prepare() {
 
   # https://bugs.archlinux.org/task/56711
   patch -Np1 -i ../drm-i915-edp-Only-use-the-alternate-fixed-mode-if-its-asked-for.patch
-  
+
+  # NVIDIA driver compat
+  patch -Np1 -i ../partially-revert-swiotlb-remove-various-exports.patch
+
+  # https://bugs.archlinux.org/task/58153
+  patch -Np1 -i ../fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
+
+  # https://bugs.archlinux.org/task/58174
+  patch -Np1 -i ../net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+
   # maintain the TTY over USB disconnects
   # http://www.coreboot.org/EHCI_Gadget_Debug
   patch -p1 -i ../0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
@@ -109,6 +125,10 @@ prepare() {
   # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
   patch -p1 -i ../0002-fix-Atmel-maXTouch-touchscreen-support.patch
 
+  # set CONSOLE_LOGLEVEL_MOTORMOUTH to 1
+  # https://labs.parabola.nu/issues/1754
+  patch -p1 -i ../change-console-loglevel-motormouth.patch
+
   cat ../config.${CARCH} - >.config <<END
 CONFIG_LOCALVERSION="${_kernelname}"
 CONFIG_LOCALVERSION_AUTO=n
@@ -228,9 +248,6 @@ _package-headers() {
   install -Dt "${_builddir}/drivers/md" -m644 drivers/md/*.h
   install -Dt "${_builddir}/net/mac80211" -m644 net/mac80211/*.h
 
-  # http://bugs.archlinux.org/task/9912
-  install -Dt "${_builddir}/drivers/media/dvb-core" -m644 drivers/media/dvb-core/*.h
-
   # http://bugs.archlinux.org/task/13146
   install -Dt "${_builddir}/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
 
-- 
cgit v1.2.3