summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefaan De Roeck <stefaan@gentoo.org>2008-04-06 18:28:02 +0000
committerStefaan De Roeck <stefaan@gentoo.org>2008-04-06 18:28:02 +0000
commitc53fd8e079dd419818f0e83899c5246dba646847 (patch)
treecc4a468d1e73990b40beaa28484026f33ab9348b /net-fs/openafs-kernel
parentamd64 stable wrt #215071 (diff)
downloadhistorical-c53fd8e079dd419818f0e83899c5246dba646847.tar.gz
historical-c53fd8e079dd419818f0e83899c5246dba646847.tar.bz2
historical-c53fd8e079dd419818f0e83899c5246dba646847.zip
Adapt cvs-mangled patches, fixing bug #216465
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-fs/openafs-kernel')
-rw-r--r--net-fs/openafs-kernel/ChangeLog7
-rw-r--r--net-fs/openafs-kernel/Manifest6
-rw-r--r--net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-2008040212
-rw-r--r--net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-200804029
4 files changed, 11 insertions, 23 deletions
diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 18083546a803..ef1ea8bc9815 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-fs/openafs-kernel
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.103 2008/04/05 09:26:54 stefaan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.104 2008/04/06 18:28:01 stefaan Exp $
+
+ 06 Apr 2008; Stefaan De Roeck <stefaan@gentoo.org>
+ files/STABLE14-linux-flush-compare-20080402,
+ files/STABLE14-linux-flush-unlock-20080402:
+ Adapt cvs-mangled patches, fixing bug #216465
04 Apr 2008; Stefaan De Roeck <stefaan@gentoo.org>
-openafs-kernel-1.2.13.ebuild, -openafs-kernel-1.4.5.ebuild,
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index a6b0813bd5d4..94d962fddd10 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,5 +1,5 @@
-AUX STABLE14-linux-flush-compare-20080402 912 RMD160 fe566f56bf44c698e23d737905d324b4c5d7bfef SHA1 35c0b9976de9bc7c1667de29febd0449605c6fa4 SHA256 a01dc48b61b5c2962f318ee047d0f5c46e247ad3ff634f37b669e465e4a15aa2
-AUX STABLE14-linux-flush-unlock-20080402 1026 RMD160 ad76d88cdbc91e26b8b514c30a74b2f39c78f53f SHA1 382aab46b5bf4ad8977b0e245b2cb31c3b5b48bb SHA256 28c0b779d4bc89f043303626ef5dfe82540a59f1df0db655e1785084053a20e1
+AUX STABLE14-linux-flush-compare-20080402 574 RMD160 8c69e79a700d315d49fd5032e827a6ab2ac8b5fd SHA1 46e8b86c8899899c7eb7b457f797d58de70b6747 SHA256 ce4651160c62a92448fd4faa110595a9ae71370a6fc36faf59846797296f52bd
+AUX STABLE14-linux-flush-unlock-20080402 621 RMD160 fb1b4f76a5d61abd7b7a38f83eb418125cb5f846 SHA1 aad85aef5ebaf173b73b592127dabb4bd912ec98 SHA256 64e7df65937237e88f28fb30d079d59613c84236469ea2a9958a30eaa4fb19e7
DIST openafs-1.4.6-cvs20080222.patch.bz2 284987 RMD160 de642f29f66844a5ff8fbdd3dd2ec8af41748869 SHA1 5dcf1d85df1a90fc00cf596da76fe75b7a951c14 SHA256 749f32890ffb68b2a1a8348348854140baca781e9996c8b873b7e9d97d5c068a
DIST openafs-1.4.6-src.tar.bz2 12485179 RMD160 856fa915c7847c25dab77b450bc8b0c6f6aeb308 SHA1 39489babe20c42c16ea8f11457de423b2bcca009 SHA256 996c6b53d81bd87f754e9596e24e11e65e6402b6ddab727634e05d73f3bb0ea1
DIST openafs-1.4.7pre2-src.tar.bz2 11491127 RMD160 71c3f446e906ecb9209f2c00762c708f7e285c7c SHA1 cac7c829f5be84fc4cb35fb59a20799d20cf3915 SHA256 203a4e7a554eef3a5062d6e7a3ab136acb2c245ee26256552404d01ae998c3de
@@ -9,5 +9,5 @@ EBUILD openafs-kernel-1.4.6.ebuild 1649 RMD160 7a2c6b5dafcb7666ebfe45bc4ee278ae9
EBUILD openafs-kernel-1.4.6_p20080222.ebuild 1823 RMD160 7adc2c2a6ed26091e344cbef1fc6b598c78b31dc SHA1 29bf0c7833edb4b95d5eca909526dda633f4099c SHA256 7ca987c869122c0d47037e603b3696c359a3c41d6cd6d021010dbde4db101c9e
EBUILD openafs-kernel-1.4.7_pre2-r1.ebuild 1855 RMD160 64226cb4e965279466031eac9504706a0f1fcf75 SHA1 19ceeda38caeb8e0a98287575617bcdb2949822d SHA256 917c57b97e4b4b5215987a18e5a5010254aaef89b5b796956d44ac9265d0859f
EBUILD openafs-kernel-1.5.34.ebuild 1513 RMD160 81447b24d073df8120a3fc0def91a20f070093aa SHA1 e5ec963ef99398c5affb0bb261878af1ec9f3ac0 SHA256 bcf75e4d76fbd5b835a0d2bbdcff369d19eaf19b48fc27e11d5cdcbdd85b4e28
-MISC ChangeLog 16668 RMD160 56e893f78e480a0fb94bf4f1639ec21b91654661 SHA1 b9e2860e562fda39288637db88a495249a576cce SHA256 7042aeb76cf1b5041b7854d4ea1adb78bf36cb91cd8d55ff1ede344db0098544
+MISC ChangeLog 16863 RMD160 270b6fb150ad1dc0e77eb33df58088cc34935831 SHA1 0b9aaee49cbb7ecb43f0acd676a2a83900a70682 SHA256 5620fe01e7de3d9278cb10198b7a4b952aaf479d7b97b4ccb576400ceef4558a
MISC metadata.xml 254 RMD160 1bef8b94265bf2b400fb6235b3e43b504b8d2b71 SHA1 a4ad632b650953fa9c9f203a9c55f58ddba37705 SHA256 90d7dcb6aede67bf64f610984a31fc03573512de9e241db42acb32601373db62
diff --git a/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402 b/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402
index f4ed02b6801f..faeb752a63b1 100644
--- a/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402
+++ b/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402
@@ -1,18 +1,10 @@
-CS file: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v
+===================================================================
+RCS file: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v
retrieving revision 1.81.2.62
retrieving revision 1.81.2.63
diff -u -r1.81.2.62 -r1.81.2.63
--- openafs/src/afs/LINUX/osi_vnodeops.c 2008/04/02 13:11:42 1.81.2.62
+++ openafs/src/afs/LINUX/osi_vnodeops.c 2008/04/02 18:27:13 1.81.2.63
-@@ -22,7 +22,7 @@
- #include "afs/param.h"
-
- RCSID
-- ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $");
-+ ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-compare-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $");
-
- #include "afs/sysincludes.h"
- #include "afsincludes.h"
@@ -570,7 +570,7 @@
AFS_GLOCK();
diff --git a/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402 b/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402
index f76815810664..1261810ee099 100644
--- a/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402
+++ b/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402
@@ -5,15 +5,6 @@ retrieving revision 1.81.2.62
diff -u -r1.81.2.61 -r1.81.2.62
--- openafs/src/afs/LINUX/osi_vnodeops.c 2008/03/26 04:17:32 1.81.2.61
+++ openafs/src/afs/LINUX/osi_vnodeops.c 2008/04/02 13:11:42 1.81.2.62
-@@ -22,7 +22,7 @@
- #include "afs/param.h"
-
- RCSID
-- ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $");
-+ ("$Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/files/STABLE14-linux-flush-unlock-20080402,v 1.1 2008/04/04 12:39:17 stefaan Exp $");
-
- #include "afs/sysincludes.h"
- #include "afsincludes.h"
@@ -570,8 +570,10 @@
AFS_GLOCK();