Version bump. Should fix bug #233280, thank Christopher Covington for report, and Peter Alfredsen for reopening and Daniel Robbins for comments.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686)

9 files changed, 221 insertions, 1 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index 54c78973eb05..ead6be80ceee 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,20 @@
 # 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.92 2008/07/24 07:56:21 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.93 2008/08/22 19:39:27 pva Exp $
+
+*openvz-sources-2.6.18.028.057.2 (22 Aug 2008)
+
+  22 Aug 2008; Peter Volkov <pva@gentoo.org>
+  +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-CIFS-build.patch,
+  +files/openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch,
+  +files/openvz-sources-2.6.18.028.057.2-missed-PATH_MAX-sumversion.c.patch,
+  +files/openvz-sources-2.6.18.028.057.2-prevent-gcc-smartness.patch,
+  +files/openvz-sources-2.6.18.028.057.2-qouta-compat-build.patch,
+  +files/openvz-sources-2.6.18.028.057.2-utimenstat.patch,
+  +openvz-sources-2.6.18.028.057.2.ebuild:
+  Version bump. Should fix bug #233280, thank Christopher Covington for
+  report, and Peter Alfredsen for reopening and Daniel Robbins for comments.
 
   23 Jul 2008; Peter Volkov <pva@gentoo.org>
   +files/openvz-sources-2.6.24.005.1-CONFIG_SYSVIPC-build-fix.patch,
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
new file mode 100644
index 000000000000..a33676f7737e
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-another-fix-build-xfrm.h.patch
@@ -0,0 +1,15 @@
+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-CIFS-build.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-fix-CIFS-build.patch
new file mode 100644
index 000000000000..f6dda3340bba
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-fix-CIFS-build.patch
@@ -0,0 +1,25 @@
+http://bugzilla.openvz.org/show_bug.cgi?id=951
+
+commit 516897a208bc1423d561ce2ccce0624c3b652275
+Author: Steve French <sfrench@us.ibm.com>
+Date:   Fri Oct 12 19:24:06 2007 +0000
+
+    [CIFS] fix build break when lanman not enabled
+    
+    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+    Signed-off-by: Steve French <sfrench@us.ibm.com>
+
+diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
+index fbde55c..61d6173 100644
+--- a/fs/cifs/cifsglob.h
++++ b/fs/cifs/cifsglob.h
+@@ -479,6 +479,9 @@ struct dir_notify_req {
+ #ifdef CONFIG_CIFS_WEAK_PW_HASH
+ #define   CIFSSEC_MAY_LANMAN	0x00010
+ #define   CIFSSEC_MAY_PLNTXT	0x00020
++#else
++#define   CIFSSEC_MAY_LANMAN    0
++#define   CIFSSEC_MAY_PLNTXT    0
+ #endif /* weak passwords */
+ #define   CIFSSEC_MAY_SEAL	0x00040 /* not supported yet */
+ 
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
new file mode 100644
index 000000000000..a2ebc7e8351f
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-fix-build-xfrm.h.patch
@@ -0,0 +1,44 @@
+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.057.2-missed-PATH_MAX-sumversion.c.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-missed-PATH_MAX-sumversion.c.patch
new file mode 100644
index 000000000000..9efd6ab15124
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-missed-PATH_MAX-sumversion.c.patch
@@ -0,0 +1,13 @@
+http://bugzilla.openvz.org/show_bug.cgi?id=951
+
+diff -up ./scripts/mod/sumversion.c.cfx ./scripts/mod/sumversion.c
+--- ./scripts/mod/sumversion.c.cfx	2006-09-20 07:42:06.000000000 +0400
++++ ./scripts/mod/sumversion.c	2008-08-20 16:59:14.000000000 +0400
+@@ -7,6 +7,7 @@
+ #include <ctype.h>
+ #include <errno.h>
+ #include <string.h>
++#include <limits.h>
+ #include "modpost.h"
+ 
+ /*
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-prevent-gcc-smartness.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-prevent-gcc-smartness.patch
new file mode 100644
index 000000000000..a68aece756c9
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-prevent-gcc-smartness.patch
@@ -0,0 +1,31 @@
+http://bugzilla.openvz.org/show_bug.cgi?id=951
+
+commit 38332cb98772f5ea757e6486bed7ed0381cb5f98
+Author: Segher Boessenkool <segher@kernel.crashing.org>
+Date:   Tue Mar 4 14:59:54 2008 -0800
+
+    time: prevent the loop in timespec_add_ns() from being optimised away
+    
+    Since some architectures don't support __udivdi3().
+    
+    Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org>
+    Cc: john stultz <johnstul@us.ibm.com>
+    Cc: Ingo Molnar <mingo@elte.hu>
+    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+diff --git a/include/linux/time.h b/include/linux/time.h
+index 2091a19..d32ef0a 100644
+--- a/include/linux/time.h
++++ b/include/linux/time.h
+@@ -174,6 +174,10 @@ static inline void timespec_add_ns(struct timespec *a, u64 ns)
+ {
+ 	ns += a->tv_nsec;
+ 	while(unlikely(ns >= NSEC_PER_SEC)) {
++		/* The following asm() prevents the compiler from
++		 * optimising this loop into a modulo operation.  */
++		asm("" : "+r"(ns));
++
+ 		ns -= NSEC_PER_SEC;
+ 		a->tv_sec++;
+ 	}
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-qouta-compat-build.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-qouta-compat-build.patch
new file mode 100644
index 000000000000..b34ed695d75a
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-qouta-compat-build.patch
@@ -0,0 +1,13 @@
+--- ./fs/compat.c.bk	2008-08-06 15:31:16.000000000 +0400
++++ ./fs/compat.c	2008-08-06 15:41:47.000000000 +0400
+@@ -1565,8 +1565,10 @@ asmlinkage long sys32_quotactl(unsigned 
+ 		__u32 dqb_itime[2];
+ 		__u32 dqb_valid;
+ 	} dqblk32;
++#ifdef CONFIG_QUOTA_COMPAT
+ 	struct compat_v2_dqblk cdq;
+ 	struct compat_v2_dqblk_32 cdq32;
++#endif
+ 
+ 	cmds = cmd >> SUBCMDSHIFT;
+ 
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-utimenstat.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-utimenstat.patch
new file mode 100644
index 000000000000..7ddc69688618
--- /dev/null
+++ b/sys-kernel/openvz-sources/files/openvz-sources-2.6.18.028.057.2-utimenstat.patch
@@ -0,0 +1,18 @@
+diff -up ./fs/utimes.c.touchkludge ./fs/utimes.c
+--- ./fs/utimes.c.touchkludge	2008-08-20 20:54:10.000000000 +0400
++++ ./fs/utimes.c	2008-08-20 21:07:40.000000000 +0400
+@@ -14,6 +14,14 @@ asmlinkage long sys_utimensat(int dfd, c
+ {
+ 	struct timespec tstimes[2];
+ 	struct timeval time[2];
++
++	if (filename == NULL)
++		/*
++		 * a kludge for thuse, checking for utimensat
++		 * availability via this maneuver
++		 */
++		return -ENOSYS;
++
+ 	if (utimes) {
+ 		if (copy_from_user(&tstimes, utimes, sizeof(tstimes)))
+ 			return -EFAULT;
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.057.2.ebuild
new file mode 100644
index 000000000000..4fab14b9da44
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.057.2.ebuild
@@ -0,0 +1,47 @@
+# 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.1 2008/08/22 19:39:27 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="$(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 ${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"
+
+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"
+
+K_EXTRAEINFO="Starting with openvz-sources-2.6.18.028.053.14 we use RHEL5 patchset
+instead of previously used 2.6.18 one. 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"