Bumped rhel5 based (~arch) and 2.6.24 kernels. Fixed build issue if CONFIG_SECCOMP is enabled, bug #242728, thank Balazs Nemeth for report.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-openvz.git-35f41f1 i686

11 files changed, 201 insertions, 143 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index 90ae72685186..b9301ac38232 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.98 2008/10/14 08:56:34 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.99 2008/10/29 15:28:12 pva Exp $
+
+*openvz-sources-2.6.24.006.4 (29 Oct 2008)
+*openvz-sources-2.6.18.028.059.3 (29 Oct 2008)
+
+  29 Oct 2008; Peter Volkov <pva@gentoo.org>
+  +files/openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch,
+  -files/openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch,
+  -files/openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch,
+  +files/openvz-sources-2.6.18.028.059.3-e1000-build.patch,
+  -files/openvz-sources-2.6.18-ms-splice-access.patch,
+  -openvz-sources-2.6.18.028.053-r2.ebuild,
+  openvz-sources-2.6.18.028.056.1.ebuild,
+  -openvz-sources-2.6.18.028.057.2.ebuild,
+  +openvz-sources-2.6.18.028.059.3.ebuild,
+  -openvz-sources-2.6.24.006.2.ebuild, +openvz-sources-2.6.24.006.4.ebuild:
+  Bumped rhel5 based (~arch) and 2.6.24 kernels. Fixed build issue if
+  CONFIG_SECCOMP is enabled, bug #242728, thank Balazs Nemeth for report.
 
 *openvz-sources-2.6.26.9999 (14 Oct 2008)
 
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index f20e9d6978d2..0b8daa0fb560 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -1,23 +1,20 @@
-AUX openvz-sources-2.6.18-ms-splice-access.patch 712 RMD160 9c9125f4500fefcbd14e36a8ee5f5028bab9f467 SHA1 7c5d45417380edd8e3c3b4f64722791ab0132f19 SHA256 46f19b681afb0d0b101eb92695108e7b60b0b191cbc77bbf56446116e591d7ad
 AUX openvz-sources-2.6.18.028.056.1-3ware.patch 17077 RMD160 078448bb57c7e628031f48356af93fe0c524e96e SHA1 61f4149380afa692361e99df5e7f97f7e584c78a SHA256 e7c03273043d71a5198d5dd5383b516bebf9124728ded35ab97662df2f4d8574
+AUX openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch 4560 RMD160 3a763c807776669ba78c3c2c0809ec49fffe322e SHA1 91d537febc999621d2b4bc95d028f9802e259f29 SHA256 1ecc24cad67622de8d0915e005d2f17e9902c5045b821f586b0d6febad283498
 AUX openvz-sources-2.6.18.028.056.1-utimensat.patch 528 RMD160 1edc34e5e0fddd8c0960b8dcbc54d0f0f486a0fa SHA1 26190020c24645e71c10c4da8ab79f120be946e2 SHA256 79cbf231ecea1eb45d94c5f2ef38082e8c9745f25d4fc6e53fa46fb69631dd25
-AUX openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch 822 RMD160 40a9e9e8a7ef128ed8a1f953ea5dbd87b5e5849a SHA1 dc4c2215ebbe0e75aa97757a70be591021d4e36d SHA256 51e6d613f248cb9f384ba42bb1402418eedcd9e3127402cc4e0da33e76a16d82
 AUX openvz-sources-2.6.18.028.057.2-fix-CIFS-build.patch 803 RMD160 fbffc246d035b816d26d91161b1db8e393a897b7 SHA1 eb9a883a9d987e6fd7e68dc390effadeaaf5e219 SHA256 2b7dbb4bf4b4120e699a9242840ccd1023b24b4a008c928ace6b3f8b8ef8a36d
