Added a patch for the 2.4 kNFSd security vulnerability, bug #62524 and also CAN-2004...

diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog
index 9d50a3b31f8739d6b9674459122e320fc4db8479..50deb3f74d7e2a32093375d826f45bfaaca8cfe2 100644 (file)
--- a/sys-kernel/wolk-sources/ChangeLog
+++ b/sys-kernel/wolk-sources/ChangeLog
@@ -1,6 +1,16 @@
 # 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.58 2004/11/03 06:56:46 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.59 2004/11/08 22:44:29 plasmaroo Exp $
+
+*wolk-sources-4.11-r11 (08 Nov 2004)
+
+  08 Nov 2004; <plasmaroo@gentoo.org> -wolk-sources-4.11-r10.ebuild,
+  +wolk-sources-4.11-r11.ebuild, -wolk-sources-4.14-r7.ebuild,
+  +wolk-sources-4.14-r8.ebuild, +wolk-sources-4.15-r1.ebuild,
+  -wolk-sources-4.15.ebuild, -wolk-sources-4.9-r14.ebuild,
+  +wolk-sources-4.9-r15.ebuild, +files/wolk-sources.XDRWrapFix.patch:
+  Added a patch for the 2.4 kNFSd security vulnerability, bug #62524 and also
+  CAN-2004-0814, bug #68421.
 
   03 Nov 2004; Bret Curtis <psi29a@gentoo.org> wolk-sources-4.11-r10.ebuild,
   wolk-sources-4.14-r7.ebuild, wolk-sources-4.15.ebuild,

diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest
index 097e1aed044f8d772611a136bb6812e9a8c2527d..d9d9853ba7e0fe591b797558fea48ad0c8a61e3c 100644 (file)
--- a/sys-kernel/wolk-sources/Manifest
+++ b/sys-kernel/wolk-sources/Manifest
@@ -1,35 +1,36 @@
-MD5 adaedf62a65ff1cae95cb73a6ce55e29 ChangeLog 18677
+MD5 ff74222469fda41427a567541b9e7e16 ChangeLog 19149
+MD5 303a35c61a6dbb7f1d62c3a549be7afa wolk-sources-4.11-r11.ebuild 3122
+MD5 881a772a18b1e1c29316ff63e2a88607 wolk-sources-4.14-r8.ebuild 2470
 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226
-MD5 0c670b2ece4529d7ebc5844b42890a2a wolk-sources-4.15.ebuild 1413
-MD5 c250221be0180cb9a5829682918ed9ff wolk-sources-4.14-r7.ebuild 2296
-MD5 b54deed6d7df23617333ea07856999f1 wolk-sources-4.9-r14.ebuild 5874
-MD5 a6a23f30d2fe4f9b490f0b85f5065dd8 wolk-sources-4.11-r10.ebuild 2840
-MD5 2ca46d61e534cfd18a965e9ae8e870e2 files/binfmt_elf.patch 2347
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893
+MD5 108e9ae48022076f0cfe01fba690ac39 wolk-sources-4.15-r1.ebuild 1583
+MD5 fe292cb4572271ae8dea36793d04d4e2 wolk-sources-4.9-r15.ebuild 6146
+MD5 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476
 MD5 d5efa40a4cca5b1a29d16204dd1f3a32 files/wolk-4.9s-page.h.patch 635
-MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531
-MD5 1555afc1bfb28980c75f13cff2e49b91 files/digest-wolk-sources-4.15 146
-MD5 78191bfb63fdfd2714e57a8d3fb746c1 files/digest-wolk-sources-4.14-r7 168
-MD5 49b8fb6de609dcc985711120dfa0a509 files/digest-wolk-sources-4.9-r14 1400
-MD5 823898399dbfae0de1c72688bc80a9f1 files/digest-wolk-sources-4.11-r10 312
-MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777
-MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/wolk-sources-4.9s.munmap.patch 826
 MD5 aa193a78c4f2fdd248f992db935c7895 files/wolk-sources-4.9s.CAN-2004-0010.patch 6065
