diff options
Diffstat (limited to 'kernels')
-rwxr-xr-x | kernels/linux-libre-grsec/PKGBUILD | 12 | ||||
-rw-r--r-- | kernels/linux-libre-grsec/config.i686 | 1 | ||||
-rw-r--r-- | kernels/linux-libre-grsec/config.x86_64 | 1 | ||||
-rwxr-xr-x | kernels/linux-libre-grsec/linux-libre-grsec.install | 6 | ||||
-rwxr-xr-x | kernels/linux-libre-lts-rt/PKGBUILD | 12 | ||||
-rwxr-xr-x | kernels/linux-libre-lts-rt/linux-libre-lts-rt.install | 2 | ||||
-rw-r--r-- | kernels/linux-libre-pax-flags/PKGBUILD | 27 | ||||
-rwxr-xr-x | kernels/linux-libre-rt/PKGBUILD | 17 | ||||
-rw-r--r-- | kernels/linux-libre-rt/irq_cfg_pointer-3.6.6.patch | 16 | ||||
-rwxr-xr-x | kernels/linux-libre-rt/linux-libre-rt.install | 2 | ||||
-rw-r--r-- | kernels/paxutils/PKGBUILD | 24 | ||||
-rwxr-xr-x | kernels/paxutils/paxutils (renamed from kernels/linux-libre-pax-flags/linux-pax-flags) | 0 |
12 files changed, 70 insertions, 50 deletions
diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index c22a208d5..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=201211181105 +_timestamp=201211251900 pkgver=${_basekernel}.${_sublevel} -pkgrel=3 +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' - 'af1f2097a6e26d36801188193d3eb185' - '508ce60a46a36c65d847c4759ac5f6c7' - 'ec6b214e3744cc5fb38bcafb0c6218d6' + 'a56e5d5ab9dd0f44677aa61466046ce6' + '9b4ec887671d9242eba16be5cba4f9dc' + '55695d7853abe483f4db189877fd5e36' '5f66bed97a5c37e48eb2f71b2d354b9a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -161,7 +161,7 @@ build() { _package() { pkgdesc="The ${pkgbase} kernel and modules with grsecurity/PaX patches" [ "${pkgbase}" = "linux-libre" ] && groups=('base') - depends=('gradm' 'linux-libre-pax-flags' 'coreutils' 'linux-libre-firmware' 'kmod') + depends=('gradm' 'paxutils' 'coreutils' 'linux-libre-firmware' 'kmod') optdepends=('crda: to set the correct wireless channels of your country') provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") 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 281b26f47..2652b500b 100644 --- a/kernels/linux-libre-grsec/config.x86_64 +++ b/kernels/linux-libre-grsec/config.x86_64 @@ -5609,6 +5609,7 @@ CONFIG_PAX_USERCOPY=y # CONFIG_GRKERNSEC_KMEM=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/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install index ad209388f..4c65c9783 100755 --- a/kernels/linux-libre-grsec/linux-libre-grsec.install +++ b/kernels/linux-libre-grsec/linux-libre-grsec.install @@ -2,14 +2,14 @@ # arg 2: the old package version KERNEL_NAME=-grsec -KERNEL_VERSION=3.6.7-1-LIBRE-GRSEC +KERNEL_VERSION=3.6.7-4-LIBRE-GRSEC _fix_permissions() { - /usr/bin/linux-pax-flags + /usr/bin/paxutils echo echo You can repeat this process after updating or installing affected - echo binaries by running "linux-pax-flags". + echo binaries by running "paxutils". } _add_trusted_group() { diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD index 976b2995c..b426568ed 100755 --- 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 100755 --- 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-pax-flags/PKGBUILD b/kernels/linux-libre-pax-flags/PKGBUILD deleted file mode 100644 index 102f5ee74..000000000 --- a/kernels/linux-libre-pax-flags/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Contributors: -# henning mueller <henning@orgizm.net> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -_pkgname=linux-pax-flags -pkgname=linux-libre-pax-flags -pkgdesc='Deactivates PaX flags for several libre binaries to work with PaX enabled kernels' -pkgver=1.0.26 -pkgrel=1 -arch=(any) -url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/linux-libre-pax-flags/' -license=(GPL2) -depends=(bash paxctl) -replaces=('linux-pax-flags') -conflicts=('linux-pax-flags') -provides=("linux-pax-flags=$pkgver") -source=($_pkgname) -sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b) - -build() { - return 0 -} - -package() { - install -D -m755 $srcdir/$_pkgname $pkgdir/usr/bin/$_pkgname -} diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 30361d313..32a69fba2 100755 --- 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 100755 --- 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' diff --git a/kernels/paxutils/PKGBUILD b/kernels/paxutils/PKGBUILD new file mode 100644 index 000000000..3d6d1e772 --- /dev/null +++ b/kernels/paxutils/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: André Silva <emulatorman@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=paxutils +pkgdesc='PaX utilities to configure flags for several binaries to work with PaX kernels' +pkgver=0.1.0 +pkgrel=2 +arch=(any) +url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/paxutils/' +license=(GPL2) +depends=(bash paxctl) +replaces=('linux-pax-flags' 'linux-libre-pax-flags') +conflicts=('linux-pax-flags' 'linux-libre-pax-flags') +provides=('linux-pax-flags' 'linux-libre-pax-flags') +source=($pkgname) +sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b) + +build() { + return 0 +} + +package() { + install -D -m755 $srcdir/$pkgname $pkgdir/usr/bin/$pkgname +} diff --git a/kernels/linux-libre-pax-flags/linux-pax-flags b/kernels/paxutils/paxutils index 22f5a8171..22f5a8171 100755 --- a/kernels/linux-libre-pax-flags/linux-pax-flags +++ b/kernels/paxutils/paxutils |