Version bump.

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

5 files changed, 213 insertions, 2 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index 6a0f608f5c33..bc14dc5064fb 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.153 2010/10/25 13:56:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.154 2010/11/09 13:55:32 pva Exp $
+
+*openvz-sources-2.6.32.10.1 (09 Nov 2010)
+
+  09 Nov 2010; Peter Volkov <pva@gentoo.org>
+  +openvz-sources-2.6.32.10.1.ebuild,
+  +files/openvz-sources-2.6.32.10.1-cpt_process.c-build.patch,
+  +files/openvz-sources-2.6.32.10.1-orphans.patch:
+  Version bump.
 
   25 Oct 2010; Peter Volkov <pva@gentoo.org>
   openvz-sources-2.6.27.7.1.ebuild:
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index f640488cf0a1..4b41a42d091f 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -1,5 +1,7 @@
 AUX openvz-sources-2.6.18.028.064.7-bridgemac.patch 514 RMD160 bdd04c4dc86c79b91b7675d8c59b569483e444c4 SHA1 ef092a68c4dab7dc7284b2be8cc74b1510def485 SHA256 250bc852aedca35624d9352c1d693e147812504b2799cd2ba20f0c9763e61908
 AUX openvz-sources-2.6.18.028.068.3-build-fix.patch 742 RMD160 1c6e51e8e9d490cfeae747229deafbe129b73be6 SHA1 9e21887303534a76956ba8cafdd31c7168f8eae1 SHA256 0e04df4445fcea66ea771b727dc50800ff4e7065fc5cda3767f8a5fedee9b786
+AUX openvz-sources-2.6.32.10.1-cpt_process.c-build.patch 1355 RMD160 10ed708f8981a8da5c48e85f8d4ab92fd8c52a6b SHA1 34623bd06d781e25ed18781bc48a30ffc3a0f29d SHA256 5d3c0cd848f2546025374b1da77fb34bbae85bdf955bf21e9451c03b7221457d
+AUX openvz-sources-2.6.32.10.1-orphans.patch 3294 RMD160 3e56e9a503a1f15682a65709ab2cfff5a6d1239d SHA1 51890a4730e3c45cdd7602c15b56d158575a101e SHA256 856f8d92026ef4856aede3f19ca01b016bf01e8744878889463077e64302d130
 DIST deblob-2.6.27 67810 RMD160 2d697e569fb4ba294c94a50798de10d2ad930b84 SHA1 45b2a16c2df2c14380cd813c74be721b9537d03d SHA256 2eab6480d170a7204b09f2c1091f2b3e4c19c3525ea4887e6887501bfa263efc
 DIST deblob-2.6.32 84094 RMD160 394f46ec5b869638a7bc2e87beb118167c9bd6cb SHA1 1a2a1efb72126609d9e3b9be99ae5be2751efd06 SHA256 de625f0bd221c9c38d4453f1b709622f222d86a0ae9350d2b7b0e17795e6de6d
 DIST deblob-check-2.6.27 247608 RMD160 840bf8a229ea79810519eee6241edb85b78a6562 SHA1 d45a24eb16e5ac956c0fcddbc1ac4d67e326c7b8 SHA256 da1aecdf3ab7f1207b90642d303e52262ccc2ed9e49739b729512b88950d17f3
@@ -11,12 +13,14 @@ DIST openvz-2.6.27-2.6.27.53.patch.bz2 34532 RMD160 82cf5116bd2b41f47485d0d9aa5c
 DIST patch-194.17.1.el5.028stab070.7-combined.gz 18798886 RMD160 978b570583dd82aea45828b2134e1b3027fc4e8f SHA1 046e3bc8c966697e9de75c2433999ceea6b24e85 SHA256 43f0884242d19ef3cd848223b2b0158634a00bc1ac8d2a196856f607a35314f3
 DIST patch-194.8.1.el5.028stab070.5-combined.gz 18756668 RMD160 6f340f479498066ed3d2fc7eab565c55a463c750 SHA1 a6201ee34639bc84041d675c26db14003deaae50 SHA256 801874493654c72cec0daee59f4615377122b7f2028acc9d0071b8cc39ccb6f3
 DIST patch-dyomin.1-combined.gz 1247998 RMD160 abf46c045b383fbff66f440fb9c6b94ac2729c35 SHA1 89c287e16de1bea099733f205ea43690c66cb527 SHA256 4ecc57a1ab24897ade64306253edabcb4ebe8ca2546cc1e89aea29a0ee423f42
