Version bump to 1.6.12. Supports Kernels up to 4.1. See http://openafs.org/dl/openafs/1.6.12/RELNOTES-1.6.12 for release notes.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x18F89C67

3 files changed, 149 insertions, 15 deletions

diff --git a/net-fs/openafs-kernel/ChangeLog b/net-fs/openafs-kernel/ChangeLog
index 672b46ae3a2e..14f2331cea97 100644
--- a/net-fs/openafs-kernel/ChangeLog
+++ b/net-fs/openafs-kernel/ChangeLog
@@ -1,6 +1,12 @@
 # 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.171 2015/05/03 14:34:58 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/ChangeLog,v 1.172 2015/07/03 02:01:07 np-hardass Exp $
+
+*openafs-kernel-1.6.12 (03 Jul 2015)
+
+  03 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> +openafs-kernel-1.6.12.ebuild:
+  Version bump to 1.6.12.  Supports Kernels up to 4.1. See
+  http://openafs.org/dl/openafs/1.6.12/RELNOTES-1.6.12 for release notes.
 
 *openafs-kernel-1.6.11.1 (03 May 2015)
 
diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index 5df05a08ad2f..a3685995ecb1 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -6,25 +6,29 @@ DIST openafs-1.6.11-patches.tar.xz 9628 SHA256 16fdf63d81bd986aea4112f43f4005912
 DIST openafs-1.6.11-src.tar.bz2 14605284 SHA256 cc42da08ef750a2363f7ea291e2264a9334c6ecf1400a75f5dabc170205bd01d SHA512 4e82553443009f899dfbd3eed0b9ed63c55aff5d5ce02f31657277385f0dfdef7e724b81a25fabb962d03b5a622d8d3fa9eca04879d1b84f4b253a52ea4ab90c WHIRLPOOL fbf188144643a71f7e505251033ed68c3d684dabd6647b4096c7a4010a76285db46c0cd586c5481635eb7da8406b5adee72c02528e59c4f89c6d923640cc93fb
 DIST openafs-1.6.11.1-doc.tar.bz2 3530413 SHA256 cb398583931e7f0edf17b2321a858afc62cffa3c48cf69021eccc198d3e764f9 SHA512 bcf48ae1e4f12a758adf3f64b60738cce6853501d66dce594df75d28687e939b2f369b485e27fbe116bd14816277c39ebe213f65f20c9ca6ab76946742ee18f8 WHIRLPOOL 6d8f5a2e602d4388dfca8634b7f5a8545bb39e5859b012700e0a361b4d7151eb8a6493e7a18f408a1ab54f083dfc4b0e8ca310c7772f5144dd0083af5b7488af
 DIST openafs-1.6.11.1-src.tar.bz2 14603197 SHA256 ae1a87faec8ee273f7d4baa69d1346f798415b38de72888decde011405423dc7 SHA512 43238d16d52498c62f6de944e030edeafdce9373074f961820d383bf82034511a484e79f1f655d5152f39abb38dfb744a9d02c47bb762c59e505de165bcc5579 WHIRLPOOL eb56015aaec4aa8c2a0d5aa901f4291a043e373d533bed5a48620e3b3a472226599dd083a4837ecc5a8763e7448ed1fb8c08aeec7ca53cf82db8be39d63dc522
+DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e8f08099eb1b2a4308ae8f0638199963 SHA512 b0389f5aecce913a50e827204c3d3f19964473d4b8b0e6e39d91d00971e4be57b4cfece0b4bc40fb3b6f5d7d60ee40b079883505625413f0748035452c3c2686 WHIRLPOOL a795b70caf84e17d5bea720a12e2c1aa159a34105f51dbcf60a464b2c8bf81a9624e8beede566c9c4b6ceeff424db7925bf588a7383f0860df8ec65828d32cc1
+DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9
 DIST openafs-patches-20150503.tar.xz 9736 SHA256 066f61fe795e2cb3235a0a991abe8c5e876758bae7ea9bec61e98a3f601c9d7d SHA512 c687be78c7a6442b81c1362cab6ba215301911bdefcf39d2758ffeddecfa3efaa67990ea8277bbc1dedc14ad70a33213a37dbc45c43cd53871eec089759596c6 WHIRLPOOL 0935946c9a535f8e9ce6dd292801c671aef1c40f2a3f51aa4a85e5f4181fb46c3b2df55be56eec56c7fcab0eaf27d97cc6cef98c1b70178ba8cd7258174036cf
+DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2
 EBUILD openafs-kernel-1.6.11.1.ebuild 3529 SHA256 8c4d649a0d72b582767810fbd16a70914a68e89f272a06572794ac8e3a418f25 SHA512 e87c8ee4ec79b3c1cb3d110c6eca7a567f47ddddc3849675a84e64ba75a0b808a3494bae4430c73073463e61a2c7d8ec68fa0264d68f258e82aeef454072c22a WHIRLPOOL f8d9113f4aa36cc734184f24af2962460f4541c8551fccd3d8975a5c2c30aa09a7ae8abd4ec6ed532a337fc19f88a95ae52f41790d2f8322fb7ba01a79cac6af
 EBUILD openafs-kernel-1.6.11.ebuild 3503 SHA256 2add102530d410f40b9db4a29bfb45d6cbc1a8eecf75820a5299cd38c56e5f5e SHA512 55d798144a5956355fc884bb3791f9ba6729ac7773a528d800b72c34e02d34877f97762f485c15cf9ce09cd8565c40c69fa07242b81f314dcce174175e932d79 WHIRLPOOL 65b0be8227bcbc438049e0833cf5e0aa9111a1b180dc162e21f529cb9199f7fbc3547db6fe2602140b96986920d26d48a2793cbea59144bcde872e1aa2ee07d8
-MISC ChangeLog 28867 SHA256 6ddcc1c0dc8c2c8a1e07147491d9f8fb6e9a7a7864773cd0b6e8e61ef3d6353b SHA512 76b1e1a133a9aed64bd8bfbc8a33264d12a7cfb7ff0217ee53b32cd0cb83d3de5f99f8e69df82e61f865899fae28fafa955f4c7255b3cec73efa64d23a1c6bdd WHIRLPOOL 3bd3a835eea55bd206a10029d585637a61efb5526f4d3eb96096014b4a3db728ef202b254d0ef1a71e315581fca075d955f486b0a930fe591e3041e7d20ac60b
+EBUILD openafs-kernel-1.6.12.ebuild 3759 SHA256 6fa6e7d2254037609fffc33ae501f8d7465aa847ffbe1eb5a203fcd9c9f73755 SHA512 4883f82c111e650059f26d044d01320af219566c06a3948412a278312afc79d8947e3a327ee384d2dc7e1f72da96527e3fc604aea4a2855fd1e6a1e330ff1145 WHIRLPOOL 9269a980be5b41a36d4b3a10386795204fd9603ede18f9df67e21974d950dc675c4181868b6d6e04892be1354f326fe17158c6c6dd9917cdb2bf0fdca375c7dc
+MISC ChangeLog 29123 SHA256 4c95ef686475550fea49c59d4152cb2ba69cae32e2a673ff1fdc8c7097d54552 SHA512 0607f7e09958af3974b853cbd7c5fd970d5a3907d94748842cd1c9489bfcc63f51c834756c46c276d7cb1dc2dccfb36fac7ddde8ae7f974b8132b8e897d22b24 WHIRLPOOL 66b7476c37147f79d75eff1f4737dc9c254bf97d25cb97fc54b6ce5a2d2ff24b601a43528c09dce51d85fe0a89509f19065efc176b78dfdfcf2bc820447974bc
 MISC metadata.xml 633 SHA256 442bb9cf1629f19c8bfc8ad6248563a76f233be7fe96d3ff4f1eadcda47f0a3d SHA512 d8ddd9400c4f0032905cf5888d87bfdc527c5ce5adff87a64227465146256b9d9969d6fe69dc9dac728ebdb145becde0daf7f290df15bbeaf083ae94b95caff0 WHIRLPOOL b821ce56f3d82d7ef161cca489bc2dc1f8cfe55783eb4c7370edf9f8bd7f674f9fbc4c763e4c633ac0d34fc505dd20d6401e9512ca0d2f04dbae5a7cab602c97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVRjITAAoJEPZTWjO6HuSNmtgQALsWWYWD5KcFOMCvCHvvJzpb
