Err, reverting my last commit. The ibmtr bugfix isn't supposed to be in 2.6.18.

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index 628587d3f38e7c617ded379896fbdf3bc09cdeed..9754c4b218b2471e41ba7512ce393dd3e801d56b 100644 (file)
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX openvz-sources-ibmtr.patch 1070 RMD160 613f13d96b8fbfca43dc893ff90cf0f9c8745cf0 SHA1 40d742c69e50c3b85f83c64bcec3c13b6b00b264 SHA256 ff0c2e31316fd9f33fea8a40349733ce2e307838b78cf9a2c9a95495e185a855
-MD5 3a65727b79f61d986594734845f058a4 files/openvz-sources-ibmtr.patch 1070
-RMD160 613f13d96b8fbfca43dc893ff90cf0f9c8745cf0 files/openvz-sources-ibmtr.patch 1070
-SHA256 ff0c2e31316fd9f33fea8a40349733ce2e307838b78cf9a2c9a95495e185a855 files/openvz-sources-ibmtr.patch 1070
 DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
 DIST linux-2.6.9.tar.bz2 36261440 RMD160 42e5fd6e633dcd3a0762f7e284158dd7f3e71aa0 SHA1 dd8f8b0c43b83339a42246d322cb48c6f2323236 SHA256 f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
 DIST patch-023stab032-combined.gz 7873683 RMD160 d141521cc7ff8597eba204498e0fd0969d6e5a1f SHA1 06b760f19e71579556cc105a9ccb43cbe04c0098 SHA256 80e68240098471c6e24c517ab32ea73a0501d07aa05d17acb85111106b948e84
@@ -19,18 +15,18 @@ EBUILD openvz-sources-023.037.ebuild 784 RMD160 868198447242345bed9a379c35eb88e3
 MD5 15aabecdb65b6a0151f95dcb0db1fcc8 openvz-sources-023.037.ebuild 784
 RMD160 868198447242345bed9a379c35eb88e3b37f46de openvz-sources-023.037.ebuild 784
 SHA256 17ea6fe44f8418e66fc2e3a2ae0652250c19592a623b4049f3e01ec82d586603 openvz-sources-023.037.ebuild 784
-EBUILD openvz-sources-028.005-r1.ebuild 834 RMD160 2289e8df1d6ed49018beb12f5251cec27be16edf SHA1 cb045b02cf01b5e5ab89a903a4dd5e7dc31cb2b9 SHA256 f190a9cfdd312ba671425ceb43671924bd39837a49876c2e00e2031195da5caf
-MD5 3aa78ed350b9608c38f11b3d303416ca openvz-sources-028.005-r1.ebuild 834
-RMD160 2289e8df1d6ed49018beb12f5251cec27be16edf openvz-sources-028.005-r1.ebuild 834
-SHA256 f190a9cfdd312ba671425ceb43671924bd39837a49876c2e00e2031195da5caf openvz-sources-028.005-r1.ebuild 834
-EBUILD openvz-sources-028.007-r1.ebuild 834 RMD160 f85b6b3d3556f75b457620048d110aeb0e677b59 SHA1 7554603cb0a1a1a1e098116b8286e828f129bfe3 SHA256 983af61980c4a77b71eff5dc1c1e60d9db83cd0938f5fa7093dd742d47499afe
-MD5 8f7911ea2467182bd628f9af477d6d7f openvz-sources-028.007-r1.ebuild 834
-RMD160 f85b6b3d3556f75b457620048d110aeb0e677b59 openvz-sources-028.007-r1.ebuild 834
-SHA256 983af61980c4a77b71eff5dc1c1e60d9db83cd0938f5fa7093dd742d47499afe openvz-sources-028.007-r1.ebuild 834
-MISC ChangeLog 11522 RMD160 ca0765378694e2789022a68e3d7fabe752347017 SHA1 ababbef56f87639e9f1ac13077d745a3810f35ae SHA256 948de47412e36d18b2c71f19b1378a88c0e806e0463a67916d7cd721b82d7f45
-MD5 a35cc9801a96880dd69e6378d1cd19d8 ChangeLog 11522
-RMD160 ca0765378694e2789022a68e3d7fabe752347017 ChangeLog 11522
-SHA256 948de47412e36d18b2c71f19b1378a88c0e806e0463a67916d7cd721b82d7f45 ChangeLog 11522
+EBUILD openvz-sources-028.005.ebuild 807 RMD160 b11daf9cae1355c3fea954ebf4948a982776b534 SHA1 0a6aff628d0dfa6e119d07114537700afcbc384b SHA256 b72eff60b1141621ee64ab3d4c1abf54789fff947283c6daca0c86ac978a573a
+MD5 d584375d76a94866d6ef0bad65f0a842 openvz-sources-028.005.ebuild 807
+RMD160 b11daf9cae1355c3fea954ebf4948a982776b534 openvz-sources-028.005.ebuild 807
+SHA256 b72eff60b1141621ee64ab3d4c1abf54789fff947283c6daca0c86ac978a573a openvz-sources-028.005.ebuild 807
+EBUILD openvz-sources-028.007.ebuild 807 RMD160 f0d1c6309c2e2d1112cff2a8905b280fbbe6a366 SHA1 ff7cc09f725a88e62c62aeb51aec549ea0210172 SHA256 ebb9c52306b1f32fcd4050ff4d15911d3ef0847f93e47cfbf98e6b11f94c5e69
+MD5 f280d4729edd0928b178e6ebe7208c0b openvz-sources-028.007.ebuild 807
+RMD160 f0d1c6309c2e2d1112cff2a8905b280fbbe6a366 openvz-sources-028.007.ebuild 807
+SHA256 ebb9c52306b1f32fcd4050ff4d15911d3ef0847f93e47cfbf98e6b11f94c5e69 openvz-sources-028.007.ebuild 807
+MISC ChangeLog 11830 RMD160 e09946c3ab409bab3f1d01ab134a460b9fdacbf4 SHA1 de4ce7fc9a824bb8aee33b5cee13acd3d6eb836c SHA256 440e96c5e2c3123d3fae376f1039b8106ef68287cede898d64c9d893c88ae3fa
+MD5 511ec3c99dd79cabe201ce34fcc85a3d ChangeLog 11830
+RMD160 e09946c3ab409bab3f1d01ab134a460b9fdacbf4 ChangeLog 11830
+SHA256 440e96c5e2c3123d3fae376f1039b8106ef68287cede898d64c9d893c88ae3fa ChangeLog 11830
 MISC metadata.xml 563 RMD160 108fdcf814f98a73f85efd8dbb958097bd661429 SHA1 5fd9bd40dc4d2b712cb620cb736531bf7002ca20 SHA256 2f3dd3bbbc518c57717fc13b4c12dddd41413cf0aca1869c0fc8667f26ccbdfb
 MD5 ea0a561ec3e0c4ffc620051c3c41c225 metadata.xml 563
 RMD160 108fdcf814f98a73f85efd8dbb958097bd661429 metadata.xml 563