+DIST patch-dzhanibekov.1-combined.gz 1288000 RMD160 7d85773fbac4237568351d2d2652249f88319742 SHA1 48fb44a7e9ea322e4a8d5a449ca93dfae5667bb5 SHA256 092bec284abb3a3e5b6c836319e646c1e89b72369681e6bfbfa9e79bd0df4e03
 DIST patch-kuindzhi.1-combined.gz 1104589 RMD160 bca276d3ee8ef77a985bdbbeef118e23194512fa SHA1 c64bc9d48c83edcaadb334be13bad6014fdd6e47 SHA256 afd96addcec3b51ce00e6239073c964ba9dffb5d5cb58a41baa14882893a9e83
 DIST patch-levitan.1-combined.gz 1138510 RMD160 6f7e7f56f7b14c1f2e9ee9b681e242b6c3f26466 SHA1 97828f49e9eb36b63016b5cacff6e6e02cd743a6 SHA256 c0b810d8d9d3fc93a969d0a567dfca178ebecbd01819163845b3274e95c6a497
 EBUILD openvz-sources-2.6.18.028.070.5.ebuild 1843 RMD160 66193e1e9403daddca5bbfac3a12b808ef4e0d66 SHA1 3248f604b91fe0ab8f6e75c5cffbc00dfb1ea324 SHA256 475fae166af06cd9e08acdb1a73fb085376e364c24608170ac8b36c95339d7b1
 EBUILD openvz-sources-2.6.18.028.070.7.ebuild 1844 RMD160 666cdac9b042cfec65a756c1e9c4690816533a75 SHA1 66731118f5280698ab7ef0bf5fd33c51cff601ed SHA256 8bec9ba1b2f3ea05c6f29aae362cb43f0c4c7470c6f993c16e1f35ca39d2b86b
 EBUILD openvz-sources-2.6.27.6.1-r1.ebuild 1991 RMD160 35f04bbef9747525ac3b4971882bcf13d874a0f2 SHA1 7a2b61e4c7d58f6a8547b74d1e4f28880c8e3f3f SHA256 50fd721269da58ab867b05664a39c9e1d07e3db4834b15062c22ea5050382469
 EBUILD openvz-sources-2.6.27.7.1.ebuild 1891 RMD160 2aa22612647441582589ebc224017766bbe3fae6 SHA1 6e1e82aa59f13b9f7d24666593d763e06b3d1bbf SHA256 1d0c0407da58f201f28d642e8a2f892f91642ddf647d1b03daf6c889f92e7266
+EBUILD openvz-sources-2.6.32.10.1.ebuild 1855 RMD160 e410beb0e82771f09f1874988b25023bbac561a7 SHA1 4db5de600669fae75445beb56305c8c2b1143374 SHA256 2e91817e062bbcdd0575a14c7ff63803a3b74805946ecdd52a5e1281c5a8122e
 EBUILD openvz-sources-2.6.32.9.1.ebuild 1775 RMD160 ceb820da18d2097aade25f69e83ac410f8b7b78a SHA1 3af44ef0bf67b450912acfcb20eb1d38f734d564 SHA256 9e0890001e4ca1566c1ab58695a35bb1b412cc9bcf99def8f802578a0b259780
