summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2009-07-08 13:56:14 +0000
committerPeter Volkov <pva@gentoo.org>2009-07-08 13:56:14 +0000
commitb8b4a708c77ca684efffb205f93b24ad48787665 (patch)
tree0f6a0428b3bcf7b766c6bdf5a6044723c4eecbcd /sys-kernel/openvz-sources
parentAdd ~mips keywords to KDE 3.5.10 (diff)
downloadgentoo-2-b8b4a708c77ca684efffb205f93b24ad48787665.tar.gz
gentoo-2-b8b4a708c77ca684efffb205f93b24ad48787665.tar.bz2
gentoo-2-b8b4a708c77ca684efffb205f93b24ad48787665.zip
Added upstream patches. Changed SLOT to reflect upstream versioning, thank Night Nord.
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'sys-kernel/openvz-sources')
-rw-r--r--sys-kernel/openvz-sources/ChangeLog17
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-avoid-double-free.patch26
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-ban-netns-creation.patch53
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-process-skbs.patch29
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch39
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch29
-rw-r--r--sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch27
-rw-r--r--sys-kernel/openvz-sources/openvz-sources-2.6.18.028.060.8.ebuild43
-rw-r--r--sys-kernel/openvz-sources/openvz-sources-2.6.24.009.1.ebuild38
-rw-r--r--sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r2.ebuild60
-rw-r--r--sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1.ebuild37
11 files changed, 279 insertions, 119 deletions
diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index 8c1621c23d1a..3d928f0aec8e 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,21 @@
# ChangeLog for sys-kernel/openvz-sources
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.111 2009/06/26 11:28:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.112 2009/07/08 13:56:14 pva Exp $
+
+*openvz-sources-2.6.27.2.1-r2 (08 Jul 2009)
+
+ 08 Jul 2009; Peter Volkov <pva@gentoo.org>
+ -openvz-sources-2.6.18.028.060.8.ebuild,
+ -openvz-sources-2.6.24.009.1.ebuild, -openvz-sources-2.6.27.2.1.ebuild,
+ +openvz-sources-2.6.27.2.1-r2.ebuild,
+ +files/openvz-sources-2.6.27.2.1-avoid-double-free.patch,
+ +files/openvz-sources-2.6.27.2.1-ban-netns-creation.patch,
+ +files/openvz-sources-2.6.27.2.1-bridge-process-skbs.patch,
+ +files/openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch,
+ +files/openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch,
+ +files/openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch:
+ Added upstream patches. Changed SLOT to reflect upstream versioning, thank
+ Night Nord.
*openvz-sources-2.6.18.028.062.3 (26 Jun 2009)
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-avoid-double-free.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-avoid-double-free.patch
new file mode 100644
index 000000000000..755bd4ed67e8
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-avoid-double-free.patch
@@ -0,0 +1,26 @@
+From: Pavel Emelyanov <xemul@openvz.org>
+Date: Wed, 22 Apr 2009 15:05:03 +0000 (+0400)
+Subject: net: avoid double free on net->gen pointer on error
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=4f908925f495ea1e2f401b8fcf3cdc91c5968429
+
+net: avoid double free on net->gen pointer on error
+
+If we failed with netns creation net->gen will be kfree-ed twice.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1241
+
+Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
+---
+
+diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
+index 523eba0..64b0a40 100644
+--- a/net/core/net_namespace.c
++++ b/net/core/net_namespace.c
+@@ -75,6 +75,7 @@ out_undo:
+ }
+
+ rcu_barrier();
++ net->gen = NULL;
+ kfree(ng);
+ goto out;
+ }
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-ban-netns-creation.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-ban-netns-creation.patch
new file mode 100644
index 000000000000..49191ce427f3
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-ban-netns-creation.patch
@@ -0,0 +1,53 @@
+From: Pavel Emelyanov <xemul@openvz.org>
+Date: Fri, 10 Apr 2009 11:22:09 +0000 (+0400)
+Subject: namespaces: ban netns creation even for ve0's root
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=5728d99a5ae464d533487ef5874a3f9ea9ff2097
+
+namespaces: ban netns creation even for ve0's root
+
+netnamespace do not work with sysfs yet, so creating one
+can be fatal
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1234
+
+Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
+---
+
+diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
+index 052b894..25288ad 100644
+--- a/kernel/nsproxy.c
++++ b/kernel/nsproxy.c
+@@ -142,9 +142,20 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk,
+ CLONE_NEWUSER | CLONE_NEWPID | CLONE_NEWNET)))
+ return 0;
+
+- if (!capable(CAP_SYS_ADMIN) && !force_admin) {
+- err = -EPERM;
+- goto out;
++ if (!force_admin) {
++ if (!capable(CAP_SYS_ADMIN)) {
++ err = -EPERM;
++ goto out;
++ }
++
++ /*
++ * netns-vs-sysfs is deadly broken, thus new namespace
++ * (even in ve0) can bring the node down
++ */
++ if (flags & CLONE_NEWNET) {
++ err = -EINVAL;
++ goto out;
++ }
+ }
+
+ /*
+@@ -221,6 +232,9 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags,
+ if (!capable(CAP_SYS_ADMIN))
+ return -EPERM;
+
++ if (unshare_flags & CLONE_NEWNET)
++ return -EINVAL;
++
+ *new_nsp = create_new_namespaces(unshare_flags, current,
+ new_fs ? new_fs : current->fs);
+ if (IS_ERR(*new_nsp)) {
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-process-skbs.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-process-skbs.patch
new file mode 100644
index 000000000000..be6606477f61
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-process-skbs.patch
@@ -0,0 +1,29 @@
+From: Cyrill Gorcunov <gorcunov@openvz.org>
+Date: Tue, 21 Apr 2009 12:00:07 +0000 (+0400)
+Subject: net: bridge - process skbs has been already substituted due to via_phys_dev
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=ac9403982e62e2eb33ec19264d2d389f09034320
+
+net: bridge - process skbs has been already substituted due to via_phys_dev
+
+When via_phys_dev is enabled we substitute skb->dev with
+master_dev and pass it back to bridge code. Instead of
+dropping such skb we should pass it up to network stack
+to process.
+
+Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
+---
+
+diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
+index 44fb444..1a650ac 100644
+--- a/net/bridge/br_input.c
++++ b/net/bridge/br_input.c
+@@ -160,7 +160,7 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
+ /* fall through */
+ case BR_STATE_LEARNING:
+ if (skb->brmark == BR_ALREADY_SEEN)
+- return 0;
++ return skb;
+
+ out = p->br->via_phys_dev ? p->br->master_dev : p->br->dev;
+
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch
new file mode 100644
index 000000000000..de6d70522188
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch
@@ -0,0 +1,39 @@
+From: Cyrill Gorcunov <gorcunov@openvz.org>
+Date: Tue, 7 Apr 2009 17:59:25 +0000 (+0400)
+Subject: net: bridge - set_via_phys_dev_state should return int value
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=649958ef9120ebea8ed3d216e02a9218e9acad8d
+
+net: bridge - set_via_phys_dev_state should return int value
+
+While playing with bridge code I found the following
+compiler warning
+
+| CC net/bridge/br_sysfs_br.o
+|net/bridge/br_sysfs_br.c: In function ‘store_via_phys_dev_state’:
+|net/bridge/br_sysfs_br.c:199: warning: passing argument 4 of
+|‘store_bridge_parm’ from incompatible pointer type
+
+This is due to store_bridge_parm uses int returning callback.
+Fix it.
+
+Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
+---
+
+diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
+index 5b6f301..b33cf32 100644
+--- a/net/bridge/br_sysfs_br.c
++++ b/net/bridge/br_sysfs_br.c
+@@ -188,9 +188,10 @@ static ssize_t show_via_phys_dev_state(struct device *cd,
+ return sprintf(buf, "%d\n", br->via_phys_dev);
+ }
+
+-static void set_via_phys_dev_state(struct net_bridge *br, unsigned long val)
++static int set_via_phys_dev_state(struct net_bridge *br, unsigned long val)
+ {
+- br->via_phys_dev = val;
++ br->via_phys_dev = val ? 1 : 0;
++ return 0;
+ }
+
+ static ssize_t store_via_phys_dev_state(struct device *cd,
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch
new file mode 100644
index 000000000000..451489ad424e
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch
@@ -0,0 +1,29 @@
+From: Cyrill Gorcunov <gorcunov@openvz.org>
+Date: Thu, 23 Apr 2009 09:47:54 +0000 (+0400)
+Subject: mm: check for no mmaps in exit_mmap()
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=acfd6c89981b9de80b96741380780ffe6c87a15d
+
+mm: check for no mmaps in exit_mmap()
+
+Backported commit dcd4a049 from the mainstream.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1230
+
+Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
+Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
+---
+
+diff --git a/mm/mmap.c b/mm/mmap.c
+index 564186a..2679a9c 100644
+--- a/mm/mmap.c
++++ b/mm/mmap.c
+@@ -2133,6 +2133,9 @@ void exit_mmap(struct mm_struct *mm)
+ arch_exit_mmap(mm);
+ mmu_notifier_release(mm);
+
++ if (!vma) /* Can happen if dup_mmap() received an OOM */
++ return;
++
+ lru_add_drain();
+ flush_cache_mm(mm);
+ tlb = tlb_gather_mmu(mm, 1);
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch
new file mode 100644
index 000000000000..a12ec51e196d
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch
@@ -0,0 +1,27 @@
+From: Konstantin Khlebnikov <khlebnikov@openvz.org>
+Date: Wed, 3 Jun 2009 12:34:08 +0000 (+0400)
+Subject: pidns: pi-futex pid check fixup
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=81e645095ced04ab9bff9680f112774c396ab13f
+
+pidns: pi-futex pid check fixup
+
+fix WARN_ON condition
+
+port rh5 patch from Stanichenko Marat <mstanichenko@openvz.org>
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1262
+---
+
+diff --git a/kernel/futex.c b/kernel/futex.c
+index 1cc3092..d1351bb 100644
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -534,7 +534,7 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb,
+
+ WARN_ON(!atomic_read(&pi_state->refcount));
+ WARN_ON(pid && pi_state->owner &&
+- pi_state->owner->pid != pid);
++ task_pid_vnr(pi_state->owner) != pid);
+
+ atomic_inc(&pi_state->refcount);
+ *ps = pi_state;
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.060.8.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.060.8.ebuild
deleted file mode 100644
index c6b9c86159d4..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.060.8.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2009 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.060.8.ebuild,v 1.1 2009/04/02 19:55:30 bangert 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-6)
-else
-KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4-6)-${PR}
-fi
-OVZ_KERNEL="$(get_version_component_range 4)stab$(get_version_component_range 5)"
-OVZ_REV="$(get_version_component_range 6)"
-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 2.6.18 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.18.el5.${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-92.1.18.el5.${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-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/028stab059.9"
-
-K_EXTRAEWARN="This kernel is stable only when built with gcc-4.1.x and is known
-to oops in random places if built with newer compilers."
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.24.009.1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.24.009.1.ebuild
deleted file mode 100644
index b82cd2a8569b..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.24.009.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 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.009.1.ebuild,v 1.1 2009/04/16 16:11:41 bangert Exp $
-
-inherit versionator
-
-ETYPE="sources"
-
-CKV=$(get_version_component_range 1-3)
-OKV=${OKV:-${CKV}}
-OVZ_KERNEL="ovz$(get_version_component_range 4)"
-if [[ ${PR} == "r0" ]]; then
-KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4).$(get_version_component_range 5)
-EXTRAVERSION=-${OVZ_KERNEL}
-else
-KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4).$(get_version_component_range 5)-${PR}
-EXTRAVERSION=-${OVZ_KERNEL}-${PR}
-fi
-OVZ_REV="$(get_version_component_range 5)"
-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}/${CKV}-${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-K_EXTRAEINFO="This is development branch of openvz-sources. For more information
-about this kernel tak a look at:
-http://wiki.openvz.org/Download/kernel/${CKV}/${CKV}-${OVZ_KERNEL}.${OVZ_REV}"
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r2.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r2.ebuild
new file mode 100644
index 000000000000..3a0b74a27770
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2009 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.27.2.1-r2.ebuild,v 1.1 2009/07/08 13:56:14 pva Exp $
+
+inherit versionator
+
+# Upstream uses string to version their releases. To make portage version
+# comparisment working we have to use numbers instead of strings, that is 4th
+# component of our version. So we have aivazovsky - 1, briullov - 2 and so on.
+# Keep this string on top since we have to modify it each new release.
+OVZ_CODENAME="briullov"
+OVZ_CODENAME_SUBRELEASE=$(get_version_component_range 5)
+
+OVZ_KV="${OVZ_CODENAME}.${OVZ_CODENAME_SUBRELEASE}"
+
+ETYPE="sources"
+
+CKV=$(get_version_component_range 1-3)
+OKV=${OKV:-${CKV}}
+EXTRAVERSION=-${PN/-*}-${OVZ_KV}
+KV_FULL=${CKV}${EXTRAVERSION}
+if [[ ${PR} != r0 ]]; then
+ KV_FULL+=-${PR}
+ EXTRAVERSION+=-${PR}
+fi
+
+# ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} should succeed.
+KV_MAJOR=$(get_version_component_range 1 ${OKV})
+KV_MINOR=$(get_version_component_range 2 ${OKV})
+KV_PATCH=$(get_version_component_range 3 ${OKV})
+
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+
+inherit kernel-2
+detect_version
+
+SLOT=${CKV}-${OVZ_KV}
+if [[ ${PR} != r0 ]]; then
+ SLOT+=-${PR}
+fi
+
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DESCRIPTION="Kernel sources with OpenVZ patchset"
+HOMEPAGE="http://www.openvz.org"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+ http://download.openvz.org/kernel/branches/${CKV}/${CKV}-${OVZ_KV}/patches/patch-${OVZ_KV}-combined.gz"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KV}-combined.gz
+${FILESDIR}/${PN}-2.6.27.2.1-ban-netns-creation.patch
+${FILESDIR}/${PN}-2.6.27.2.1-bridge-process-skbs.patch
+${FILESDIR}/${PN}-2.6.27.2.1-bridge-set_via_phys_dev_state.patch
+${FILESDIR}/${PN}-2.6.27.2.1-avoid-double-free.patch
+${FILESDIR}/${PN}-2.6.27.2.1-check-for-no-mmaps.patch
+${FILESDIR}/${PN}-2.6.27.2.1-pi-futex-pid-check-fixup.patch"
+
+K_EXTRAEINFO="For more information about this kernel take a look at:
+http://wiki.openvz.org/Download/kernel/${CKV}/${CKV}-${OVZ_KV}"
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1.ebuild
deleted file mode 100644
index d05774234338..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2009 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.27.2.1.ebuild,v 1.1 2009/04/18 20:10:36 bangert Exp $
-
-inherit versionator
-
-ETYPE="sources"
-
-CKV=$(get_version_component_range 1-3)
-OKV=${OKV:-${CKV}}
-OVZ_REV="$(get_version_component_range 5)"
-OVZ_KERNEL="briullov"
-if [[ ${PR} == "r0" ]]; then
- EXTRAVERSION=-${PN/-*}-${OVZ_KERNEL}.${OVZ_REV}
-else
- EXTRAVERSION=-${PN/-*}-${OVZ_KERNEL}.${OVZ_REV}-${PR}
-fi
-KV_FULL=${CKV}${EXTRAVERSION}
-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}/${CKV}-${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-K_EXTRAEINFO="This is development branch of openvz-sources. For more information
-about this kernel tak a look at:
-http://wiki.openvz.org/Download/kernel/${CKV}/${CKV}-${OVZ_KERNEL}.${OVZ_REV}"