Fix patch to apply

Package-Manager: portage-2.0.51.19

2 files changed, 98 insertions, 40 deletions

diff --git a/sys-kernel/usermode-sources/Manifest b/sys-kernel/usermode-sources/Manifest
index 6c62d8938c61..1d3adae18cbc 100644
--- a/sys-kernel/usermode-sources/Manifest
+++ b/sys-kernel/usermode-sources/Manifest
@@ -1,48 +1,93 @@
-MD5 6ee1b3dfe6accdbeb51e47de0c651b55 ChangeLog 17367
-MD5 d8a22cdd09d93f364532aa9db4847e09 usermode-sources-2.6.8.1-r9.ebuild 1672
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d81a18d7adba77a16afa2fa384bbed45 usermode-sources-2.4.26-r13.ebuild 2225
+MD5 6ee1b3dfe6accdbeb51e47de0c651b55 ChangeLog 17367
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
-MD5 7b6f30de95fee7eef67ec1866a06005a files/digest-usermode-sources-2.6.8.1-r9 214
-MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
+MD5 d8a22cdd09d93f364532aa9db4847e09 usermode-sources-2.6.8.1-r9.ebuild 1672
+MD5 0cda434273a2558ebcfe696c0e813c78 files/usermode-sources-2.6.78362.patch 2430
+MD5 60d25ff310fc6abfdce39ec9e47345af files/usermode-sources-2.4.CAN-2004-0685.patch 2809
+MD5 74219287c673cee8f0c4da8731d0229c files/usermode-sources-2.6.77666.patch 4751
+MD5 6bcdd0bb63e2db559a5c6465c73a7f89 files/usermode-sources-2.6.CAN-2004-1151.patch 1143
 MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/usermode-sources-2.4.smbfs.patch 3434
-MD5 b9a94233e1457787352e5f85e3e3582d files/usermode-sources-2.4.binfmt_a.out.patch 2009
-MD5 8165de5e2ab6e0d3263ea35ce856fd1b files/usermode-sources-2.6.smbfs.patch 3309
-MD5 452e04a312368605e145428c35bd0e05 files/usermode-sources-2.6.devPtmx.patch 572
-MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
-MD5 4b4299f62b65a80161f1acd0a2e4240e files/digest-usermode-sources-2.4.26-r13 300
+MD5 9eda91c0c7c7cd61ac3fbc4b309de3c0 files/usermode-sources-2.6.77094.patch 5193
+MD5 a9991d6324d7404ed99e79be6e44e9de files/usermode-sources-2.6.binfmt_elf.patch 2348
 MD5 025c80544aef14ce3a49024d791c5596 files/usermode-sources-2.6.binfmt_a.out.patch 1763
+MD5 c942eca63f26d0e933a366491340e95b files/usermode-sources-2.6.CAN-2004-1056.patch 6187
+MD5 757ee1239c3f14645ccea3640d551e11 files/usermode-sources-2.4.CAN-2004-1056.patch 11249
 MD5 c9da1bc82b906f6abc648c056e7bf662 files/usermode-sources-2.4.FPULockup-53804.patch 354
+MD5 4b4299f62b65a80161f1acd0a2e4240e files/digest-usermode-sources-2.4.26-r13 300
 MD5 b0a1f80aff51d6601e8924329023b241 files/usermode-sources.AF_UNIX.patch 515
-MD5 530630d25910e6bd9376b63ea099655f files/usermode-sources-2.6.AF_UNIX.patch 469
+MD5 915e8d7a0618736caa44d96968015467 files/usermode-sources-2.4.binfmt_elf.patch 2346
+MD5 d4a740ae56c2049247083af387a22a85 files/usermode-sources-2.4.26.CAN-2004-0394.patch 350
 MD5 2b3ddb8b8b15f8da35ade38544b57857 files/usermode-sources-2.4.XDRWrapFix.patch 1499
-MD5 4d656fa3f3a47df751c0d78b64ed8353 files/usermode-sources-2.6.AF_UNIX.SELinux.patch 1761
-MD5 6bcdd0bb63e2db559a5c6465c73a7f89 files/usermode-sources-2.6.CAN-2004-1151.patch 1143
+MD5 452e04a312368605e145428c35bd0e05 files/usermode-sources-2.6.devPtmx.patch 572
 MD5 22192366443458dc8815827df35b63a7 files/usermode-sources-2.6.vma.patch 8034
 MD5 0f66013f643c79c97fda489618a4e2fd files/usermode-sources-2.4.CAN-2004-0535.patch 476
