net-fs/openafs: 1.8.2 version bump

- Update to upstream version 1.8.2 and patches from 1_8_x branch
  till 20181001. This fixes some open Gentoo bugs:
    472184 (probably), 544162, 603890 (likely), 640874, 642542.
- Merge openafs-kernel back into openafs:
  - save lots of build time (configure, compilling common code);
  - original split was required due to problems in the build system
    (e.g. -j1) which are fixed now.
  Now kernels < 4.21 are supported.
- Add support for new features:
  - enable gssapi via kerberos;
  - allow to choose between namei and inode file servers;
  - add Tivoli TSM API support;
  - conrol ubik-read-while-write mode;
  - deprecate kauth tools (may be enabled via flag);
  - add support for perl bindings via swig;
- Docs:
  - build api docs (using doxygen);
  - Build PDF docs, support all three generators (fop, dblatex,
    docbook2pdf).
- Avoid file collision with heimdal (bug 631584).

The client is tested on various configurations, the server is not.

Closes: https://bugs.gentoo.org/472184
Closes: https://bugs.gentoo.org/544162
Closes: https://bugs.gentoo.org/603890
Closes: https://bugs.gentoo.org/631584
Closes: https://bugs.gentoo.org/640874
Closes: https://bugs.gentoo.org/642542
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org>
Package-Manager: Portage-2.3.53, Repoman-2.3.11

3 files changed, 358 insertions, 2 deletions

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index f475d2a5b248..2a52a3181dbb 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -2,4 +2,7 @@ DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B e9f67fb42b6c4e6c2092e713e801db
 DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
 DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c SHA512 e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1
 DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
+DIST openafs-1.8.2-doc.tar.bz2 3801937 BLAKE2B 321af6f0b97cfe195b18a7fb55208981158f23671dec35c0462167d3ebddd245e3aabefbc13f3caddbd6d4556c448f137acfd70be768dbeb843bedf2acfe8e2b SHA512 99bf052f7128e920766efaafc930fa33b7d3615f7c61c1182fd93159fd477d88da05f88fd9f39896c44d80a3687142367613adc2d7bd73d069dc5820b4cf8653
+DIST openafs-1.8.2-src.tar.bz2 15109003 BLAKE2B 13a786bcc2053d70a161e32911eef9c774492b28f93d33747f51fd55e4374d1dba52c83733d6cce8fdb4496a222800acaf4f95d8e7b4790259476c29486fd601 SHA512 8115098fc60e12f63e9177a7487c08bf60ac738ceaa84644e4c57345928f2764a9e06653f235456e8667a779bbce7647521574751d1bd6b64827b12f63f91b92
 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
+DIST openafs-patches-20190105.tar.xz 29484 BLAKE2B a9dd46edb86f185d04a1c3c08bc89d643bca70c201af66d9fce5b7b9bc3d7341d7704dfbcf0be87d8c4ff0296702b6e842b1a40f2e3b858eb060563a923f7ccf SHA512 c646e559c3e876daf904df638962c6cee0d8eabfb80ef6b7eacf25740b2f70ad3258e5dddbda0b2e6fea4a841b8b8ea84ae42fb74d5933bb68ead0a94439658a
diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index 4e38bd3d43bd..d8682a896200 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -9,12 +9,24 @@
 	<name>Andrew Savchenko</name>
 </maintainer>
 <use>
-	<flag name="bitmap-later">Enable fast startup of file server by
-	not reading bitmap till needed.</flag>
+	<flag name="api">Build API documentation using <pkg>app-doc/doxygen</pkg>.
+	May take a *long* time to build.</flag>
+	<flag name="bitmap-later">Enable fast startup of file server by not
+	reading bitmap till needed.</flag>
 	<flag name="fuse">Build fuse client.</flag>
+	<flag name="gssapi">Enable GSSAPI support via Kerberos (<pkg>virtual/krb5</pkg>).</flag>
+	<flag name="kauth">Install the DEPRECATED kauth server, PAM modules, and utilities</flag>
 	<flag name="modules">Build libafs kernel module. Disable only if you know
 	what you're doing: without this module OpenAFS client will not work.</flag>
+	<flag name="namei">Enable namei fileserver instead of inode fileserver.
+	You should disable this option only if compatibility with inode format AFS
+	storage is required.
+	</flag>
 	<flag name="pthreaded-ubik">Enable installation of pthreaded ubik applications.</flag>
 	<flag name="supergroups">Enable support for nested pts groups.</flag>
