Version bump. Added myself into metadata.

(Portage version: 2.1.3.18)

9 files changed, 153 insertions, 1 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index a20b82b4987c..5b513f27dd47 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.71 2007/10/20 15:31:08 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.72 2007/11/07 20:09:32 pva Exp $
+
+*openvz-sources-028.047 (07 Nov 2007)
+
+  07 Nov 2007; <pva@gentoo.org>
+  +files/openvz-sources-028.047-build-with-recent-binutils.patch,
+  +files/openvz-sources-028.047-compilation-vpid.patch,
+  +files/openvz-sources-028.047-cpt-vsyscall-comp.patch,
+  +files/openvz-sources-028.047-grsec-2.1.10-comp-off.patch,
+  +files/openvz-sources-028.047-grsec-2.1.10-tpe-comp.patch, metadata.xml,
+  +openvz-sources-028.047.ebuild:
+  Version bump. Added myself into metadata.
 
 *openvz-sources-028.045 (20 Oct 2007)
 
diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-028.047 b/sys-kernel/openvz-sources/files/digest-openvz-sources-028.047
new file mode 100644
index 000000000000..1d9e846a4232
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/digest-openvz-sources-028.047
@@ -0,0 +1,6 @@
+MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
+RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
+SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
+MD5 5925cd08d459882de22cf4185a57a770 patch-ovz028stab047.1-combined.gz 1126505
+RMD160 138ae40cd8710f620c6d75f9b35d9c46c049cccc patch-ovz028stab047.1-combined.gz 1126505
+SHA256 f17d0302953625a04215372f2d6570365e09b2947536c572e1b8833f8d591c09 patch-ovz028stab047.1-combined.gz 1126505
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-028.047-build-with-recent-binutils.patch b/sys-kernel/openvz-sources/files/openvz-sources-028.047-build-with-recent-binutils.patch
new file mode 100644
index 000000000000..18fa07f2e1df
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-028.047-build-with-recent-binutils.patch
@@ -0,0 +1,37 @@
+From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
+Date: Tue, 26 Sep 2006 08:52:37 +0000 (+0200)
+Subject: [PATCH] Fix boot code head.S warning
+X-Git-Tag: v2.6.19-rc1~1077^2~64
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6.23.y.git;a=commitdiff_plain;h=b3698c03eb6d4581e879d6bb0f183ed8dda96d37
+
+[PATCH] Fix boot code head.S warning
+
+When compiling a 64-bit kernel on an Ubuntu 6.06 32bit system (whose GCC is also
+a cross-compiler for x86_64) I've seen that head.o is compiled as a 64-bit file
+(while it should not) and ld complaining about this during linking:
+[AK: it happens on all systems with new binutils]
+
+ld: warning: i386:x86-64 architecture of input file
+`arch/x86_64/boot/compressed/head.o' is incompatible with i386 output
+
+I've verified that removing -m64 from compilation flags to turn
+"-m64 -traditional -m32" into "-traditional -m32" fixes the issue.
+
+Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
+Signed-off-by: Andi Kleen <ak@suse.de>
+---
+
+diff --git a/arch/x86_64/boot/compressed/Makefile b/arch/x86_64/boot/compressed/Makefile
+index f89d96f..e70fa6e 100644
+--- a/arch/x86_64/boot/compressed/Makefile
++++ b/arch/x86_64/boot/compressed/Makefile
+@@ -7,7 +7,8 @@
+ #
+ 
+ targets		:= vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o
+-EXTRA_AFLAGS	:= -traditional -m32
++EXTRA_AFLAGS	:= -traditional
++AFLAGS		:= $(subst -m64,-m32,$(AFLAGS))
+ 
+ # cannot use EXTRA_CFLAGS because base CFLAGS contains -mkernel which conflicts with
+ # -m32
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-028.047-compilation-vpid.patch b/sys-kernel/openvz-sources/files/openvz-sources-028.047-compilation-vpid.patch
new file mode 100644
index 000000000000..1657a888b1c8
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-028.047-compilation-vpid.patch
@@ -0,0 +1,33 @@
+From: Alexander Y. Fomichev <git.user@gmail.com>
+Date: Fri, 26 Oct 2007 10:05:57 +0000 (+0400)
+Subject: [PATCH] Fix compilation issues in vpid code
+X-Git-Tag: 028stab048~2
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.18-openvz;a=commitdiff_plain;h=0a17273c35f9fd043979da9ef216305f07ef369e
+
+[PATCH] Fix compilation issues in vpid code
+Patch fixes compilation issue in kernel/pid.c:
+...
+kernel/pid.c: In function 'free_pid':
+kernel/pid.c:197: error: dereferencing pointer to incomplete type
+kernel/pid.c: In function 'alloc_pid':
+kernel/pid.c:233: error: dereferencing pointer to incomplete type
+make[2]: *** [kernel/pid.o] Error 1
+make[1]: *** [kernel] Error 2
+
+If linux/kmem_cache is not included kmem_cache type is undefined.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=689
+---
+
+diff --git a/kernel/pid.c b/kernel/pid.c
+index c6678a6..9d5208d 100644
+--- a/kernel/pid.c
++++ b/kernel/pid.c
+@@ -22,6 +22,7 @@
+ 
+ #include <linux/mm.h>
+ #include <linux/module.h>
++#include <linux/kmem_cache.h>
+ #include <linux/slab.h>
+ #include <linux/init.h>
+ #include <linux/bootmem.h>
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-028.047-cpt-vsyscall-comp.patch b/sys-kernel/openvz-sources/files/openvz-sources-028.047-cpt-vsyscall-comp.patch
new file mode 100644
index 000000000000..e8c177ab3e63
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-028.047-cpt-vsyscall-comp.patch
@@ -0,0 +1,11 @@
+--- arch/i386/kernel/sysenter.c.orig	2007-11-07 08:13:49.000000000 +0300
++++ arch/i386/kernel/sysenter.c	2007-11-07 08:13:53.000000000 +0300
+@@ -109,7 +109,7 @@
+ {
+ }
+ 
+-static struct vm_operations_struct syscall_vm_ops = {
++struct vm_operations_struct syscall_vm_ops = {
+ 	.close = syscall_vma_close,
+ 	.nopage = syscall_nopage,
+ };
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-028.047-grsec-2.1.10-comp-off.patch b/sys-kernel/openvz-sources/files/openvz-sources-028.047-grsec-2.1.10-comp-off.patch
new file mode 100644
index 000000000000..4848f1e2793b
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-028.047-grsec-2.1.10-comp-off.patch
@@ -0,0 +1,11 @@
+http://bugzilla.openvz.org/show_bug.cgi?id=716
+
+--- grsecurity/grsec_disabled.c.orig	2007-11-10 22:49:58.000000000 +0300
++++ grsecurity/grsec_disabled.c	2007-11-10 22:50:14.000000000 +0300
+@@ -1,5 +1,6 @@
+ #include <linux/kernel.h>
+ #include <linux/sched.h>
++#include <linux/module.h>
+ 
+ void
+ gr_copy_label(struct task_struct *tsk)
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-028.047-grsec-2.1.10-tpe-comp.patch b/sys-kernel/openvz-sources/files/openvz-sources-028.047-grsec-2.1.10-tpe-comp.patch
new file mode 100644
index 000000000000..ee7458833a54
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-028.047-grsec-2.1.10-tpe-comp.patch
@@ -0,0 +1,14 @@
+http://bugzilla.openvz.org/show_bug.cgi?id=721
+
+
+--- ./grsecurity/grsec_tpe.c.ve7655	2007-10-23 15:16:05.000000000 +0400
++++ ./grsecurity/grsec_tpe.c	2007-11-06 14:24:31.000000000 +0300
+@@ -9,7 +9,7 @@ extern int gr_acl_tpe_check(void);
+ int
+ gr_tpe_allow(const struct file *file)
+ {
+-#ifdef CONFIG_GRKERNSEC
++#ifdef CONFIG_GRKERNSEC_TPE
+ 	struct inode *inode = file->f_dentry->d_parent->d_inode;
+ 
+ 	if (current->uid && ((grsec_enable_tpe &&
diff --git a/sys-kernel/openvz-sources/metadata.xml b/sys-kernel/openvz-sources/metadata.xml
index 9e24902f5d37..8079f7b19cc5 100644
--- a/sys-kernel/openvz-sources/metadata.xml
+++ b/sys-kernel/openvz-sources/metadata.xml
@@ -5,6 +5,9 @@
 	<maintainer>
 		<email>vserver-devs@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>pva@gentoo.org</email>
+	</maintainer>
 	<longdescription>
 		OpenVZ is an Operating System-level server virtualization solution, 
 		built on Linux. OpenVZ creates isolated, secure virtual private 
diff --git a/sys-kernel/openvz-sources/openvz-sources-028.047.ebuild b/sys-kernel/openvz-sources/openvz-sources-028.047.ebuild
new file mode 100644
index 000000000000..22dfc0ff0f92
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-028.047.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-028.047.ebuild,v 1.1 2007/11/07 20:09:32 pva Exp $
+
+ETYPE="sources"
+CKV="2.6.18"
+
+K_USEPV=1
+K_NOSETEXTRAVERSION=1
+
+inherit kernel-2
+detect_version
+
+OVZ_KERNEL="${PV%%.*}stab${PV##*.}"
+OVZ_REV="1"
+
+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}/${P}-compilation-vpid.patch ${FILESDIR}/${P}-grsec-2.1.10-comp-off.patch ${FILESDIR}/${P}-grsec-2.1.10-tpe-comp.patch ${FILESDIR}/${P}-cpt-vsyscall-comp.patch ${FILESDIR}/${P}-build-with-recent-binutils.patch"