-MD5 915e8d7a0618736caa44d96968015467 files/usermode-sources-2.4.binfmt_elf.patch 2346
-MD5 a9991d6324d7404ed99e79be6e44e9de files/usermode-sources-2.6.binfmt_elf.patch 2348
-MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846
+MD5 dc18e982f8149588a291956481885a8c files/usermode-sources-2.4.CAN-2004-0495.patch 17549
+MD5 b6cd2468a246169a6e2f969c44e3f341 files/usermode-sources-2.4.78362.patch 10372
+MD5 7b6f30de95fee7eef67ec1866a06005a files/digest-usermode-sources-2.6.8.1-r9 214
+MD5 1efe4024e443e60db5fd9b21b22fabd2 files/usermode-sources-2.4.77666.patch 1724
+MD5 8165de5e2ab6e0d3263ea35ce856fd1b files/usermode-sources-2.6.smbfs.patch 3309
+MD5 4d656fa3f3a47df751c0d78b64ed8353 files/usermode-sources-2.6.AF_UNIX.SELinux.patch 1761
+MD5 7695b79187fcc27339ab62af1112ec11 files/usermode-sources-2.6.74070.patch 525
+MD5 1d78b90e495e432432e095ee47bbc2fc files/usermode-sources-2.4.77094.patch 452
+MD5 792fa9165e5ae65d46ee206c7f7a4fc9 files/usermode-sources-2.4.78363.patch 788
+MD5 cd0a7533c43364e377348613c6d76bb7 files/usermode-sources-2.6.brk-locked.patch 9736
+MD5 09e9f1cad6f2f28fe81682cbad8e3011 files/usermode-sources-2.6.CAN-2004-1137.patch 2551
+MD5 8c35751caf824a9dacb02e80d6189b2e files/usermode-sources-2.4.CAN-2004-1137.patch 1764
+MD5 77a23c26c0468c64ee5bc13c9999d79b files/usermode-sources-2.6.82141.patch 7684
 MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/usermode-sources-2.6.CAN-2004-1016.patch 2835
-MD5 c942eca63f26d0e933a366491340e95b files/usermode-sources-2.6.CAN-2004-1056.patch 6187
-MD5 60d25ff310fc6abfdce39ec9e47345af files/usermode-sources-2.4.CAN-2004-0685.patch 2809
-MD5 d1ccc2047be533c992f67270a150a210 files/usermode-sources-2.4.cmdlineLeak.patch 388
+MD5 655251f31f0bdc85bdd0cd0280af22b7 files/usermode-sources-2.6.75963.patch 979
 MD5 c2510fe1891f5a9effb12c2196922206 files/usermode-sources-2.6.cmdlineLeak.patch 281
-MD5 09e9f1cad6f2f28fe81682cbad8e3011 files/usermode-sources-2.6.CAN-2004-1137.patch 2551
 MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/usermode-sources-2.4.CAN-2004-1016.patch 2835
-MD5 757ee1239c3f14645ccea3640d551e11 files/usermode-sources-2.4.CAN-2004-1056.patch 11249
-MD5 8c35751caf824a9dacb02e80d6189b2e files/usermode-sources-2.4.CAN-2004-1137.patch 1764
-MD5 c27699e9d62f7d46213bd51f87636163 files/usermode-sources-2.4.vma.patch 8143
-MD5 1d78b90e495e432432e095ee47bbc2fc files/usermode-sources-2.4.77094.patch 452
+MD5 530630d25910e6bd9376b63ea099655f files/usermode-sources-2.6.AF_UNIX.patch 469
+MD5 eb75782ba6714f1c78b956e1497816f3 files/usermode-sources-2.6.81106.patch 826
+MD5 b9a94233e1457787352e5f85e3e3582d files/usermode-sources-2.4.binfmt_a.out.patch 2009
 MD5 a37241da52edeb7fb1d4989b28eee9cd files/usermode-sources-2.4.brk-locked.patch 8523
-MD5 655251f31f0bdc85bdd0cd0280af22b7 files/usermode-sources-2.6.75963.patch 979
-MD5 9eda91c0c7c7cd61ac3fbc4b309de3c0 files/usermode-sources-2.6.77094.patch 5193
-MD5 cd0a7533c43364e377348613c6d76bb7 files/usermode-sources-2.6.brk-locked.patch 9736
-MD5 1efe4024e443e60db5fd9b21b22fabd2 files/usermode-sources-2.4.77666.patch 1724
-MD5 b6cd2468a246169a6e2f969c44e3f341 files/usermode-sources-2.4.78362.patch 10372
-MD5 792fa9165e5ae65d46ee206c7f7a4fc9 files/usermode-sources-2.4.78363.patch 788
-MD5 7695b79187fcc27339ab62af1112ec11 files/usermode-sources-2.6.74070.patch 525
-MD5 6cb26dd15360991af04188047c57c3d2 files/usermode-sources-2.6.77666.patch 4096
+MD5 d1ccc2047be533c992f67270a150a210 files/usermode-sources-2.4.cmdlineLeak.patch 388
 MD5 a3f4cfc55b03f9a6104da43da9c38928 files/usermode-sources-2.6.77923.patch 1094