-MISC ChangeLog 38392 RMD160 e3082c9bcac155a225220678bcb0fc8cbc313c1a SHA1 5ffea085c76c9f2670c2a4d83b7fe02b23cb3399 SHA256 bf979a7ccbd800faa3b7a827caceae7217dd8888db34129dbf0bb10250a89303
+MISC ChangeLog 38649 RMD160 89e621f37ce982d91326dafc2238f97af0b49eb6 SHA1 41cdc86966432b774967730c424ed8c40edd1185 SHA256 613e982d305175db2538e1caa652e4b78d481a4695d327fca1910c6ef2f426f8
 MISC metadata.xml 681 RMD160 2506e8f34c2b1c706419e24c14ae0dbce7912a5f SHA1 bc3c7c37e15a4ffc097a823eb3a0758364781c9b SHA256 1a1794adcc3b2443635b21dee50f86ac796c7fdc44a276f8852357f8bedde9b8
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.32.10.1-cpt_process.c-build.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.32.10.1-cpt_process.c-build.patch
new file mode 100644
index 000000000000..8fe515006e80
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.32.10.1-cpt_process.c-build.patch
@@ -0,0 +1,36 @@
+http://bugzilla.openvz.org/show_bug.cgi?id=1687
+
+C/R: Use in_gate_area_no_task helper to test task's checkpoint-ability v2
+
+Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
+---
+ arch/x86/mm/init_64.c    |    1 +
+ kernel/cpt/cpt_process.c |    3 +--
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: linux-2.6-openvz/arch/x86/mm/init_64.c
+=====================================================================
+--- linux-2.6-openvz.orig/arch/x86/mm/init_64.c
++++ linux-2.6-openvz/arch/x86/mm/init_64.c
+@@ -893,6 +893,7 @@ int in_gate_area_no_task(unsigned long a
+ {
+ 	return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
+ }
++EXPORT_SYMBOL(in_gate_area_no_task);
+ 
+ const char *arch_vma_name(struct vm_area_struct *vma)
+ {
+Index: linux-2.6-openvz/kernel/cpt/cpt_process.c
+=====================================================================
+--- linux-2.6-openvz.orig/kernel/cpt/cpt_process.c
++++ linux-2.6-openvz/kernel/cpt/cpt_process.c
+@@ -40,8 +40,7 @@ int check_task_state(struct task_struct 
+ {
+ #ifdef CONFIG_X86_64
+ 	if (!(task_thread_info(tsk)->flags&_TIF_IA32)) {
+-		if (task_pt_regs(tsk)->ip >= VSYSCALL_START &&
+-				task_pt_regs(tsk)->ip < VSYSCALL_END) {
++		if (in_gate_area_no_task(task_pt_regs(tsk)->ip)) {
+ 			eprintk_ctx(CPT_FID "cannot be checkpointied while vsyscall, try later\n", CPT_TID(tsk));
+ 			return -EAGAIN;
+ 		}
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.32.10.1-orphans.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.32.10.1-orphans.patch
new file mode 100644
index 000000000000..ea9893faa0dc
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.32.10.1-orphans.patch
@@ -0,0 +1,107 @@
+From: Pavel Emelyanov <xemul@openvz.org>
+Date: Sat, 6 Nov 2010 14:02:43 +0000 (+0300)
+Subject: ubc: Fix orphan count checks after merge
+X-Git-Url: http://git.openvz.org/?p=linux-2.6.32-openvz;a=commitdiff_plain;h=e5db932edffe86ddc4a8f9cdfc6e267ed887570c
+
+ubc: Fix orphan count checks after merge
+
+After merging -stable the orphans checking function started checking
+the wrong counter.
+
+http://bugzilla.openvz.org/show_bug.cgi?id=1693
+
+Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
+---
+
+diff --git a/include/bc/sock_orphan.h b/include/bc/sock_orphan.h
+index c5b2412..8f829c3 100644
+--- a/include/bc/sock_orphan.h
++++ b/include/bc/sock_orphan.h
+@@ -19,9 +19,13 @@
+ 
+ static inline struct percpu_counter *__ub_get_orphan_count_ptr(struct sock *sk)
+ {
+-	if (sock_has_ubc(sk))
+-		return &sock_bc(sk)->ub->ub_orphan_count;
+-	return sk->sk_prot->orphan_count;
++	if (sock_has_ubc(sk)) {
++		struct user_beancounter *ub;
++
++		ub = top_beancounter(sock_bc(sk)->ub);
++		return &ub->ub_orphan_count;
++	} else
++		return sk->sk_prot->orphan_count;
+ }
+ 
+ static inline void ub_inc_orphan_count(struct sock *sk)
+@@ -39,15 +43,7 @@ static inline int ub_get_orphan_count(struct sock *sk)
+ 	return percpu_counter_sum_positive(__ub_get_orphan_count_ptr(sk));
+ }
+ 
+-extern int __ub_too_many_orphans(struct sock *sk, int count);
+-static inline int ub_too_many_orphans(struct sock *sk, int shift)
+-{
+-#ifdef CONFIG_BEANCOUNTERS
+-	if (__ub_too_many_orphans(sk, shift))
+-		return 1;
+-#endif
+-	return tcp_too_many_orphans(sk, shift);
+-}
++extern int ub_too_many_orphans(struct sock *sk, int count);
+ 
+ #include <bc/kmem.h>
+ 
+diff --git a/include/net/tcp.h b/include/net/tcp.h
+index 6fa5f0d..ac5f07d 100644
+--- a/include/net/tcp.h
++++ b/include/net/tcp.h
+@@ -272,9 +272,9 @@ static inline int between(__u32 seq1, __u32 seq2, __u32 seq3)
+ 	return seq3 - seq2 >= seq1 - seq2;
+ }
+ 
+-static inline bool tcp_too_many_orphans(struct sock *sk, int shift)
++static inline bool tcp_too_many_orphans(struct sock *sk,
++		struct percpu_counter *ocp, int shift)
+ {
+-	struct percpu_counter *ocp = sk->sk_prot->orphan_count;
+ 	int orphans = percpu_counter_read_positive(ocp);
+ 
+ 	if (orphans << shift > sysctl_tcp_max_orphans) {
+diff --git a/kernel/bc/net.c b/kernel/bc/net.c
+index 2866ebb..427fc42 100644
+--- a/kernel/bc/net.c
++++ b/kernel/bc/net.c
+@@ -102,17 +102,18 @@ EXPORT_SYMBOL(skb_charge_fullsize);
+ static int ub_sock_makewreserv_locked(struct sock *sk,
+ 		int bufid, unsigned long size);
+ 
+-int __ub_too_many_orphans(struct sock *sk, int shift)
++int ub_too_many_orphans(struct sock *sk, int shift)
+ {
+-	struct user_beancounter *ub;
+ 	struct percpu_counter *cnt;
+ 
++	cnt = sk->sk_prot->orphan_count;
+ 	if (sock_has_ubc(sk)) {
+-		int orphans, limit;
++		struct user_beancounter *ub;
++		unsigned int orphans, limit;
+ 
+ 		ub = top_beancounter(sock_bc(sk)->ub);
+-		limit = ((int)ub->ub_parms[UB_NUMTCPSOCK].barrier) >> 2;
+-		cnt = __ub_get_orphan_count_ptr(sk);
++		limit = ub->ub_parms[UB_NUMTCPSOCK].barrier >> 2;
++		cnt = &ub->ub_orphan_count;
+ 
+ 		orphans = percpu_counter_read_positive(cnt);
+ 		if ((orphans << shift) >= limit)
+@@ -122,7 +123,8 @@ int __ub_too_many_orphans(struct sock *sk, int shift)
+ 		if ((orphans << shift) >= limit)
+ 			return 1;
+ 	}
+-	return 0;
++
++	return tcp_too_many_orphans(sk, cnt, shift);
+ }
+ 
+ /*
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.10.1.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.10.1.ebuild
new file mode 100644
index 000000000000..a231d036b556
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.10.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2010 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.32.10.1.ebuild,v 1.1 2010/11/09 13:55:32 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="dzhanibekov"
+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 ~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}/${P}-cpt_process.c-build.patch
+${FILESDIR}/${P}-orphans.patch"
+
+K_EXTRAEINFO="For more information about this kernel take a look at:
+http://wiki.openvz.org/Download/kernel/${CKV}/${CKV}-${OVZ_KV}"