diff options
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 20 |
1 files changed, 9 insertions, 11 deletions
@@ -7,7 +7,7 @@ pkgbase=linux-tomoyo _srcname=linux-4.9 -pkgver=4.9.6 +pkgver=4.9.11 pkgrel=1 arch=('i686' 'x86_64') url="https://www.kernel.org/" @@ -25,19 +25,19 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" # standard config files for mkinitcpio ramdisk 'linux-tomoyo.preset' 'change-default-console-loglevel.patch' - '0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch' + '0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch' ) sha256sums=('029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a' 'SKIP' - 'cd0d5ea27c487a7d1354ba3e80f85af4924b77ad1180f1fbfaf6844ae03c8728' + '23e773a670f3cac11a92c4e442405dea6d2c28fea0f914ea2ba4bea313c26541' 'SKIP' 'b5c2a685667a884477904c9fb337d944667b6144720ac2a67d1116f711e70768' 'ab6c0fab5b147fab9ccef90c62b963510e92fbd068a6a33b9619537243fedca4' '834bd254b56ab71d73f59b3221f056c72f559553c04718e350ab2a3e2991afe0' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '3e955e0f1aae96bb6c1507236adc952640c9bd0a134b9995ab92106a33dc02d9') + '85954ac18da9dc1bec5df28e2f097d13016e39fa9631074f85b6364af340fcd9') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman @@ -51,10 +51,8 @@ prepare() { # add upstream patch patch -p1 -i "${srcdir}/patch-${pkgver}" - # Revert a commit that causes memory corruption in i686 chroots on our - # build server ("valgrind bash" immediately crashes) - # https://bugzilla.kernel.org/show_bug.cgi?id=190061 - patch -Rp1 -i "${srcdir}/0001-x86-fpu-Fix-invalid-FPU-ptrace-state-after-execve.patch" + # https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-6074 + patch -p1 -i "${srcdir}/0001-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -149,10 +147,10 @@ _package() { # remove the firmware rm -rf "${pkgdir}/lib/firmware" # make room for external modules - ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules" + ln -s "../extramodules-${_basekernel}${_kernelname:--tomoyo}" "${pkgdir}/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from post_install/upgrade - mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}" - echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version" + mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--tomoyo}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--tomoyo}/version" # Now we call depmod... depmod -b "${pkgdir}" -F System.map "${_kernver}" |