-DZeTXLfGus1BygcBB0zm/LJlNRYpd11Re2z8L4NwElCl8PzEFGAeikib0Y15xG+z
-Ue/v7qkFxfydzGN0rcYmDDecTxVJPt+2gmv9dih8mPIm6QN2lGtsBOzilje0CBvk
-6qsfL9vb8cxjKh5JsNjGf0iRDnNE74clctd2WpVe1LauqDOZPj2x9FDWVfVh0UWp
-jHXYPl4B8h0irFPSdfth9jTmT718TKchBpYyVDjDqs+oFSyncUHX3ZLkPneM8L0N
-cL75np3VHe/OBdWaozt98DcnrZVlwazLfJkv64BYy3vClXvpbXBnuFSCyshmDshv
-7uuqARWZyHgEQT1kPNgj6FQPLIqYCxYdC683EcVZY17ic8P62i7UEG7KUTrciW46
-AYHVmWRh9wUHICq0P3CmwNlvL6sDSgh/cCgyYX35wyRaytcq92jQlwEqTOQtB1Cc
-z2Q2X30dBwbElmlmUEpaDrjzwpyf+uZ1+OrHpoLXxm5E9dmwmB58YYOMYBWkoBDD
-9oOu6dQdyo2yaN2YlpdgW+kjY13unrHn9Gdp+pgK+VtyXGvMnMzCLuX1V+CqqxCt
-mheLjkUM6VARo31xINzyb5DuPu48FWWtl7AcJnZhZcxG4whWOKDlP0Y2F4jl9sKE
-Iz/xuDeToKz0nxOGVALV
-=FXkM
+iQIcBAEBCAAGBQJVlezsAAoJEBzZQR2yrxj7YZIP/3fcjGxlLJz8h87VnyojCEeu
+LPIgVuYvhF2EzipKuJ2OeyOG/1QLR4+L2l5GUIAyI0T3YcfRCh4Jch6dvFEkJfHp
+ehiTDU8nP5+DNk0KVCTq7I72XSCy07PPfOVf35MJGnsYOVaV7uiVXk3VgJrbfziP
+k1mE/V7JqFjZl5NM+HP0UyxNi0AcDHxqzXR9a2jbajFda7XF8ppMjS0GhBfwzayJ
++4pgl/+4CC1PU7ZlwWGdI978fxJGjxjwIG0vwUYiAFz+6ubJ1kzTQKeM8Exs1D+t
+hZsco32OnMVgSgduKWw/dUCUOja6WZ4JsZAQA8BH+Y+7UuCHtrz+hIm13L/f4CUY
+U0niYFOLbpslH4yjSFCsgDIFhJdhtLGkmR7XKGrlJVIN5HMyQWKob7kKV5lhWBW0
+2fbelJRTlqLPzjJTTzL80f/RnAjPsgeCfSczf4JOuqhoJ8JeyfUYN4GkG22IwhDK
+xWPGTzXeWGx7tMTWgCCjh5hdewBlJ+Sxy/EKYvzpkHkoncEaC1172TDxIb+8sVyV
+ScvSHSdKoECXGEo9G6AViuwOIOy4QOE26HxM46fSLSzvTLVK3O5/qAkMcW5zq5kA
+SO1iJV8k8nto7BSvBBtQwLPLOPxRMEw21WtaPzm6zG6vGob/J6ycHejUwrqP7NqS
+okIImg1NLGydaYeKSoSL
+=AOzg
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.12.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.12.ebuild
new file mode 100644
index 000000000000..4e0f9e85c985
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.12.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2015 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.12.ebuild,v 1.1 2015/07/03 02:01:07 np-hardass Exp $
+
+EAPI="5"
+
+inherit autotools eutils linux-mod multilib toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_PN="${PN/-kernel}"
+MY_P="${MY_PN}-${MY_PV}"
+PVER="20150626"
+
+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
+[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
+SRC_URI="
+	http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
+	http://dev.gentoo.org/~bircoph/afs/${MY_PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~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_pretend() {
+	if use kernel_linux && kernel_is ge 4 2 ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: <4.2"
+		ewarn ""
+		ewarn "You are free to utilize epatch_user to provide whatever"
+		ewarn "support you feel is appropriate, but will not receive"
+		ewarn "support as a result of those changes."
+		ewarn ""
+		ewarn "Please do not file a bug report about this."
+	fi
+}
+
+pkg_setup() {
+	if use kernel_linux; then
+		linux-mod_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# do not tamper with CFLAGS for the kernel module
+	EPATCH_EXCLUDE="040_all_flags.patch" \
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/gentoo/patches
+	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() {
+	local myconf=""
+	# OpenAFS 1.6.11 has a bug with kernels 3.17-3.17.2 that requires a config option
+	if use kernel_linux && kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+		myconf="--enable-linux-d_splice_alias-extra-iput"
+	fi
+
+	local ARCH="$(tc-arch-kernel)"
+	local MY_ARCH="$(tc-arch)"
+	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
+
+	if use kernel_linux; then
+		myconf+=( --with-linux-kernel-headers="${KV_DIR}" \
+			--with-linux-kernel-build="${KV_OUT_DIR}"
+		)
+	elif use kernel_FreeBSD; then
+		myconf+=( --with-bsd-kernel-build="${BSD_BUILD_DIR}" )
+	fi
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1 -j1 only_libafs
+}
+
+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
+}