commit: 75181050ad6e34273e970a185989b3cd25a81486
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 15:43:01 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 15:45:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75181050
net-fs/openafs: Bump to 1.6.21.1
Fixed service scripts, Thanks to johnfg for his help
Package-Manager: Portage-2.3.10, Repoman-2.3.3
net-fs/openafs/Manifest | 3 +
net-fs/openafs/openafs-1.6.21.1.ebuild | 222 +++++++++++++++++++++++++++++++++
2 files changed, 225 insertions(+)
diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index 62536ae1cb5..41c2460b077 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -4,4 +4,7 @@ DIST openafs-1.6.20.2-doc.tar.bz2 3531309 SHA256
ec19f00594d8dd0b201aa8a2799ccab
DIST openafs-1.6.20.2-src.tar.bz2 14676861 SHA256
50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614 SHA512
74c50fa71a98e7ad8bfed0610ab1dbf5c6669cdbd1e240c7b155f345fc511d9e51b4d9caa8d235223ad929b711577a192ca0841c92279bf16991cace8f19a575
WHIRLPOOL
af213b7bb94962dcf76d22cf2078c8cc02d435a22a26f14ca7113d3eafb4304823b9806ff4121e5c0ab4f9f4f665eed0910c08dd41f3f2de136e8818f7ed2b1e
DIST openafs-1.6.21-doc.tar.bz2 3532948 SHA256
5bc07340fc6b6db12e92f88a33c70478d22c93de7ae1725c4b25ef43caac6e8c SHA512
37ee9a140e9f34145a020ee2ba06c8635a27c3329836dc379af2fcda9928182637b4ab3da303b4a54d8dde6df463e50481b9a970b1d07d180a78f8a9e46e0d96
WHIRLPOOL
fbe089e6ec88babfb9865917a64cf711f952be20dc0079c4e31327bf7a0d2ee1ab10c77a531297a366402df6c5994411f1ae3ed99ea966feb64c5341e5d695bd
DIST openafs-1.6.21-src.tar.bz2 14682997 SHA256
ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f SHA512
451c38ed5031b8a962da3276bf5d0f1b74c5956c2d10cdb8bbd22ea633880ebf35cf5fc71feb5d2eca4306762f6c2376a46f4522150291acfc469f8be2da757f
WHIRLPOOL
a643735720d8ab486fc32f0f21a1340792879e0648d0ffa72bfe7a10a4659f5c0f986d4b918bfc7810c2fe4fa0762a0c727c7fd8de5c179b14bdbdb56664c607
+DIST openafs-1.6.21.1-doc.tar.bz2 3532980 SHA256
a8b2482eaa3bd5a3521b8dfde69337e5e01b1b1626c0a2e0a489049834a2983a SHA512
97236d45153dd8f487caad2e5fff382dc63dd3c75270f58c8afd47145176255d1c7b454b366118543a168951066fd721c7dce506e123adf57d3db939129e6356
WHIRLPOOL
6a72623508a01f9cb8fd5ec33a7a407a3c813e24756ed88e45edf0cc9503135ac85a6fc78257d5ea91bdfa4cce4dd25b9a38a5a463a901bd665c1da85830a5be
+DIST openafs-1.6.21.1-src.tar.bz2 14679991 SHA256
aed896b0f598e3033e9ceb2a1eae24addff9ec0bb2d713ab63945a449ded3a5a SHA512
a8c496657a59ee00411717aac8b6c4ca64f7ffeef400ae84ff902c8b2d81d19a367f78fbe105512ec7ec7181e8b0158fc359565eb99e2beb39d6a93ed1b28f98
WHIRLPOOL
57919d0babfee0aca6659e0e036437b9f0d01d8798bdaf51200798dd47d08b706a078bdff055f0ac0f85cb4ee7cf3adc239feaf9bec19dfb268984b9fd47faca
DIST openafs-patches-20170212.tar.xz 11008 SHA256
9e20ca0ce0af6178ba39e459e88ecf3da8e6d97947a8b77a65f3cb0e523f6b47 SHA512
13e525a3f612b43318ad2fefaa3edf15ad572153494e94826815400f90a253678d2ade44d6adae08b1cb0dc8f311f5407f5aa540ed0df7a2d2d6024695bd917f
WHIRLPOOL
4f81b94ad5ae7aab8ab954a333aa5cf72692cf91784b441b16e55fd023e58b7fe575b0228073fbacb9036cd4a7bfccd7553795457872973d15bbe48b95ac4484
+DIST openafs-patches-20170822.tar.xz 11036 SHA256
970324fc50ee48bc6aa06bbe448c0aac5a398c38e196155924b85dc8ed36e649 SHA512
f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
WHIRLPOOL
d9485c1d08f2346218cf1285d02ac5097bc283d4648ba9203d861162c259fa74ff749acb455e62eaa38a717cf253ed221c11f3ad0339600496b7da4929419e50
diff --git a/net-fs/openafs/openafs-1.6.21.1.ebuild
b/net-fs/openafs/openafs-1.6.21.1.ebuild
new file mode 100644
index 00000000000..4ecf063fc89
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.21.1.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs
versionator
+
+MY_PV=$(delete_version_separator '_')
+MY_P="${PN}-${MY_PV}"
+PVER="20170822"
+
+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="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik
+supergroups"
+
+CDEPEND="
+ virtual/libintl
+ fuse? ( sys-fs/fuse )
+ kerberos? ( virtual/krb5 )
+ ncurses? ( sys-libs/ncurses:0= )
+ pam? ( virtual/pam )"
+
+DEPEND="${CDEPEND}
+ virtual/yacc
+ doc? (
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ )"
+
+RDEPEND="${CDEPEND}
+ modules? ( ~net-fs/openafs-kernel-${PV} )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${WORKDIR}/gentoo/patches" )
+
+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'
+
+ # 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
+ use debug && use pam && myconf="--enable-debug-pam"
+
+ AFS_SYSKVERS=26 \
+ econf \
+ --disable-kernel-module \
+ --disable-strip-binaries \
+ $(use_enable bitmap-later) \
+ $(use_enable debug) \
+ $(use_enable debug debug-lwp) \
+ $(use_enable fuse fuse-client) \
+ $(use_enable ncurses gtx) \
+ $(use_enable pam) \
+ $(use_enable pthreaded-ubik) \
+ $(use_enable supergroups) \
+ $(use_with doc html-xsl
/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
+ $(use_with kerberos krb5) \
+ "${myconf}"
+}
+
+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
+ DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
+ src/afsd/CellServDB NEWS README )
+
+ # documentation package
+ if use doc ; then
+ DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
+ dohtml -r doc/xml/
+ fi
+
+ 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() {
+ 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_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."
+}
