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, 200 insertions, 15 deletions

diff --git a/net-fs/openafs/ChangeLog b/net-fs/openafs/ChangeLog
index 683f2dd084d9..98eb0fc26b7a 100644
--- a/net-fs/openafs/ChangeLog
+++ b/net-fs/openafs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/openafs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.208 2015/05/03 14:35:52 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.209 2015/07/03 02:01:49 np-hardass Exp $
+
+*openafs-1.6.12 (03 Jul 2015)
+
+  03 Jul 2015; NP-Hardass <NP-Hardass@gentoo.org> +openafs-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-1.6.11.1 (03 May 2015)
 
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 9d6e1c0cf23a..0f5c7d5cd8c9 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/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-1.6.11.1.ebuild 5177 SHA256 d3d5604b9f8896e7f2e52cd7441f32428242e975a4d261d3bac02728cf7630f9 SHA512 1533d553354ca0b13ba2e2e20192eeeb8449ed1bf9d81b20385c151ded0945b83caa1a782611af77e70ca551f5b757f442758b671ad54c2900b97f240ac25602 WHIRLPOOL 17e124f6c17729271ea152d28573c4699b94e44aa071e26174dea61c1a6bd21a8be5b0eb86d6ccf878215a8c919fdf0d4411f72ae20192127fb989bdde910179
 EBUILD openafs-1.6.11.ebuild 5143 SHA256 592aa193c882491a2d51f6195c8b86d80fddc15bd32d3bfe3f4d30154ba25362 SHA512 c00925fdd1bfb923bc5511b2ae0bd7ad9db2698cb71e314e36afd544ab688a67b89ef03790d42d2aead3e673cbfc61656e153db68d38e7bbfe43e56bc6d4f61f WHIRLPOOL 88792845290212e932b263b20cf86dface2295f80b679c7bb1685f9ff885524d6dfd83bd9b8e4f6d01fa244fe6d5b25716eba1c7893172b6452410f043320ba3