-AUX openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch 1634 RMD160 7fd86d605352ce8ccc128fe007e9c080de925f2e SHA1 a16ffff52b2bd7980567681d04067f5811e47b78 SHA256 14b01087412f7bc5d96bdab1be733bc37588a5cbc746f077f0f0193b9a1cfe72
 AUX openvz-sources-2.6.18.028.057.2-missed-PATH_MAX-sumversion.c.patch 379 RMD160 12c3045b42807927f937ace65df548ba5ec00a34 SHA1 8878d2e2f782026bce65d0c0202f79266860122f SHA256 bd70ec387bf0d4b453ea04be59fe9e10d1448207d63c1de2c32fb199d588c885
 AUX openvz-sources-2.6.18.028.057.2-prevent-gcc-smartness.patch 1059 RMD160 4daadab57df2984ce7ffd2d245598aa50a75d29c SHA1 118d8ada3d6f6edf332ce9926f5ce12a988b012b SHA256 eecb5e6a4d86c541fb157a229d275cb1404389bef55ac52e83c30357a2da5ff6
 AUX openvz-sources-2.6.18.028.057.2-qouta-compat-build.patch 365 RMD160 1d7dea5718e0e889c8fe6c6c6cfbd3636fa91ad3 SHA1 5fb1d346e362cb8cd54b4f02283ce185782f7d28 SHA256 c7d3ae9adfe7464ebe7d25948978392c244d2021cda678e30a316295a96ec4ff
 AUX openvz-sources-2.6.18.028.057.2-utimenstat.patch 528 RMD160 1edc34e5e0fddd8c0960b8dcbc54d0f0f486a0fa SHA1 26190020c24645e71c10c4da8ab79f120be946e2 SHA256 79cbf231ecea1eb45d94c5f2ef38082e8c9745f25d4fc6e53fa46fb69631dd25
+AUX openvz-sources-2.6.18.028.059.3-e1000-build.patch 482 RMD160 d9efc32ad38f49d51edafba9ecb13c7e07fc30a9 SHA1 39e2b73591b0b824c28efaae24015c5478f44668 SHA256 47c0c05f5a53cb5febdace055d5c0b746b3d77f1fcfb4995d57048ec9042720a
 DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
 DIST linux-2.6.24.tar.bz2 46737783 RMD160 0e5194c69c3d82c41ece689c4f84e638f8776d34 SHA1 351aebc784a5395fe4c92d1e514a89680482f7e2 SHA256 413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
-DIST patch-92.1.1.el5.028stab057.2-combined.gz 10632553 RMD160 baee5d57f70c81cd60927b7a819f1607d73ff885 SHA1 7b917f330e435053bb80736d8639de94cf0db3f0 SHA256 b1014ecdc99a9a7e007a4b3208ea573a8cbb366b0a2222632299c933fac0d3d3
-DIST patch-ovz006.2-combined.gz 868035 RMD160 b213805800c08c7eb4972fb90423c85f4f76d4d9 SHA1 0eda6988cfe060971382026f2da4ac66b5ba89eb SHA256 a24209028d15eb5158ed97460c8dac23d0337ca5ba2ee195d6fe1dfa88460bc3
-DIST patch-ovz028stab053.4-combined.gz 1142095 RMD160 d4ac3f1d6c6db92bae89859c96e94df24a9e37ca SHA1 7e0a8c3caf808cec70d8676770cc32859ef4f4df SHA256 3d7901582c35b70c9581e2cd1d3e1a3ddae79b607c7de927cd99edc878e73f27
+DIST patch-92.1.13.el5.028stab059.3-combined.gz 10679619 RMD160 be7959e81dc746a493277da4e48618e799ddf308 SHA1 0027ebde1f82a117e5487c629b14c7552d2540fe SHA256 ad84edbe318dc029d2331f131205be7dbf3b2cc012174468966c486b7630b901
+DIST patch-ovz006.4-combined.gz 870618 RMD160 72caf68c7b9d709ab72b2fad06ac43104b4b0db6 SHA1 9a8dc8eb554d4aa655695479f4cd9b95f31f3f23 SHA256 7679391446d24f3ec35c5b18394ad2f88bafb1aab4f9bb053388240f1510f9c2
 DIST patch-ovz028stab056.1-combined.gz 1167989 RMD160 7953e020db894ddd9c6e61b6cbbedea0179ab09b SHA1 105ef675c10ed7063309dd636d2580a5cc3c05dd SHA256 2a99359fcf8af8f4b5ffd56011a63c2300086f944784ff855a9f7ecf46434df9
