Fix SCTP compile error

Package-Manager: portage-2.1.2.9

4 files changed, 37 insertions, 15 deletions

diff --git a/sys-kernel/xen-sources/ChangeLog b/sys-kernel/xen-sources/ChangeLog
index c07f6ea4ca2b..2d453f81e231 100644
--- a/sys-kernel/xen-sources/ChangeLog
+++ b/sys-kernel/xen-sources/ChangeLog
@@ -1,6 +1,11 @@
 # 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.40 2007/07/10 19:42:31 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/ChangeLog,v 1.41 2007/07/15 18:00:11 marineam Exp $
+
+  15 Jul 2007; Michael Marineau <marineam@gentoo.org>
+  +files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch,
+  xen-sources-2.6.16.52.ebuild:
+  Add fix for sctp compile error, resolves bug #185406.
 
 *xen-sources-2.6.16.52 (10 Jul 2007)
 
diff --git a/sys-kernel/xen-sources/Manifest b/sys-kernel/xen-sources/Manifest
index bece06b9051e..57ff72af8a15 100644
--- a/sys-kernel/xen-sources/Manifest
+++ b/sys-kernel/xen-sources/Manifest
@@ -37,6 +37,10 @@ AUX xen-sources-2.6.16.52-ipt-reject-fix.patch 619 RMD160 22d0856d7f56168b82b430
 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
+AUX xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch 473 RMD160 6376dc36ec1464445ca0f781107881aeab173200 SHA1 6e3bb8e88fde614cde6233ab19abbc28175139ef SHA256 1def119bdcb86a5c2f7d4df855faad320a4fdc07125c8fc3dff45c1ef1c9c88d
+MD5 dae2d4e18c6a4baea6a032fd63102c2f files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch 473
+RMD160 6376dc36ec1464445ca0f781107881aeab173200 files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch 473
+SHA256 1def119bdcb86a5c2f7d4df855faad320a4fdc07125c8fc3dff45c1ef1c9c88d files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch 473
 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
@@ -66,14 +70,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
-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
+EBUILD xen-sources-2.6.16.52.ebuild 945 RMD160 0800db638276ad42d22e5087f8f9f0808bca0bfa SHA1 0edddaa3d4f3ed7adaee3d9b5759e297d64af97a SHA256 ff7bf539e40dd13831d695a3482fb84b667fbe474f2bed8cb577b3ee1cad2e48
+MD5 1a59f82dcb3c5d508e239da7217295b1 xen-sources-2.6.16.52.ebuild 945
+RMD160 0800db638276ad42d22e5087f8f9f0808bca0bfa xen-sources-2.6.16.52.ebuild 945
+SHA256 ff7bf539e40dd13831d695a3482fb84b667fbe474f2bed8cb577b3ee1cad2e48 xen-sources-2.6.16.52.ebuild 945
+MISC ChangeLog 7355 RMD160 7a6808bf43d16c376464380e255239aa9347cc79 SHA1 9746c33b1c10a8e1f634e1bb58b222e0214ebc8c SHA256 34411f673042ba0a762b7121bec48867dbbfd283f43359cef5be9be6dd8184bc
+MD5 a6a2f78f467400334f89b9bd0fcc5080 ChangeLog 7355
+RMD160 7a6808bf43d16c376464380e255239aa9347cc79 ChangeLog 7355
+SHA256 34411f673042ba0a762b7121bec48867dbbfd283f43359cef5be9be6dd8184bc ChangeLog 7355
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156
@@ -97,9 +101,9 @@ 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 v1.4.7 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFGk+EuiP+LossGzjARAqA5AKCL7jYAjUigrpAsF89z8M8QMdbEFQCcDysR
-zTUOGnNrRnXOx5RM9rxscZA=
-=S+Hh
+iD8DBQFGmmCziP+LossGzjARAsuXAKCjgfmzvpC1w0zvj0DkfgAV4wS7kwCfVVvn
+h4um5hG5KpOF5x/kQcImcIY=
+=KIJ7
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch b/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch
new file mode 100644
index 000000000000..431fc96936ff
--- /dev/null
+++ b/sys-kernel/xen-sources/files/xen-sources-2.6.16.52-sctp-skb_linearize-fix.patch
@@ -0,0 +1,12 @@
+diff -rup linux-2.6.16.52-xen.orig/net/sctp/input.c linux-2.6.16.52-xen/net/sctp/input.c
+--- linux-2.6.16.52-xen.orig/net/sctp/input.c	2007-07-15 10:07:12.000000000 -0700
++++ linux-2.6.16.52-xen/net/sctp/input.c	2007-07-15 10:42:38.000000000 -0700
+@@ -134,7 +134,7 @@ int sctp_rcv(struct sk_buff *skb)
+ 
+ 	SCTP_INC_STATS_BH(SCTP_MIB_INSCTPPACKS);
+ 
+-	if (skb_linearize(skb, GFP_ATOMIC))
++	if (skb_linearize(skb))
+ 		goto discard_it;
+ 
+ 	sh = (struct sctphdr *) skb->h.raw;
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
index 31d5ef1a3274..e8eb2070e87c 100644
--- a/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild
+++ b/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/xen-sources/xen-sources-2.6.16.52.ebuild,v 1.2 2007/07/15 18:00:11 marineam Exp $
 
 ETYPE="sources"
 UNIPATCH_STRICTORDER="1"
@@ -17,7 +17,8 @@ PATCH_URI="mirror://gentoo/${XEN_PATCH}"
 SRC_URI="${KERNEL_URI} ${PATCH_URI}"
 
 UNIPATCH_LIST="${DISTDIR}/${XEN_PATCH}
-	${FILESDIR}/${P}-ipt-reject-fix.patch"
+	${FILESDIR}/${P}-ipt-reject-fix.patch
+	${FILESDIR}/${P}-sctp-skb_linearize-fix.patch"
 
 KEYWORDS="~x86 ~amd64"