-MISC ChangeLog 33427 SHA256 5f70727f99d792fea049522e86c69f44240fd671b2f7caecb2ef44cbcaae2b53 SHA512 6ef5175828d6721654aeff24e7bc2707b476a49b1a659d229df0dc836f2ac36a61099dde48b218947529e11ee7c227099cd098ae76a4f74456197a814141e588 WHIRLPOOL f13ed96c960bfa7d5c376362ef3b969e52d1eeb52b7634efe59bd352436e1e73cfa00499b1b0b9df5a9e2da3ad54f726eb8e24238c6df7c0a70de5cbabe4aea1
+EBUILD openafs-1.6.12.ebuild 5145 SHA256 a50d7d85c23d37ab491bc1d9a24476e71727acfca2abd42b95728937c6b6df31 SHA512 cd7958643525cab83966846fb2f43a77a4def0de7fc1e0826982dbd8f62dd777a0d16872303d530ea64de663e1ddf33390f0d09e973ca261d15cc64ca6bccd4a WHIRLPOOL 3bd480ec86b2f1fa38f6703e78c4777074b6d180d18b3adc4ea6d910d1eec9b805c167d64697e74151e1696a4853473d2bd4b43686589cf96d11d310582dfa64
+MISC ChangeLog 33669 SHA256 3539de64902e3aac237f7fe68420761eaf5d75c6461ed517e8c00542f2b0ec5c SHA512 17a9562f2503cc0aded229cd52fd5d398516fd42e25c891c350356211862fa2bf05f8650617d46688578b6ba9f468b76a7e30e54565c6f804586404703aa7d7a WHIRLPOOL 32eebb47cbfa97526c3a1b2197c492476d83e1f366b8ff799460a865eddbe180cf69d896cfd5cbef567c2e8e8520a8e5491a73ec713ba4b2daa901e6f7fe4890
 MISC metadata.xml 798 SHA256 5cfd52d185fab0f797f7540a1a735145e048fac8580c0980c8f42f57f1b0980a SHA512 0cc8e8045221de543915002564a221d06971f385637cec33b97ccb263ac225830bf304e7056c684293f01c4f4a2a203ebc43d46fc2e91af943402317e61a933b WHIRLPOOL ab6a8ee10061ef9c30aa717191bc792d5c54a0aec3feb727a85dd6e8fb99b9c09377366d0adc215077edf5deeec50c69213ece76645e548832f6eff2bbd79458
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVRjJJAAoJEPZTWjO6HuSN2B8P/34OlQonJKuVwWsx5VDfWXvy
-nxwYDzvmPLcAEtq8HsOAcRSb5hX2UxtyVsNcLGhvXQ/ErAc8mTP++Gu4gV1x6xKq
-KPq2K0lBP+bV0ehWwFbaGj+C795u4udi9yEB70i9qKo4eGBpKwlLVmSThTzjk3Xu
-F4YP8IptKQ163k6gocrZCaaxeXTFDR2PODQJr86o0Dhh673sUsJqUU01l8WnPh3X
-AN9DiblLMd6uX7T+j5F0YRe9h+QbttEmlGua3O1+awmWOm3MVwa+HucFJgQTQjx7
-iBQf7O9BSfoVomgll/Z/0G+55SxfaIkXYt8szhPQVt8YTfur4tZ5ETyE7AKSrBif
-zQ/dMS7/DGOpARwZ62qvHYYj8xwUfWl6XMkwVE5p4PKhj45XmGT7Ig6lqr27n3IK
-H7I9Uh9Sba9jg9eskgIiw0DzyCzexv9ALjdQAFUiO5RkjVGSdnTPcxoh3Iuj3HBY
-974ibEjy+sQTl+RhdNPRmHbkjDQQE+dOmQA9BBx5Q4mCR3saJUr7s+Rls0G2LQOX
-WnR1jHH3MLhf2Q4sICIZPxhPA5UYdp0/aBw0W1xELy+DY8cnc6YwmIgl7TMk2IlM
-GPGmKzzrko98Twth5N0ILWbEYteysDsB0rSf6hdwNds170L7Zhg8rruhcAYgs83s
-0K0GcS/HYErX0qRje+Je
-=7Xvf
+iQIcBAEBCAAGBQJVle0LAAoJEBzZQR2yrxj7DEQP/1YpE5W/XcFR0xrhlTSkWTsx
+03diP9ExPPJneRcGPrNMwGR9cok7dHNuvaeuTwasq5PL5gFGdnBlvikPljE4CyCa
+KxhKt66nVuytKJv6z76/lHDfjYuWXkIEiOD21ORcgLiF2LF5zly/fqLKZHRXT6fO
+3cO5807G9d/8pCU0/o6pAOEfhStegtOP65c2NHTrEsfJ4o03+ZxTI5+zbaJdH7m8
+a6uLtEL434v8dn7z4aZDL/JRuDgzqLnsc8+HiBVCx0tSuTJYR3xLTu2zzYy/EDJW
+Qo2NoFOLConv1toKcylcntyLfewfXRVpxeOKG1rYOPqAUVV3lyEnvyqTT2qt8HiO
+B7qtRd07eCEMvb9kqjWfpTCT+45NnSbS9Azg2I7wPtpnHWmdLPy5lr3kUL3nFyAm
+VKV72nMyKvFIbWfqakwaYCbp8vcBN+Mb84IQUrGMiBY/+irff2GkK+5MS39F+/y/
+JNZGizBYymvssu/RRiXexXNOF2xVY5LxPbw3Igoty5Yk55NV6THo1fJeyGCID1FR
+Q3rU9ZgrltlV0JteOQJGMDZbl4rarRtvXMW4HVGArMTaSyz3R9PQy99KzGt60nAs
+rdusYuwn58lzMmlEyvVBvuyChnotSfFHiPeHWv4/rxyCc3Xzez4EbGoFVwbTRdrw
+p+oQ0+t7IvkoJ52zBYfH
+=ZTp3
 -----END PGP SIGNATURE-----
