Gentoo Archives: gentoo-commits

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