Bump xen-sources to 2.6.16.52, fix ipt_REJECT compile failure

Package-Manager: portage-2.1.2.9

5 files changed, 80 insertions, 9 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/Manifest b/sys-kernel/xen-sources/Manifest
index 99fe5f2cd0ea..bece06b9051e 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -33,11 +33,16 @@ AUX xen-sources-2.6.16.28-CVE-2006-6333.patch 1070 RMD160 613f13d96b8fbfca43dc89
 MD5 3a65727b79f61d986594734845f058a4 files/xen-sources-2.6.16.28-CVE-2006-6333.patch 1070
 RMD160 613f13d96b8fbfca43dc893ff90cf0f9c8745cf0 files/xen-sources-2.6.16.28-CVE-2006-6333.patch 1070
 SHA256 ff0c2e31316fd9f33fea8a40349733ce2e307838b78cf9a2c9a95495e185a855 files/xen-sources-2.6.16.28-CVE-2006-6333.patch 1070
+AUX xen-sources-2.6.16.52-ipt-reject-fix.patch 619 RMD160 22d0856d7f56168b82b4306b38755d636087ce97 SHA1 b6e65de1e4a898276252e62eedbf97c2c2a907ee SHA256 4c4afd94f5a26dbd5cb4a055f17d10b30be7fbd92e11cfbeeca52308d0304c43
+MD5 8e0bfa1090fa601b526610ca7b9ecc1b files/xen-sources-2.6.16.52-ipt-reject-fix.patch 619
+RMD160 22d0856d7f56168b82b4306b38755d636087ce97 files/xen-sources-2.6.16.52-ipt-reject-fix.patch 619
+SHA256 4c4afd94f5a26dbd5cb4a055f17d10b30be7fbd92e11cfbeeca52308d0304c43 files/xen-sources-2.6.16.52-ipt-reject-fix.patch 619
 DIST linux-2.6.16.tar.bz2 40845005 RMD160 af5c2f55733fadd2fdf8b00da55e7b31d516d4e8 SHA1 bef21cd5063a648f33a99a26f4742dd05eb4dca2 SHA256 1200dcc7e60fcdaf68618dba991917a47e41e67099e8b22143976ec972e2cad7
 DIST patch-2.6.16.28.bz2 76693 RMD160 5235c0b5f9665a279f5bf5d42f942cef215e822f SHA1 7b1d450cf300ec6788919e4b5601389e258d28cc SHA256 6b05fd7121a86a5a6cfd0177200259eeb9a3d276a3cb16ba8cf2acdd747fa6be
 DIST patch-2.6.16.33.bz2 119729 RMD160 00168955e8219783b39896ba53ebbd36361a8e8a SHA1 25b107a8cc0d97fc2798482090dccd9701fe0c71 SHA256 25cec957b2057381f61c5d1e6963dd6fab46264cda160cd6550ead3bdb4ccaba
 DIST patch-2.6.16.33_to_xen-3.0.4_1.bz2 669094 RMD160 5c595e8b4c6565de241a5b3a31f2e34afb24face SHA1 26cc01234bed90f3dc7695dcbbb35e190ba4c864 SHA256 0ce11436602401447763688819c4f62db87cac644e093304b7522b073693f9da
 DIST patch-2.6.16.49.bz2 309537 RMD160 4ae48c9432e1ed61d0e882174d8174de9b52593d SHA1 d020057af20817812ebd71dbc67a03d1379b75b8 SHA256 ed6fb9875dc2f263c9f405092713435c91337393b937a2dc8c3c82c7223cfd8d
+DIST patch-2.6.16.52.bz2 315299 RMD160 a0e70a8b10511b69bbb8585fb930523e9950d2dc SHA1 56a86e67a1b50c89a151aaa9d02514fd7b728052 SHA256 282f0bee51e854882860e3a1a1a5486479e49a7926835a839f208d0312ea767d
 DIST xen-3.0.2-src.tgz 4933621 RMD160 34e4431a981891319f8a5ea0c3f604e7d8d7d7af SHA1 b7e797048b516f8b385afd3da9ae2eded1b8033a SHA256 f18ffab16a457fa721d11933c75f8288f6958c88c2669857c7c11d5107ba2951
 DIST xen-3.0.4_1-src.tgz 6473636 RMD160 f869eec35f6afe0bc9824ce2eb4a600f789d423b SHA1 7ca5af70996215229e143c7563e69b3719284a95 SHA256 6b3842393e69a9c8fcdbc2789d05830aba6f1d108a6f97f1448de4a86f92a5cb
 DIST xen-sources-2.6.16.28-3.0.2.patch.bz2 467924 RMD160 8b62dc416b08e4ef4a10add18b3287eef856c613 SHA1 56ae78337b7754031aa82cf64b277ff6e320f5a0 SHA256 0f3400e1c877b765fc62453664b80cf2e51002299476d532fe8f6af6db0fdb99
