Fix kernel 2.6.22 patch.

Package-Manager: portage-2.1.2.7

3 files changed, 26 insertions, 13 deletions

diff --git a/sys-fs/fuse/ChangeLog b/sys-fs/fuse/ChangeLog
index cae317519d7e..12a64464c218 100644
--- a/sys-fs/fuse/ChangeLog
+++ b/sys-fs/fuse/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/fuse
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.91 2007/05/20 07:39:24 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/ChangeLog,v 1.92 2007/05/20 20:29:24 drizzt Exp $
+
+  20 May 2007; Timothy Redaelli <drizzt@gentoo.org> files/fuse-2.6.22.patch:
+  Fix kernel 2.6.22 patch.
 
   20 May 2007; Stefan Schweizer <genstef@gentoo.org>
   +files/fuse-2.6.22.patch, fuse-2.6.4-r1.ebuild:
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index f5c3a8526814..f99a3dcfb473 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,7 +1,10 @@
-AUX fuse-2.6.22.patch 1563 RMD160 3996778eb4bff4f41b21c91b5f3d3de277821203 SHA1 ccd4d019cbe4aee21bcc6e2191753bb7753c0f8d SHA256 b089f376df3162923233a7e1633e9b00f20e551b6125a6a2a3b178d7fa9fed46
-MD5 6a7e50846bd28cecc34afdd32fc4520f files/fuse-2.6.22.patch 1563
-RMD160 3996778eb4bff4f41b21c91b5f3d3de277821203 files/fuse-2.6.22.patch 1563
-SHA256 b089f376df3162923233a7e1633e9b00f20e551b6125a6a2a3b178d7fa9fed46 files/fuse-2.6.22.patch 1563
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX fuse-2.6.22.patch 1467 RMD160 7cffb02d2e7742e7db4da52eebebe359ae97826b SHA1 263156a40cc3d9ee5961b1cbcf99f021cbbba277 SHA256 e39d6833f850201a26c1350e76fdb95f71b374f7e9a728002eec794b1e5df03d
+MD5 62d7b2a0d2d79822c7eedf2c16dded7d files/fuse-2.6.22.patch 1467
+RMD160 7cffb02d2e7742e7db4da52eebebe359ae97826b files/fuse-2.6.22.patch 1467
+SHA256 e39d6833f850201a26c1350e76fdb95f71b374f7e9a728002eec794b1e5df03d files/fuse-2.6.22.patch 1467
 AUX fuse-fbsd.init 467 RMD160 ac8ce54b189b3433cede1c8360b63d38a4203e67 SHA1 8f0f10dac4653a82677f31a079a3b006cc8e122d SHA256 d896a80d67668246f586c6283f95f624fdbecb306408bec6f2c944601aae7273
 MD5 377334eb85baa4cefe0cb821d994907d files/fuse-fbsd.init 467
 RMD160 ac8ce54b189b3433cede1c8360b63d38a4203e67 files/fuse-fbsd.init 467
@@ -24,10 +27,10 @@ EBUILD fuse-2.6.4-r1.ebuild 2216 RMD160 56d96c298da32c06f6ef85907770fa75d6edb630
 MD5 5e11d67a430961798fa6c8b7610201e5 fuse-2.6.4-r1.ebuild 2216
 RMD160 56d96c298da32c06f6ef85907770fa75d6edb630 fuse-2.6.4-r1.ebuild 2216
 SHA256 311e0ffdc0edacadf327ae18ba7135cb7d66752fb60923045a4291cde4428908 fuse-2.6.4-r1.ebuild 2216
-MISC ChangeLog 12764 RMD160 9c74d546bdfd1eb91c70979fa143d6fe5c69cf4f SHA1 f30ca65628e6c423c6a800243eca23771b3b3e46 SHA256 79c737890c1e66169d3b2760734ab028c535127fcbb2a2dc8fb20149ab491329
-MD5 41ca8cc0f4b93accecfbd94315bda814 ChangeLog 12764
-RMD160 9c74d546bdfd1eb91c70979fa143d6fe5c69cf4f ChangeLog 12764
-SHA256 79c737890c1e66169d3b2760734ab028c535127fcbb2a2dc8fb20149ab491329 ChangeLog 12764
+MISC ChangeLog 12868 RMD160 522f985011e05bdd7d0b87a9f3bb3d0ad18415af SHA1 8d09da3a7c1315a815f6d38c0290f78eec121522 SHA256 9c29372e0fef0bf3187097dafa0003355ce450290b55c2fd332a9f2562be6d43
+MD5 588407e3ab512b6adee9d29bb8919e0a ChangeLog 12868
+RMD160 522f985011e05bdd7d0b87a9f3bb3d0ad18415af ChangeLog 12868
+SHA256 9c29372e0fef0bf3187097dafa0003355ce450290b55c2fd332a9f2562be6d43 ChangeLog 12868
 MISC metadata.xml 269 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 SHA1 87192fbb5e58ab4854c26ea5fcfe535700f462be SHA256 9459df81d59d1dac43f3f8061590e1618e6f256b409a772bb07e660dac3bc5f6
 MD5 7963d4a8ac789c1141ba042fefb2f660 metadata.xml 269
 RMD160 f435568d5cae240406c8def9cbb4b2195567f011 metadata.xml 269
@@ -38,3 +41,10 @@ SHA256 c8581faf6e90c4c6a181d6de1c8ead042654269af6313984fa00886db15cf9ed files/di
 MD5 99824676751c75115bc8a1a24a6b2886 files/digest-fuse-2.6.4-r1 232
 RMD160 90e78ac98ee1cbdc18a90a9378e366b1e337b8be files/digest-fuse-2.6.4-r1 232
 SHA256 9f95ae0cfc9de856b53278c8bf253f6fbe6714189554e45b4551980fb24e6b39 files/digest-fuse-2.6.4-r1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGUK+pjJyKLBkBVroRAvnjAJwJ5i2/c0b7z9nyHdSEbykwl1xLggCeMVb3
+vwohzYjhxkr2sJsaOYiLYdw=
+=JpfM
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/fuse/files/fuse-2.6.22.patch b/sys-fs/fuse/files/fuse-2.6.22.patch
index fbb9cdff3d4f..c1af56511e3b 100644
--- a/sys-fs/fuse/files/fuse-2.6.22.patch
+++ b/sys-fs/fuse/files/fuse-2.6.22.patch
@@ -1,5 +1,5 @@
---- /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c	2007-05-19 19:54:45.000000000 +0930
-+++ /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c	2007-05-19 19:58:40.000000000 +0930
+--- fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c	2007-05-19 19:54:45.000000000 +0930
++++ fuse-2.6.4-r1/work/fuse-2.6.4/kernel/file.c	2007-05-19 19:58:40.000000000 +0930
 @@ -781,7 +781,8 @@
  
  	if (cmd == F_GETLK) {
@@ -10,8 +10,8 @@
  			if (!posix_test_lock(file, fl, fl))
  				fl->fl_type = F_UNLCK;
  #else
---- /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c	2007-05-20 09:13:34.000000000 +0930
-+++ /var/tmp/portage/sys-fs/fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c	2007-05-20 09:18:33.000000000 +0930
+--- fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c	2007-05-20 09:13:34.000000000 +0930
++++ fuse-2.6.4-r1/work/fuse-2.6.4/kernel/inode.c	2007-05-20 09:18:33.000000000 +0930
 @@ -809,9 +809,13 @@
  {
  	struct inode * inode = foo;