diff options
| author |   Guillaume Destuynder <kang@gentoo.org> | 2004-12-11 12:52:26 +0000 |
|---|---|---|
| committer | Guillaume Destuynder <kang@gentoo.org> | 2004-12-11 12:52:26 +0000 |
| commit | f7d516ae4fa96083b0b6c0df036331341c1e6acd (patch) | |
| tree | fa0ed3b2bbd556708948f7830c4a250164f16c0b /sys-kernel | |
| parent | Stable on alpha. (diff) | |
| download | historical-f7d516ae4fa96083b0b6c0df036331341c1e6acd.tar.gz historical-f7d516ae4fa96083b0b6c0df036331341c1e6acd.tar.bz2 historical-f7d516ae4fa96083b0b6c0df036331341c1e6acd.zip | |
FIxixes #73899, bad upstream patch corrected
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/rsbac-dev-sources/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-kernel/rsbac-dev-sources/Manifest | 4 | ||||
| -rw-r--r-- | sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-2.6.7-dos_mem_disc2.patch | 8 |
3 files changed, 8 insertions, 11 deletions
diff --git a/sys-kernel/rsbac-dev-sources/ChangeLog b/sys-kernel/rsbac-dev-sources/ChangeLog index 68a74c0f9757..f5e449830202 100644 --- a/sys-kernel/rsbac-dev-sources/ChangeLog +++ b/sys-kernel/rsbac-dev-sources/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/rsbac-dev-sources # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/ChangeLog,v 1.16 2004/12/08 19:53:28 kang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/rsbac-dev-sources/ChangeLog,v 1.17 2004/12/11 12:52:26 kang Exp $ + + 11 Dec 2004; Guillaume Destuynder <kang@gentoo.org> + files/rsbac-dev-sources-2.6.7-dos_mem_disc2.patch: + Fixes #73899, incoherent patch from the last security fixes removes a + variable it also added in fs/exec.c *rsbac-dev-sources-2.6.7-r10 (08 Dec 2004) diff --git a/sys-kernel/rsbac-dev-sources/Manifest b/sys-kernel/rsbac-dev-sources/Manifest index e1ed5c1bfe5a..14b87f3e7a24 100644 --- a/sys-kernel/rsbac-dev-sources/Manifest +++ b/sys-kernel/rsbac-dev-sources/Manifest @@ -1,5 +1,5 @@ MD5 ed6fb50f79e8049f3f3576bb25c32747 metadata.xml 465 -MD5 99848b4cf5752f1a16862a7f5afa31ab ChangeLog 4417 +MD5 2381cc3d54015367da96222898383ad6 ChangeLog 4635 MD5 8935fe858917edc96958d71c945d1930 rsbac-dev-sources-2.6.7-r10.ebuild 1886 MD5 706d7794a822074aaf31502d7a7e48d3 files/2.6.7-cmdline.patch 455 MD5 b6e38b41c8a79943df2ab2642149d06f files/rsbac-dev-sources-CAN-2004-0497.patch 2214 @@ -16,4 +16,4 @@ MD5 7872d0af6e27fb6007833b113097bb34 files/rsbac-dev-sources-2.6.7-CAN-2004-0883 MD5 530630d25910e6bd9376b63ea099655f files/rsbac-dev-sources-2.6.7-AF_UNIX.patch 469 MD5 ee9c2340e890a15d199f98f98e027466 files/digest-rsbac-dev-sources-2.6.7-r10 281 MD5 91dd923056c1af13054cb00fb0a8daa3 files/rsbac-dev-sources-2.6.7-dos_mem_disc1.patch 1578 -MD5 4c0855099b2f8bd4b6e06b4903d5ba74 files/rsbac-dev-sources-2.6.7-dos_mem_disc2.patch 7578 +MD5 632a66f683783bebc9c7b565284284d0 files/rsbac-dev-sources-2.6.7-dos_mem_disc2.patch 7369 diff --git a/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-2.6.7-dos_mem_disc2.patch b/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-2.6.7-dos_mem_disc2.patch index c700a9c71832..60baa63df5a7 100644 --- a/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-2.6.7-dos_mem_disc2.patch +++ b/sys-kernel/rsbac-dev-sources/files/rsbac-dev-sources-2.6.7-dos_mem_disc2.patch @@ -146,14 +146,6 @@ diff -urNp -X /usr/src/dontdiff linux-2.6.7-gentoo-r19/fs/exec.c linux-dsd/fs/ex long arg_size; #ifdef CONFIG_STACK_GROWSUP -@@ -413,7 +413,6 @@ int setup_arg_pages(struct linux_binprm - - down_write(&mm->mmap_sem); - { -- struct vm_area_struct *vma; - mpnt->vm_mm = mm; - #ifdef CONFIG_STACK_GROWSUP - mpnt->vm_start = stack_base; diff -urNp -X /usr/src/dontdiff linux-2.6.7-gentoo-r19/include/linux/mm.h linux-dsd/include/linux/mm.h --- linux-2.6.7-gentoo-r19/include/linux/mm.h 2004-12-02 23:32:15.430905336 +0000 +++ linux-dsd/include/linux/mm.h 2004-12-02 23:33:06.942074448 +0000 |