diff options
author | Tim Yamin <plasmaroo@gentoo.org> | 2004-11-20 15:11:28 +0000 |
---|---|---|
committer | Tim Yamin <plasmaroo@gentoo.org> | 2004-11-20 15:11:28 +0000 |
commit | 4a24dc55a429415144b34b67291e137474d82b73 (patch) | |
tree | 4b3ae203bd738fe48618fef700d172cc5e9e5f3f /sys-kernel | |
parent | cat files digest* (diff) | |
download | historical-4a24dc55a429415144b34b67291e137474d82b73.tar.gz historical-4a24dc55a429415144b34b67291e137474d82b73.tar.bz2 historical-4a24dc55a429415144b34b67291e137474d82b73.zip |
Version bump; updates binfmt_elf patch (bug #70681) and adds the smbfs security patch (bug #65877).
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/wolk-sources/ChangeLog | 13 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/Manifest | 21 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r13 (renamed from sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r12) | 0 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r10 (renamed from sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r9) | 0 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r3 (renamed from sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r2) | 0 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r17 (renamed from sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r16) | 0 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/wolk-sources.binfmt_elf.patch | 29 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/files/wolk-sources.smbfs.patch | 97 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/wolk-sources-4.11-r13.ebuild (renamed from sys-kernel/wolk-sources/wolk-sources-4.11-r12.ebuild) | 3 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/wolk-sources-4.14-r10.ebuild (renamed from sys-kernel/wolk-sources/wolk-sources-4.14-r9.ebuild) | 5 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/wolk-sources-4.15-r3.ebuild (renamed from sys-kernel/wolk-sources/wolk-sources-4.15-r2.ebuild) | 5 | ||||
-rw-r--r-- | sys-kernel/wolk-sources/wolk-sources-4.9-r17.ebuild (renamed from sys-kernel/wolk-sources/wolk-sources-4.9-r16.ebuild) | 3 |
12 files changed, 151 insertions, 25 deletions
diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog index 96099769e489..f4251101a173 100644 --- a/sys-kernel/wolk-sources/ChangeLog +++ b/sys-kernel/wolk-sources/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-kernel/wolk-sources # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.60 2004/11/12 21:01:30 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.61 2004/11/20 15:11:28 plasmaroo Exp $ + +*wolk-sources-4.14-r10 (20 Nov 2004) + + 20 Nov 2004; <plasmaroo@gentoo.org> -wolk-sources-4.11-r12.ebuild, + +wolk-sources-4.11-r13.ebuild, +wolk-sources-4.14-r10.ebuild, + -wolk-sources-4.14-r9.ebuild, -wolk-sources-4.15-r2.ebuild, + +wolk-sources-4.15-r3.ebuild, -wolk-sources-4.9-r16.ebuild, + +wolk-sources-4.9-r17.ebuild, files/wolk-sources.binfmt_elf.patch, + +files/wolk-sources.smbfs.patch: + Version bump; updates binfmt_elf patch (bug #70681) and adds the smbfs + security patch (bug #65877). *wolk-sources-4.15-r2 (12 Nov 2004) diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest index 7f1c0ff9eaf7..1bf7a97fd7e9 100644 --- a/sys-kernel/wolk-sources/Manifest +++ b/sys-kernel/wolk-sources/Manifest @@ -1,37 +1,38 @@ -MD5 6fe377eeccb617cb6b7297d6a0d2caa5 ChangeLog 19583 -MD5 8acace8673fba0a5ace93af6d2623ab3 wolk-sources-4.9-r16.ebuild 6236 -MD5 7fe7bb3855a94802c50d9f97b3f13e03 wolk-sources-4.14-r9.ebuild 2506 +MD5 91a236e4c6fe9750c2c156a969f20b7c ChangeLog 20087 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226 -MD5 fdd56c83ddd4c52b7149bba2dc5164af wolk-sources-4.11-r12.ebuild 3213 -MD5 a1a6481188f95a89c897e896d41b3fc0 wolk-sources-4.15-r2.ebuild 1619 +MD5 3bda7c3e6d1d19bed00853b005cb232a wolk-sources-4.11-r13.ebuild 3293 +MD5 0f32c1c76fd5f650e9c25aa6ccd36d4c wolk-sources-4.9-r17.ebuild 6316 +MD5 8ab650923c348babe29003f3e6c71c36 wolk-sources-4.14-r10.ebuild 2538 +MD5 8a80bc94b438ef1bee49de553f8933d4 wolk-sources-4.15-r3.ebuild 1650 MD5 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476 MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635 -MD5 696de19810e15bd0d4373c0256efb3e0 files/digest-wolk-sources-4.14-r9 248 +MD5 696de19810e15bd0d4373c0256efb3e0 files/digest-wolk-sources-4.14-r10 248 +MD5 379ebf50edb608e7dce21bbc0fd2d265 files/digest-wolk-sources-4.15-r3 227 MD5 aa193a78c4f2fdd248f992db935c7895 files/wolk-sources-4.9s.CAN-2004-0010.patch 6065 MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424 +MD5 895c08b40b862ad74da9d49232ec83f1 files/digest-wolk-sources-4.11-r13 392 MD5 21f3a4f186017d925067335e24db36a1 files/wolk-sources.CAN-2004-0109.patch 1877 MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531 -MD5 ff260e3c42d263d7ef1a579eaa38e5e6 files/wolk-sources.binfmt_elf.patch 2237 +MD5 a4cb2b30bc0ad5f4f3913a6ec2ddfe1a files/wolk-sources.binfmt_elf.patch 2618 MD5 5bf9836a632a861728d33f9736bb7431 files/wolk-sources.CAN-2004-0133.patch 427 MD5 c9da1bc82b906f6abc648c056e7bf662 files/wolk-sources.FPULockup-53804.patch 354 MD5 dc18e982f8149588a291956481885a8c files/wolk-sources.CAN-2004-0495.patch 17549 MD5 2ca46d61e534cfd18a965e9ae8e870e2 files/binfmt_elf.patch 2347 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/wolk-sources.CAN-2004-0427.patch 460 MD5 3bdf00d5f80fe9dfbfe8220e076cd04c files/wolk-sources.CAN-2004-0497.patch 707 +MD5 30e9fd1fbb477c5fc965dbf0fe41f3e8 files/digest-wolk-sources-4.9-r17 1480 MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350 MD5 528da73c9e4a6fb017561e51dc0ab815 files/wolk-sources.CAN-2003-0643.patch 747 +MD5 1e1fe7bb98c80db4644f4b7fd7dd5d32 files/wolk-sources.smbfs.patch 3434 MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777 MD5 de75cfa969ed092578d9ddda6c5be334 files/wolk-sources.CAN-2004-0181.patch 1233 -MD5 30e9fd1fbb477c5fc965dbf0fe41f3e8 files/digest-wolk-sources-4.9-r16 1480 MD5 60d25ff310fc6abfdce39ec9e47345af files/wolk-sources.CAN-2004-0685.patch 2809 MD5 d1ccc2047be533c992f67270a150a210 files/wolk-sources.cmdlineLeak.patch 388 MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893 MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414 -MD5 895c08b40b862ad74da9d49232ec83f1 files/digest-wolk-sources-4.11-r12 392 MD5 2b3ddb8b8b15f8da35ade38544b57857 files/wolk-sources.XDRWrapFix.patch 1499 MD5 92f1b3aa68de326081b75653a77d64cf files/wolk-sources-4.9s.CAN-2004-0685.patch 2881 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/wolk-sources.CAN-2004-0177.patch 384 -MD5 379ebf50edb608e7dce21bbc0fd2d265 files/digest-wolk-sources-4.15-r2 227 MD5 a61e57d5483a06f20da339d91f98fbb8 files/wolk-sources-4.9s.rtc_fix.patch 6769 MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242 MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/wolk-sources-4.9s.munmap.patch 826 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r12 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r13 index 49ba6c313556..49ba6c313556 100644 --- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r12 +++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r13 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r9 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r10 index 0d04b5cf57f2..0d04b5cf57f2 100644 --- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r9 +++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r10 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r2 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r3 index 3bdaa8aa52a4..3bdaa8aa52a4 100644 --- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r2 +++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r3 diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r16 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r17 index 1fcc6f96f959..1fcc6f96f959 100644 --- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r16 +++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r17 diff --git a/sys-kernel/wolk-sources/files/wolk-sources.binfmt_elf.patch b/sys-kernel/wolk-sources/files/wolk-sources.binfmt_elf.patch index bce026adf312..a8ce8124db86 100644 --- a/sys-kernel/wolk-sources/files/wolk-sources.binfmt_elf.patch +++ b/sys-kernel/wolk-sources/files/wolk-sources.binfmt_elf.patch @@ -1,6 +1,6 @@ -diff -ur linux-2.4.27-gentoo-r2/fs/binfmt_elf.c linux-2.4.27-gentoo-r3/fs/binfmt_elf.c ---- linux-2.4.27-gentoo-r2/fs/binfmt_elf.c 2004-11-10 20:43:18.000000000 +0000 -+++ linux-2.4.27-gentoo-r3/fs/binfmt_elf.c 2004-11-10 20:33:40.000000000 +0000 +diff -ur linux-2.4.27-gentoo-r3/fs/binfmt_elf.c linux-2.4.27-gentoo-r4/fs/binfmt_elf.c +--- linux-2.4.27-gentoo-r3/fs/binfmt_elf.c 2004-11-20 14:00:14.547133232 +0000 ++++ linux-2.4.27-gentoo-r4/fs/binfmt_elf.c 2004-11-20 13:59:42.415018056 +0000 @@ -308,9 +308,12 @@ goto out; @@ -29,7 +29,17 @@ diff -ur linux-2.4.27-gentoo-r2/fs/binfmt_elf.c linux-2.4.27-gentoo-r3/fs/binfmt files = current->files; /* Refcounted so ok */ retval = unshare_files(); -@@ -734,8 +740,14 @@ +@@ -724,7 +730,8 @@ + */ + + retval = -ENOMEM; +- if (elf_ppnt->p_filesz > PATH_MAX) ++ if (elf_ppnt->p_filesz > PATH_MAX || ++ elf_ppnt->p_filesz == 0) + goto out_free_file; + elf_interpreter = (char *) kmalloc(elf_ppnt->p_filesz, + GFP_KERNEL); +@@ -734,8 +741,16 @@ retval = kernel_read(bprm->file, elf_ppnt->p_offset, elf_interpreter, elf_ppnt->p_filesz); @@ -40,12 +50,14 @@ diff -ur linux-2.4.27-gentoo-r2/fs/binfmt_elf.c linux-2.4.27-gentoo-r3/fs/binfmt goto out_free_interp; + } + /* make sure path is NULL terminated */ -+ elf_interpreter[elf_ppnt->p_filesz - 1] = '\0'; ++ retval = -EINVAL; ++ if (elf_interpreter[elf_ppnt->p_filesz - 1] != '\0') ++ goto out_free_interp; + /* If the program interpreter is one of these two, * then assume an iBCS2 image. Otherwise assume * a native linux image. -@@ -754,8 +766,11 @@ +@@ -754,8 +769,11 @@ if (IS_ERR(interpreter)) goto out_free_interp; retval = kernel_read(interpreter, 0, bprm->buf, BINPRM_BUF_SIZE); @@ -58,7 +70,7 @@ diff -ur linux-2.4.27-gentoo-r2/fs/binfmt_elf.c linux-2.4.27-gentoo-r3/fs/binfmt /* Get the exec headers */ interp_ex = *((struct exec *) bprm->buf); -@@ -967,7 +982,10 @@ +@@ -967,7 +985,10 @@ #endif if (BAD_ADDR(error)) @@ -70,7 +82,7 @@ diff -ur linux-2.4.27-gentoo-r2/fs/binfmt_elf.c linux-2.4.27-gentoo-r3/fs/binfmt /* PaX: mirror at a randomized base */ down_write(¤t->mm->mmap_sem); -@@ -1008,7 +1026,10 @@ +@@ -1008,7 +1029,10 @@ { error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, elf_prot, elf_flags); if (BAD_ADDR(error)) @@ -82,3 +94,4 @@ diff -ur linux-2.4.27-gentoo-r2/fs/binfmt_elf.c linux-2.4.27-gentoo-r3/fs/binfmt } if (!load_addr_set) { +Only in linux-2.4.27-gentoo-r4/fs: binfmt_elf.c.orig diff --git a/sys-kernel/wolk-sources/files/wolk-sources.smbfs.patch b/sys-kernel/wolk-sources/files/wolk-sources.smbfs.patch new file mode 100644 index 000000000000..63c5ba30403f --- /dev/null +++ b/sys-kernel/wolk-sources/files/wolk-sources.smbfs.patch @@ -0,0 +1,97 @@ +diff -ur linux-2.4.27/fs/smbfs/proc.c linux-2.4.28/fs/smbfs/proc.c +--- linux-2.4.27/fs/smbfs/proc.c 2004-11-12 19:32:24.000000000 +0000 ++++ linux-2.4.28/fs/smbfs/proc.c 2004-11-19 20:18:27.000000000 +0000 +@@ -1289,10 +1289,12 @@ + data_len = WVAL(buf, 1); + + /* we can NOT simply trust the data_len given by the server ... */ +- if (data_len > server->packet_size - (buf+3 - server->packet)) { +- printk(KERN_ERR "smb_proc_read: invalid data length!! " +- "%d > %d - (%p - %p)\n", +- data_len, server->packet_size, buf+3, server->packet); ++ if (data_len > count || ++ (buf+3 - server->packet) + data_len > server->packet_size) { ++ printk(KERN_ERR "smb_proc_read: invalid data length/offset!! " ++ "%d > %d || (%p - %p) + %d > %d\n", ++ data_len, count, ++ buf+3, server->packet, data_len, server->packet_size); + result = -EIO; + goto out; + } +@@ -1378,10 +1380,12 @@ + buf = smb_base(server->packet) + data_off; + + /* we can NOT simply trust the info given by the server ... */ +- if (data_len > server->packet_size - (buf - server->packet)) { +- printk(KERN_ERR "smb_proc_read: invalid data length!! " +- "%d > %d - (%p - %p)\n", +- data_len, server->packet_size, buf, server->packet); ++ if (data_len > count || ++ (buf - server->packet) + data_len > server->packet_size) { ++ printk(KERN_ERR "smb_proc_readX: invalid data length/offset!! " ++ "%d > %d || (%p - %p) + %d > %d\n", ++ data_len, count, ++ buf, server->packet, data_len, server->packet_size); + result = -EIO; + goto out; + } +diff -ur linux-2.4.27/fs/smbfs/sock.c linux-2.4.28/fs/smbfs/sock.c +--- linux-2.4.27/fs/smbfs/sock.c 2004-11-12 19:32:24.000000000 +0000 ++++ linux-2.4.28/fs/smbfs/sock.c 2004-11-19 20:18:27.000000000 +0000 +@@ -571,7 +571,11 @@ + parm_disp, parm_offset, parm_count, + data_disp, data_offset, data_count); + *parm = base + parm_offset; ++ if (*parm - inbuf + parm_tot > server->packet_size) ++ goto out_bad_parm; + *data = base + data_offset; ++ if (*data - inbuf + data_tot > server->packet_size) ++ goto out_bad_data; + goto success; + } + +@@ -591,6 +595,8 @@ + rcv_buf = smb_vmalloc(buf_len); + if (!rcv_buf) + goto out_no_mem; ++ memset(rcv_buf, 0, buf_len); ++ + *parm = rcv_buf; + *data = rcv_buf + total_p; + } else if (data_tot > total_d || parm_tot > total_p) +@@ -598,8 +604,12 @@ + + if (parm_disp + parm_count > total_p) + goto out_bad_parm; ++ if (parm_offset + parm_count > server->packet_size) ++ goto out_bad_parm; + if (data_disp + data_count > total_d) + goto out_bad_data; ++ if (data_offset + data_count > server->packet_size) ++ goto out_bad_data; + memcpy(*parm + parm_disp, base + parm_offset, parm_count); + memcpy(*data + data_disp, base + data_offset, data_count); + +@@ -610,8 +620,11 @@ + * Check whether we've received all of the data. Note that + * we use the packet totals -- total lengths might shrink! + */ +- if (data_len >= data_tot && parm_len >= parm_tot) ++ if (data_len >= data_tot && parm_len >= parm_tot) { ++ data_len = data_tot; ++ parm_len = parm_tot; + break; ++ } + } + + /* +@@ -625,6 +638,9 @@ + server->packet = rcv_buf; + rcv_buf = inbuf; + } else { ++ if (parm_len + data_len > buf_len) ++ goto out_data_grew; ++ + PARANOIA("copying data, old size=%d, new size=%u\n", + server->packet_size, buf_len); + memcpy(inbuf, rcv_buf, parm_len + data_len); diff --git a/sys-kernel/wolk-sources/wolk-sources-4.11-r12.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.11-r13.ebuild index f2db8751b49a..1d43281c20dc 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.11-r12.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.11-r13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.11-r12.ebuild,v 1.1 2004/11/12 21:01:30 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.11-r13.ebuild,v 1.1 2004/11/20 15:11:28 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -52,6 +52,7 @@ src_unpack() { epatch ${FILESDIR}/${PN}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!" epatch ${FILESDIR}/${PN}.XDRWrapFix.patch || die "Failed to apply the kNFSd XDR patch!" epatch ${FILESDIR}/${PN}.binfmt_elf.patch || die "Failed to apply the binfmt_elf patch!" + epatch ${FILESDIR}/${PN}.smbfs.patch || die "Failed to apply the SMBFS patch!" kernel_universal_unpack } diff --git a/sys-kernel/wolk-sources/wolk-sources-4.14-r9.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.14-r10.ebuild index ce3259266e2e..54ae86ee8941 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.14-r9.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.14-r10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r9.ebuild,v 1.1 2004/11/12 21:01:30 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r10.ebuild,v 1.1 2004/11/20 15:11:28 plasmaroo Exp $ OKV="2.4.20" OKB="2.4" @@ -40,7 +40,8 @@ UNIPATCH_LIST=" ${FILESDIR}/${PN}.FPULockup-53804.patch ${FILESDIR}/${PN}.cmdlineLeak.patch ${FILESDIR}/${PN}.XDRWrapFix.patch - ${FILESDIR}/${PN}.binfmt_elf.patch" + ${FILESDIR}/${PN}.binfmt_elf.patch + ${FILESDIR}/${PN}.smbfs.patch" #============================================================================ # We'll override the src_unpack() function from the eclass. This is necessary diff --git a/sys-kernel/wolk-sources/wolk-sources-4.15-r2.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.15-r3.ebuild index 09a873ac8139..74d5eebb5bf4 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.15-r2.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.15-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.15-r2.ebuild,v 1.1 2004/11/12 21:01:30 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.15-r3.ebuild,v 1.1 2004/11/20 15:11:28 plasmaroo Exp $ # Ramereth's contributed WOLK ebuild - thanks! (you didn't think you'd # go blameless, did you?) @@ -10,7 +10,8 @@ UNIPATCH_LIST=" ${DISTDIR}/${P}-CAN-2004-0814.patch ${FILESDIR}/binfmt_elf.patch ${FILESDIR}/${PN}.XDRWrapFix.patch - ${FILESDIR}/${PN}.binfmt_elf.patch" + ${FILESDIR}/${PN}.binfmt_elf.patch + ${FILESDIR}/${PN}.smbfs.patch" UNIPATCH_STRICTORDER="yes" OKV="2.4.20" diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r16.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r17.ebuild index e01467717fe7..b2ac16a7dc41 100644 --- a/sys-kernel/wolk-sources/wolk-sources-4.9-r16.ebuild +++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r17.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r16.ebuild,v 1.1 2004/11/12 21:01:30 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r17.ebuild,v 1.1 2004/11/20 15:11:28 plasmaroo Exp $ # OKV=original kernel version, KV=patched kernel version. They can be the same. @@ -97,6 +97,7 @@ src_unpack() { epatch ${FILESDIR}/${PN}.cmdlineLeak.patch || die "Failed to apply the /proc/cmdline patch!" epatch ${FILESDIR}/${PN}.XDRWrapFix.patch || die "Failed to apply the kNFSd XDR patch!" epatch ${FILESDIR}/${PN}.binfmt_elf.patch || die "Failed to apply the binfmt_elf patch!" + epatch ${FILESDIR}/${PN}.smbfs.patch || die "Failed to apply the SMBFS patch!" kernel_universal_unpack } |