-MD5 0cda434273a2558ebcfe696c0e813c78 files/usermode-sources-2.6.78362.patch 2430
-MD5 eb75782ba6714f1c78b956e1497816f3 files/usermode-sources-2.6.81106.patch 826
-MD5 77a23c26c0468c64ee5bc13c9999d79b files/usermode-sources-2.6.82141.patch 7684
+MD5 95708646470a95668e8789cd415844ed files/usermode-sources.CAN-2004-0497.patch 846
+MD5 c27699e9d62f7d46213bd51f87636163 files/usermode-sources-2.4.vma.patch 8143
+MD5 8204afea1d572b49a4a80d8da4eef0c9 security/CAN-2004-0596-2.6-eql.patch 1033
+MD5 b738cb0120a32aa92cfcfdbd564dd21f security/security-2.6-attr_check.patch 1368
+MD5 d1ccc2047be533c992f67270a150a210 security/security-2.4-proc_race.patch 388
+MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 security/CAN-2004-0883-2.4-smbfs_remote_overflows.patch 3434
+MD5 30c242af6df0e71b06018cf8abbe224b security/security-2.6.8.1-binfmt_elf-fixes.patch 2349
+MD5 d4a740ae56c2049247083af387a22a85 security/CAN-2004-0394-panic.patch 350
+MD5 9305bb1af0da4ef1510285b7ad880d2d security/security-2.6-af_unix-kern-mem.patch 470
+MD5 263a9f529a3b80e2c91340a73c0c5920 security/CAN-2004-0816-2.6-iptables_dos.patch 1445
+MD5 9e48781c02908b41ffa39a752bf2530f security/CAN-2004-0814-2.6.7-tty_race_conditions.patch 131731
+MD5 eb70acb35ba13daa4b1fda53cb61fc01 security/CAN-2004-0495_0496-2.6-sparse.patch 23861
+MD5 8812f60b8d02b0b3b4c46a3311ddd851 security/CAN-2004-0883-2.6.9-smbfs_remote_overflows.patch 2662
+MD5 b0a1f80aff51d6601e8924329023b241 security/security-2.4-af_unix-kern-mem.patch 515
+MD5 4b99df79dcc18b17eb41489b96ff9689 security/CAN-2004-0814-2.4.27-tty_race_conditions.patch 81529
+MD5 91dd923056c1af13054cb00fb0a8daa3 security/CAN-2004-1074-2.6-kernel_dos_vma.patch 1578
+MD5 52996b643afbd6ed9ba38b9483c2cac3 security/CAN-2004-0415-2.6.7-file_offset_pointers.patch 112612
+MD5 8165de5e2ab6e0d3263ea35ce856fd1b security/CAN-2004-0883-2.6.8.1-smbfs_remote_overflows.patch 3309
+MD5 8f8f2412aacf9a01b5549bf2a9a3bff8 security/CAN-2004-0415-2.4-file_offset_pointers.patch 90145
+MD5 d4c051e7c6062704be85192e25e2f5b2 security/CAN-2004-0814-2.4.26-tty_race_conditions.patch 81508
+MD5 0f66013f643c79c97fda489618a4e2fd security/CAN-2004-0535-2.4-e1000.patch 476
+MD5 e6b4f6f02b16fec37c79501ad976f831 security/CAN-2004-0814-2.6.8.1-tty_race_conditions.patch 130365
+MD5 48d91c3d100d5ffc57155c537b50b861 security/security-2.4-mips-ptrace.patch 1934
+MD5 452e04a312368605e145428c35bd0e05 security/security-2.6-remote_ddos.patch 572
+MD5 d918b0aea5eeb2b536a8a26f9cbbc0d9 security/security-2.6.8.1-mips-ptrace.patch 2085
+MD5 dc18e982f8149588a291956481885a8c security/CAN-2004-0495-2.4-sparse.patch 17549
+MD5 e1f9b1e3d7a58ac47f77dfc6953333ec security/CAN-2004-1074-2.4-kernel_dos_vma.patch 2010
+MD5 2b3ddb8b8b15f8da35ade38544b57857 security/security-2.4-remote_ddos.patch 1499
+MD5 fe5c0aaaedb5a0db1039a5aae50723f7 security/security-2.6.9-mips-ptrace.patch 2278
+MD5 87d4a5f01955bd23fdf77e55ba12b320 security/security-2.6.9-binfmt_elf-fixes.patch 2351
+MD5 95708646470a95668e8789cd415844ed security/CAN-2004-0497-attr_gid.patch 846
+MD5 01d575c832f36dc0433a904cc64448a6 security/security-2.6-proc_race.patch 692
+MD5 12025d52cb6a387cc4becbac6c5654c8 security/CAN-2004-0685-2.4-conectiva_usb.patch 2789
+MD5 d54a257e7c777d0bc7edf1c22152e8f0 security/security-2.6.7-mips-ptrace.patch 2085
+MD5 4c7627b4667b47b9a437f061ea04b5d4 security/security-2.4-binfmt_elf-fixes.patch 2347
+MD5 23852ec2542971547374316129336f33 security/security-2.6.7-binfmt_elf-fixes.patch 2607
+MD5 c91330cc5b4044b6f59696095c2dc0fb security/CAN-2004-0626-death_packet.patch 423
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCOE8miJcSIUGNthERAnDVAKCPfVXEwt3dx2TrvdF8dGapLJtHCgCgjRad
+gJx4w5lYpY6zI0Tyze+mOX4=
+=Xvw0
+-----END PGP SIGNATURE-----
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.77666.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.77666.patch
index 9c9303c1ad85..5702aa0d46fd 100644
--- a/sys-kernel/usermode-sources/files/usermode-sources-2.6.77666.patch
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.77666.patch
@@ -1,6 +1,7 @@
---- linux-2.6.8.1/mm/mmap.c	2005-03-07 22:00:32.000000000 +0000
-+++ linux-2.6.8.1-plasmaroo/mm/mmap.c	2005-03-07 22:30:33.985127376 +0000
-@@ -1182,13 +1182,57 @@
+diff -urNpX /usr/src/dontdiff linux-2.6.8.1-r9/mm/mmap.c linux-dsd/mm/mmap.c
+--- linux-2.6.8.1-r9/mm/mmap.c	2005-03-16 14:56:52.000000000 +0000
++++ linux-dsd/mm/mmap.c	2005-03-16 15:14:58.000000000 +0000
+@@ -1182,13 +1182,57 @@ out:
  	return prev ? prev->vm_next : vma;
  }
  