diff --git a/net-fs/openafs/openafs-1.6.12.ebuild b/net-fs/openafs/openafs-1.6.12.ebuild
new file mode 100644
index 000000000000..69679135d233
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.12.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.12.ebuild,v 1.1 2015/07/03 02:01:49 np-hardass Exp $
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+PVER="20150626"
+
+DESCRIPTION="The OpenAFS distributed file system"
+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/${PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~sparc ~x86 ~x86-linux"
+
+IUSE="doc kerberos +modules pam"
+
+CDEPEND="
+	sys-libs/ncurses
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )"
+
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)"
+
+RDEPEND="${CDEPEND}
+	modules? ( ~net-fs/openafs-kernel-${PV} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	EPATCH_EXCLUDE="050_all_job_server.patch" \
+	EPATCH_SUFFIX="patch" \
+	epatch "${WORKDIR}"/gentoo/patches
+	epatch_user
+
+	# fixing 2-nd level makefiles to honor flags
+	sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
+		src/*/Makefile.in || die '*/Makefile.in sed failed'
+
+	# 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() {
+	AFS_SYSKVERS=26 \
+	econf \
+		--disable-kernel-module \
+		--disable-strip-binaries \
+		--enable-supergroups \
+		$(use_enable pam) \
+		$(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
+		$(use_with kerberos krb5)
+}
+
+src_compile() {
+	emake all_nolibafs
+	local d
+	if use doc; then
+		for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
+			emake -C "${d}" html;
+		done
+	fi
+}
+
+src_install() {
+	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	insinto /etc/openafs
+	doins src/afsd/CellServDB
+	echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
+	echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
+
+	# pam_afs and pam_afs.krb have been installed in irregular locations, fix
+	if use pam ; then
+		dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
+	fi
+	rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
+
+	# remove kdump stuff provided by kexec-tools #222455
+	rm -rf "${ED}"/usr/sbin/kdump*
+
+	# avoid collision with mit_krb5's version of kpasswd
+	mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+	mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+
+	# move lwp stuff around #200674 #330061
+	mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
+	mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
+	# update paths to the relocated lwp headers
+	sed -ri \
+		-e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
+		"${ED}"/usr/include/*.h \
+		"${ED}"/usr/include/*/*.h \
+		|| die
+
+	# minimal documentation
+	use pam && doman src/pam/pam_afs.5
+	dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
+
+	# documentation package
+	if use doc ; then
+		dodoc -r doc/{arch,examples,protocol,txt}
+		dohtml -r doc/xml/*
+	fi
+
+	# Gentoo related scripts
+	newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
+	newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
+	newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
+	newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
+	systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
+	systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
+	systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
+
+	# used directories: client
+	keepdir /etc/openafs
+
+	# used directories: server
+	keepdir /etc/openafs/server
+	diropts -m0700
+	keepdir /var/lib/openafs
+	keepdir /var/lib/openafs/db
+	diropts -m0755
+	keepdir /var/lib/openafs/logs
+
+	# link logfiles to /var/log
+	dosym ../lib/openafs/logs /var/log/openafs
+}
+
+pkg_preinst() {
+	## Somewhat intelligently install default configuration files
+	## (when they are not present)
+	local x
+	for x in cacheinfo CellServDB ThisCell ; do
+		if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
+			cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
+		fi
+	done
+}
+
+pkg_postinst() {
+	elog "This installation should work out of the box (at least the"
+	elog "client part doing global afs-cell browsing, unless you had"
+	elog "a previous and different configuration).  If you want to"
+	elog "set up your own cell or modify the standard config,"
+	elog "please have a look at the Gentoo OpenAFS documentation"
+	elog "(warning: it is not yet up to date wrt the new file locations)"
+	elog
+	elog "The documentation can be found at:"
+	elog "  https://wiki.gentoo.org/wiki/OpenAFS"
+}