[gentoo-commits] repo/gentoo:master commit in: net-fs/openafs-kernel/

["Andrew Savchenko" <bircoph@gentoo.org>]

commit:     a73195998ab291fb6a9cc1bd5b2caf838689cc87
Author:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 09:52:56 2016 +0000
Commit:     Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 09:52:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7319599

net-fs/openafs-kernel: version bump to 1.6.16

This fixes several security bugs: CVE-2015-{7762,7763,8312}.
Update to EAPI 6.

Package-Manager: portage-2.2.27
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>

 net-fs/openafs-kernel/Manifest                     |   2 +
 net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild | 121 +++++++++++++++++++++
 2 files changed, 123 insertions(+)

diff --git a/net-fs/openafs-kernel/Manifest b/net-fs/openafs-kernel/Manifest
index e1a8d0d..9b691c1 100644
--- a/net-fs/openafs-kernel/Manifest
+++ b/net-fs/openafs-kernel/Manifest
@@ -2,5 +2,7 @@ DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e
 DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9
 DIST openafs-1.6.14-doc.tar.bz2 3530481 SHA256 544fb3370465881bd1aadb24cf9e40610ff23d8445759c659d5354ce1e9358c3 SHA512 35de279fd61c657f5cd1b5fa26113a667155c2f2733fffb9bafeec1ac6be548fa335e5039e783cd6031fbc0ab8d27dd576e4571d76dd3f403283d5b32f75ca50 WHIRLPOOL 0663663a365f20448641093b1fc086219d395a7603c1658b69c083657ae0a2fec3d16a44e48adc3a7669b4a89ea07f0ce8e91d80134c5a5a1a193f304ced4a0b
 DIST openafs-1.6.14-src.tar.bz2 14605615 SHA256 3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f SHA512 957178b1c3f6262e831ec497b7dd76e208a48f2107942d44ce72b062081e2932b93cb800b786eb88b770a647daf3585f659fdd1e715d0e724ac56eae011f3601 WHIRLPOOL 43e58a9e34ed2340c732b88261ecf4043f7a6e7db18bac7113b74455b1a2f1ed864d345bf41bac42d6d437ae18778e7f37a794b738a882c0fb5e36257af7d960
+DIST openafs-1.6.16-src.tar.bz2 14612920 SHA256 3431702bdcbd1b27833060c50869e618a192495877ebb0a66e4610de0b48eb81 SHA512 775c6b51e4a916ab14c2a33b746ffc67ce7f8e4d4d75e17374341d81b8d8b424971ffd67ba191848be28560cefceecc51f1f608ccdc7d896bafafa68e1726cb9 WHIRLPOOL 0da43210ee7779e49b86bb337bef5f3b70fdf3876eca763025d45628533a7ce7104b193c0c9d98d2f4363314faa79c7bd367432c5272c9b12249623f9b342812
 DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2
 DIST openafs-patches-20150813.tar.xz 15520 SHA256 209766f5e97e924eab91d862875f360e0ed9821b317ee609789a77d7fbdeb8f0 SHA512 2703f65e7c3f1a724e9330d8f2aedf80f9d0b8ba4b03a5f466cd523eb8d0a1692542df722b24e06ce4ced476fb8615e2caca6159de7b18f151ecf7a14a5f0565 WHIRLPOOL c4055a7c0cf19847ecd8679316a0146b41589f157996b2f15b807d272270e65c1a6ee5f916d3127803cd26370c392b1e751d100d2ab383a57530b768e1682d60
+DIST openafs-patches-20160223.tar.xz 10536 SHA256 19c14ecd625ce96370fe3629faffd2841567954d687e1ee30c81a848702231a6 SHA512 83018a4ace8189182de7b878094c773996d824f9127f15167e1b5795e4b7af8f3cb3a86e054b95043343ff88c8b505376005cd97cc91b50e6bf05b2d5242ccbd WHIRLPOOL 8f58b30446fccf37df9460ff3ab87cbd2338346c545aca48bc328578951b92b3e34fe102ade2bcb822ddee5c826d9834d0c2ce257092aa9bdde4717afbbd756d

diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild
new file mode 100644
index 0000000..316d7c9
--- /dev/null
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.16.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit autotools linux-mod multilib toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_PN="${PN/-kernel}"
+MY_P="${MY_PN}-${MY_PV}"
+PVER="20160223"
+
+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
+	https://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"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+pkg_pretend() {
+	if use kernel_linux && kernel_is ge 4 3 ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: <4.3"
+		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() {
+	default
+
+	# 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
+}