From c008601effc878e60852f7928ddadcf5a16eb851 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 27 Nov 2012 02:19:29 -0800
Subject: Tue Nov 27 02:14:24 PST 2012

---
 kernels/linux-libre-grsec/PKGBUILD                    | 10 +++++-----
 kernels/linux-libre-grsec/config.i686                 |  1 +
 kernels/linux-libre-grsec/config.x86_64               |  3 ++-
 kernels/linux-libre-lts-rt/PKGBUILD                   | 12 ++++++------
 kernels/linux-libre-lts-rt/linux-libre-lts-rt.install |  2 +-
 kernels/linux-libre-rt/PKGBUILD                       | 17 +++++++++++------
 kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch    | 16 ++++++++++++++++
 kernels/linux-libre-rt/linux-libre-rt.install         |  2 +-
 8 files changed, 43 insertions(+), 20 deletions(-)
 create mode 100644 kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch

(limited to 'kernels')

diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD
index c0f1eb2a9..34eb84ed2 100755
--- a/kernels/linux-libre-grsec/PKGBUILD
+++ b/kernels/linux-libre-grsec/PKGBUILD
@@ -11,9 +11,9 @@ pkgbase=linux-libre-grsec      # Build stock -LIBRE-GRSEC kernel
 _basekernel=3.6
 _sublevel=7
 _grsecver=2.9.1
-_timestamp=201211221000
+_timestamp=201211251900
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=4
+pkgrel=5
 _lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
@@ -37,9 +37,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          'a4e642180c7d757a642175fe32e4a264'
-         '25ad4a2c727ae5d0fcfe30008a6cce09'
-         '508ce60a46a36c65d847c4759ac5f6c7'
-         'e0df7f5866d6d74ecc339347ac58ea3b'
+         'a56e5d5ab9dd0f44677aa61466046ce6'
+         '9b4ec887671d9242eba16be5cba4f9dc'
+         '55695d7853abe483f4db189877fd5e36'
          '5f66bed97a5c37e48eb2f71b2d354b9a'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
diff --git a/kernels/linux-libre-grsec/config.i686 b/kernels/linux-libre-grsec/config.i686
index 4d43f6702..cd4caf51b 100644
--- a/kernels/linux-libre-grsec/config.i686
+++ b/kernels/linux-libre-grsec/config.i686
@@ -5845,6 +5845,7 @@ CONFIG_PAX_USERCOPY=y
 CONFIG_GRKERNSEC_KMEM=y
 CONFIG_GRKERNSEC_VM86=y
 # CONFIG_GRKERNSEC_IO is not set
+CONFIG_GRKERNSEC_JIT_HARDEN=y
 CONFIG_GRKERNSEC_PROC_MEMMAP=y
 CONFIG_GRKERNSEC_BRUTE=y
 CONFIG_GRKERNSEC_MODHARDEN=y
diff --git a/kernels/linux-libre-grsec/config.x86_64 b/kernels/linux-libre-grsec/config.x86_64
index c1729bff5..2652b500b 100644
--- a/kernels/linux-libre-grsec/config.x86_64
+++ b/kernels/linux-libre-grsec/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.6.7-4 Kernel Configuration
+# Linux/x86_64 3.6.1-2 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -5691,6 +5691,7 @@ CONFIG_GRKERNSEC_BLACKHOLE=y
 # Sysctl Support
 #
 CONFIG_GRKERNSEC_SYSCTL=y
+# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set
 CONFIG_GRKERNSEC_SYSCTL_ON=y
 
 #
diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD
index 976b2995c..b426568ed 100644
--- a/kernels/linux-libre-lts-rt/PKGBUILD
+++ b/kernels/linux-libre-lts-rt/PKGBUILD
@@ -11,12 +11,12 @@
 pkgbase=linux-libre-lts-rt  # Build stock -LIBRE-LTS-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_releasever=51
-_rtpatchver=rt75
+_releasever=52
+_rtpatchver=rt76
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.50 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.52 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -39,8 +39,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         'fb3c742b1f8b01131534a22348cfa712'
-         '904669e437a0bb19e95022964430ad4a'
+         '41adc30b96b745f08899317da83f7eaa'
+         'a2b53a39e1a4b4103f91609b3d285591'
          '7266f5e7af09cc6e4b15d7a952e3b350'
          '5387f0cf51652c071190789569adf9c7'
          '85f04a9555bdc295f7c387a6564f0c81'
@@ -52,7 +52,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          'f36222e7ce20c8e4dc27376f9be60f6c'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         'e2cc9f33fb26b254b6b65f8981aebf13')
+         'ecf9d21d2d6dfbc29dc18b616cbce4e1')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
index 5f31cc3d4..98e85eeaf 100644
--- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
+++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts-rt
-KERNEL_VERSION=3.0.51-1-rt75-LIBRE-LTS-RT
+KERNEL_VERSION=3.0.52-1-rt76-LIBRE-LTS-RT
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 30361d313..32a69fba2 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -11,12 +11,12 @@
 pkgbase=linux-libre-rt      # Build stock -LIBRE-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.6
-_releasever=6
-_rtpatchver=rt17
+_releasever=7
+_rtpatchver=rt18
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -35,10 +35,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         'module-symbol-waiting-3.6.patch'
         'module-init-wait-3.6.patch'
+        'irq_cfg_pointer-3.6.6.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a2312edd0265b5b07bd4b50afae2b380'
-         '887e4a0fd0fb10da9410f5d1a75466b8'
-         '20cd3b6ed53047a633d1e2b1ba32973e'
+         'a4e642180c7d757a642175fe32e4a264'
+         '01f97c0630de43763699d580f48e1c74'
          '11161582d9050710ccfecbe077fc5a63'
          'ac8f20b0cd83acb9525b5557e1fafeaf'
          '82496e68851d1960543a07ba51cdb44a'
@@ -48,7 +49,8 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '670931649c60fcb3ef2e0119ed532bd4'
          '8a71abc4224f575008f974a099b5cf6f'
-         'a281ee5d89a016d72840bddb2d742635')
+         '4909a0271af4e5f373136b382826717f'
+         '1dd80f353c705fef988346a8ef05d13f')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -81,6 +83,9 @@ build() {
   patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch"
   patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch"
 
+  # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt
+  patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-rt|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
diff --git a/kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch b/kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch
new file mode 100644
index 000000000..32583c0ac
--- /dev/null
+++ b/kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch
@@ -0,0 +1,16 @@
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=blobdiff_plain;f=arch%2Fx86%2Fkernel%2Fapic%2Fio_apic.c;h=1817fa911024f07151d3edf91bd350722c9f79f8;hp=c265593ec2cdc3df35fda1586aaf91514fab62fa;hb=94777fc51b3ad85ff9f705ddf7cdd0eb3bbad5a6;hpb=3e8fa263a97079c74880675c451587bb6899e661
+
+diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
+index c265593..1817fa9 100644
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -2257,6 +2257,9 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void)
+ 			continue;
+ 
+ 		cfg = irq_cfg(irq);
++		if (!cfg)
++			continue;
++
+ 		raw_spin_lock(&desc->lock);
+ 
+ 		/*
diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install
index c7a44aeee..7925ec89c 100644
--- a/kernels/linux-libre-rt/linux-libre-rt.install
+++ b/kernels/linux-libre-rt/linux-libre-rt.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-rt
-KERNEL_VERSION=3.6.6-1-rt17-LIBRE-RT
+KERNEL_VERSION=3.6.7-1-rt18-LIBRE-RT
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
-- 
cgit v1.2.3-54-g00ecf