-MD5 92f1b3aa68de326081b75653a77d64cf files/wolk-sources-4.9s.CAN-2004-0685.patch 2881
-MD5 a61e57d5483a06f20da339d91f98fbb8 files/wolk-sources-4.9s.rtc_fix.patch 6769
-MD5 528da73c9e4a6fb017561e51dc0ab815 files/wolk-sources.CAN-2003-0643.patch 747
-MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414
+MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424
 MD5 21f3a4f186017d925067335e24db36a1 files/wolk-sources.CAN-2004-0109.patch 1877
+MD5 94da93ba922ec8143b6d7a8470747fb5 files/wolk-4.9s-setup.c.patch 531
+MD5 895c08b40b862ad74da9d49232ec83f1 files/digest-wolk-sources-4.11-r11 392
 MD5 5bf9836a632a861728d33f9736bb7431 files/wolk-sources.CAN-2004-0133.patch 427
-MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/wolk-sources.CAN-2004-0177.patch 384
-MD5 ac42024b6e6ee1e2165914db4b22a61c files/wolk-sources.CAN-2004-0178.patch 424
-MD5 de75cfa969ed092578d9ddda6c5be334 files/wolk-sources.CAN-2004-0181.patch 1233
-MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350
-MD5 c460ea130cb4ae84a5063ba044e3ce72 files/wolk-sources.CAN-2004-0427.patch 460
+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 0f66013f643c79c97fda489618a4e2fd files/wolk-sources.CAN-2004-0535.patch 476
+MD5 379ebf50edb608e7dce21bbc0fd2d265 files/digest-wolk-sources-4.15-r1 227
+MD5 d4a740ae56c2049247083af387a22a85 files/wolk-sources.CAN-2004-0394.patch 350
+MD5 528da73c9e4a6fb017561e51dc0ab815 files/wolk-sources.CAN-2003-0643.patch 747
+MD5 d4ef22c0e842ad7a48980130bf579e6e files/wolk-4.9s-speedstep.c.patch 777
+MD5 de75cfa969ed092578d9ddda6c5be334 files/wolk-sources.CAN-2004-0181.patch 1233
 MD5 60d25ff310fc6abfdce39ec9e47345af files/wolk-sources.CAN-2004-0685.patch 2809
-MD5 c9da1bc82b906f6abc648c056e7bf662 files/wolk-sources.FPULockup-53804.patch 354
 MD5 d1ccc2047be533c992f67270a150a210 files/wolk-sources.cmdlineLeak.patch 388
+MD5 e7b64a09d10444ca699e9696a4035c3e files/patches.txt 12893
+MD5 696de19810e15bd0d4373c0256efb3e0 files/digest-wolk-sources-4.14-r8 248
+MD5 e77a93fdf26f06cf3ea5080b27211725 files/wolk-sources.CAN-2003-0985.patch 414
+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 30e9fd1fbb477c5fc965dbf0fe41f3e8 files/digest-wolk-sources-4.9-r15 1480
+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-r10 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r11
similarity index 79%
rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r10
rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r11
index efedb836a1f89cd953aaf17d8a2e186250639a2f..49ba6c31355644216f85c43f54a55ede224cec27 100644 (file)
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r10
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.11-r11
@@ -2,3 +2,4 @@ MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
 MD5 7ab3d945def110a2ee78ce88175c7abe linux-2.4.20-wolk4.10s.patch.bz2 12773140
 MD5 befb7511aa4075255bb7755fb961c0e5 linux-2.4.20-wolk4.10s-to-4.11s.patch.bz2 88660
 MD5 5483fa54161c0dd4b2762332a24c3b8a wolk-sources-4.11-CAN-2004-0415.patch 83257
+MD5 534bb4c1e4a2cc5cd11b2bd3a3a74a3a wolk-sources-4.9-CAN-2004-0814.patch 82272

diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r7 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r8
similarity index 67%
rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r7
rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r8
index bca87b6da2e8519f6c83ea8034408555e034d7eb..0d04b5cf57f2d9bff3a518046a4e7750669040ab 100644 (file)
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r7
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.14-r8
@@ -1,2 +1,3 @@
 MD5 5b2e099686c30bc9c848072a43b95c00 linux-2.4.20-wolk4.14-fullkernel.tar.bz2 36588181
 MD5 5483fa54161c0dd4b2762332a24c3b8a wolk-sources-4.11-CAN-2004-0415.patch 83257