+	<flag name="tsm">Enable use of the Tivoli TSM API libraries from <pkg>app-backup/tsm</pkg>
+	for butc support. AMD64 only.</flag>
+	<flag name="ubik-read-while-write">Enable vlserver read from db cache during
+	write locks (EXPERIMENTAL)</flag>
 </use>
 </pkgmetadata>
diff --git a/net-fs/openafs/openafs-1.8.2.ebuild b/net-fs/openafs/openafs-1.8.2.ebuild
new file mode 100644
index 000000000000..f7d0930be691
--- /dev/null
+++ b/net-fs/openafs/openafs-1.8.2.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-mod flag-o-matic pam systemd toolchain-funcs
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+PVER=20190105
+KERNEL_LIMIT=4.21
+
+DESCRIPTION="The OpenAFS distributed file system"
+HOMEPAGE="https://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="
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
+	https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
+	https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
+"
+
+LICENSE="IBM BSD openafs-krb5-a APSL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+IUSE="api bitmap-later debug doc fuse gssapi kauth kerberos +modules +namei
+ncurses perl +pthreaded-ubik +supergroups tsm ubik-read-while-write"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/flex
+	virtual/yacc
+	api? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	doc? (
+		app-text/docbook-xsl-stylesheets
+		app-text/docbook-xml-dtd
+		dev-libs/libxslt
+		|| (
+			dev-java/fop
+			app-text/dblatex
+			app-text/docbook-sgml-utils[jadetex]
+		)
+	)
+	perl? ( dev-lang/swig )"
+DEPEND="
+	!net-fs/openafs-kernel
+	virtual/libintl
+	amd64? ( tsm? ( app-backup/tsm ) )
+	fuse? ( sys-fs/fuse:0= )
+	kauth? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ncurses? ( sys-libs/ncurses:0= )"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="gssapi? ( kerberos )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+CONFIG_CHECK="~!AFS_FS KEYS"
+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"
+MODULES_OPTIONAL_USE="modules"
+
+QA_TEXTRELS_x86_fbsd="/boot/modules/libafs.ko"
+QA_TEXTRELS_amd64_fbsd="/boot/modules/libafs.ko"
+
+pkg_pretend() {
+	if use modules && use kernel_linux && kernel_is -ge ${KERNEL_LIMIT/\./ } ; then
+		ewarn "Gentoo supports kernels which are supported by OpenAFS"
+		ewarn "which are limited to the kernel versions: < ${KERNEL_LIMIT}"
+		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."
+		ewarn ""
+		ewarn "Alternatively, you may:"
+		ewarn "1. Use OpenAFS FUSE client, build OpenAFS with USE=fuse to enable it."
+		ewarn "2. Use native kernel AFS client: configure your kernel with CONFIG_AFS_FS."
+		ewarn "net-fs/openafs is not required in this case, but client's functionality will be limited."
+	fi
+}
+
+pkg_setup() {
+	use kernel_linux && linux-mod_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# 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'
+	# fix xml docs to use local dtd files
+	sed -i 's|http://www.oasis-open.org/docbook/xml/4.3|/usr/share/sgml/docbook/xml-dtd-4.3|' \
+		doc/xml/*/*000.xml || die
+
+	# 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 -I src/external/rra-c-util/m4
+	eautoconf
+	eautoconf -o configure-libafs configure-libafs.ac
+	eautoheader
+	einfo "Deleting autom4te.cache directory"
+	rm -rf autom4te.cache || die
+}
+
+src_configure() {
+	local -a myconf
+
+	if use debug; then
+		use kauth && myconf+=( --enable-debug-pam )
+		use modules && myconf+=( --enable-debug-kernel )
+	fi
+
+	if use modules; then
+		if use kernel_linux; then
+			if kernel_is -ge 3 17 && kernel_is -le 3 17 2; then
+				myconf+=( --enable-linux-d_splice_alias-extra-iput )
+			fi
+			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
+	fi
+
+	use amd64 && use tsm && myconf+=( --enable-tivoli-tsm )
+
+	local ARCH="$(tc-arch-kernel)"
+	local MY_ARCH="$(tc-arch)"
+	local BSD_BUILD_DIR="/usr/src/sys/${MY_ARCH}/compile/GENERIC"
+
+	AFS_SYSKVERS=26 \
+	econf \
+		--disable-strip-binaries \
+		$(use_enable bitmap-later) \
+		$(use_enable debug) \
+		$(use_enable debug debug-locks) \
+		$(use_enable debug debug-lwp) \
+		$(use_enable fuse fuse-client) \
+		$(use_enable kauth) \
+		$(use_enable modules kernel-module) \
+		$(use_enable namei namei-fileserver) \
+		$(use_enable ncurses gtx) \
+		$(use_enable pthreaded-ubik) \
+		$(use_enable supergroups) \
+		$(use_enable ubik-read-while-write) \
+		$(use_with api dot) \
+		$(use_with doc docbook-stylesheets /usr/share/sgml/docbook/xsl-stylesheets) \
+		$(use_with gssapi) \
+		$(use_with kerberos krb5) \
+		$(use_with perl swig) \
+		"${myconf[@]}"
+}
+
+src_compile() {
+	ARCH="$(tc-arch-kernel)" AR="$(tc-getAR)" emake V=1
+	local d
+	if use doc; then
+		emake -C doc/xml/AdminGuide auagd000.pdf
+		emake -C doc/xml/AdminRef auarf000.pdf
+		emake -C doc/xml/QuickStartUnix auqbg000.pdf
+		emake -C doc/xml/UserGuide auusg000.pdf
+	fi
+	use api && doxygen doc/doxygen/Doxyfile
+}
+
+src_install() {
+	local OPENRCDIR="${WORKDIR}/gentoo/openrc"
+	local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
+
+	emake DESTDIR="${ED}" install_nolibafs
+
+	if use modules; then
+		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
+	fi
+
+	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 kauth; 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* || die
+
+	# avoid collision with mit_krb5's version of kpasswd
+	if use kauth; then
+		mv "${ED}"/usr/bin/kpasswd{,_afs} || die
+		mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
+	fi
+
+	# avoid collision with heimdal's pagsh
+	if has_version app-crypt/heimdal; then
+		mv "${ED}"/usr/bin/pagsh{,_afs} || die
+		mv "${ED}"/usr/share/man/man1/pagsh{,_afs}.1 || die
+	fi
+
+	# 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 kauth && doman src/pam/pam_afs.5
+	DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
+			src/afsd/CellServDB NEWS README )
+
+	# documentation package
+	rm -rf doc/txt/winnotes || die # unneeded docs
+	if use doc; then
+		DOCS+=( doc/{pdf,protocol,txt} CODING CONTRIBUTING )
+		newdoc doc/xml/AdminGuide/auagd000.pdf AdminGuide.pdf
+		newdoc doc/xml/AdminRef/auarf000.pdf AdminRef.pdf
+		newdoc doc/xml/QuickStartUnix/auqbg000.pdf QuickStartUnix.pdf
+		newdoc doc/xml/UserGuide/auusg000.pdf UserGuide.pdf
+	fi
+	use api && DOCS+=( doc/doxygen/output/html )
+	einstalldocs
+
+	# 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
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
+	systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
+
+	# 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() {
+	if use modules; then
+		# Update linker.hints file
+		use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+		use kernel_linux && linux-mod_pkg_postinst
+	fi
+
+	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"
+	elog
+	elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
+	elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
+}
+
+pkg_postrm() {
+	if use modules; then
+		# Update linker.hints file
+		use kernel_FreeBSD && /usr/sbin/kldxref "${EPREFIX}/boot/modules"
+		use kernel_linux && linux-mod_pkg_postrm
+	fi
+}
+
+pkg_config() {
+	elog "Setting cache options for systemd."
+
+	SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
+	[ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
+
+	CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
+	[ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
+
+	if [ ${CACHESIZE} -lt 131070 ]; then
+		AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
+	elif [ ${CACHESIZE} -lt 524288 ]; then
+		AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
+	elif [ ${CACHESIZE} -lt 1048576 ]; then
+		AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
+	elif [ ${CACHESIZE} -lt 2209715 ]; then
+		AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
+	else
+		AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
+	fi
+
+	# Replace existing env var if exists, else append line
+	grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
+		sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
+		sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
+		die "Updating ${SERVICED_FILE} failed."
+}