commit:     0c61d3b80d393e87f20abef474ee79caf72404fc
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  2 04:20:24 2018 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 04:41:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c61d3b8

net-fs/openafs:  Bump to 1.6.22.2

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-fs/openafs/Manifest                |   2 +
 net-fs/openafs/openafs-1.6.22.2.ebuild | 222 +++++++++++++++++++++++++++++++++
 2 files changed, 224 insertions(+)

diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
index d24412ddc6f..d43a0e71a00 100644
--- a/net-fs/openafs/Manifest
+++ b/net-fs/openafs/Manifest
@@ -2,4 +2,6 @@ DIST openafs-1.6.22-doc.tar.bz2 3567926 BLAKE2B 
49c20ba0cf28cf567bbdbdd9f34bce50
 DIST openafs-1.6.22-src.tar.bz2 14606745 BLAKE2B 
ee406ac0bc2f91862b916fe2c84bb5b1887b43bfb396a0d4b4d3349420b4af397344a2c4d585698fe6f3870fba2090df7b7da85431275b5d1c28b01168221557
 SHA512 
7a533462175e79aa48339c5105d2dbddde284e23e5d5bcff58a4893839fc7bcfdd779d1d65abfc5217b185624bf88fe1ef02d0c37d29b6ff96616e96f54a6d87
 DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B 
e9f67fb42b6c4e6c2092e713e801db5479beccb1e3dc6d48c16e655151dcf91693497c4ee57c47c98c52cba6eb0ad271698ed450487bdb462111a9276cb1eb74
 SHA512 
1c9481507824a450d6610dbbb427bdbccb3373e12bae0bf603ec121023ee7bbb05fef366f5eec793736b0643d0f6e8f611bc55473c71a831e3b31970420ec44c
 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-patches-20170822.tar.xz 11036 BLAKE2B 
e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4
 SHA512 
f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a

diff --git a/net-fs/openafs/openafs-1.6.22.2.ebuild 
b/net-fs/openafs/openafs-1.6.22.2.ebuild
new file mode 100644
index 00000000000..249ca428710
--- /dev/null
+++ b/net-fs/openafs/openafs-1.6.22.2.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2018 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."
+}

Reply via email to