+MD5 534bb4c1e4a2cc5cd11b2bd3a3a74a3a wolk-sources-4.9-CAN-2004-0814.patch 82272

diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r1
similarity index 64%
rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.15
rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r1
index 2690df82bf75443c309f72f00b8e21ea886a8b81..3bdaa8aa52a48e3f91d8b9eac6112b53998f4726 100644 (file)
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.15-r1
@@ -1,2 +1,3 @@
 MD5 c439d5c93d7fc9a1480a90842465bb97 linux-2.4.20.tar.bz2 27421046
 MD5 9288e5f01df7fae699a0a87069e35c83 linux-2.4.20-wolk4.15s.patch.bz2 13952014
+MD5 07206015810a41da15f1ca27e4946312 wolk-sources-4.15-CAN-2004-0814.patch 82261

diff --git a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r14 b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r15
similarity index 94%
rename from sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r14
rename to sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r15
index a34da13edabbe9216c2ee6e98e5dd89434d72680..1fcc6f96f959ba495c57efb3a82970f3fe148019 100644 (file)
--- a/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r14
+++ b/sys-kernel/wolk-sources/files/digest-wolk-sources-4.9-r15
@@ -15,3 +15,4 @@ MD5 87bdd189276be8de8c9f8177855e7f27 1007_bootsplash-v3.0.8-2.4.20-update.patch
 MD5 48110e2e60a28e6a433bbb24f0bd93a9 1008_supermount-1.2.9-2.4.20-OLDIDE.patch 169980
 MD5 4c94545d63a35b216c7a9c5c3e10b223 1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch 586142
 MD5 c4a897cb2cfbc031bf73cf71ea45c6f2 wolk-sources-4.9-CAN-2004-0415.patch 83245
+MD5 534bb4c1e4a2cc5cd11b2bd3a3a74a3a wolk-sources-4.9-CAN-2004-0814.patch 82272

