aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-05-06 09:56:12 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-05-06 09:56:12 +0000
commit2e4a717af4ee11ba5c48a5d53115c1567dc298d7 (patch)
treec753930cc74183dedd4507239feaa985b08385dd
parent6f8960df9ea8a93aeee3ec3683d1aca3fd1f7280 (diff)
downloadaports-2e4a717af4ee11ba5c48a5d53115c1567dc298d7.tar.bz2
aports-2e4a717af4ee11ba5c48a5d53115c1567dc298d7.tar.xz
main/linux-grsec: upgrade to 3.10.38
-rw-r--r--main/linux-grsec/APKBUILD14
-rw-r--r--main/linux-grsec/grsecurity-2.9.1-3.10.38-unofficial.patch (renamed from main/linux-grsec/grsecurity-2.9.1-3.10.37-unofficial.patch)44
2 files changed, 29 insertions, 29 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD
index be8696eba6..aee069acf8 100644
--- a/main/linux-grsec/APKBUILD
+++ b/main/linux-grsec/APKBUILD
@@ -2,7 +2,7 @@
_flavor=grsec
pkgname=linux-${_flavor}
-pkgver=3.10.37
+pkgver=3.10.38
case $pkgver in
*.*.*) _kernver=${pkgver%.*};;
*.*) _kernver=${pkgver};;
@@ -152,8 +152,8 @@ dev() {
}
md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz
-0e0d007bcb00c0ce3a6f83bbeecbb3b4 patch-3.10.37.xz
-9a5db9db27532a463e45f2bff702af5c grsecurity-2.9.1-3.10.37-unofficial.patch
+4afed6094673141bf97dd3e1b5d9aa88 patch-3.10.38.xz
+9b8c7d0a5053d3393d3b8dda4f4cb9b9 grsecurity-2.9.1-3.10.38-unofficial.patch
a16f11b12381efb3bec79b9bfb329836 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
656ae7b10dd2f18dbfa1011041d08d60 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
aa454ffb96428586447775c21449e284 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -166,8 +166,8 @@ b3c0153d53e508e03d73b94d15b24a96 sysctl_lxc.patch
7cdd9694350d23aece5224a6513f9003 kernelconfig.x86
f8e6f528a32f6a4ceef1efcc1fff0718 kernelconfig.x86_64"
sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 linux-3.10.tar.xz
-259d679a0a8c33bb3ddf97a8c14ce443a53be55239dcae24837317b275ce76ad patch-3.10.37.xz
-2db8b3f5b55eefa506111ec84218f940afc5ddc06b392dba6fbc0073a6215d0a grsecurity-2.9.1-3.10.37-unofficial.patch
+c1e4a92e06c6bc35c643fa433f484810e52895796d316ec3c3168b7a804951af patch-3.10.38.xz
+862d5602c1fb272605552ac8eaefab3112cdcd88f670d8f7121e7f91d50da24c grsecurity-2.9.1-3.10.38-unofficial.patch
6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
@@ -180,8 +180,8 @@ fc613ac466610b866b721c41836fd5bfb2d4b75bceb67972dc6369d7f62ff47e 0006-ipv4-use-
10d93e55f62f1704200c7ca22d7b7c77f0a0f8b418fda0e102c0ff25d62b4d34 kernelconfig.x86
f8f8bd6d4c41409668b9273fd62841dd7d9ffe927323457d5fcb550f9a13f6cf kernelconfig.x86_64"
sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 linux-3.10.tar.xz
-bbe1088dae3b7cc5331d7d5d52f6272ad47b5bde8a1afed15e1944a03fbe12ed9864bc3818beb761099e9d8b48658b2ee739da534e60e7a4e0dcf50914f57686 patch-3.10.37.xz
-3f6331c23bb32e64882d01186a7c98bbc4ae32b294a1f1fa257798b8e79a8852751c489ec27db08be665b8055a0a66c28450e3e961d560ff64dd9396c282533b grsecurity-2.9.1-3.10.37-unofficial.patch
+61873cddea34ebca02c4c0793d3b08b3a2c8a453324d8c1f75d7528f34927e2503444c87c90d16339e69695a062825e45b5424ff0007d496352a8b9044e50171 patch-3.10.38.xz
+e7caf3ebce5863a22e284ebc7127d905b0453d8ab3be20ba934a379739bf2f069c7fee460ca9f78702fc6a8e29a5d3f8de38c659aa7ebad8b0fe43de0234e847 grsecurity-2.9.1-3.10.38-unofficial.patch
81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch
51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch
57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch
diff --git a/main/linux-grsec/grsecurity-2.9.1-3.10.37-unofficial.patch b/main/linux-grsec/grsecurity-2.9.1-3.10.38-unofficial.patch
index ba581768c6..284976f357 100644
--- a/main/linux-grsec/grsecurity-2.9.1-3.10.37-unofficial.patch
+++ b/main/linux-grsec/grsecurity-2.9.1-3.10.38-unofficial.patch
@@ -281,7 +281,7 @@ index 1311a48..f233324 100644
pcd. [PARIDE]
diff --git a/Makefile b/Makefile
-index bd9fb5b..9e2e9b6 100644
+index bd51b50..3d0c1f0 100644
--- a/Makefile
+++ b/Makefile
@@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
@@ -9533,7 +9533,7 @@ index 53a28dd..50c38c3 100644
}
diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
-index e562d3c..191f176 100644
+index ad7e178..c9e7423 100644
--- a/arch/sparc/include/asm/uaccess_64.h
+++ b/arch/sparc/include/asm/uaccess_64.h
@@ -10,6 +10,7 @@
@@ -9643,10 +9643,10 @@ index fdd819d..5af08c8 100644
} while (++count < 16);
printk("\n");
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
-index baebab2..9cd13b1 100644
+index b9cc976..a4c7ef0 100644
--- a/arch/sparc/kernel/process_64.c
+++ b/arch/sparc/kernel/process_64.c
-@@ -158,7 +158,7 @@ static void show_regwindow(struct pt_regs *regs)
+@@ -160,7 +160,7 @@ static void show_regwindow(struct pt_regs *regs)
printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
if (regs->tstate & TSTATE_PRIV)
@@ -9655,7 +9655,7 @@ index baebab2..9cd13b1 100644
}
void show_regs(struct pt_regs *regs)
-@@ -167,7 +167,7 @@ void show_regs(struct pt_regs *regs)
+@@ -169,7 +169,7 @@ void show_regs(struct pt_regs *regs)
printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
regs->tpc, regs->tnpc, regs->y, print_tainted());
@@ -9664,7 +9664,7 @@ index baebab2..9cd13b1 100644
printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
regs->u_regs[3]);
-@@ -180,7 +180,7 @@ void show_regs(struct pt_regs *regs)
+@@ -182,7 +182,7 @@ void show_regs(struct pt_regs *regs)
printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
regs->u_regs[15]);
@@ -9673,7 +9673,7 @@ index baebab2..9cd13b1 100644
show_regwindow(regs);
show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
}
-@@ -269,7 +269,7 @@ void arch_trigger_all_cpu_backtrace(void)
+@@ -271,7 +271,7 @@ void arch_trigger_all_cpu_backtrace(void)
((tp && tp->task) ? tp->task->pid : -1));
if (gp->tstate & TSTATE_PRIV) {
@@ -9972,7 +9972,7 @@ index 2daaaa6..4fb84dc 100644
mm->unmap_area = arch_unmap_area_topdown;
}
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
-index 73ec8a7..4611979 100644
+index c79c687..f046f9c 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
@@ -52,7 +52,7 @@ sys32_rt_sigreturn:
@@ -9993,7 +9993,7 @@ index 73ec8a7..4611979 100644
bne,pn %icc, linux_syscall_trace32 ! CTI
mov %i0, %l5 ! IEU1
5: call %l7 ! CTI Group brk forced
-@@ -207,7 +207,7 @@ linux_sparc_syscall:
+@@ -208,7 +208,7 @@ linux_sparc_syscall:
mov %i3, %o3 ! IEU1
mov %i4, %o4 ! IEU0 Group
@@ -48286,10 +48286,10 @@ index b51c154..17d55d1 100644
if (get_user(c, buf))
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
-index 59d26ef5..3135b94 100644
+index 3723c0e..1fddfef 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
-@@ -3467,7 +3467,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
+@@ -3468,7 +3468,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
void tty_default_fops(struct file_operations *fops)
{
@@ -81003,7 +81003,7 @@ index ad8e1bd..fed7ba9 100644
pagefault_disable();
result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
diff --git a/kernel/exit.c b/kernel/exit.c
-index 7bb73f9..d7978ed 100644
+index 6682b2e..9991506 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -172,6 +172,10 @@ void release_task(struct task_struct * p)
@@ -81026,7 +81026,7 @@ index 7bb73f9..d7978ed 100644
recalc_sigpending();
spin_unlock_irq(&current->sighand->siglock);
return 0;
-@@ -709,6 +713,8 @@ void do_exit(long code)
+@@ -716,6 +720,8 @@ void do_exit(long code)
struct task_struct *tsk = current;
int group_dead;
@@ -81035,7 +81035,7 @@ index 7bb73f9..d7978ed 100644
profile_task_exit(tsk);
WARN_ON(blk_needs_flush_plug(tsk));
-@@ -725,7 +731,6 @@ void do_exit(long code)
+@@ -732,7 +738,6 @@ void do_exit(long code)
* mm_release()->clear_child_tid() from writing to a user-controlled
* kernel address.
*/
@@ -81043,7 +81043,7 @@ index 7bb73f9..d7978ed 100644
ptrace_event(PTRACE_EVENT_EXIT, code);
-@@ -784,6 +789,9 @@ void do_exit(long code)
+@@ -791,6 +796,9 @@ void do_exit(long code)
tsk->exit_code = code;
taskstats_exit(tsk, group_dead);
@@ -81053,7 +81053,7 @@ index 7bb73f9..d7978ed 100644
exit_mm(tsk);
if (group_dead)
-@@ -905,7 +913,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
+@@ -910,7 +918,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
* Take down every thread in the group. This is called by fatal signals
* as well as by sys_exit_group (below).
*/
@@ -83047,7 +83047,7 @@ index 0eb6d8e..ee0e17d 100644
{
struct pid *pid;
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
-index 6917e8e..9909aeb 100644
+index e32703d..0c16e87 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -247,7 +247,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
@@ -85903,7 +85903,7 @@ index b20428c..4845a10 100644
local_irq_save(flags);
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 9064b91..1f5d2f8 100644
+index 9bea1d7..903a298 100644
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -82,6 +82,21 @@ int create_user_ns(struct cred *new)
@@ -85928,7 +85928,7 @@ index 9064b91..1f5d2f8 100644
ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
if (!ns)
return -ENOMEM;
-@@ -862,7 +877,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
+@@ -861,7 +876,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
if (atomic_read(&current->mm->mm_users) > 1)
return -EINVAL;
@@ -86655,7 +86655,7 @@ index e742d06..c56fdd8 100644
config NOMMU_INITIAL_TRIM_EXCESS
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
-index 5025174..9d67dcd 100644
+index eea1a9d..5149b1a 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -12,7 +12,7 @@
@@ -86667,7 +86667,7 @@ index 5025174..9d67dcd 100644
struct backing_dev_info default_backing_dev_info = {
.name = "default",
-@@ -515,7 +515,6 @@ EXPORT_SYMBOL(bdi_destroy);
+@@ -523,7 +523,6 @@ EXPORT_SYMBOL(bdi_destroy);
int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
unsigned int cap)
{
@@ -86675,7 +86675,7 @@ index 5025174..9d67dcd 100644
int err;
bdi->name = name;
-@@ -524,8 +523,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
+@@ -532,8 +531,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name,
if (err)
return err;