@@ -61,10 +66,14 @@ EBUILD xen-sources-2.6.16.49.ebuild 859 RMD160 f368103eae44804b7be877a3465cbb45f
 MD5 ba3a227404cfda5ab91bcb8ac4b5359f xen-sources-2.6.16.49.ebuild 859
 RMD160 f368103eae44804b7be877a3465cbb45f0f4440b xen-sources-2.6.16.49.ebuild 859
 SHA256 a5fa0d1909372cc0c6e175680d043071a542d6fe4e68c3e8c45a0f637f9d067c xen-sources-2.6.16.49.ebuild 859
-MISC ChangeLog 6913 RMD160 59be17f3dfc2b9e73fa2d8278ae54688b6969bc8 SHA1 9b981f3501833e2b5e8d559734fa8f40c2015cec SHA256 755bd8b91004d26ba4826dca40785a39558bd88cdf03528299c6def920efcd6a
-MD5 d2cf048d198786cd1f1d885fed3cfd3e ChangeLog 6913
-RMD160 59be17f3dfc2b9e73fa2d8278ae54688b6969bc8 ChangeLog 6913
-SHA256 755bd8b91004d26ba4826dca40785a39558bd88cdf03528299c6def920efcd6a ChangeLog 6913
+EBUILD xen-sources-2.6.16.52.ebuild 898 RMD160 ec4602778660df6c490eb0e89cce6cd56673d4a7 SHA1 f526e30a00f7115282994a8238461fecaa5ac656 SHA256 d419f3e06e2a754c7f35eb2b7c3fb2b836ad399bbae06efeb90e323d18f7e12c
+MD5 ce8406404f41072cc1e45be9a2bc55f4 xen-sources-2.6.16.52.ebuild 898
+RMD160 ec4602778660df6c490eb0e89cce6cd56673d4a7 xen-sources-2.6.16.52.ebuild 898
+SHA256 d419f3e06e2a754c7f35eb2b7c3fb2b836ad399bbae06efeb90e323d18f7e12c xen-sources-2.6.16.52.ebuild 898
+MISC ChangeLog 7151 RMD160 ddeb72aa7de65801d1ab0fef4af36c6361c35221 SHA1 e24292fe8cee4a6d4fc382deb96a172d33c6031b SHA256 d7312f6d9fd01394cdbcb2812a816e75885a416b54296df87239942d540bd46e
+MD5 488472b4761e9890f197e6b216b899a3 ChangeLog 7151
+RMD160 ddeb72aa7de65801d1ab0fef4af36c6361c35221 ChangeLog 7151
+SHA256 d7312f6d9fd01394cdbcb2812a816e75885a416b54296df87239942d540bd46e ChangeLog 7151
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156
@@ -84,10 +93,13 @@ SHA256 4fd98ee4a2c2608c4d4c910cfd6a2976353de973d078e90cd7b3427dd64e277f files/di
 MD5 d764599ea5c1b68fe63be37d89512661 files/digest-xen-sources-2.6.16.49 768
 RMD160 c95e530a85c3d4ba130e2e861d26e391f166e635 files/digest-xen-sources-2.6.16.49 768
 SHA256 cb5bf466d9417590decadd22ce06e9a6278d6dbc5cb38600ec73f500d2d32a2b files/digest-xen-sources-2.6.16.49 768
+MD5 84fb1bb2784c3871f0db6d858828d5a8 files/digest-xen-sources-2.6.16.52 768
+RMD160 9c5e6d9e5b1f5392b473d0af6d0ef882fc3ea46d files/digest-xen-sources-2.6.16.52 768
+SHA256 41cc8aa58e4818a5a2173372b9b2b69cc470fa4f27764964af1ede38b54113b6 files/digest-xen-sources-2.6.16.52 768
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGiRrkppoStNGKGywRAjIIAJ96XFDM9ZKo8tbXhHBS9RKAQgb3LwCgqUKu
-uloAcNIkCzfYztealQ+ldCE=
-=v45O
+iD8DBQFGk+EuiP+LossGzjARAqA5AKCL7jYAjUigrpAsF89z8M8QMdbEFQCcDysR
+zTUOGnNrRnXOx5RM9rxscZA=
+=S+Hh
 -----END PGP SIGNATURE-----
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."
+}