diff --git a/sys-kernel/wolk-sources/files/wolk-sources.XDRWrapFix.patch b/sys-kernel/wolk-sources/files/wolk-sources.XDRWrapFix.patch
new file mode 100644 (file)
index 0000000..9a336ab
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-sources.XDRWrapFix.patch
@@ -0,0 +1,48 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/08/16 14:50:04-03:00 neilb@cse.unsw.edu.au 
+#   [PATCH] Fixed possibly xdr parsing error if write size exceed 2^31
+#   
+#   xdr_argsize_check needs to cope with the possibility that the
+#   pointer has wrapped and could be below buf->base.
+#   
+#   Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
+#   
+#   ### Diffstat output
+#    ./fs/nfsd/nfs3xdr.c         |    2 +-
+#    ./include/linux/nfsd/xdr3.h |    2 +-
+#    2 files changed, 2 insertions(+), 2 deletions(-)
+# 
+# fs/nfsd/nfs3xdr.c
+#   2004/08/14 00:23:06-03:00 neilb@cse.unsw.edu.au +1 -1
+#   Fixed possibly xdr parsing error if write size exceed 2^31
+# 
+# include/linux/nfsd/xdr3.h
+#   2004/08/15 20:48:43-03:00 neilb@cse.unsw.edu.au +1 -1
+#   Fixed possibly xdr parsing error if write size exceed 2^31
+# 
+diff -Nru a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
+--- a/fs/nfsd/nfs3xdr.c        2004-09-06 11:20:28 -07:00
++++ b/fs/nfsd/nfs3xdr.c        2004-09-06 11:20:28 -07:00
+@@ -273,7 +273,7 @@
+ {
+       struct svc_buf  *buf = &rqstp->rq_argbuf;
+ 
+-      return p - buf->base <= buf->buflen;
++      return p >= buf->base && p <= buf->base + buf->buflen ;
+ }
+ 
+ static inline int
+diff -Nru a/include/linux/nfsd/xdr3.h b/include/linux/nfsd/xdr3.h
+--- a/include/linux/nfsd/xdr3.h        2004-09-06 11:20:28 -07:00
++++ b/include/linux/nfsd/xdr3.h        2004-09-06 11:20:28 -07:00
+@@ -41,7 +41,7 @@
+       __u32                   count;
+       int                     stable;
+       __u8 *                  data;
+-      int                     len;
++      __u32                   len;
+ };
+ 
+ struct nfsd3_createargs {

diff --git a/sys-kernel/wolk-sources/wolk-sources-4.11-r10.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.11-r11.ebuild
similarity index 88%
rename from sys-kernel/wolk-sources/wolk-sources-4.11-r10.ebuild
rename to sys-kernel/wolk-sources/wolk-sources-4.11-r11.ebuild
index c8e2d4988aa2011d847219b7a23d9e740c876980..fc7c86405b9e60bc910e1657c033dff49d2c5538 100644 (file)
--- a/sys-kernel/wolk-sources/wolk-sources-4.11-r10.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.11-r11.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-r10.ebuild,v 1.2 2004/11/03 06:56:46 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.11-r11.ebuild,v 1.1 2004/11/08 22:44:30 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -21,7 +21,8 @@ SRC_PATH="mirror://www.kernel.org/pub/linux/kernel/v2.4/linux-${OKV}.tar.bz2"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
        mirror://sourceforge/wolk/linux-${OKV}-wolk4.10s.patch.bz2
        mirror://sourceforge/wolk/linux-${OKV}-wolk4.10s-to-4.11s.patch.bz2
-       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0415.patch"
+       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0415.patch
+       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-4.9-CAN-2004-0814.patch"
 
 SLOT="${KV}"
 HOMEPAGE="http://wolk.sourceforge.net http://www.kernel.org"
@@ -46,8 +47,10 @@ src_unpack() {
        epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
        epatch ${FILESDIR}/${PN}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
        epatch ${FILESDIR}/${PN}.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
+       epatch ${DISTDIR}/${PN}-4.9-CAN-2004-0814.patch || die "Failed to add the CAN-2004-0814 patch!"
        epatch ${FILESDIR}/${PN}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
        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!"
        kernel_universal_unpack
 }
 

diff --git a/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.14-r8.ebuild
similarity index 87%
rename from sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild
rename to sys-kernel/wolk-sources/wolk-sources-4.14-r8.ebuild
index ded38e579ef052dc8b1abc219c874e05d2e251d9..c0b5ac5fd5142a5ae7324125f438581c3462b450 100644 (file)
--- a/sys-kernel/wolk-sources/wolk-sources-4.14-r7.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.14-r8.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-r7.ebuild,v 1.3 2004/11/03 06:56:46 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.14-r8.ebuild,v 1.1 2004/11/08 22:44:30 plasmaroo Exp $
 
 OKV="2.4.20"
 OKB="2.4"
@@ -17,7 +17,8 @@ RESTRICT="nomirror"
 DESCRIPTION="Full sources for Marc-Christian Peterson's WOLK kernel, based on 2.4.20 vanilla with many popular patches and fixes"
 HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/mcp/${OKB}-WOLK/"
 SRC_URI="mirror://kernel/linux/kernel/people/mcp/${OKB}-WOLK/${WOLK_SRC}
-       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-4.11-CAN-2004-0415.patch"
+       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-4.11-CAN-2004-0415.patch
+       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${PN}-4.9-CAN-2004-0814.patch"
 
 KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa -mips"
 
@@ -28,6 +29,7 @@ this file in the directory containing the sources."
 
 UNIPATCH_LIST="
        ${DISTDIR}/${PN}-4.11-CAN-2004-0415.patch
+       ${DISTDIR}/${PN}-4.9-CAN-2004-0814.patch
        ${FILESDIR}/${PN}.CAN-2004-0133.patch
        ${FILESDIR}/${PN}.CAN-2004-0181.patch
        ${FILESDIR}/${PN}.CAN-2004-0394.patch
@@ -36,7 +38,8 @@ UNIPATCH_LIST="
        ${FILESDIR}/${PN}.CAN-2004-0535.patch
        ${FILESDIR}/${PN}.CAN-2004-0685.patch
        ${FILESDIR}/${PN}.FPULockup-53804.patch
-       ${FILESDIR}/${PN}.cmdlineLeak.patch"
+       ${FILESDIR}/${PN}.cmdlineLeak.patch
+       ${FILESDIR}/${PN}.XDRWrapFix.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.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.15-r1.ebuild
similarity index 68%
rename from sys-kernel/wolk-sources/wolk-sources-4.15.ebuild
rename to sys-kernel/wolk-sources/wolk-sources-4.15-r1.ebuild
index 01f295df437091e55bae58b05859a61ff7fcbcc6..aea701d0fe84ce8ec96e3cb7e73f7b4892e60e90 100644 (file)
--- a/sys-kernel/wolk-sources/wolk-sources-4.15.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.15-r1.ebuild
@@ -1,11 +1,15 @@
 # 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.ebuild,v 1.3 2004/11/03 06:56:46 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.15-r1.ebuild,v 1.1 2004/11/08 22:44:30 plasmaroo Exp $
 
 # Ramereth's contributed WOLK ebuild - thanks! (you didn't think you'd
 # go blameless, did you?)
 
-UNIPATCH_LIST="${DISTDIR}/${WOLK_SRC} ${FILESDIR}/binfmt_elf.patch"
+UNIPATCH_LIST="
+       ${DISTDIR}/${WOLK_SRC}
+       ${DISTDIR}/${P}-CAN-2004-0814.patch
+       ${FILESDIR}/binfmt_elf.patch
+       ${FILESDIR}/${PN}.XDRWrapFix.patch"
 UNIPATCH_STRICTORDER="yes"
 
 OKV="2.4.20"
@@ -23,8 +27,10 @@ KEYWORDS="~x86 -mips"
 
 K_NOSETEXTRAVERSION="don't_set_it"
 RESTRICT="nomirror"
-DESCRIPTION=" Marc-Christian Peterson's WOLK kernel. A stable and development kernel, containing many useful patches from many projects."
-SRC_URI="mirror://kernel/linux/kernel/${OKB}/linux-${OKV}.tar.bz2 mirror://kernel/linux/kernel/people/mcp/${OKB}-WOLK/${WOLK_SRC}"
+DESCRIPTION="Marc-Christian Peterson's WOLK kernel. A stable and development kernel, containing many useful patches from many projects."
+SRC_URI="mirror://kernel/linux/kernel/${OKB}/linux-${OKV}.tar.bz2
+       mirror://kernel/linux/kernel/people/mcp/${OKB}-WOLK/${WOLK_SRC}
+       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch"
 
 K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
 existing bug. Only create a new bug if you have not found one that matches

diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r14.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r15.ebuild
similarity index 94%
rename from sys-kernel/wolk-sources/wolk-sources-4.9-r14.ebuild
rename to sys-kernel/wolk-sources/wolk-sources-4.9-r15.ebuild
index 40e8a6e3a1873e4c0688212ebb5727510e21998f..1bee87dd85044600d18cccd19c9439fe82377ba1 100644 (file)
--- a/sys-kernel/wolk-sources/wolk-sources-4.9-r14.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-r15.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-r14.ebuild,v 1.2 2004/11/03 06:56:46 psi29a Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r15.ebuild,v 1.1 2004/11/08 22:44:30 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -34,7 +34,8 @@ SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
                        http://wolk.sourceforge.net/Workstation-Edition/1007_bootsplash-v3.0.8-2.4.20-update.patch)
                wolk-supermount? ( http://wolk.sourceforge.net/Workstation-Edition/1008_supermount-1.2.9-2.4.20-OLDIDE.patch)
                ipv6? ( http://wolk.sourceforge.net/Workstation-Edition/1009_mipv6-0.9.5.1-v2.4.20-wolk4.0s.patch )
-       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0415.patch"
+       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0415.patch
+       http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/${P}-CAN-2004-0814.patch"
 
 SLOT="${KV}"
 HOMEPAGE="http://wolk.sourceforge.net http://www.kernel.org"
@@ -91,8 +92,10 @@ src_unpack() {
        epatch ${FILESDIR}/${PN}.CAN-2004-0497.patch || die "Failed to add the CAN-2004-0497 patch!"
        epatch ${FILESDIR}/${PN}.CAN-2004-0535.patch || die "Failed to add the CAN-2004-0535 patch!"
        epatch ${FILESDIR}/${PN}-4.9s.CAN-2004-0685.patch || die "Failed to add the CAN-2004-0685 patch!"
+       epatch ${DISTDIR}/${P}-CAN-2004-0814.patch || die "Failed to add the CAN-2004-0814 patch!"
        epatch ${FILESDIR}/${PN}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
        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!"
 
        kernel_universal_unpack
 }