@@ -41,16 +37,16 @@ SHA256 c290afc13d261966b1f6e29d3b90fcb7924738c7c8d708d9cffa6186cc174c95 files/di
 MD5 9f03a8132c4af4fcaa84ef8ec7e0aada files/digest-openvz-sources-023.037 518
 RMD160 04fff211b3b7a4e2cb438e017b78a1643d0259b9 files/digest-openvz-sources-023.037 518
 SHA256 6980391c1159201b7f06e98c3a369b61647041acdf8ae0adcd58e083b73cee0e files/digest-openvz-sources-023.037 518
-MD5 ded257c14fd7d38504f40ec03732dea5 files/digest-openvz-sources-028.005-r1 527
-RMD160 0ea74eebc0eacd4edd5c154a6df67acaeda1b3bd files/digest-openvz-sources-028.005-r1 527
-SHA256 43764b7adf96a7cf6183567ae3f9b28cf3d8da4c364ca405fec9f24332289276 files/digest-openvz-sources-028.005-r1 527
-MD5 d8854e80a38c52e9a5a04e5248c1fac8 files/digest-openvz-sources-028.007-r1 527
-RMD160 299a8d799c5f02eda62a3052e45874c28b45daca files/digest-openvz-sources-028.007-r1 527
-SHA256 2533910d17f84565036f388362deb7cac8fc0ac5ff30d8a770a711378536bbb1 files/digest-openvz-sources-028.007-r1 527
+MD5 ded257c14fd7d38504f40ec03732dea5 files/digest-openvz-sources-028.005 527
+RMD160 0ea74eebc0eacd4edd5c154a6df67acaeda1b3bd files/digest-openvz-sources-028.005 527
+SHA256 43764b7adf96a7cf6183567ae3f9b28cf3d8da4c364ca405fec9f24332289276 files/digest-openvz-sources-028.005 527
+MD5 d8854e80a38c52e9a5a04e5248c1fac8 files/digest-openvz-sources-028.007 527
+RMD160 299a8d799c5f02eda62a3052e45874c28b45daca files/digest-openvz-sources-028.007 527
+SHA256 2533910d17f84565036f388362deb7cac8fc0ac5ff30d8a770a711378536bbb1 files/digest-openvz-sources-028.007 527
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFks0AyuNVb5qfaOYRAjMiAJ9s5QKRScxpwy6LDnSelt9Ky3VTHgCeJiod
-iT7DWkL73uT5Vi1J4+rTB/M=
-=PFXH
+iD8DBQFFks53yuNVb5qfaOYRAsrvAJ0frj8JedeikITjgpmkM90oVMR4PgCfXtga
+m2E0GTlW8kn5vPTcHzCnyO0=
+=sLq/
 -----END PGP SIGNATURE-----

diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-028.005-r1 b/sys-kernel/openvz-sources/files/digest-openvz-sources-028.005-r1
deleted file mode 100644 (file)
index 906844c..0000000
--- a/sys-kernel/openvz-sources/files/digest-openvz-sources-028.005-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
-RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
-SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
-MD5 9a85c007920ecdb5ff6886fb80951287 patch-ovz028test005.1-combined.gz 737098
-RMD160 1d057f9bf6a856a6feb820c1c9e0c673b822d266 patch-ovz028test005.1-combined.gz 737098
-SHA256 160a3917bd1b1691d6cef9377a9f07955f09c70cb83b7453fd587c836f21a94d patch-ovz028test005.1-combined.gz 737098

diff --git a/sys-kernel/openvz-sources/files/digest-openvz-sources-028.007-r1 b/sys-kernel/openvz-sources/files/digest-openvz-sources-028.007-r1
deleted file mode 100644 (file)
index e133c28..0000000
--- a/sys-kernel/openvz-sources/files/digest-openvz-sources-028.007-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 296a6d150d260144639c3664d127d174 linux-2.6.18.tar.bz2 41863580
-RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 linux-2.6.18.tar.bz2 41863580
-SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d linux-2.6.18.tar.bz2 41863580
-MD5 28d3aea741a5ea82107138f11134e837 patch-ovz028test007.1-combined.gz 889512
-RMD160 1af78405e504b221c5ab5965d22f13a763a168f5 patch-ovz028test007.1-combined.gz 889512
-SHA256 dd74f2c0b70836750dcb01f44d0527c406e431792aafd19f4d93581d566d73bb patch-ovz028test007.1-combined.gz 889512

diff --git a/sys-kernel/openvz-sources/files/openvz-sources-ibmtr.patch b/sys-kernel/openvz-sources/files/openvz-sources-ibmtr.patch
deleted file mode 100644 (file)
index 66445ef..0000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-ibmtr.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Al Viro <viro@hera.kernel.org>
-Date: Mon, 4 Dec 2006 22:05:09 +0000 (+0000)
-Subject: [PATCH] remote memory corruptor in ibmtr.c
-X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ee28b0da1069ced1688aa9d0b7b378353b988321
-
-[PATCH] remote memory corruptor in ibmtr.c
-
-ip_summed changes last summer had missed that one.  As the result,
-we have ip_summed interpreted as CHECKSUM_PARTIAL now.  IOW,
-->csum is interpreted as offset of checksum in the packet.  net/core/*
-will both read and modify the value as that offset, with obvious
-reasons.  At the very least it's a remote memory corruptor.
-
-Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-Signed-off-by: Linus Torvalds <torvalds@osdl.org>
----
-
---- a/drivers/net/tokenring/ibmtr.c
-+++ b/drivers/net/tokenring/ibmtr.c
-@@ -1826,7 +1826,7 @@ static void tr_rx(struct net_device *dev
-       skb->protocol = tr_type_trans(skb, dev);
-       if (IPv4_p) {
-               skb->csum = chksum;
--              skb->ip_summed = 1;
-+              skb->ip_summed = CHECKSUM_COMPLETE;
-       }
-       netif_rx(skb);
-       dev->last_rx = jiffies;

diff --git a/sys-kernel/openvz-sources/openvz-sources-028.005-r1.ebuild b/sys-kernel/openvz-sources/openvz-sources-028.005-r1.ebuild
deleted file mode 100644 (file)
index 2bfae59..0000000
--- a/sys-kernel/openvz-sources/openvz-sources-028.005-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-028.005-r1.ebuild,v 1.1 2006/12/27 19:43:51 phreak Exp $
-
-ETYPE="sources"
-CKV="2.6.18"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-
-OVZ_KERNEL="${PV%%.*}test${PV##*.}"
-OVZ_REV="1"
-
-KEYWORDS="~amd64 ~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}
-       mirror://openvz/kernel/devel/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-ovz${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-ovz${OVZ_KERNEL}.${OVZ_REV}-combined.gz ${FILESDIR}/${PN}-ibmtr.patch"

diff --git a/sys-kernel/openvz-sources/openvz-sources-028.007-r1.ebuild b/sys-kernel/openvz-sources/openvz-sources-028.007-r1.ebuild
deleted file mode 100644 (file)
index 67cfe3f..0000000
--- a/sys-kernel/openvz-sources/openvz-sources-028.007-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-028.007-r1.ebuild,v 1.1 2006/12/27 19:43:51 phreak Exp $
-
-ETYPE="sources"
-CKV="2.6.18"
-
-K_USEPV=1
-K_NOSETEXTRAVERSION=1
-
-inherit kernel-2
-detect_version
-
-OVZ_KERNEL="${PV%%.*}test${PV##*.}"
-OVZ_REV="1"
-
-KEYWORDS="~amd64 ~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}
-       mirror://openvz/kernel/devel/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-ovz${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-ovz${OVZ_KERNEL}.${OVZ_REV}-combined.gz ${FILESDIR}/${PN}-ibmtr.patch"