-EBUILD openvz-sources-2.6.18.028.053-r2.ebuild 1308 RMD160 faa90fe50a134a7f18e74744fb786b05fe2b2830 SHA1 2a0c0a3c05bef299999992403ab4608b832a4b06 SHA256 3a588a2b6fad71661d97c6628b0d8dcdb1c73acda7739cac7f9821dfce00351c
-EBUILD openvz-sources-2.6.18.028.056.1.ebuild 1628 RMD160 6ff47950b721da335817a748e14e8e5b4d461e7b SHA1 db1734a5b177f29c12f6483d6901f579f51a74e3 SHA256 bf59aff161900aa2f08c3ced6d553bb8e182f87f8aa151374b4be2434d2187f2
-EBUILD openvz-sources-2.6.18.028.057.2.ebuild 2002 RMD160 f6d74f635dc5b3c9aa4bef083437cfe989007ff0 SHA1 cc3ae606b87cf6c2475e8fb4da335244a6a2ac9a SHA256 a36377b4ffc4cf33bd38cd3ce701e165d8fc585320227be1994557d23b2565e1
-EBUILD openvz-sources-2.6.24.006.2.ebuild 1464 RMD160 58641979be481b142fd501c4b331184f3bceb25d SHA1 e521d36ffa53f3066a4ace05f7c1857855dd61b9 SHA256 ba8627fa5650312f66aa061dc5d94d75f6c8c389ff17deebc81d1c88108488d7
+EBUILD openvz-sources-2.6.18.028.056.1.ebuild 1699 RMD160 704a674fec3e9da6197b41c3e3f330168689f59a SHA1 b08b0e5b30ad93f1749fd1932b6d134d1a265e49 SHA256 49907a3de2d84f0b69aeaf384a7864c55f66a2e802850cb065ee4229844c6080
+EBUILD openvz-sources-2.6.18.028.059.3.ebuild 1855 RMD160 fbf6127e528cee5d570b448084b02e8f51f38948 SHA1 f1499d563e606010841091d4eaa2895152c0d6b2 SHA256 e4837c023c060c2ede1e4582c9effcf81eae25f8632f2df1e67d5286a0792f66
+EBUILD openvz-sources-2.6.24.006.4.ebuild 1464 RMD160 362c3d4c95794b8bd30a040e7f909487243661a3 SHA1 2c36872917d8d9697ba9966a4b17cc1a10256673 SHA256 4ff904f168774c43bf02634488eadefab8ebb0430b5e835f57906c8b2e0b74c2
 EBUILD openvz-sources-2.6.26.9999.ebuild 914 RMD160 0dfb08c51d70acbaa5555ec7545f83240c4befbc SHA1 cdc1c296c461d05b97e2d162bca5a67906e367f7 SHA256 61960ff3ec3a78966407dff5b8d8d669957a0d2ae09deb6eed53631a533af9b3
