From 8260b65d58cca933b903a5c37064035494aef300 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 3 Aug 2015 18:20:32 -0300 Subject: linux-libre-grsec{,-knock}-4.1.3_gnu.201508011613-1: updating version --- kernels/linux-libre-grsec-knock/PKGBUILD | 50 +++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 13 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 3d976cb69..e2d533343 100644 --- a/kernels/linux-libre-grsec-knock/PKGBUILD +++ b/kernels/linux-libre-grsec-knock/PKGBUILD @@ -11,11 +11,11 @@ # Contributor: Luke Shumaker pkgbase=linux-libre-grsec-knock # Build kernel with -grsec-knock localname -_pkgbasever=4.0-gnu -_pkgver=4.0.8-gnu +_pkgbasever=4.1-gnu +_pkgver=4.1.3-gnu _grsecver=3.1 -_timestamp=201507111211 -_knockpatchver=3.18_1 +_timestamp=201508011613 +_knockpatchver=4.1_1 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname @@ -36,8 +36,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}/patch-${_pkgbasever}-${_pkgver}.xz.sign" "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" + #"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" + "https://repo.parabola.nu/other/knock/patches/linux-libre/tcp_stealth_${_knockpatchver}.diff" + "https://repo.parabola.nu/other/knock/patches/linux-libre/tcp_stealth_${_knockpatchver}.diff.sig" "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_clut224.ppm" "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" @@ -48,14 +50,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk 'linux.preset' + '0001-block-loop-convert-to-per-device-workqueue.patch' + '0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch' + '0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch' + 'bitmap-enable-booting-for-dm-md-raid1.patch' 'change-default-console-loglevel.patch') -sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' +sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324' 'SKIP' - '16153fc11146d0de0158b7f7ed24437b42c61a16e5e404b258d04bdceef5b9e0' + 'd52669f17a1cd13abba4f47a04e1991be59cfa707926b21f9c5bf031ec10c5d0' 'SKIP' - 'b9338c20615444bf844edc16ef98e9696db159a50e5eeea3b693edf6eabb24cd' + '79fa9ee9f8c08b18d446d52049b8843cb49e78ff06b81551bbd68afdfd9be650' 'SKIP' - '93a1610c203ea4c187ac5b50dce105fac86df914b1406e1d85df5857d36201c9' + 'da336d8e5291b7641598eb5d7f44f54dacf6515ed6ffd32735dd6f128458dbdc' 'SKIP' 'bfd4a7f61febe63c880534dcb7c31c5b932dde6acf991810b41a939a93535494' 'SKIP' @@ -63,15 +69,19 @@ sha256sums=('0e2dd5be12c1f82ab3d03b89cbe3f1a20e14332ec42c102efb226a6283fdd38a' 'SKIP' '6de8a8319271809ffdb072b68d53d155eef12438e6d04ff06a5a4db82c34fa8a' 'SKIP' - 'df033a9eb5729f61169e3aca092709cf928f820b05fea3efde14d372e2fa607f' - 'fbf48421ebfb46f09457fe601255a7dd3631f24bba28945dcabc5a8772ab3872' + '84e07b7add1c4bd9a78a12fff20aa552f498ff88e396a4246b4ed2b24f86de9d' + 'f40aededdf7932a62fb0d812906e363c393ce6c3771553566122224e47f900d9' 'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c' + '9e1d3fd95d768a46353593f6678513839cedb98ee66e83d9323233104ec3b23f' + 'bbe3631c737ed8329a1b7a9610cc0a07330c14194da5e9afec7705e7f37eeb81' + '08f69d122021e1d13c31e5987c23021916a819846c47247b3f1cee2ef99d7f82' + '959c4d71b5dc50434eeecf3a8608758f57f111c6e999289c435b13fc8c6be5f0' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva 'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva '684D54A189305A9CC95446D36B888913DDB59515' # Márcio Silva - 'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch + #'F949CFBD140A6DD071E90B8CDC24396B6D451038' # Julian Kirsch ) _kernelname=${pkgbase#linux-libre} @@ -105,6 +115,20 @@ prepare() { # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + # Fix deadlock with stacked loop devices (FS#45129) + # http://marc.info/?l=linux-kernel&m=143280649731902&w=2 + patch -Np1 -i ../0001-block-loop-convert-to-per-device-workqueue.patch + patch -Np1 -i ../0002-block-loop-avoiding-too-many-pending-per-work-I-O.patch + + # Fix bluetooth chip initialization on some macbooks (FS#45554) + # http://marc.info/?l=linux-bluetooth&m=143690738728402&w=2 + # https://bugzilla.kernel.org/show_bug.cgi?id=100651 + patch -Np1 -i ../0001-Bluetooth-btbcm-allow-btbcm_read_verbose_config-to-f.patch + + # Fix kernel oops when booting with root on RAID1 LVM (FS#45548) + # https://bugzilla.kernel.org/show_bug.cgi?id=100491#c24 + patch -Np1 -i ../bitmap-enable-booting-for-dm-md-raid1.patch + # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) -- cgit v1.2.3-54-g00ecf