summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Marineau <marineam@gentoo.org>2007-07-10 19:42:31 +0000
committerMichael Marineau <marineam@gentoo.org>2007-07-10 19:42:31 +0000
commitae3e83415ffe8bf004b265533076935099336463 (patch)
treeed49907305b7eaef8a501c1ba1de34613fc1a466
parentAdd ~ia64 wrt #184563 (diff)
downloadgentoo-2-ae3e83415ffe8bf004b265533076935099336463.tar.gz
gentoo-2-ae3e83415ffe8bf004b265533076935099336463.tar.bz2
gentoo-2-ae3e83415ffe8bf004b265533076935099336463.zip
Bump xen-sources to 2.6.16.52, fix ipt_REJECT compile failure
(Portage version: 2.1.2.9)
-rw-r--r--sys-kernel/xen-sources/ChangeLog9
-rw-r--r--sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.529
-rw-r--r--sys-kernel/xen-sources/files/xen-sources-2.6.16.52-ipt-reject-fix.patch14
-rw-r--r--sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild29
4 files changed, 60 insertions, 1 deletions
diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index 5febe62c6aa9..c07f6ea4ca2b 100644
--- a/sys-kernel/xen-sources/ChangeLog
+++ b/sys-kernel/xen-sources/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for sys-kernel/xen-sources
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.39 2007/07/02 15:33:50 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.40 2007/07/10 19:42:31 marineam Exp $
+
+*xen-sources-2.6.16.52 (10 Jul 2007)
+
+ 10 Jul 2007; Michael Marineau <marineam@gentoo.org>
+ +files/xen-sources-2.6.16.52-ipt-reject-fix.patch,
+ +xen-sources-2.6.16.52.ebuild:
+ Version bump and fix ip tables REJECT compile failure
02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
xen-sources-2.6.16.28.ebuild, xen-sources-2.6.16.28-r1.ebuild:
diff --git a/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.52 b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.52
new file mode 100644
index 000000000000..7f34cac89771
--- /dev/null
+++ b/sys-kernel/xen-sources/files/digest-xen-sources-2.6.16.52
@@ -0,0 +1,9 @@
+MD5 9a91b2719949ff0856b40bc467fd47be linux-2.6.16.tar.bz2 40845005
+RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 linux-2.6.16.tar.bz2 40845005
+SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7 linux-2.6.16.tar.bz2 40845005
+MD5 a45805635c1e1f53edebe01486761ecc patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
+RMD160 5c595e8b4c6565de241a5b3a31f2e34afb24face patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
+SHA256 0ce11436602401447763688819c4f62db87cac644e093304b7522b073693f9da patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094
+MD5 f3b8ec81456d4d23a369f4a0b89ee069 patch-2.6.16.52.bz2 315299
+RMD160 a0e70a8b10511b69bbb8585fb930523e9950d2dc patch-2.6.16.52.bz2 315299
+SHA256 282f0bee51e854882860e3a1a1a5486479e49a7926835a839f208d0312ea767d patch-2.6.16.52.bz2 315299
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-ipt-reject-fix.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-ipt-reject-fix.patch
new file mode 100644
index 000000000000..88c95beb2e73
--- /dev/null
+++ b/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-ipt-reject-fix.patch
@@ -0,0 +1,14 @@
+diff -rpu linux-2.6.16.52-xen.orig/net/ipv4/netfilter/ipt_REJECT.c linux-2.6.16.52-xen/net/ipv4/netfilter/ipt_REJECT.c
+--- linux-2.6.16.52-xen.orig/net/ipv4/netfilter/ipt_REJECT.c 2007-07-10 10:52:39.000000000 -0700
++++ linux-2.6.16.52-xen/net/ipv4/netfilter/ipt_REJECT.c 2007-07-10 10:50:03.000000000 -0700
+@@ -159,8 +159,8 @@ static void send_reset(struct sk_buff *o
+ nskb->nf_bridge = NULL;
+ #endif
+
+- skb_shinfo(nskb)->tso_size = 0;
+- skb_shinfo(nskb)->tso_segs = 0;
++ skb_shinfo(nskb)->gso_size = 0;
++ skb_shinfo(nskb)->gso_segs = 0;
+
+ tcph = (struct tcphdr *)((u_int32_t*)nskb->nh.iph + nskb->nh.iph->ihl);
+
diff --git a/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild b/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild
new file mode 100644
index 000000000000..31d5ef1a3274
--- /dev/null
+++ b/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild,v 1.1 2007/07/10 19:42:31 marineam Exp $
+
+ETYPE="sources"
+UNIPATCH_STRICTORDER="1"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="Full sources for a dom0/domU Linux kernel to run under Xen"
+HOMEPAGE="http://www.xensource.com/xen/xen/"
+
+XEN_VERSION="3.0.4_1"
+XEN_BASE_KV="2.6.16.33"
+XEN_PATCH="patch-${XEN_BASE_KV}_to_xen-${XEN_VERSION}.bz2"
+PATCH_URI="mirror://gentoo/${XEN_PATCH}"
+SRC_URI="${KERNEL_URI} ${PATCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
+ ${FILESDIR}/${P}-ipt-reject-fix.patch"
+
+KEYWORDS="~x86 ~amd64"
+
+pkg_postinst() {
+ postinst_sources
+
+ elog "This kernel uses the linux patches released with Xen 3.0.4"
+ elog "It claims to have a 3.0.2 compatibility option but it may not work."
+}