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