summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gentoo.org>2015-03-22 21:14:54 +0000
committerAndrew Savchenko <bircoph@gentoo.org>2015-03-22 21:14:54 +0000
commite20b7df991000a5ba488df5fc886ea79b0a226e4 (patch)
treea3790abcbe2369ff7b8d5d2b6d9625d83330536e /net-fs
parentversion bump (diff)
downloadhistorical-e20b7df991000a5ba488df5fc886ea79b0a226e4.tar.gz
historical-e20b7df991000a5ba488df5fc886ea79b0a226e4.tar.bz2
historical-e20b7df991000a5ba488df5fc886ea79b0a226e4.zip
remove old
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org> Package-Manager: portage-2.2.18/cvs/Linux i686 Manifest-Sign-Key: 0x565953B95372756C
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/openafs-kernel/ChangeLog13
-rw-r--r--net-fs/openafs-kernel/Manifest39
-rw-r--r--net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-1.patch366
-rw-r--r--net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-2.patch137
-rw-r--r--net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-3.patch80
-rw-r--r--net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-4.patch37
-rw-r--r--net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-5.patch65
-rw-r--r--net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-1.patch102
-rw-r--r--net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-2.patch99
-rw-r--r--net-fs/openafs-kernel/openafs-kernel-1.6.2-r1.ebuild92
-rw-r--r--net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild93
11 files changed, 26 insertions, 1097 deletions
diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index e9054078c58c..42bb35900b9c 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,17 @@
# ChangeLog for net-fs/openafs-kernel
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.164 2015/03/22 21:00:47 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.165 2015/03/22 21:14:48 bircoph Exp $
+
+ 22 Mar 2015; Andrew Savchenko <bircoph@gentoo.org>
+ -openafs-kernel-1.6.2-r1.ebuild, -openafs-kernel-1.6.5-r2.ebuild,
+ -files/openafs-1.6.2-kernel-3.8-1.patch,
+ -files/openafs-1.6.2-kernel-3.8-2.patch,
+ -files/openafs-1.6.2-kernel-3.8-3.patch,
+ -files/openafs-1.6.2-kernel-3.8-4.patch,
+ -files/openafs-1.6.2-kernel-3.8-5.patch,
+ -files/openafs-1.6.5-kernel-3.11-1.patch,
+ -files/openafs-1.6.5-kernel-3.11-2.patch:
+ Remove old versions.
*openafs-kernel-1.6.11 (22 Mar 2015)
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 682b8a59b890..0987b08cf80e 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -1,40 +1,29 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX openafs-1.6.2-kernel-3.8-1.patch 11032 SHA256 7ce4fab26f18fda238bda02159187cf3400640ed40de7bf057b6013b8b3c4447 SHA512 f655adf4073dcb6fc3f427d9956b01846f625ee09846e0d5498dd509b2834c2b8cff7694b00a5162baa55aeecfa991fa5cfe990c27ea37688b6ed9423060812e WHIRLPOOL 4a4dbd3c2f932ee73e63579030fbd6eb9072b8e5b55e8ff85f098a58d1cf09d8e22e43438dcb150402f9bdc9f6667923bf017350e4518909b02a1d292f57b489
-AUX openafs-1.6.2-kernel-3.8-2.patch 4761 SHA256 6638d923ae70674528cb90dabb4c7dca4f1636f5e83394987f651811dbb52cfa SHA512 054fd7f03243b1bb8b4413265602792211ef0e0574572bd831826af40d0674d313417688cdd06a6e2968e7ee2ec46bdd9684c9bd50b961a5ae5369f08bd99c01 WHIRLPOOL e49f12c8c052a647ac0259bbaaed4b880a1741e0ae1a941dfbb21675feafd4f9062f8d0f6c0154cb1a3a9a4fa9d5c7952682df69ebb75655e9d155532fe0118e
-AUX openafs-1.6.2-kernel-3.8-3.patch 2699 SHA256 41bd2ee35867f1899f9ae4bd7df38042ef591aae0330a27c32dbb725f15e648f SHA512 fb0777696dd1780ce0ed0ae3160fedf960df91afd680f0f11896d726beec06f3534a68abce2dbb474f171cd3a400f38d948971848a653f3d63d6f410ac929b7f WHIRLPOOL 1044b75eaadff4cea49cc315bdc8c9d36db9d957571cc50a716287fa5a25132a27faf54fb8c943b85deaa7de15ad75cce044536ab3eb86715e29ab5dd334a350
-AUX openafs-1.6.2-kernel-3.8-4.patch 1300 SHA256 3604174099c3a98a0596b86ed083c609c3124ff95fb73e44a81bac489a9f5c5e SHA512 feb75e80fb3ed7f868476abce7caa301908c5fda6b999e68891f174786f6b5151a9615491d6ba48bbe2b5224082ceebcc5d1d4b108a776eb104eac5e61afa0c8 WHIRLPOOL d3fa687fea25dbbc71d2dde86a57741d21cd4e6bc6153120c502c73cf7812f2ff511fab9c411f2b02727a4adbdec65c97830b7ae1315c45eba0d26f5f9baaa92
-AUX openafs-1.6.2-kernel-3.8-5.patch 2463 SHA256 745bdd7e75f65ca7af3caf5bf0a85fcba1ff17a2336adc4fc286d843f7af89db SHA512 3f11aed22890ab679cfa245b19af76267b0047fa4279914b5f7616646f455485cb67191abb5eab0aeecd845e65eca43f16761a5288492c5dd91be9a9e38399ae WHIRLPOOL c1dcd37946e053fa85b1ee9592c69beee7e01ee4d5b29545145d2d8f12f2a40efee94ac5e658f5cc9199ac1d3cb5168918c53b205f2ce959aa4de28ff9fb8468
-AUX openafs-1.6.5-kernel-3.11-1.patch 3702 SHA256 ef1b1f1859e7b4e62ade92f07846e126c05525a55f3e6e0ce5ae8f0b7abc9b39 SHA512 0123a1b62605bc2b89385367bea51c59d29d83d6b92ccfe3edf65896ead9874d6b9f127e003c637448897114c8a2709d6d9d212af8f090a930959462d78aa277 WHIRLPOOL d50db673cecb3bf37f90923d0eb3eb4fa045f5111ed6e6e4de1ad2c41122c66a697b7132df1c01cacba1d8e846a6e46d82d74e8a49b34dc24149d56e5c26bde1
-AUX openafs-1.6.5-kernel-3.11-2.patch 3083 SHA256 a76ee1d2494ff48ecb73983ee7aec7aa3cd4cbb564b2443a7106aa2a4ebfeb0c SHA512 2957ef5885ab3cb2ab5250748521314091efb2df1fe432ae5fa90112c911cb49ebd819ce510b13bed7ffd36602adb58db4109edb958a38732f6cef91f0bde551 WHIRLPOOL e65e5e7c7bcf0b5c47f5fc3ae7695065568ecf2129379045bfec186d90a00e96859a0c79aebf900ed59d69d10ae8e991e9990bbcdd0234dc487f3d3472dcf1af
DIST openafs-1.6.11-doc.tar.bz2 3530829 SHA256 d5cfa17ec06812a9961960bfdf54c1a753f512826fbbb41e3fdbb2310b5b5a59 SHA512 9bd792eae719c6cfa3d250ae31fcc2cd47e40d0b78f5e3453a5b242255bc64d88b9943ac5a7ab2565509904499d6b11a94d27e9c9b48b515aa51bd8f0670ec67 WHIRLPOOL 1a6bdc5d0920eb046c6b975b4f17caca2e30295d0b26993edda17bec09adffa9254bfb5897979beb92ccafe4e1fbfc36d82ed715d46e967a6a0b1cb4bf4e05f8
DIST openafs-1.6.11-patches.tar.xz 9628 SHA256 16fdf63d81bd986aea4112f43f4005912dd62175aeb355e7b729b309842c970c SHA512 8227cb156f7498afa70e3086f4bfd26672576229a8f847d24a85b495942270e4964aa715536d43c2e63bbd3f4ced7cd19971c76007cb8e2e5aef17fe0ceb9d1d WHIRLPOOL 9ae675c36ec5fe07b7d095705dc6ee02f4a4ac227d9396e29299d94cde10f18e217c06e3c62f73d3d2b07a43410b35e464e7b328e25710e6c497d093381ce158
DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256 cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512 4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c WHIRLPOOL fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
-DIST openafs-1.6.2-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
-DIST openafs-1.6.2-src.tar.bz2 14378378 SHA256 0db0877cd42131a744472ad0abfa26a4402a5bad94adb4d1eada75c8b6895bc9 SHA512 769b82d4ba8fe391f7dacc1f422d0bca564450ee3e05da34296aa461fecab825956e2bea4849af65af8592ffe50853e725ee0a700c1afaea67652adf8a93c01c WHIRLPOOL 61947ee3f0e3d7107f3611add14bd90ca1f5744986f75a92a28f6ccda8936f16441ec819640eebbd0cfaffaaa716c3077980b28512a84e9be770a4320a19997a
DIST openafs-1.6.5-patches-1.tar.bz2 10880 SHA256 bde25a4ec9ab38cb9864deb38d4d3f4b3affc44969c072a3329844dbbebd1c5c SHA512 f6cd5916bc072cb855a0edfb640cf53cfdc5fb7d3b9ed0e23e9c739ea4f046653ac60b731cb469838085c92286485fafa00807b857f89ca2c90fea3dce2c9a56 WHIRLPOOL 93a6648ddc8e35c05c176a9d835fefcd97afc217bbf80547895e5da40ac4e0a85842dd89c5b3074986045db67548f766a72cd5a2c05eb24c62ae04f26a490e04
DIST openafs-1.6.5-src.tar.bz2 14400420 SHA256 176fab2d710d8dcf566f5aa229fd796dd8165561d57590e32790a3034a195ef2 SHA512 2a03b87499f3304c85664787602f1e2f1988a5baa34bc7754e28f8ead6a1b70d826e63cd6ce4b4c5a97ae48fff6255a51be973c098f8a176369ae557b18830f1 WHIRLPOOL 66c058a09396054dc675351b1b27628144a7f29b2255e7192906290bd0b76ea8c08a398d773031a9835edbdd2452990cc6e3273c02e4d25560d62ddcd7318c97
EBUILD openafs-kernel-1.6.11.ebuild 3510 SHA256 590df68b6ac302c9b39462cdebc63f20443df63cf914ee687951735ac06ded36 SHA512 4f92d3e2057e423f4ca0f91100fdedef03457492d811d907f4cfa4abd8a69b9f6d36c154dbe7e90e0982cae78d0bbff3e6ffb6e5d19eeb59fe176ac777e9a439 WHIRLPOOL f860a0fdc1e22db8d257c47196d76b4471e79f0ecf077866ff213b18888bae12b411ef83d6a6fb73fe6c9f7d3bc03f249bda656eaef1bf4bd2c4d654e6633edb
-EBUILD openafs-kernel-1.6.2-r1.ebuild 2675 SHA256 45010f6f5b72240ba37711fa25ad0edd0294ad2cb15279d761e6a18ceefdccd0 SHA512 f068c378fadbe66cf48dd01127a4007c6c89919bc857ac68d26d729eceec2b2e3e1325ec58f7438ffbf3b3b7e083a66ade2d87d2738622099263fc1c95af394a WHIRLPOOL 463ad4c98cad71651bad2384011c509290cc939b409ed86cbad7bf773c8552033d7f50536e793a75413d0f5425353ddfd956aa60329e38fdcaf089606f11d88b
EBUILD openafs-kernel-1.6.5-r1.ebuild 2636 SHA256 ddc0e3bf1869de3567b671c8b50781bfc2b8244f06bfd9b827fc909bace12aba SHA512 b30afc2a4c295b68f92a3871f3f1588ea2eacdb1b2b54ab693a898b7da66a8d73392e17dd6d184536414f6f2fd6cea2aeddf1cee25d40b4e7d0c175ba8abe4db WHIRLPOOL 47f71450cd913d5022111974b623ddb8f9e1b47ba4184017ec8a965955bf7206beaa506c70f7c8ada47ee50edbc96c1a9687d3578627e949cfa52c0c47732a72
-EBUILD openafs-kernel-1.6.5-r2.ebuild 2718 SHA256 2b2e04f3eb22d1e32cefc26e7c81b5abc351bb6e90336dd9a5bfde96ba2df632 SHA512 16e0cd54faaf993ffd123b374615d4c86a5a00dd802651050a3730db8778fb73c7aef77360e1c2885090e1982fb88e99a45cd739f499d7551927e8844125196a WHIRLPOOL 6bff1e8adf12cdf9253334785420e7957bffb565e6bfea7c7e933f16d47d0c7665e761decdf909cc4c297aaccb4db05fd06dc7879c0b9964c89a85e634d158ee
-MISC ChangeLog 27708 SHA256 6d852c10dd8c4e8478f05da496db94c38ff13ae553b155fe17f7f92070717400 SHA512 00cb83bb6ae259f5a3df2987e52d00010eea2af343a6f44ceec885504c5202e57f55b3df0159ae0cfcaac0281d560ac9876ed41e434b2d0660f884056222cd81 WHIRLPOOL 65ab6ddbed85524215ad8eef95f51df76ba4af161909fdc3e2947cfba613d32fc8267def2f69cff42a215b9b4a17c315cf598cf6d744582f0f03f2f78d05d2b1
+MISC ChangeLog 28156 SHA256 6d58c925ce702a39d0170c563c9eed94ac65862c9335ce2892174b6ea47e13da SHA512 278d39cad069ffd67a6bbb9254b9a83b083c0bf3cd88f126a950e54bc4fa6989f6ff53f607ca1ab56e4fff00b68f87e3d0d3a895df16dcdfdf911e51662fcab8 WHIRLPOOL 4766d8f52137e6c3f0784b5b1d3c2e23004f6ba4845ae783c7fc7d1f24d941e80004d88c8fd30970d6f24222101eecba82b12aebb03b9a748bae7d005081999b
MISC metadata.xml 777 SHA256 ec3cab4f468a8af1770926801c13d31ba46aba22cacc231eb40510b811c07c2f SHA512 4641468811b7c6cad2111a1b21a890c082e1449ba68ae0703cf5096c7dbbd6b22715f9476d4b714048c9fb0630f651b5f68b10be4da867cbd7f8adcff1a2cfb4 WHIRLPOOL 4b5ebfaefa3631c6eb3ed7bf03278f85d4b95b0c7e7469d55f3603ae26829c210d31b5ca99d0db2392acbb75406ed2108420ecb5444fcbc9dc9575ad017fd3a5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJVDy2BAAoJEPZTWjO6HuSNFnMQAIFhP/GhOj7ZqluEOoSOspMo
-lb7TkUJMrAe89j7TsxCQ4E5ZTicczj3Jkc9VSoAsHvGOp3DfDE0pweC0eSUXn6aC
-sDaTjwUjGNZq7Mzo2aSiTP6W1YPmjjCu4r18xWzDqV1snAlodL23JQNi+KG1pTFY
-JqweJBxC0pi1PGiT13nD0mfbksDGflHUcXLQFtLCsxB8yrK2CItRjpAw7iov2/Sn
-pwTK66wq4FmsetxJpQ/UKoB6RcSrKvY63ItZ3X5hMyZkoLDuFw6gcwT6KL4RVjct
-wcogBwHmZIn4qCEk9kVxbWCfzxMeI7dtH9F9vZip9rr8fjk49ein+FtkdUd8BiaM
-cMyvpjWpVCdwPg4tA1/P7PHIH8jggKCaXJmlAYEtlELNKrGwKvpFpRAIWeBwH5Le
-utyG4q0iw+4ImxnvhpyI6Z5d5fR3LAaMLfwyGURty8MxHNTrxn9vKzNhdPVLm7QL
-qfC80zd+n+aBbWuKqYIf4Dlhe+ajWra++umPkHmMbJGn5AMptOeTgZ/5X7lU/1b7
-VZc7bsLAvE+SLer1DP3by1faQch0KcjtMEsExTExz2MNqSiS7fHWVOzpNTQkFKtw
-RH9rZKjq1c+wJeiFC7f3/OFX9LjKRnWZwVvkyLVnnlCcrKW2AfuGpqoN4mgSZZPn
-F6R4SjhmZiXtnS2fQ4/6
-=rz8V
+iQIcBAEBCAAGBQJVDzDJAAoJEPZTWjO6HuSNKJkP/1irteYkYo69H5FFLMZSgRkG
+EeW2O8vYZiRhLF7zESqGOveFlw9ZyWlhZyDuI4Avn86Hjos8I32+WLuBiNIREy5K
+KcglN0R/6eiKvR51klooOq7QFtd17MFg7YtXo/dRMI3OmaDgYGrHRUyX3GK8+8MZ
+KF/MJY3mGaYVBEKkfgh5LHuB9+QwzCgJ1g7N+eT233h0GoBVnDxD7v3iF3l/5bE4
+IQU5iYTc5Ptt3/YA4ExZcSGiXjasqBIgdPyfCqIbIPNwnCYDofXrWkjl6yQaZYBM
+Jn583bakKoZvBwg9w23b438r1hHnSLt4DWtkuLfKOxFdJ8/nyZ+d9h9pRPCzSlIV
+uyP6jAVb8PYSZ/C9OvdBZOUysADv7w6J0rqmq+egUxYxr0+T7wsXuPKmxJTB9Sis
+YeNvOenS0JYBHAKd/oMhjyyznrMl6fTg7wDte2867TDJkkr8EQupY4FVyQTi4rrk
+0w+8eoekEsZJFlM3rj+dDa3curqLy0A7WMwEtbA7mFRndiwoa+CViAXFVTE6w45d
+jKKs1mlpZUzlaAbh7w4PLWmuH+q/h4O2O0b7ii/YHX4VoKurRrjU8NaVfryZKuVX
+qRyTRzx0FcwRAoX1QNRX0XUxrEjzQd0db7sk/zsG9hYWVJnqzJevABBy1yeckXzq
+D9Iz7x8stS6N5itNRX4Q
+=+7WI
-----END PGP SIGNATURE-----
diff --git a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-1.patch b/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-1.patch
deleted file mode 100644
index 125bc4e6e8af..000000000000
--- a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-1.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-From bb75426b891ac03f2baa0abfaf565d12e026f35d Mon Sep 17 00:00:00 2001
-From: Andrew Deason <adeason@sinenomine.net>
-Date: Wed, 29 Aug 2012 11:34:06 -0500
-Subject: [PATCH] LINUX: Indent osi_machdep.h maze
-
-This one isn't so bad, actually, but it still benefits from some
-indentation.
-
-Reviewed-on: http://gerrit.openafs.org/8018
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Derrick Brashear <shadow@dementix.org>
-(cherry picked from commit 579048cb1ec24b09a869928ceb521c8db4201a43)
-
-Change-Id: I91bddcafe4141c5e6789b01cc4be1a879b6464d1
----
- src/afs/LINUX/osi_machdep.h | 240 +++++++++++++++++++++---------------------
- 1 files changed, 120 insertions(+), 120 deletions(-)
-
-diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
-index a2c16f5..9260733 100644
---- a/src/afs/LINUX/osi_machdep.h
-+++ b/src/afs/LINUX/osi_machdep.h
-@@ -17,60 +17,60 @@
-
- #include <linux/version.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,4)
--#define AFS_LINUX26_ONEGROUP_ENV 1
-+# define AFS_LINUX26_ONEGROUP_ENV 1
- #endif
-
- /* Only needed for xdr.h in glibc 2.1.x */
- #ifndef quad_t
--#define quad_t __quad_t
--#define u_quad_t __u_quad_t
-+# define quad_t __quad_t
-+# define u_quad_t __u_quad_t
- #endif
-
- #undef getuerror
-
- #ifdef STRUCT_TASK_STRUCT_HAS_TGID
--#define getpid() current->tgid
--#ifdef STRUCT_TASK_STRUCT_HAS_REAL_PARENT
--#define getppid() current->real_parent->tgid
--#elif defined(STRUCT_TASK_STRUCT_HAS_PARENT)
--#define getppid() current->parent->tgid
--#else
--#define getppid() current->p_opptr->tgid
--#endif
-+# define getpid() current->tgid
-+# ifdef STRUCT_TASK_STRUCT_HAS_REAL_PARENT
-+# define getppid() current->real_parent->tgid
-+# elif defined(STRUCT_TASK_STRUCT_HAS_PARENT)
-+# define getppid() current->parent->tgid
-+# else
-+# define getppid() current->p_opptr->tgid
-+# endif
- #else /* !STRUCT_TASK_STRUCT_HAS_TGID */
--#define getpid() current->pid
--#ifdef STRUCT_TASK_STRUCT_HAS_REAL_PARENT
--#define getppid() current->real_parent->pid
--#elif defined(STRUCT_TASK_STRUCT_HAS_PARENT)
--#define getppid() current->parent->pid
--#else
--#define getppid() current->p_opptr->pid
--#endif
-+# define getpid() current->pid
-+# ifdef STRUCT_TASK_STRUCT_HAS_REAL_PARENT
-+# define getppid() current->real_parent->pid
-+# elif defined(STRUCT_TASK_STRUCT_HAS_PARENT)
-+# define getppid() current->parent->pid
-+# else
-+# define getppid() current->p_opptr->pid
-+# endif
- #endif /* STRUCT_TASK_STRUCT_HAS_TGID */
-
- #ifdef RECALC_SIGPENDING_TAKES_VOID
--#define RECALC_SIGPENDING(X) recalc_sigpending()
-+# define RECALC_SIGPENDING(X) recalc_sigpending()
- #else
--#define RECALC_SIGPENDING(X) recalc_sigpending(X)
-+# define RECALC_SIGPENDING(X) recalc_sigpending(X)
- #endif
-
- #if defined (STRUCT_TASK_STRUCT_HAS_SIGMASK_LOCK)
--#define SIG_LOCK(X) spin_lock_irq(&X->sigmask_lock)
--#define SIG_UNLOCK(X) spin_unlock_irq(&X->sigmask_lock)
-+# define SIG_LOCK(X) spin_lock_irq(&X->sigmask_lock)
-+# define SIG_UNLOCK(X) spin_unlock_irq(&X->sigmask_lock)
- #elif defined (STRUCT_TASK_STRUCT_HAS_SIGHAND)
--#define SIG_LOCK(X) spin_lock_irq(&X->sighand->siglock)
--#define SIG_UNLOCK(X) spin_unlock_irq(&X->sighand->siglock)
-+# define SIG_LOCK(X) spin_lock_irq(&X->sighand->siglock)
-+# define SIG_UNLOCK(X) spin_unlock_irq(&X->sighand->siglock)
- #else
--#define SIG_LOCK(X) spin_lock_irq(&X->sig->siglock)
--#define SIG_UNLOCK(X) spin_unlock_irq(&X->sig->siglock)
-+# define SIG_LOCK(X) spin_lock_irq(&X->sig->siglock)
-+# define SIG_UNLOCK(X) spin_unlock_irq(&X->sig->siglock)
- #endif
-
- #if defined (STRUCT_TASK_STRUCT_HAS_RLIM)
--#define TASK_STRUCT_RLIM rlim
-+# define TASK_STRUCT_RLIM rlim
- #elif defined (STRUCT_TASK_STRUCT_HAS_SIGNAL_RLIM)
--#define TASK_STRUCT_RLIM signal->rlim
-+# define TASK_STRUCT_RLIM signal->rlim
- #else
--#error Not sure what to do about rlim (should be in the Linux task struct somewhere....)
-+# error Not sure what to do about rlim (should be in the Linux task struct somewhere....)
- #endif
-
-
-@@ -83,13 +83,13 @@ static inline time_t osi_Time(void) {
- return xtime.tv_sec;
- }
- #else
--#define osi_Time() (xtime.tv_sec)
-+# define osi_Time() (xtime.tv_sec)
- #endif
-
-
-
- #ifdef AFS_LINUX_64BIT_KERNEL
--#define osi_GetTime(V) \
-+# define osi_GetTime(V) \
- do { \
- struct timeval __afs_tv; \
- do_gettimeofday(&__afs_tv); \
-@@ -97,7 +97,7 @@ static inline time_t osi_Time(void) {
- (V)->tv_usec = (afs_int32)__afs_tv.tv_usec; \
- } while (0)
- #else
--#define osi_GetTime(V) do_gettimeofday((V))
-+# define osi_GetTime(V) do_gettimeofday((V))
- #endif
-
- #undef gop_lookupname
-@@ -149,12 +149,12 @@ typedef struct task_struct afs_proc_t;
- typedef struct cred afs_ucred_t;
- typedef struct cred cred_t;
-
--#define afs_cr_uid(cred) ((cred)->fsuid)
--#define afs_cr_gid(cred) ((cred)->fsgid)
--#define afs_cr_ruid(cred) ((cred)->uid)
--#define afs_cr_rgid(cred) ((cred)->gid)
--#define afs_cr_group_info(cred) ((cred)->group_info)
--#define crhold(c) (get_cred(c))
-+# define afs_cr_uid(cred) ((cred)->fsuid)
-+# define afs_cr_gid(cred) ((cred)->fsgid)
-+# define afs_cr_ruid(cred) ((cred)->uid)
-+# define afs_cr_rgid(cred) ((cred)->gid)
-+# define afs_cr_group_info(cred) ((cred)->group_info)
-+# define crhold(c) (get_cred(c))
- static inline void
- afs_set_cr_uid(cred_t *cred, uid_t uid) {
- cred->fsuid = uid;
-@@ -176,11 +176,11 @@ afs_set_cr_group_info(cred_t *cred, struct group_info *group_info) {
- cred->group_info = group_info;
- }
-
--#define current_group_info() (current->cred->group_info)
--#define task_gid(task) (task->cred->gid)
--#define task_user(task) (task->cred->user)
--#define task_session_keyring(task) (task->cred->tgcred->session_keyring)
--#define current_session_keyring() (current->cred->tgcred->session_keyring)
-+# define current_group_info() (current->cred->group_info)
-+# define task_gid(task) (task->cred->gid)
-+# define task_user(task) (task->cred->user)
-+# define task_session_keyring(task) (task->cred->tgcred->session_keyring)
-+# define current_session_keyring() (current->cred->tgcred->session_keyring)
-
- #else
-
-@@ -194,31 +194,31 @@ typedef struct afs_cred {
- } cred_t;
-
- typedef struct afs_cred afs_ucred_t;
--#define afs_cr_group_info(cred) ((cred)->cr_group_info)
-+# define afs_cr_group_info(cred) ((cred)->cr_group_info)
- static inline void
- afs_set_cr_group_info(cred_t *cred, struct group_info *group_info) {
- cred->cr_group_info = group_info;
- }
-
--#define current_group_info() (current->group_info)
--#if !defined(task_gid)
--#define task_gid(task) (task->gid)
--#endif
--#if !defined(task_uid)
--#define task_uid(task) (task->uid)
--#endif
--#define task_user(task) (task->user)
--#define task_session_keyring(task) (task->signal->session_keyring)
--#define current_session_keyring() (current->signal->session_keyring)
--#define crhold(c) atomic_inc(&(c)->cr_ref)
-+# define current_group_info() (current->group_info)
-+# if !defined(task_gid)
-+# define task_gid(task) (task->gid)
-+# endif
-+# if !defined(task_uid)
-+# define task_uid(task) (task->uid)
-+# endif
-+# define task_user(task) (task->user)
-+# define task_session_keyring(task) (task->signal->session_keyring)
-+# define current_session_keyring() (current->signal->session_keyring)
-+# define crhold(c) atomic_inc(&(c)->cr_ref)
-
- #endif /* defined(STRUCT_TASK_STRUCT_HAS_CRED) */
-
- #if !defined(current_cred)
--#define current_gid() (current->gid)
--#define current_uid() (current->uid)
--#define current_fsgid() (current->fsgid)
--#define current_fsuid() (current->fsuid)
-+# define current_gid() (current->gid)
-+# define current_uid() (current->uid)
-+# define current_fsgid() (current->fsgid)
-+# define current_fsuid() (current->fsuid)
- #endif
-
- /* UIO manipulation */
-@@ -245,7 +245,7 @@ struct uio {
- #define OSIFILE_INODE(a) FILE_INODE((a)->filp)
-
- #if defined(AFS_LINUX_64BIT_KERNEL) && !defined(AFS_ALPHA_LINUX20_ENV) && !defined(AFS_IA64_LINUX20_ENV)
--#define NEED_IOCTL32
-+# define NEED_IOCTL32
- #endif
-
- #include <linux/version.h>
-@@ -256,8 +256,8 @@ struct uio {
- extern struct mutex afs_global_lock;
- #else
- extern struct semaphore afs_global_lock;
--#define mutex_lock(lock) down(lock)
--#define mutex_unlock(lock) up(lock)
-+# define mutex_lock(lock) down(lock)
-+# define mutex_unlock(lock) up(lock)
- #endif
- extern int afs_global_owner;
-
-@@ -285,63 +285,63 @@ do { \
- #ifdef AFS_AMD64_LINUX20_ENV
- /* RHEL5 beta's kernel doesn't define these. They aren't gonna change, so... */
-
--#ifndef __NR_ia32_afs_syscall
--#define __NR_ia32_afs_syscall 137
--#endif
--#ifndef __NR_ia32_setgroups
--#define __NR_ia32_setgroups 81
--#endif
--#ifndef __NR_ia32_setgroups32
--#define __NR_ia32_setgroups32 206
--#endif
--#ifndef __NR_ia32_close
--#define __NR_ia32_close 6
--#endif
--#ifndef __NR_ia32_chdir
--#define __NR_ia32_chdir 12
--#endif
--#ifndef __NR_ia32_break
--#define __NR_ia32_break 17
--#endif
--#ifndef __NR_ia32_stty
--#define __NR_ia32_stty 31
--#endif
--#ifndef __NR_ia32_gtty
--#define __NR_ia32_gtty 32
--#endif
--#ifndef __NR_ia32_ftime
--#define __NR_ia32_ftime 35
--#endif
--#ifndef __NR_ia32_prof
--#define __NR_ia32_prof 44
--#endif
--#ifndef __NR_ia32_lock
--#define __NR_ia32_lock 53
--#endif
--#ifndef __NR_ia32_mpx
--#define __NR_ia32_mpx 56
--#endif
--#ifndef __NR_ia32_exit
--#define __NR_ia32_exit 1
--#endif
--#ifndef __NR_ia32_mount
--#define __NR_ia32_mount 21
--#endif
--#ifndef __NR_ia32_read
--#define __NR_ia32_read 3
--#endif
--#ifndef __NR_ia32_write
--#define __NR_ia32_write 4
--#endif
--#ifndef __NR_ia32_open
--#define __NR_ia32_open 5
--#endif
--#ifndef __NR_ia32_close
--#define __NR_ia32_close 6
--#endif
--#ifndef __NR_ia32_unlink
--#define __NR_ia32_unlink 10
--#endif
-+# ifndef __NR_ia32_afs_syscall
-+# define __NR_ia32_afs_syscall 137
-+# endif
-+# ifndef __NR_ia32_setgroups
-+# define __NR_ia32_setgroups 81
-+# endif
-+# ifndef __NR_ia32_setgroups32
-+# define __NR_ia32_setgroups32 206
-+# endif
-+# ifndef __NR_ia32_close
-+# define __NR_ia32_close 6
-+# endif
-+# ifndef __NR_ia32_chdir
-+# define __NR_ia32_chdir 12
-+# endif
-+# ifndef __NR_ia32_break
-+# define __NR_ia32_break 17
-+# endif
-+# ifndef __NR_ia32_stty
-+# define __NR_ia32_stty 31
-+# endif
-+# ifndef __NR_ia32_gtty
-+# define __NR_ia32_gtty 32
-+# endif
-+# ifndef __NR_ia32_ftime
-+# define __NR_ia32_ftime 35
-+# endif
-+# ifndef __NR_ia32_prof
-+# define __NR_ia32_prof 44
-+# endif
-+# ifndef __NR_ia32_lock
-+# define __NR_ia32_lock 53
-+# endif
-+# ifndef __NR_ia32_mpx
-+# define __NR_ia32_mpx 56
-+# endif
-+# ifndef __NR_ia32_exit
-+# define __NR_ia32_exit 1
-+# endif
-+# ifndef __NR_ia32_mount
-+# define __NR_ia32_mount 21
-+# endif
-+# ifndef __NR_ia32_read
-+# define __NR_ia32_read 3
-+# endif
-+# ifndef __NR_ia32_write
-+# define __NR_ia32_write 4
-+# endif
-+# ifndef __NR_ia32_open
-+# define __NR_ia32_open 5
-+# endif
-+# ifndef __NR_ia32_close
-+# define __NR_ia32_close 6
-+# endif
-+# ifndef __NR_ia32_unlink
-+# define __NR_ia32_unlink 10
-+# endif
- #endif
-
- #define osi_procname(procname, size) strncpy(procname, current->comm, size)
---
-1.7.2.5
-
diff --git a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-2.patch b/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-2.patch
deleted file mode 100644
index 64ed5adfcb06..000000000000
--- a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-2.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From eeaabffccffca0bf4c622819da62c6eaa51888bb Mon Sep 17 00:00:00 2001
-From: Marc Dionne <marc.c.dionne@gmail.com>
-Date: Wed, 9 Jan 2013 19:26:54 -0500
-Subject: [PATCH] Linux 3.8: session_keyring changes
-
-The session_keyring is now attached directly to the cred structure
-and the thread_group_cred structure (cred->tgcred) no longer exists.
-
-Adapt code that makes use of tgcred, and use the standard rcu based
-mechanism to update session_keyring.
-
-Reviewed-on: http://gerrit.openafs.org/8905
-Reviewed-by: Andrew Deason <adeason@sinenomine.net>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
-(cherry picked from commit c6d27e322a8d3b352554650473a048235a9c763a)
-
-Change-Id: I048ed7b52062a5d666c78dba2599d5fb81c676c1
----
- acinclude.m4 | 1 +
- src/afs/LINUX/osi_compat.h | 34 ++++++++++++++++++++++++++++++++--
- src/afs/LINUX/osi_groups.c | 9 ++-------
- src/afs/LINUX/osi_machdep.h | 9 +++++++--
- 4 files changed, 42 insertions(+), 11 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 8c57779..0a05caa 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -812,6 +812,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- [write_begin], [fs.h])
- AC_CHECK_LINUX_STRUCT([backing_dev_info], [name],
- [backing-dev.h])
-+ AC_CHECK_LINUX_STRUCT([cred], [session_keyring], [cred.h])
- AC_CHECK_LINUX_STRUCT([ctl_table], [ctl_name], [sysctl.h])
- AC_CHECK_LINUX_STRUCT([dentry_operations], [d_automount], [dcache.h])
- AC_CHECK_LINUX_STRUCT([inode], [i_alloc_sem], [fs.h])
-diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
-index 2dda136..a777542 100644
---- a/src/afs/LINUX/osi_compat.h
-+++ b/src/afs/LINUX/osi_compat.h
-@@ -186,14 +186,24 @@ afs_linux_key_alloc(struct key_type *type, const char *desc, uid_t uid,
- }
-
- # if defined(STRUCT_TASK_STRUCT_HAS_CRED)
-+static inline struct key *
-+afs_session_keyring(afs_ucred_t *cred)
-+{
-+# if defined(STRUCT_CRED_HAS_SESSION_KEYRING)
-+ return cred->session_keyring;
-+# else
-+ return cred->tgcred->session_keyring;
-+# endif
-+}
-+
- static inline struct key*
- afs_linux_search_keyring(afs_ucred_t *cred, struct key_type *type)
- {
- key_ref_t key_ref;
-
-- if (cred->tgcred->session_keyring) {
-+ if (afs_session_keyring(cred)) {
- key_ref = keyring_search(
-- make_key_ref(cred->tgcred->session_keyring, 1),
-+ make_key_ref(afs_session_keyring(cred), 1),
- type, "_pag");
- if (IS_ERR(key_ref))
- return ERR_CAST(key_ref);
-@@ -507,4 +517,24 @@ afs_set_name(afs_name_t aname, char *string) {
- }
- #endif
-
-+static_inline struct key *
-+afs_set_session_keyring(struct key *keyring)
-+{
-+ struct key *old;
-+#if defined(STRUCT_CRED_HAS_SESSION_KEYRING)
-+ struct cred *new_creds;
-+ old = current_session_keyring();
-+ new_creds = prepare_creds();
-+ rcu_assign_pointer(new_creds->session_keyring, keyring);
-+ commit_creds(new_creds);
-+#else
-+ spin_lock_irq(&current->sighand->siglock);
-+ old = task_session_keyring(current);
-+ smp_wmb();
-+ task_session_keyring(current) = keyring;
-+ spin_unlock_irq(&current->sighand->siglock);
-+#endif
-+ return old;
-+}
-+
- #endif /* AFS_LINUX_OSI_COMPAT_H */
-diff --git a/src/afs/LINUX/osi_groups.c b/src/afs/LINUX/osi_groups.c
-index c2a0308..e351344 100644
---- a/src/afs/LINUX/osi_groups.c
-+++ b/src/afs/LINUX/osi_groups.c
-@@ -214,14 +214,9 @@ install_session_keyring(struct key *keyring)
- }
-
- /* install the keyring */
-- spin_lock_irq(&current->sighand->siglock);
-- old = task_session_keyring(current);
-- smp_wmb();
-- task_session_keyring(current) = keyring;
-- spin_unlock_irq(&current->sighand->siglock);
--
-+ old = afs_set_session_keyring(keyring);
- if (old)
-- key_put(old);
-+ key_put(old);
-
- out:
- return code;
-diff --git a/src/afs/LINUX/osi_machdep.h b/src/afs/LINUX/osi_machdep.h
-index 9260733..0202d0d 100644
---- a/src/afs/LINUX/osi_machdep.h
-+++ b/src/afs/LINUX/osi_machdep.h
-@@ -179,8 +179,13 @@ afs_set_cr_group_info(cred_t *cred, struct group_info *group_info) {
- # define current_group_info() (current->cred->group_info)
- # define task_gid(task) (task->cred->gid)
- # define task_user(task) (task->cred->user)
--# define task_session_keyring(task) (task->cred->tgcred->session_keyring)
--# define current_session_keyring() (current->cred->tgcred->session_keyring)
-+# if defined(STRUCT_CRED_HAS_SESSION_KEYRING)
-+# define task_session_keyring(task) (task->cred->session_keyring)
-+# define current_session_keyring() (current->cred->session_keyring)
-+# else
-+# define task_session_keyring(task) (task->cred->tgcred->session_keyring)
-+# define current_session_keyring() (current->cred->tgcred->session_keyring)
-+# endif
-
- #else
-
---
-1.7.2.5
-
diff --git a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-3.patch b/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-3.patch
deleted file mode 100644
index 7aab040db769..000000000000
--- a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-3.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From e18d900f585d2fe319d3c0f6d10c11dc0acefed4 Mon Sep 17 00:00:00 2001
-From: Marc Dionne <marc.c.dionne@gmail.com>
-Date: Wed, 9 Jan 2013 21:22:27 -0500
-Subject: [PATCH] Linux 3.8: vmtruncate removal
-
-vmtruncate had been deprecated for a while and has now been
-removed. Do things the new way based on truncate_setsize.
-
-Reviewed-on: http://gerrit.openafs.org/8906
-Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
-(cherry picked from commit d0479bbaf43900d6733c3f7517926ee9813c9610)
-
-Change-Id: Ie0065cb0ca817c1af5ed51418a0474012050f34d
----
- acinclude.m4 | 1 +
- src/afs/LINUX/osi_compat.h | 14 ++++++++++++++
- src/afs/LINUX/osi_vm.c | 5 ++---
- 3 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 0a05caa..4223bb1 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -824,6 +824,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h])
- AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h])
- AC_CHECK_LINUX_STRUCT([filename], [name], [fs.h])
-+ AC_CHECK_LINUX_STRUCT([inode_operations], [truncate], [fs.h])
- AC_CHECK_LINUX_STRUCT([key_type], [preparse], [key-type.h])
- AC_CHECK_LINUX_STRUCT([nameidata], [path], [namei.h])
- AC_CHECK_LINUX_STRUCT([proc_dir_entry], [owner], [proc_fs.h])
-diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
-index a777542..e8bf003 100644
---- a/src/afs/LINUX/osi_compat.h
-+++ b/src/afs/LINUX/osi_compat.h
-@@ -537,4 +537,18 @@ afs_set_session_keyring(struct key *keyring)
- return old;
- }
-
-+static inline int
-+afs_truncate(struct inode *inode, int len)
-+{
-+ int code;
-+#if defined(STRUCT_INODE_OPERATIONS_HAS_TRUNCATE)
-+ code = vmtruncate(inode, len);
-+#else
-+ code = inode_newsize_ok(inode, len);
-+ if (!code)
-+ truncate_setsize(inode, len);
-+#endif
-+ return code;
-+}
-+
- #endif /* AFS_LINUX_OSI_COMPAT_H */
-diff --git a/src/afs/LINUX/osi_vm.c b/src/afs/LINUX/osi_vm.c
-index 2cd34f9..8bc792e 100644
---- a/src/afs/LINUX/osi_vm.c
-+++ b/src/afs/LINUX/osi_vm.c
-@@ -51,8 +51,7 @@ osi_VM_FlushVCache(struct vcache *avc, int *slept)
- if (avc->opens != 0)
- return EBUSY;
-
-- return vmtruncate(ip, 0);
-- return 0;
-+ return afs_truncate(ip, 0);
- }
-
- /* Try to invalidate pages, for "fs flush" or "fs flushv"; or
-@@ -132,5 +131,5 @@ osi_VM_FlushPages(struct vcache *avc, afs_ucred_t *credp)
- void
- osi_VM_Truncate(struct vcache *avc, int alen, afs_ucred_t *acred)
- {
-- vmtruncate(AFSTOV(avc), alen);
-+ afs_truncate(AFSTOV(avc), alen);
- }
---
-1.7.2.5
-
diff --git a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-4.patch b/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-4.patch
deleted file mode 100644
index d8cfbbbcdbb5..000000000000
--- a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-4.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7e8731d4971f6c93c5edaf28d8582d6accc5c42c Mon Sep 17 00:00:00 2001
-From: Marc Dionne <marc.c.dionne@gmail.com>
-Date: Thu, 24 Jan 2013 21:38:28 -0500
-Subject: [PATCH] Linux: crset should use passed credentials
-
-When copying credentials in crset, take the passed credentials as
-the source instead of the current process credentials.
-
-This doesn't cause any problems currently since crset always gets
-called with the current credentials.
-
-Reviewed-on: http://gerrit.openafs.org/8980
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
-(cherry picked from commit 3b733db8bf2bc3a1366554ae97814cc722437149)
-
-Change-Id: I4d0000a139d16fafe480f7ebccc6759da7dea6bb
----
- src/afs/LINUX/osi_cred.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/afs/LINUX/osi_cred.c b/src/afs/LINUX/osi_cred.c
-index 20be594..f271321 100644
---- a/src/afs/LINUX/osi_cred.c
-+++ b/src/afs/LINUX/osi_cred.c
-@@ -117,7 +117,7 @@ crset(cred_t * cr)
- new_creds = prepare_creds();
- /* Drop the reference to group_info - we'll overwrite it in afs_copy_creds */
- put_group_info(new_creds->group_info);
-- afs_copy_creds(new_creds, current_cred());
-+ afs_copy_creds(new_creds, cr);
-
- commit_creds(new_creds);
- #else
---
-1.7.2.5
-
diff --git a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-5.patch b/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-5.patch
deleted file mode 100644
index 4a40f748d8a5..000000000000
--- a/net-fs/openafs-kernel/files/openafs-1.6.2-kernel-3.8-5.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 5f1d570c7bcafbda90bc5985b716fdb94e2aa10a Mon Sep 17 00:00:00 2001
-From: Marc Dionne <marc.c.dionne@gmail.com>
-Date: Sun, 27 Jan 2013 20:52:39 -0500
-Subject: [PATCH] Linux: Detect undefined symbols in kernel modules
-
-Undefined symbols in the kernel modules are not currently detected
-at build time. As a result, buildbot may indicate success while
-the resulting kernel modules are unusable.
-
-In the kernel build process, modpost warns about missing symbols
-but does not return an error in the case of external modules.
-Detect these warnings and cause the libafs build to fail.
-
-Reviewed-on: http://gerrit.openafs.org/8981
-Tested-by: BuildBot <buildbot@rampaginggeek.com>
-Reviewed-by: Simon Wilkinson <simonxwilkinson@gmail.com>
-Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
-(cherry picked from commit dbdee60a83d72d38a04a0eeb2a5324cf497e57e3)
-
-Change-Id: If28b97b6ce53b0feef2464a56fd7a48443c973ae
----
- src/libafs/.gitignore | 1 +
- src/libafs/MakefileProto.LINUX.in | 10 +++++++++-
- 2 files changed, 10 insertions(+), 1 deletions(-)
-
-diff --git a/src/libafs/.gitignore b/src/libafs/.gitignore
-index d87f88a..225e979 100644
---- a/src/libafs/.gitignore
-+++ b/src/libafs/.gitignore
-@@ -26,3 +26,4 @@
- /rpc
- /sys
- /rx
-+/.makelog
-diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
-index 63b2f35..9449360 100644
---- a/src/libafs/MakefileProto.LINUX.in
-+++ b/src/libafs/MakefileProto.LINUX.in
-@@ -19,6 +19,8 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-
-+AFS_OS_CLEAN = .makelog
-+
- # OS specific object files:
- AFS_OS_OBJS = \
- osi_alloc.o \
-@@ -338,7 +340,13 @@ ${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: ${LINUX_LIBAFS_NAME}.ko
- .FORCE:
- ${LINUX_LIBAFS_NAME}.ko afspag.ko: .FORCE
- env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common
-- env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules
-+ env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_BUILD} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules 2>&1 | tee .makelog
-+ @if [ `grep ^WARNING .makelog | wc -l` -ne 0 ]; then \
-+ echo Error: Undefined symbols in modules ; \
-+ rm .makelog \
-+ exit 1 ; \
-+ fi
-+ rm .makelog
-
- <all -linux26 -linux_26 -umlinux26>
- ${LIBAFS}: $(AFSAOBJS) $(AFSNONFSOBJS)
---
-1.7.2.5
-
diff --git a/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-1.patch b/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-1.patch
deleted file mode 100644
index 5047b1f4ecee..000000000000
--- a/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-1.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 8563077e818d62a3c764caf8818d8bf24a3cb0b6 Mon Sep 17 00:00:00 2001
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Mon, 8 Jul 2013 10:53:00 -0400
-Subject: [PATCH] Linux 3.11: Convert from readdir to iterate file operation
-
-Convert the readdir function so that it can be used as the new
-"iterate" file operation. This new operation is passed a context
-that contains a pointer to the filldir function and the offset.
-The context is passed into the new dir_emit function that will
-call the function specified by the context.
-
-The new dir_emit function returns true on success, so we must be
-careful about how we check for failure since this is different
-behaviour from what filldir currently does.
-
-Change-Id: I6b01b4c78a501bdf4f8d583b0d3b94d677c5d541
----
- acinclude.m4 | 1 +
- src/afs/LINUX/osi_vnodeops.c | 22 ++++++++++++++++++++++
- 2 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 6ffb686..15b5ad8 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -842,6 +842,7 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- AC_CHECK_LINUX_STRUCT([inode], [i_mutex], [fs.h])
- AC_CHECK_LINUX_STRUCT([inode], [i_security], [fs.h])
- AC_CHECK_LINUX_STRUCT([file_operations], [flock], [fs.h])
-+ AC_CHECK_LINUX_STRUCT([file_operations], [iterate], [fs.h])
- AC_CHECK_LINUX_STRUCT([file_operations], [sendfile], [fs.h])
- AC_CHECK_LINUX_STRUCT([file_system_type], [mount], [fs.h])
- AC_CHECK_LINUX_STRUCT([filename], [name], [fs.h])
-diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index 46fbb88..25cbac2 100644
---- a/src/afs/LINUX/osi_vnodeops.c
-+++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -271,7 +271,11 @@ extern int BlobScan(struct dcache * afile, afs_int32 ablob);
- * handling and use of bulkstats will need to be reflected here as well.
- */
- static int
-+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
-+afs_linux_readdir(struct file *fp, struct dir_context *ctx)
-+#else
- afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
-+#endif
- {
- struct vcache *avc = VTOAFS(FILE_INODE(fp));
- struct vrequest treq;
-@@ -350,7 +354,11 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
- * takes an offset in units of blobs, rather than bytes.
- */
- code = 0;
-+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
-+ offset = ctx->pos;
-+#else
- offset = (int) fp->f_pos;
-+#endif
- while (1) {
- dirpos = BlobScan(tdc, offset);
- if (!dirpos)
-@@ -408,7 +416,13 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
- * holding the GLOCK.
- */
- AFS_GUNLOCK();
-+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
-+ /* dir_emit returns a bool - true when it succeeds.
-+ * Inverse the result to fit with how we check "code" */
-+ code = !dir_emit(ctx, de->name, len, ino, type);
-+#else
- code = (*filldir) (dirbuf, de->name, len, offset, ino, type);
-+#endif
- AFS_GLOCK();
- }
- DRelease(&entry, 0);
-@@ -419,7 +433,11 @@ afs_linux_readdir(struct file *fp, void *dirbuf, filldir_t filldir)
- /* If filldir didn't fill in the last one this is still pointing to that
- * last attempt.
- */
-+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
-+ ctx->pos = (loff_t) offset;
-+#else
- fp->f_pos = (loff_t) offset;
-+#endif
-
- ReleaseReadLock(&tdc->lock);
- afs_PutDCache(tdc);
-@@ -748,7 +766,11 @@ out:
-
- struct file_operations afs_dir_fops = {
- .read = generic_read_dir,
-+#if defined(STRUCT_FILE_OPERATIONS_HAS_ITERATE)
-+ .iterate = afs_linux_readdir,
-+#else
- .readdir = afs_linux_readdir,
-+#endif
- #ifdef HAVE_UNLOCKED_IOCTL
- .unlocked_ioctl = afs_unlocked_xioctl,
- #else
---
-1.7.2.5
-
diff --git a/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-2.patch b/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-2.patch
deleted file mode 100644
index 3ffddf083e24..000000000000
--- a/net-fs/openafs-kernel/files/openafs-1.6.5-kernel-3.11-2.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 6482f944119254da9cdea533d7ca89d3d46f0559 Mon Sep 17 00:00:00 2001
-From: Marc Dionne <marc.dionne@your-file-system.com>
-Date: Tue, 3 Sep 2013 07:55:14 -0400
-Subject: [PATCH] Linux 3.11: Adapt to d_count changes
-
-In preparation for upcoming changes in the 3.12 cycle, d_lockref
-was introduced late in the 3.11 cycle. The dentry's d_lock and
-d_count are moved to this new structure. A new d_lock macro makes
-the change transparent for locking, but direct users of d_count
-must adapt. A new d_count() helper function is provided and
-should now be used.
-
-Use the new d_count() helper function if available, and move
-some of the ifdef logic into a helper compatibility function.
-
-Change-Id: I32a21a174d763fb7df8f1e04da3bb7260684571d
----
- acinclude.m4 | 3 +++
- src/afs/LINUX/osi_compat.h | 28 ++++++++++++++++++++++++++++
- src/afs/LINUX/osi_vnodeops.c | 12 +-----------
- 3 files changed, 32 insertions(+), 11 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 15b5ad8..800333b 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -897,6 +897,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*)
- AC_CHECK_LINUX_FUNC([d_alloc_anon],
- [#include <linux/fs.h>],
- [d_alloc_anon(NULL);])
-+ AC_CHECK_LINUX_FUNC([d_count],
-+ [#include <linux/dcache.h>],
-+ [d_count(NULL);])
- AC_CHECK_LINUX_FUNC([d_make_root],
- [#include <linux/fs.h>],
- [d_make_root(NULL);])
-diff --git a/src/afs/LINUX/osi_compat.h b/src/afs/LINUX/osi_compat.h
-index ce9178e..fdddf59 100644
---- a/src/afs/LINUX/osi_compat.h
-+++ b/src/afs/LINUX/osi_compat.h
-@@ -608,4 +608,32 @@ afs_proc_create(char *name, umode_t mode, struct proc_dir_entry *parent, struct
- #endif
- }
-
-+static inline int
-+afs_dentry_count(struct dentry *dp)
-+{
-+#if defined(HAVE_LINUX_D_COUNT)
-+ return d_count(dp);
-+#elif defined(D_COUNT_INT)
-+ return dp->d_count;
-+#else
-+ return atomic_read(&dp->d_count);
-+#endif
-+}
-+
-+static inline void
-+afs_maybe_shrink_dcache(struct dentry *dp)
-+{
-+#if defined(HAVE_LINUX_D_COUNT) || defined(D_COUNT_INT)
-+ spin_lock(&dp->d_lock);
-+ if (afs_dentry_count(dp) > 1) {
-+ spin_unlock(&dp->d_lock);
-+ shrink_dcache_parent(dp);
-+ } else
-+ spin_unlock(&dp->d_lock);
-+#else
-+ if (afs_dentry_count(dp) > 1)
-+ shrink_dcache_parent(dp);
-+#endif
-+}
-+
- #endif /* AFS_LINUX_OSI_COMPAT_H */
-diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index e9191ae..a60027e 100644
---- a/src/afs/LINUX/osi_vnodeops.c
-+++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -1684,17 +1684,7 @@ afs_linux_rename(struct inode *oldip, struct dentry *olddp,
- rehash = newdp;
- }
-
--#if defined(D_COUNT_INT)
-- spin_lock(&olddp->d_lock);
-- if (olddp->d_count > 1) {
-- spin_unlock(&olddp->d_lock);
-- shrink_dcache_parent(olddp);
-- } else
-- spin_unlock(&olddp->d_lock);
--#else
-- if (atomic_read(&olddp->d_count) > 1)
-- shrink_dcache_parent(olddp);
--#endif
-+ afs_maybe_shrink_dcache(olddp);
-
- AFS_GLOCK();
- code = afs_rename(VTOAFS(oldip), (char *)oldname, VTOAFS(newip), (char *)newname, credp);
---
-1.7.2.5
-
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.2-r1.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.2-r1.ebuild
deleted file mode 100644
index a39cf197a07e..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.2-r1.ebuild,v 1.1 2013/08/29 18:44:48 axs Exp $
-
-EAPI="4"
-
-inherit eutils autotools multilib linux-mod versionator toolchain-funcs
-
-MY_PV=$(delete_version_separator '_')
-MY_PN=${PN/-kernel}
-MY_P2="${MY_PN}-${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
- mirror://gentoo/${MY_P2}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="amd64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-pkg_setup() {
- if use kernel_linux; then
- linux-mod_pkg_setup
- fi
-}
-
-src_prepare() {
- EPATCH_EXCLUDE="012_all_kbuild.patch" \
- EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}"/gentoo/patches
- epatch "${FILESDIR}"/openafs-1.6.2-kernel-3.8-{1..5}.patch
-
- # packaging is f-ed up, so we can't run eautoreconf
- # run autotools commands based on what is listed in regen.sh
- eaclocal -I src/cf
- eautoconf
- eautoconf -o configure-libafs configure-libafs.ac
- eautoheader
- einfo "Deleting autom4te.cache directory"
- rm -rf autom4te.cache
-}
-
-src_configure() {
- ARCH="$(tc-arch-kernel)" \
- econf \
- --with-linux-kernel-headers=${KV_DIR} \
- --with-linux-kernel-build=${KV_OUT_DIR}
-}
-
-src_compile() {
- ARCH="$(tc-arch-kernel)" emake -j1 only_libafs || die
-}
-
-src_install() {
- if use kernel_linux; then
- local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
- [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
- MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
- linux-mod_src_install
- elif use kernel_FreeBSD; then
- insinto /boot/modules
- doins "${S}"/src/libafs/MODLOAD/libafs.ko
- fi
-}
-
-pkg_postinst() {
- # Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
- use kernel_linux && linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
- # Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
- use kernel_linux && linux-mod_pkg_postrm
-}
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild
deleted file mode 100644
index 3fcb02200091..000000000000
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild,v 1.2 2013/10/15 19:11:13 hasufell Exp $
-
-EAPI="5"
-
-inherit autotools eutils multilib linux-mod versionator toolchain-funcs
-
-MY_PV=$(delete_version_separator '_')
-MY_PN=${PN/-kernel}
-MY_P2="${MY_PN}-${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-PVER="1"
-DESCRIPTION="The OpenAFS distributed file system kernel module"
-HOMEPAGE="http://www.openafs.org/"
-# We always d/l the doc tarball as man pages are not USE=doc material
-SRC_URI="http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
- mirror://gentoo/${MY_P2}-patches-${PVER}.tar.bz2"
-
-LICENSE="IBM BSD openafs-krb5-a APSL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-CONFIG_CHECK="!DEBUG_RODATA ~!AFS_FS KEYS"
-ERROR_DEBUG_RODATA="OpenAFS is incompatible with linux' CONFIG_DEBUG_RODATA option"
-ERROR_AFS_FS="OpenAFS conflicts with the in-kernel AFS-support. Make sure not to load both at the same time!"
-ERROR_KEYS="OpenAFS needs CONFIG_KEYS option enabled"
-
-QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
-QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
-
-pkg_setup() {
- if use kernel_linux; then
- linux-mod_pkg_setup
- fi
-}
-
-src_prepare() {
- EPATCH_EXCLUDE="012_all_kbuild.patch" \
- EPATCH_SUFFIX="patch" \
- epatch "${WORKDIR}"/gentoo/patches
- epatch "${FILESDIR}"/${P/-kernel/}-kernel-3.11-{1..2}.patch
- epatch_user
-
- # packaging is f-ed up, so we can't run eautoreconf
- # run autotools commands based on what is listed in regen.sh
- eaclocal -I src/cf
- eautoconf
- eautoconf -o configure-libafs configure-libafs.ac
- eautoheader
- einfo "Deleting autom4te.cache directory"
- rm -rf autom4te.cache
-}
-
-src_configure() {
- ARCH="$(tc-arch-kernel)" \
- econf \
- --with-linux-kernel-headers=${KV_DIR} \
- --with-linux-kernel-build=${KV_OUT_DIR}
-}
-
-src_compile() {
- ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs || die
-}
-
-src_install() {
- if use kernel_linux; then
- local srcdir=$(expr "${S}"/src/libafs/MODLOAD-*)
- [[ -f ${srcdir}/libafs.${KV_OBJ} ]] || die "Couldn't find compiled kernel module"
-
- MODULE_NAMES="libafs(fs/openafs:${srcdir})"
-
- linux-mod_src_install
- elif use kernel_FreeBSD; then
- insinto /boot/modules
- doins "${S}"/src/libafs/MODLOAD/libafs.ko
- fi
-}
-
-pkg_postinst() {
- # Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
- use kernel_linux && linux-mod_pkg_postinst
-}
-
-pkg_postrm() {
- # Update linker.hints file
- use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
- use kernel_linux && linux-mod_pkg_postrm
-}