Commit 4318da2b authored by Natanael Copa's avatar Natanael Copa

main/*-grsec: upgrade grsecurity to 2.6.30.6-200909121646

parent 5450ef2d
...@@ -14,7 +14,7 @@ _realname=dahdi-linux ...@@ -14,7 +14,7 @@ _realname=dahdi-linux
pkgname=${_realname}-${_flavor} pkgname=${_realname}-${_flavor}
pkgver=2.2.0 pkgver=2.2.0
pkgrel=14 pkgrel=15
pkgdesc="Digium Asterisk Hardware Device Interface drivers" pkgdesc="Digium Asterisk Hardware Device Interface drivers"
url="http://www.asterisk.org" url="http://www.asterisk.org"
license="GPL" license="GPL"
......
...@@ -15,7 +15,7 @@ if [ -f ../iscsitarget/APKBUILD ]; then ...@@ -15,7 +15,7 @@ if [ -f ../iscsitarget/APKBUILD ]; then
fi fi
pkgname=${_realname}-${_flavor} pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-0.4.17} pkgver=${pkgver:-0.4.17}
pkgrel=12 pkgrel=13
pkgdesc="$_flavor kernel modules for iscsitarget" pkgdesc="$_flavor kernel modules for iscsitarget"
url="http://iscsitarget.sourceforge.net/" url="http://iscsitarget.sourceforge.net/"
license="GPL-2" license="GPL-2"
......
...@@ -12,7 +12,7 @@ _abi_release=$pkgver-${_flavor} ...@@ -12,7 +12,7 @@ _abi_release=$pkgver-${_flavor}
pkgname=${_realname}-${_flavor} pkgname=${_realname}-${_flavor}
pkgver=1.4.0_pre1 pkgver=1.4.0_pre1
_realver=1.4.0pre1 _realver=1.4.0pre1
pkgrel=5 pkgrel=6
pkgdesc="$_flavor kernel modules for kemu" pkgdesc="$_flavor kernel modules for kemu"
url="http://www.nongnu.org/qemu/" url="http://www.nongnu.org/qemu/"
license="GPL" license="GPL"
......
...@@ -4,7 +4,7 @@ _flavor=grsec ...@@ -4,7 +4,7 @@ _flavor=grsec
pkgname=linux-${_flavor} pkgname=linux-${_flavor}
pkgver=2.6.30.6 pkgver=2.6.30.6
_kernver=2.6.30 _kernver=2.6.30
pkgrel=0 pkgrel=1
pkgdesc="Linux kernel with grsecurity" pkgdesc="Linux kernel with grsecurity"
url=http://grsecurity.net url=http://grsecurity.net
depends="mkinitfs" depends="mkinitfs"
...@@ -13,7 +13,7 @@ _config=${config:-kernelconfig} ...@@ -13,7 +13,7 @@ _config=${config:-kernelconfig}
install="$pkgname.post-install $pkgname.post-upgrade" install="$pkgname.post-install $pkgname.post-upgrade"
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
grsecurity-2.1.14-2.6.30.6-200909091844.patch grsecurity-2.1.14-2.6.30.6-200909121646.patch
net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
$_config $_config
" "
...@@ -114,6 +114,6 @@ dev() { ...@@ -114,6 +114,6 @@ dev() {
md5sums="7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2 md5sums="7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2
f89295707f68c2b349534b490c9d5f2d patch-2.6.30.6.bz2 f89295707f68c2b349534b490c9d5f2d patch-2.6.30.6.bz2
15313bb5bc54aacb96508b5e19e94bc7 grsecurity-2.1.14-2.6.30.6-200909091844.patch 1151bdabaa0ee99890d4d5fd85dd94b8 grsecurity-2.1.14-2.6.30.6-200909121646.patch
ca05fd252783b82e01610e775cf56498 net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch ca05fd252783b82e01610e775cf56498 net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch
35d29ea012d4b009ce2bd37b7540903e kernelconfig" 35d29ea012d4b009ce2bd37b7540903e kernelconfig"
...@@ -2937,7 +2937,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/Makefile linux-2.6.30.6/arch/sparc/Makefile ...@@ -2937,7 +2937,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/Makefile linux-2.6.30.6/arch/sparc/Makefile
diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/fault_32.c diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/fault_32.c
--- linux-2.6.30.6/arch/sparc/mm/fault_32.c 2009-07-24 17:47:51.000000000 -0400 --- linux-2.6.30.6/arch/sparc/mm/fault_32.c 2009-07-24 17:47:51.000000000 -0400
+++ linux-2.6.30.6/arch/sparc/mm/fault_32.c 2009-08-27 21:11:25.299108429 -0400 +++ linux-2.6.30.6/arch/sparc/mm/fault_32.c 2009-09-12 16:45:57.368158675 -0400
@@ -21,6 +21,9 @@ @@ -21,6 +21,9 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -2948,7 +2948,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/ ...@@ -2948,7 +2948,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/
#include <asm/system.h> #include <asm/system.h>
#include <asm/page.h> #include <asm/page.h>
@@ -167,6 +170,264 @@ static unsigned long compute_si_addr(str @@ -167,6 +170,265 @@ static unsigned long compute_si_addr(str
return safe_compute_effective_address(regs, insn); return safe_compute_effective_address(regs, insn);
} }
...@@ -3158,6 +3158,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/ ...@@ -3158,6 +3158,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/
+ { + {
+ unsigned long addr; + unsigned long addr;
+ +
+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
+ addr = (save & 0x003FFFFFU) << 10; + addr = (save & 0x003FFFFFU) << 10;
+ regs->u_regs[UREG_G2] = addr; + regs->u_regs[UREG_G2] = addr;
+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U); + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
...@@ -3213,7 +3214,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/ ...@@ -3213,7 +3214,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/
asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write, asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
unsigned long address) unsigned long address)
{ {
@@ -231,6 +492,24 @@ good_area: @@ -231,6 +493,24 @@ good_area:
if(!(vma->vm_flags & VM_WRITE)) if(!(vma->vm_flags & VM_WRITE))
goto bad_area; goto bad_area;
} else { } else {
...@@ -3240,7 +3241,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/ ...@@ -3240,7 +3241,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_32.c linux-2.6.30.6/arch/sparc/mm/
goto bad_area; goto bad_area;
diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/fault_64.c diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/fault_64.c
--- linux-2.6.30.6/arch/sparc/mm/fault_64.c 2009-07-24 17:47:51.000000000 -0400 --- linux-2.6.30.6/arch/sparc/mm/fault_64.c 2009-07-24 17:47:51.000000000 -0400
+++ linux-2.6.30.6/arch/sparc/mm/fault_64.c 2009-08-27 21:11:25.310208001 -0400 +++ linux-2.6.30.6/arch/sparc/mm/fault_64.c 2009-09-10 17:13:47.968065725 -0400
@@ -20,6 +20,9 @@ @@ -20,6 +20,9 @@
#include <linux/kprobes.h> #include <linux/kprobes.h>
#include <linux/kdebug.h> #include <linux/kdebug.h>
...@@ -3251,7 +3252,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/ ...@@ -3251,7 +3252,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/
#include <asm/page.h> #include <asm/page.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
@@ -249,6 +252,404 @@ static void noinline bogus_32bit_fault_a @@ -249,6 +252,405 @@ static void noinline bogus_32bit_fault_a
show_regs(regs); show_regs(regs);
} }
...@@ -3594,6 +3595,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/ ...@@ -3594,6 +3595,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/
+ { + {
+ unsigned long addr; + unsigned long addr;
+ +
+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
+ addr = (save & 0x003FFFFFU) << 10; + addr = (save & 0x003FFFFFU) << 10;
+ regs->u_regs[UREG_G2] = addr; + regs->u_regs[UREG_G2] = addr;
+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL); + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
...@@ -3656,7 +3658,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/ ...@@ -3656,7 +3658,7 @@ diff -urNp linux-2.6.30.6/arch/sparc/mm/fault_64.c linux-2.6.30.6/arch/sparc/mm/
asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs) asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
{ {
struct mm_struct *mm = current->mm; struct mm_struct *mm = current->mm;
@@ -315,6 +716,29 @@ asmlinkage void __kprobes do_sparc64_fau @@ -315,6 +717,29 @@ asmlinkage void __kprobes do_sparc64_fau
if (!vma) if (!vma)
goto bad_area; goto bad_area;
...@@ -16,7 +16,7 @@ fi ...@@ -16,7 +16,7 @@ fi
pkgname=${_realname}-${_flavor} pkgname=${_realname}-${_flavor}
pkgver=${pkgver:-1.17} pkgver=${pkgver:-1.17}
pkgrel=10 pkgrel=11
pkgdesc="Iptables extensions kernel modules" pkgdesc="Iptables extensions kernel modules"
url="http://xtables-addons.sourceforge.net/" url="http://xtables-addons.sourceforge.net/"
license="GPL" license="GPL"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment