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:54
Message-Id: 1519965696.7977590eae9ec4be8170ba6fcaa8fd62cb17e777.np-hardass@gentoo
1 commit: 7977590eae9ec4be8170ba6fcaa8fd62cb17e777
2 Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 2 04:36:10 2018 +0000
4 Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 2 04:41:36 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7977590e
7
8 net-fs/openafs: Drop old
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.ebuild | 222 -----------------------------------
14 2 files changed, 224 deletions(-)
15
16 diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
17 index d43a0e71a00..f475d2a5b24 100644
18 --- a/net-fs/openafs/Manifest
19 +++ b/net-fs/openafs/Manifest
20 @@ -1,5 +1,3 @@
21 -DIST openafs-1.6.22-doc.tar.bz2 3567926 BLAKE2B 49c20ba0cf28cf567bbdbdd9f34bce504bfc90fe87d74bc9a1f30250a51802239ff9ee1286da5961fed50e84c71d311df7b3c11e393a10f58f88e4dc57773ca1 SHA512 6ae43aa86744b1a7879e583faea96ecbdf4dd6f9c4eb39040ca58217c63ae5bbf565cd70e48cddf870b8cb7623e923260a31559d7d1e22b4ef86922601aedd62
22 -DIST openafs-1.6.22-src.tar.bz2 14606745 BLAKE2B ee406ac0bc2f91862b916fe2c84bb5b1887b43bfb396a0d4b4d3349420b4af397344a2c4d585698fe6f3870fba2090df7b7da85431275b5d1c28b01168221557 SHA512 7a533462175e79aa48339c5105d2dbddde284e23e5d5bcff58a4893839fc7bcfdd779d1d65abfc5217b185624bf88fe1ef02d0c37d29b6ff96616e96f54a6d87
23 DIST openafs-1.6.22.1-doc.tar.bz2 3534064 BLAKE2B e9f67fb42b6c4e6c2092e713e801db5479beccb1e3dc6d48c16e655151dcf91693497c4ee57c47c98c52cba6eb0ad271698ed450487bdb462111a9276cb1eb74 SHA512 1c9481507824a450d6610dbbb427bdbccb3373e12bae0bf603ec121023ee7bbb05fef366f5eec793736b0643d0f6e8f611bc55473c71a831e3b31970420ec44c
24 DIST openafs-1.6.22.1-src.tar.bz2 14682183 BLAKE2B a01e08f30f28dda9484407bbe0568df7b517e587b6e2475d669269e09745050bee955438dfeab9d86564dbc22821bc2fb417c15f8add0aae6acdde266c080df0 SHA512 901959051f60f7ffa2db8a253a16f9460713e3637a53f0b6b05e72247e08b633951116dc28b19db9c7448d8ebc7a20a8a851d5356c52f16c28f5c89209f8190e
25 DIST openafs-1.6.22.2-doc.tar.bz2 3533975 BLAKE2B a44b39291ece3d4b1f9f9e722b35f48698063e4daecb94745b5a8ead00412b9e8e7baef0c1264c6289de45cab66b4b83ed3cfe83a60072480c848c14bb61016c SHA512 e8405ad2f5c3ad24d37789fdf71961ed3f1af4467b9385a87f70f8ffc39dfccf1db35a492360811cf62bb3959cdb7f6eee08991aaafa24961b24815f908172c1
26
27 diff --git a/net-fs/openafs/openafs-1.6.22.ebuild b/net-fs/openafs/openafs-1.6.22.ebuild
28 deleted file mode 100644
29 index 3c3aa6efbac..00000000000
30 --- a/net-fs/openafs/openafs-1.6.22.ebuild
31 +++ /dev/null
32 @@ -1,222 +0,0 @@
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="20170822"
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 -}