Gentoo Archives: gentoo-commits

From: NP Hardass <np-hardass@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/openafs/
Date: Fri, 02 Mar 2018 04:41:56
Message-Id: 1519965691.0c61d3b80d393e87f20abef474ee79caf72404fc.np-hardass@gentoo
1 commit: 0c61d3b80d393e87f20abef474ee79caf72404fc
2 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 2 04:20:24 2018 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 2 04:41:31 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c61d3b8
7
8 net-fs/openafs: Bump to 1.6.22.2
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 net-fs/openafs/Manifest | 2 +
13 net-fs/openafs/openafs-1.6.22.2.ebuild | 222 +++++++++++++++++++++++++++++++++
14 2 files changed, 224 insertions(+)
15
16 diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
17 index d24412ddc6f..d43a0e71a00 100644
18 --- a/net-fs/openafs/Manifest
19 +++ b/net-fs/openafs/Manifest
20 @@ -2,4 +2,6 @@ DIST openafs-1.6.22-doc.tar.bz2 3567926 BLAKE2B 49c20ba0cf28cf567bbdbdd9f34bce50
21 DIST openafs-1.6.22-src.tar.bz2 14606745 BLAKE2B ee406ac0bc2f91862b916fe2c84bb5b1887b43bfb396a0d4b4d3349420b4af397344a2c4d585698fe6f3870fba2090df7b7da85431275b5d1c28b01168221557 SHA512 7a533462175e79aa48339c5105d2dbddde284e23e5d5bcff58a4893839fc7bcfdd779d1d65abfc5217b185624bf88fe1ef02d0c37d29b6ff96616e96f54a6d87
22 DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B e9f67fb42b6c4e6c2092e713e801db5479beccb1e3dc6d48c16e655151dcf91693497c4ee57c47c98c52cba6eb0ad271698ed450487bdb462111a9276cb1eb74 SHA512 1c9481507824a450d6610dbbb427bdbccb3373e12bae0bf603ec121023ee7bbb05fef366f5eec793736b0643d0f6e8f611bc55473c71a831e3b31970420ec44c
23 DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
24 +DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c SHA512 e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1
25 +DIST openafs-1.6.22.2-src.tar.bz2 14673379 BLAKE2B 06408ad98a1812608b14ee89ffa40ccbbf6aa7d41dc0741c9c7b9e2c59a3f88c1f6676aa2f996b888cb7f50c04f0c8fe2da15c3f3647e3998f70c973c18ea7d3 SHA512 e4f2ce326a1d04ec20b1fa4115509bf35f73d937ff77e6e017e851ce871542d935e5ae8a597efd14027c385869657cf538cffa2674878bd4d4da37f20626172c
26 DIST openafs-patches-20170822.tar.xz 11036 BLAKE2B e53d9e01c5808ca9876fd22f729e0e82cb0f6bc7c1f4875ad0607ac9d547e216c61cc2c3506eaafb7c81318958cd038c177e9e5b2c3728997d7f44e13bbbded4 SHA512 f4b574287bfe54881a70f3ccd4d4901b2f8f9ecbec7b3a4975b59050d5ef27c6de3da25f820b7b2b10f1a38034bb28e5c01ee094fb38cae80e244eeb04b29d0a
27
28 diff --git a/net-fs/openafs/openafs-1.6.22.2.ebuild b/net-fs/openafs/openafs-1.6.22.2.ebuild
29 new file mode 100644
30 index 00000000000..249ca428710
31 --- /dev/null
32 +++ b/net-fs/openafs/openafs-1.6.22.2.ebuild
33 @@ -0,0 +1,222 @@
34 +# Copyright 1999-2018 Gentoo Foundation
35 +# Distributed under the terms of the GNU General Public License v2
36 +
37 +EAPI="6"
38 +
39 +inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
40 +
41 +MY_PV=$(delete_version_separator '_')
42 +MY_P="${PN}-${MY_PV}"
43 +PVER="20170822"
44 +
45 +DESCRIPTION="The OpenAFS distributed file system"
46 +HOMEPAGE="https://www.openafs.org/"
47 +# We always d/l the doc tarball as man pages are not USE=doc material
48 +[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
49 +SRC_URI="
50 + https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
51 + https://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-doc.tar.bz2
52 + https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
53 +"
54 +
55 +LICENSE="IBM BSD openafs-krb5-a APSL-2"
56 +SLOT="0"
57 +KEYWORDS="~amd64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
58 +
59 +IUSE="bitmap-later debug doc fuse kerberos +modules ncurses pam pthreaded-ubik +supergroups"
60 +
61 +CDEPEND="
62 + virtual/libintl
63 + fuse? ( sys-fs/fuse )
64 + kerberos? ( virtual/krb5 )
65 + ncurses? ( sys-libs/ncurses:0= )
66 + pam? ( virtual/pam )"
67 +
68 +DEPEND="${CDEPEND}
69 + virtual/yacc
70 + doc? (
71 + app-text/docbook-xsl-stylesheets
72 + dev-libs/libxslt
73 + )"
74 +
75 +RDEPEND="${CDEPEND}
76 + modules? ( ~net-fs/openafs-kernel-${PV} )"
77 +
78 +S="${WORKDIR}/${MY_P}"
79 +
80 +PATCHES=( "${WORKDIR}/gentoo/patches" )
81 +
82 +src_prepare() {
83 + default
84 +
85 + # fixing 2-nd level makefiles to honor flags
86 + sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
87 + src/*/Makefile.in || die '*/Makefile.in sed failed'
88 +
89 + # packaging is f-ed up, so we can't run eautoreconf
90 + # run autotools commands based on what is listed in regen.sh
91 + eaclocal -I src/cf
92 + eautoconf
93 + eautoconf -o configure-libafs configure-libafs.ac
94 + eautoheader
95 + einfo "Deleting autom4te.cache directory"
96 + rm -rf autom4te.cache
97 +}
98 +
99 +src_configure() {
100 + local myconf
101 + use debug && use pam && myconf="--enable-debug-pam"
102 +
103 + AFS_SYSKVERS=26 \
104 + econf \
105 + --disable-kernel-module \
106 + --disable-strip-binaries \
107 + $(use_enable bitmap-later) \
108 + $(use_enable debug) \
109 + $(use_enable debug debug-lwp) \
110 + $(use_enable fuse fuse-client) \
111 + $(use_enable ncurses gtx) \
112 + $(use_enable pam) \
113 + $(use_enable pthreaded-ubik) \
114 + $(use_enable supergroups) \
115 + $(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
116 + $(use_with kerberos krb5) \
117 + "${myconf}"
118 +}
119 +
120 +src_compile() {
121 + emake all_nolibafs
122 + local d
123 + if use doc; then
124 + for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
125 + emake -C "${d}" html;
126 + done
127 + fi
128 +}
129 +
130 +src_install() {
131 + local OPENRCDIR="${WORKDIR}/gentoo/openrc"
132 + local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
133 +
134 + emake DESTDIR="${ED}" install_nolibafs
135 +
136 + insinto /etc/openafs
137 + doins src/afsd/CellServDB
138 + echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
139 + echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
140 +
141 + # pam_afs and pam_afs.krb have been installed in irregular locations, fix
142 + if use pam ; then
143 + dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
144 + fi
145 + rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
146 +
147 + # remove kdump stuff provided by kexec-tools #222455
148 + rm -rf "${ED}"/usr/sbin/kdump*
149 +
150 + # avoid collision with mit_krb5's version of kpasswd
151 + mv "${ED}"/usr/bin/kpasswd{,_afs} || die
152 + mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
153 +
154 + # move lwp stuff around #200674 #330061
155 + mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
156 + mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
157 + # update paths to the relocated lwp headers
158 + sed -ri \
159 + -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
160 + "${ED}"/usr/include/*.h \
161 + "${ED}"/usr/include/*/*.h \
162 + || die
163 +
164 + # minimal documentation
165 + use pam && doman src/pam/pam_afs.5
166 + DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
167 + src/afsd/CellServDB NEWS README )
168 +
169 + # documentation package
170 + if use doc ; then
171 + DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
172 + dohtml -r doc/xml/
173 + fi
174 +
175 + einstalldocs
176 +
177 + # Gentoo related scripts
178 + newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
179 + newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
180 + newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
181 + newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
182 + systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
183 + systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
184 + systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
185 + systemd_install_serviced "${SYSTEMDDIR}"/openafs-client.service.conf
186 + systemd_install_serviced "${SYSTEMDDIR}"/openafs-server.service.conf
187 +
188 + # used directories: client
189 + keepdir /etc/openafs
190 +
191 + # used directories: server
192 + keepdir /etc/openafs/server
193 + diropts -m0700
194 + keepdir /var/lib/openafs
195 + keepdir /var/lib/openafs/db
196 + diropts -m0755
197 + keepdir /var/lib/openafs/logs
198 +
199 + # link logfiles to /var/log
200 + dosym ../lib/openafs/logs /var/log/openafs
201 +}
202 +
203 +pkg_preinst() {
204 + ## Somewhat intelligently install default configuration files
205 + ## (when they are not present)
206 + local x
207 + for x in cacheinfo CellServDB ThisCell ; do
208 + if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
209 + cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
210 + fi
211 + done
212 +}
213 +
214 +pkg_postinst() {
215 + elog "This installation should work out of the box (at least the"
216 + elog "client part doing global afs-cell browsing, unless you had"
217 + elog "a previous and different configuration). If you want to"
218 + elog "set up your own cell or modify the standard config,"
219 + elog "please have a look at the Gentoo OpenAFS documentation"
220 + elog "(warning: it is not yet up to date wrt the new file locations)"
221 + elog
222 + elog "The documentation can be found at:"
223 + elog " https://wiki.gentoo.org/wiki/OpenAFS"
224 + elog
225 + elog "Systemd users should run emerge --config ${CATEGORY}/${PN} before"
226 + elog "first use and whenever ${EROOT}/etc/openafs/cacheinfo is edited."
227 +}
228 +
229 +pkg_config() {
230 + elog "Setting cache options for systemd."
231 +
232 + SERVICED_FILE="${EROOT}"/etc/systemd/system/openafs-client.service.d/00gentoo.conf
233 + [ ! -e "${SERVICED_FILE}" ] && die "Systemd service.d file ${SERVICED_FILE} not found."
234 +
235 + CACHESIZE=$(cut -d ':' -f 3 "${EROOT}"/etc/openafs/cacheinfo)
236 + [ -z ${CACHESIZE} ] && die "Failed to parse ${EROOT}/etc/openafs/cacheinfo."
237 +
238 + if [ ${CACHESIZE} -lt 131070 ]; then
239 + AFSD_CACHE_ARGS="-stat 300 -dcache 100 -daemons 2 -volumes 50"
240 + elif [ ${CACHESIZE} -lt 524288 ]; then
241 + AFSD_CACHE_ARGS="-stat 2000 -dcache 800 -daemons 3 -volumes 70"
242 + elif [ ${CACHESIZE} -lt 1048576 ]; then
243 + AFSD_CACHE_ARGS="-stat 2800 -dcache 2400 -daemons 5 -volumes 128"
244 + elif [ ${CACHESIZE} -lt 2209715 ]; then
245 + AFSD_CACHE_ARGS="-stat 3600 -dcache 3600 -daemons 5 -volumes 196 -files 50000"
246 + else
247 + AFSD_CACHE_ARGS="-stat 4000 -dcache 4000 -daemons 6 -volumes 256 -files 50000"
248 + fi
249 +
250 + # Replace existing env var if exists, else append line
251 + grep -q "^Environment=\"AFSD_CACHE_ARGS=" "${SERVICED_FILE}" && \
252 + sed -i "s/^Environment=\"AFSD_CACHE_ARGS=.*/Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"/" "${SERVICED_FILE}" || \
253 + sed -i "$ a\Environment=\"AFSD_CACHE_ARGS=${AFSD_CACHE_ARGS}\"" "${SERVICED_FILE}" || \
254 + die "Updating ${SERVICED_FILE} failed."
255 +}