-MISC ChangeLog 23333 RMD160 9a98cd8dbfbad70776e2823c83513cad541ae9e3 SHA1 72c2c87b7937fa1290d65a9fa9695286b479ab0e SHA256 8834f9c13d217c6df86e32cc0a0f70cf8fb639edf59df5fb3cf69477f1d030e6
+MISC ChangeLog 24184 RMD160 22d04d7517006db58c12e490a43e6d9531df0f36 SHA1 d93a7f73829aaf0f89166c4b0d8722dbaca554c5 SHA256 445f9a454b3f99eed601b060ecb04dbe44452c290b00daac90197c3442ae2ec7
 MISC metadata.xml 554 RMD160 0d62a03694a7c0e0caa538a603b3a41916451887 SHA1 d4d18f1c2c52425a1a819ac0d76ff1c906853047 SHA256 78f7ce5323a1a18773d5a6a01cffcc729fb51f4a667b5d2df37450907a007a31
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18-ms-splice-access.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18-ms-splice-access.patch
deleted file mode 100644
index d323f0cc28cf..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18-ms-splice-access.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=209460
-http://bugzilla.openvz.org/show_bug.cgi?id=814
-
---- ./fs/splice.c.pipe	2008-01-28 18:56:37.000000000 +0300
-+++ ./fs/splice.c	2008-02-11 14:00:53.000000000 +0300
-@@ -1138,6 +1138,10 @@ static int get_iovec_page_array(const st
- 		/*
- 		 * Get user address base and length for this iovec.
- 		 */
-+		error = -EFAULT;
-+        	if (!access_ok(VERIFY_READ, iov, sizeof(*iov)))
-+			break;
-+
- 		error = get_user(base, &iov->iov_base);
- 		if (unlikely(error))
- 			break;
-@@ -1151,7 +1155,7 @@ static int get_iovec_page_array(const st
- 		if (unlikely(!len))
- 			break;
- 		error = -EFAULT;
--		if (unlikely(!base))
-+		if (!access_ok(VERIFY_READ, base, len))
- 			break;
- 
- 		/*
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch
new file mode 100644
index 000000000000..742b91c5ee41
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch
@@ -0,0 +1,154 @@
+diff --git a/fs/compat.c b/fs/compat.c
+index 6c4741a..4f983e2 100644
+--- a/fs/compat.c
++++ b/fs/compat.c
+@@ -56,6 +56,10 @@
+ #include <asm/mmu_context.h>
+ #include <asm/ioctls.h>
+ 
++#ifdef CONFIG_QUOTA_COMPAT
++#include <linux/quota-compat.h>
++#endif
++
+ extern void sigset_from_compat(sigset_t *set, compat_sigset_t *compat);
+ 
+ int compat_log = 1;
+diff --git a/fs/quota.c b/fs/quota.c
+index e037b78..ca7a9be 100644
+--- a/fs/quota.c
++++ b/fs/quota.c
+@@ -18,6 +18,10 @@
+ #include <linux/capability.h>
+ #include <linux/quotaops.h>
+ 
++#ifdef CONFIG_QUOTA_COMPAT
++#include <linux/quota-compat.h>
++#endif
++
+ /* Check validity of generic quotactl commands */
+ static int generic_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
+ {
+diff --git a/include/linux/quota-compat.h b/include/linux/quota-compat.h
+new file mode 100644
+index 0000000..c2f3435
+--- /dev/null
++++ b/include/linux/quota-compat.h
+@@ -0,0 +1,60 @@
++/*
++ *  include/linux/quota-compat.h
++ *
++ *  Copyright (C) 2008  SWsoft
++ *  All rights reserved.
++ *
++ *  Licensing governed by "linux/COPYING.SWsoft" file.
++ *
++ */
++
++#ifndef _LINUX_QUOTA_COMPAT_
++#define _LINUX_QUOTA_COMPAT_
++
++#include <linux/compat.h>
++
++#define QC_QUOTAON  0x0100	/* enable quotas */
++#define QC_QUOTAOFF 0x0200	/* disable quotas */
++
++/* GETQUOTA, SETQUOTA and SETUSE which were at 0x0300-0x0500 has now
++ * other parameteres
++ */
++#define QC_SYNC     0x0600	/* sync disk copy of a filesystems quotas */
++#define QC_SETQLIM  0x0700	/* set limits */
++/* GETSTATS at 0x0800 is now longer... */
++#define QC_GETINFO  0x0900	/* get info about quotas - graces, flags... */
++#define QC_SETINFO  0x0A00	/* set info about quotas */
++#define QC_SETGRACE 0x0B00	/* set inode and block grace */
++#define QC_SETFLAGS 0x0C00	/* set flags for quota */
++#define QC_GETQUOTA 0x0D00	/* get limits and usage */
++#define QC_SETQUOTA 0x0E00	/* set limits and usage */
++#define QC_SETUSE   0x0F00	/* set usage */
++/* 0x1000 used by old RSQUASH */
++#define QC_GETSTATS 0x1100	/* get collected stats */
++
++struct compat_v2_dqblk {
++	unsigned int dqb_ihardlimit;
++	unsigned int dqb_isoftlimit;
++	unsigned int dqb_curinodes;
++	unsigned int dqb_bhardlimit;
++	unsigned int dqb_bsoftlimit;
++	qsize_t dqb_curspace;
++	__kernel_time_t dqb_btime;
++	__kernel_time_t dqb_itime;
++};
++
++#ifdef CONFIG_COMPAT
++struct compat_v2_dqblk_32 {
++	unsigned int dqb_ihardlimit;
++	unsigned int dqb_isoftlimit;
++	unsigned int dqb_curinodes;
++	unsigned int dqb_bhardlimit;
++	unsigned int dqb_bsoftlimit;
++	qsize_t dqb_curspace;
++	compat_time_t dqb_btime;
++	compat_time_t dqb_itime;
++} __attribute__ ((packed));
++#endif
++
++#endif /* _LINUX_QUOTA_COMPAT_ */
++
+diff --git a/include/linux/quota.h b/include/linux/quota.h
+index c8ae394..55afad9 100644
+--- a/include/linux/quota.h
++++ b/include/linux/quota.h
+@@ -321,53 +321,6 @@ int mark_dquot_dirty(struct dquot *dquot);
+ int register_quota_format(struct quota_format_type *fmt);
+ void unregister_quota_format(struct quota_format_type *fmt);
+ 
+-#ifdef CONFIG_QUOTA_COMPAT
+-#include <linux/compat.h>
+-
+-#define QC_QUOTAON  0x0100	/* enable quotas */
+-#define QC_QUOTAOFF 0x0200	/* disable quotas */
+-
+-/* GETQUOTA, SETQUOTA and SETUSE which were at 0x0300-0x0500 has now
+- * other parameteres
+- */
+-#define QC_SYNC     0x0600	/* sync disk copy of a filesystems quotas */
+-#define QC_SETQLIM  0x0700	/* set limits */
+-/* GETSTATS at 0x0800 is now longer... */
+-#define QC_GETINFO  0x0900	/* get info about quotas - graces, flags... */
+-#define QC_SETINFO  0x0A00	/* set info about quotas */
+-#define QC_SETGRACE 0x0B00	/* set inode and block grace */
+-#define QC_SETFLAGS 0x0C00	/* set flags for quota */
+-#define QC_GETQUOTA 0x0D00	/* get limits and usage */
+-#define QC_SETQUOTA 0x0E00	/* set limits and usage */
+-#define QC_SETUSE   0x0F00	/* set usage */
+-/* 0x1000 used by old RSQUASH */
+-#define QC_GETSTATS 0x1100	/* get collected stats */
+-
+-struct compat_v2_dqblk {
+-	unsigned int dqb_ihardlimit;
+-	unsigned int dqb_isoftlimit;
+-	unsigned int dqb_curinodes;
+-	unsigned int dqb_bhardlimit;
+-	unsigned int dqb_bsoftlimit;
+-	qsize_t dqb_curspace;
+-	__kernel_time_t dqb_btime;
+-	__kernel_time_t dqb_itime;
+-};
+-
+-#ifdef CONFIG_COMPAT
+-struct compat_v2_dqblk_32 {
+-	unsigned int dqb_ihardlimit;
+-	unsigned int dqb_isoftlimit;
+-	unsigned int dqb_curinodes;
+-	unsigned int dqb_bhardlimit;
+-	unsigned int dqb_bsoftlimit;
+-	qsize_t dqb_curspace;
+-	compat_time_t dqb_btime;
+-	compat_time_t dqb_itime;
+-} __attribute__ ((packed));
+-#endif
+-#endif
+-
+ struct quota_module_name {
+ 	int qm_fmt_id;
+ 	char *qm_mod_name;
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch
deleted file mode 100644
index a33676f7737e..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugzilla.openvz.org/show_bug.cgi?id=951
-
---- ./include/net/xfrm.h.xxx	2008-08-20 17:40:52.000000000 +0400
-+++ ./include/net/xfrm.h	2008-08-20 20:18:25.000000000 +0400
-@@ -429,8 +429,8 @@ static inline struct audit_buffer *xfrm_
- #else
- #define xfrm_audit_log(a,s,t,r,p,x) do { ; } while (0)
- #define xfrm_audit_state_replay_overflow(x, s)	do { ; } while (0)
--#define xfrm_audit_state_replay(s, f, sp, sq)	do { ; } while (0)
--#define xfrm_naudit_state_replay(s, f, sp, sq)	do { ; } while (0)
-+#define xfrm_audit_state_replay(s, f, sp)	do { ; } while (0)
-+#define xfrm_naudit_state_replay(s, f, sp)	do { ; } while (0)
- #define xfrm_audit_state_notfound(s, f, sp, sq)	do { ; } while (0)
- #define xfrm_naudit_state_notfound(s, f, sp, sq) do { ; } while (0)
- #define xfrm_audit_state_icvfail(x, s, p)	do { ; } while (0)
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch
deleted file mode 100644
index a2ebc7e8351f..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-http://bugzilla.openvz.org/show_bug.cgi?id=963
-
---- linux-2.6.18-ovz-057.6/include/net/icmp.h~route	2008-08-18 14:19:23.000000000 +0400
-+++ linux-2.6.18-ovz-057.6/include/net/icmp.h	2008-08-18 14:20:10.000000000 +0400
-@@ -79,7 +79,4 @@ extern int sysctl_icmp_errors_use_inboun
- extern int sysctl_icmp_ratelimit;
- extern int sysctl_icmp_ratemask;
- 
--extern void xfrm4_decode_session_reverse(struct sk_buff *skb, struct flowi *fl);
--extern int xfrm4_icmp_check(struct sk_buff *skb);
--
- #endif	/* _ICMP_H */
---- linux-2.6.18-ovz-057.6/include/net/xfrm.h~route	2008-08-18 14:19:37.000000000 +0400
-+++ linux-2.6.18-ovz-057.6/include/net/xfrm.h	2008-08-18 14:20:29.000000000 +0400
-@@ -794,6 +794,7 @@ static inline int xfrm6_policy_check_rev
- extern int xfrm_decode_session(struct sk_buff *skb, struct flowi *fl, unsigned short family);
- extern void xfrm4_decode_session_reverse(struct sk_buff *skb, struct flowi *fl);
- extern void xfrm6_decode_session_reverse(struct sk_buff *skb, struct flowi *fl);
-+extern int xfrm4_icmp_check(struct sk_buff *skb);
- 
- extern int __xfrm_route_forward(struct sk_buff *skb, unsigned short family);
- 
-@@ -875,6 +876,11 @@ static inline int xfrm6_policy_check_rev
- {
- 	return 1;
- }
-+
-+static inline int xfrm4_icmp_check(struct sk_buff *skb)
-+{
-+	return 1;
-+}
- #endif
- 
- static __inline__
---- linux-2.6.18-ovz-057.6/net/ipv4/icmp.c~route	2008-08-18 14:21:18.000000000 +0400
-+++ linux-2.6.18-ovz-057.6/net/ipv4/icmp.c	2008-08-18 14:21:35.000000000 +0400
-@@ -93,6 +93,7 @@
- #include <asm/uaccess.h>
- #include <net/checksum.h>
- #include <linux/xfrm.h>
-+#include <net/xfrm.h>
- 
- /*
-  *	Build xmit assembly blocks
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.059.3-e1000-build.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.059.3-e1000-build.patch
new file mode 100644
index 000000000000..c44c10fca10c
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.059.3-e1000-build.patch
@@ -0,0 +1,11 @@
+diff -up ./drivers/net/Kconfig.e100k ./drivers/net/Kconfig
+--- ./drivers/net/Kconfig.e100k	2008-09-30 12:43:46.000000000 +0400
++++ ./drivers/net/Kconfig	2008-10-27 17:41:54.000000000 +0300
+@@ -1915,6 +1915,7 @@ config DL2K
+ config E1000
+ 	tristate "Intel(R) PRO/1000 Gigabit Ethernet support"
+ 	depends on PCI
++	select E1000E
+ 	---help---
+ 	  This driver supports Intel(R) PRO/1000 gigabit ethernet family of
+ 	  adapters.  For more information on how to identify your adapter, go 
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.053-r2.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.053-r2.ebuild
deleted file mode 100644
index d61e7cc54d66..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.053-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.053-r2.ebuild,v 1.1 2008/02/13 20:29:54 pva Exp $
-
-inherit versionator
-
-ETYPE="sources"
-
-CKV=$(get_version_component_range 1-3)
-OKV=${OKV:-${CKV}}
-if [[ ${PR} == "r0" ]]; then
-KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4).$(get_version_component_range 5)
-else
-KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4).$(get_version_component_range 5)-${PR}
-fi
-OVZ_KERNEL="$(get_version_component_range 4)stab$(get_version_component_range 5)"
-OVZ_REV="4"
-EXTRAVERSION=-${OVZ_KERNEL}
-KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
-
-inherit kernel-2
-detect_version
-
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
-IUSE=""
-
-DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-HOMEPAGE="http://www.openvz.org"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://download.openvz.org/kernel/branches/${CKV}/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-ovz${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-ovz${OVZ_KERNEL}.${OVZ_REV}-combined.gz
-${FILESDIR}/openvz-sources-2.6.18-ms-splice-access.patch"
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.056.1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.056.1.ebuild
index 395e65185208..7feb8a9de150 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.056.1.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.056.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.056.1.ebuild,v 1.2 2008/09/30 07:30:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.056.1.ebuild,v 1.3 2008/10/29 15:28:12 pva Exp $
 
 inherit versionator
 
@@ -36,4 +36,5 @@ ${FILESDIR}/openvz-sources-2.6.18.028.057.2-qouta-compat-build.patch
 ${FILESDIR}/openvz-sources-2.6.18.028.057.2-fix-CIFS-build.patch
 ${FILESDIR}/openvz-sources-2.6.18.028.057.2-missed-PATH_MAX-sumversion.c.patch
 ${FILESDIR}/openvz-sources-2.6.18.028.057.2-prevent-gcc-smartness.patch
+${FILESDIR}/openvz-sources-2.6.18.028.056.1-CONFIG_SECCOMP-build.patch
 ${FILESDIR}/${P}-3ware.patch"
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.057.2.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.059.3.ebuild
index eb47454a2ceb..215c6e8b1762 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.057.2.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.059.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.057.2.ebuild,v 1.2 2008/09/24 09:32:55 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.059.3.ebuild,v 1.1 2008/10/29 15:28:12 pva Exp $
 
 inherit versionator
 
@@ -27,21 +27,17 @@ IUSE=""
 DESCRIPTION="Full sources including OpenVZ patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
 HOMEPAGE="http://www.openvz.org"
 SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://download.openvz.org/kernel/branches/rhel5-${CKV}/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-92.1.1.el5.${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
+	http://download.openvz.org/kernel/branches/rhel5-${CKV}/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-92.1.13.el5.${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
 
 UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-92.1.1.el5.${OVZ_KERNEL}.${OVZ_REV}-combined.gz
-${FILESDIR}/${P}-utimenstat.patch
-${FILESDIR}/${P}-qouta-compat-build.patch
-${FILESDIR}/${P}-fix-build-xfrm.h.patch
-${FILESDIR}/${P}-missed-PATH_MAX-sumversion.c.patch
-${FILESDIR}/${P}-prevent-gcc-smartness.patch
-${FILESDIR}/${P}-fix-CIFS-build.patch
-${FILESDIR}/${P}-another-fix-build-xfrm.h.patch"
+UNIPATCH_LIST="${DISTDIR}/patch-92.1.13.el5.${OVZ_KERNEL}.${OVZ_REV}-combined.gz
+${FILESDIR}/${PN}-2.6.18.028.057.2-utimenstat.patch
+${FILESDIR}/${P}-e1000-build.patch
+${FILESDIR}/${PN}-2.6.18.028.057.2-prevent-gcc-smartness.patch"
 
 K_EXTRAEINFO="This openvz kernel uses RHEL5 patchset instead of vanilla kernel.
 This patchset considered to be more stable and security supported by upstream,
 that why they suggested us to use it. But note: RHEL5 patchset is very fragile
 and fails to build in many configurations so if you have problems use config
 files from openvz team
-http://wiki.openvz.org/Download/kernel/rhel5/028stab057.2"
+http://wiki.openvz.org/Download/kernel/rhel5/028stab059.3"
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.24.006.2.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.24.006.4.ebuild
index e8d78ac16710..f3035bcd318b 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.24.006.2.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.24.006.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.24.006.2.ebuild,v 1.1 2008/09/30 16:41:49 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.24.006.4.ebuild,v 1.1 2008/10/29 15:28:12 pva Exp $
 
 inherit versionator