@@ -59,7 +60,7 @@
  
  	if (!(vma->vm_flags & VM_GROWSUP))
  		return -EFAULT;
-@@ -1208,27 +1252,25 @@
+@@ -1208,20 +1252,18 @@ int expand_stack(struct vm_area_struct *
  	 */
  	address += 4 + PAGE_SIZE - 1;
  	address &= PAGE_MASK;
@@ -89,6 +90,12 @@
 +		if (!error)
 +			vma->vm_end = address;
  	}
+ 	if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) &&
+ 			((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) >
+@@ -1230,12 +1272,12 @@ int expand_stack(struct vm_area_struct *
+ 		vm_unacct_memory(grow);
+ 		return -ENOMEM;
+ 	}
 -	vma->vm_end = address;
 -	vma->vm_mm->total_vm += grow;
 -	if (vma->vm_flags & VM_LOCKED)
@@ -103,7 +110,7 @@
  }
  
  struct vm_area_struct *
-@@ -1253,7 +1295,7 @@
+@@ -1260,7 +1302,7 @@ find_extend_vma(struct mm_struct *mm, un
   */
  int expand_stack(struct vm_area_struct *vma, unsigned long address)
  {
@@ -112,7 +119,7 @@
  
  	/*
  	 * We must make sure the anon_vma is allocated
-@@ -1269,28 +1311,23 @@
+@@ -1276,20 +1318,20 @@ int expand_stack(struct vm_area_struct *
  	 * anon_vma lock to serialize against concurrent expand_stacks.
  	 */
  	address &= PAGE_MASK;
@@ -144,6 +151,12 @@
 +			vma->vm_pgoff -= grow;
 +		}
  	}
+ 	if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) &&
+ 			((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) >
+@@ -1298,13 +1340,8 @@ int expand_stack(struct vm_area_struct *
+ 		vm_unacct_memory(grow);
+ 		return -ENOMEM;
+ 	}
 -	vma->vm_start = address;
 -	vma->vm_pgoff -= grow;
 -	vma->vm_mm->total_vm += grow;