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: Sat, 26 Mar 2016 19:15:34
Message-Id: 1459019715.37fb31d2bbb67a4bad7655e08e31aacddc1eba40.bircoph@gentoo
1 commit: 37fb31d2bbb67a4bad7655e08e31aacddc1eba40
2 Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 26 19:14:13 2016 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 26 19:15:15 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37fb31d2
7
8 net-fs/openafs: remove old and vulnerable versions
9
10 Bug: 564388
11
12 Package-Manager: portage-2.2.28
13 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
14
15 net-fs/openafs/Manifest | 9 --
16 net-fs/openafs/openafs-1.6.12-r1.ebuild | 176 -------------------------------
17 net-fs/openafs/openafs-1.6.14.ebuild | 175 -------------------------------
18 net-fs/openafs/openafs-1.6.16.ebuild | 177 --------------------------------
19 4 files changed, 537 deletions(-)
20
21 diff --git a/net-fs/openafs/Manifest b/net-fs/openafs/Manifest
22 index 22fffde..1469457 100644
23 --- a/net-fs/openafs/Manifest
24 +++ b/net-fs/openafs/Manifest
25 @@ -1,12 +1,3 @@
26 -DIST openafs-1.6.12-doc.tar.bz2 3531628 SHA256 1b5726f77ee98ae45b4b6d0142a65724e8f08099eb1b2a4308ae8f0638199963 SHA512 b0389f5aecce913a50e827204c3d3f19964473d4b8b0e6e39d91d00971e4be57b4cfece0b4bc40fb3b6f5d7d60ee40b079883505625413f0748035452c3c2686 WHIRLPOOL a795b70caf84e17d5bea720a12e2c1aa159a34105f51dbcf60a464b2c8bf81a9624e8beede566c9c4b6ceeff424db7925bf588a7383f0860df8ec65828d32cc1
27 -DIST openafs-1.6.12-src.tar.bz2 14603726 SHA256 c47ffaa24bf2373264e330a624acafb5f509f4b00d63394b96e9bab131bf5802 SHA512 12c4b1ad12be7d44c56907f250b1d1ef94ca04f2b6e6d8c750da2a304cd0c60dd410516a3fa414442149e3a99c0cfd7aef283f09106889039035347793f01fc8 WHIRLPOOL f14e72aef41c47dd4e78b519b65fc01b67d709bd027a3004a501b621d71cc76f4d27ab5704421e39f05a611516ddcba9f1c2715fd4662cff13349be31b7a61a9
28 -DIST openafs-1.6.14-doc.tar.bz2 3530481 SHA256 544fb3370465881bd1aadb24cf9e40610ff23d8445759c659d5354ce1e9358c3 SHA512 35de279fd61c657f5cd1b5fa26113a667155c2f2733fffb9bafeec1ac6be548fa335e5039e783cd6031fbc0ab8d27dd576e4571d76dd3f403283d5b32f75ca50 WHIRLPOOL 0663663a365f20448641093b1fc086219d395a7603c1658b69c083657ae0a2fec3d16a44e48adc3a7669b4a89ea07f0ce8e91d80134c5a5a1a193f304ced4a0b
29 -DIST openafs-1.6.14-src.tar.bz2 14605615 SHA256 3e62c798a7f982c4f88d85d32e46bee6a47848d207b1e318fe661ce44ae4e01f SHA512 957178b1c3f6262e831ec497b7dd76e208a48f2107942d44ce72b062081e2932b93cb800b786eb88b770a647daf3585f659fdd1e715d0e724ac56eae011f3601 WHIRLPOOL 43e58a9e34ed2340c732b88261ecf4043f7a6e7db18bac7113b74455b1a2f1ed864d345bf41bac42d6d437ae18778e7f37a794b738a882c0fb5e36257af7d960
30 -DIST openafs-1.6.16-doc.tar.bz2 3533244 SHA256 4916a5e155a4419186dd166e5eff4f30881399e81a255f7d3f43942a0b5bbcba SHA512 0a193fd24a11bb06621378e7c54feca8dc835b191f0c921c6fa6deb3d43be140ab4854f01128d29c76a075a705e88178128c94e9483162f4ba8c5e7ce4a06606 WHIRLPOOL 0be7495c40ef614d8198606afa297828fbb3fbdb063598dbb6d58e95375e9b1a49c4d6ab793f3581520bd27c655da158d3efb1602dfbaa8bca0bfadc5c94ab35
31 -DIST openafs-1.6.16-src.tar.bz2 14612920 SHA256 3431702bdcbd1b27833060c50869e618a192495877ebb0a66e4610de0b48eb81 SHA512 775c6b51e4a916ab14c2a33b746ffc67ce7f8e4d4d75e17374341d81b8d8b424971ffd67ba191848be28560cefceecc51f1f608ccdc7d896bafafa68e1726cb9 WHIRLPOOL 0da43210ee7779e49b86bb337bef5f3b70fdf3876eca763025d45628533a7ce7104b193c0c9d98d2f4363314faa79c7bd367432c5272c9b12249623f9b342812
32 DIST openafs-1.6.17-doc.tar.bz2 3529538 SHA256 803e895f9a5dc4c74866e8de20e07a8b7b972ee48b1603fab215b49116117921 SHA512 6056d5f410984a333fcd1581de623c4a4f218269138ab6ee4c9b9622a85ab89748b35d36517c092d8a7bace932fac0d6566645abbca087ae2b5d40e72cd52593 WHIRLPOOL 093b1c770748910af4c2144710350cef131b5621575d5d1648ff90ba54c4de13a1cc0bbcd9c8fcf81b126a81f20998806c90ab3d904446630eac214679c9b650
33 DIST openafs-1.6.17-src.tar.bz2 14607107 SHA256 96413a2dbffdc9170cc5dde6aa5ad0ae2383c6106994285ed8f186928813a398 SHA512 3ca61a7731c9bd9bae7da2f7b3900438fcc9f75c95b354574389c2203af2ec0a7b4dcaaf13a437743477fcad8a46c3bbb8c68255a976b9a9917b8f0a0cdf028f WHIRLPOOL 92de51878836a721e6fadbe2f6c7a8069ecf622a08fd05e3a01d8fef376bd2e18e9f3b4715d42a26e8d5f1d665f91924520ed6928ed1f460bac49b1bc906e129
34 -DIST openafs-patches-20150626.tar.xz 10588 SHA256 b221842e82e4807e6b8064454df3792b12f3d73104462d83aa88c79e3028fb4a SHA512 b77df9dc734965301585d5f66732fef119282e49cbd5c121f45aa9f0b64fc6c62e1cd93c8b7ff81702f6baece0df3cf9d99ab796e84f2c0c610dc2e2fd3cedf6 WHIRLPOOL 71778ab6f64a156f8f559d446e09cbb8278f2f0965225a21767a2a28883e228620c37241cd439426a3163ede8b04f676f2b4aea7c14394c82bdc47dc2643e6b2
35 -DIST openafs-patches-20150813.tar.xz 15520 SHA256 209766f5e97e924eab91d862875f360e0ed9821b317ee609789a77d7fbdeb8f0 SHA512 2703f65e7c3f1a724e9330d8f2aedf80f9d0b8ba4b03a5f466cd523eb8d0a1692542df722b24e06ce4ced476fb8615e2caca6159de7b18f151ecf7a14a5f0565 WHIRLPOOL c4055a7c0cf19847ecd8679316a0146b41589f157996b2f15b807d272270e65c1a6ee5f916d3127803cd26370c392b1e751d100d2ab383a57530b768e1682d60
36 -DIST openafs-patches-20160223.tar.xz 10536 SHA256 19c14ecd625ce96370fe3629faffd2841567954d687e1ee30c81a848702231a6 SHA512 83018a4ace8189182de7b878094c773996d824f9127f15167e1b5795e4b7af8f3cb3a86e054b95043343ff88c8b505376005cd97cc91b50e6bf05b2d5242ccbd WHIRLPOOL 8f58b30446fccf37df9460ff3ab87cbd2338346c545aca48bc328578951b92b3e34fe102ade2bcb822ddee5c826d9834d0c2ce257092aa9bdde4717afbbd756d
37 DIST openafs-patches-20160321.tar.xz 10940 SHA256 b8919d4db7ac962922f797b5f6a855de27f019f43163d4362946ae9b80d73278 SHA512 581f2248cd9926e79d9b2d30d5e9e3349794e8751e0382fd47c59d5d131f7d814744ed9926f008525466afa9c783e59b2f10d3def5d37966aad98c04873cf4c5 WHIRLPOOL 6da7619158dccb5fcc86e73d9d2f0c83f16fdf2dee8bf51e860db307e96262f5e669e2f3d34b166f0b5cd83f9b5b36018efc4de8e45e1265964919b24ac85b1a
38
39 diff --git a/net-fs/openafs/openafs-1.6.12-r1.ebuild b/net-fs/openafs/openafs-1.6.12-r1.ebuild
40 deleted file mode 100644
41 index 95aeef2..0000000
42 --- a/net-fs/openafs/openafs-1.6.12-r1.ebuild
43 +++ /dev/null
44 @@ -1,176 +0,0 @@
45 -# Copyright 1999-2015 Gentoo Foundation
46 -# Distributed under the terms of the GNU General Public License v2
47 -# $Id$
48 -
49 -EAPI="5"
50 -
51 -inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
52 -
53 -MY_PV=$(delete_version_separator '_')
54 -MY_P="${PN}-${MY_PV}"
55 -PVER="20150813"
56 -
57 -DESCRIPTION="The OpenAFS distributed file system"
58 -HOMEPAGE="http://www.openafs.org/"
59 -# We always d/l the doc tarball as man pages are not USE=doc material
60 -[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
61 -SRC_URI="
62 - http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
63 - http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
64 - https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
65 -"
66 -
67 -LICENSE="IBM BSD openafs-krb5-a APSL-2"
68 -SLOT="0"
69 -KEYWORDS="amd64 sparc x86 ~amd64-linux ~x86-linux"
70 -
71 -IUSE="doc kerberos +modules pam"
72 -
73 -CDEPEND="
74 - sys-libs/ncurses:0=
75 - pam? ( virtual/pam )
76 - kerberos? ( virtual/krb5 )"
77 -
78 -DEPEND="${CDEPEND}
79 - doc? (
80 - app-text/docbook-xsl-stylesheets
81 - dev-libs/libxslt
82 - )"
83 -
84 -RDEPEND="${CDEPEND}
85 - modules? ( ~net-fs/openafs-kernel-${PV} )"
86 -
87 -S="${WORKDIR}/${MY_P}"
88 -
89 -src_prepare() {
90 - EPATCH_EXCLUDE="050_all_job_server.patch" \
91 - EPATCH_SUFFIX="patch" \
92 - epatch "${WORKDIR}"/gentoo/patches
93 - epatch "${WORKDIR}"/gentoo/security-patches/CVE-2015-{3282..3287}.patch
94 - epatch_user
95 -
96 - # fixing 2-nd level makefiles to honor flags
97 - sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
98 - src/*/Makefile.in || die '*/Makefile.in sed failed'
99 -
100 - # packaging is f-ed up, so we can't run eautoreconf
101 - # run autotools commands based on what is listed in regen.sh
102 - eaclocal -I src/cf
103 - eautoconf
104 - eautoconf -o configure-libafs configure-libafs.ac
105 - eautoheader
106 - einfo "Deleting autom4te.cache directory"
107 - rm -rf autom4te.cache
108 -}
109 -
110 -src_configure() {
111 - AFS_SYSKVERS=26 \
112 - econf \
113 - --disable-kernel-module \
114 - --disable-strip-binaries \
115 - --enable-supergroups \
116 - $(use_enable pam) \
117 - $(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
118 - $(use_with kerberos krb5)
119 -}
120 -
121 -src_compile() {
122 - emake all_nolibafs
123 - local d
124 - if use doc; then
125 - for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
126 - emake -C "${d}" html;
127 - done
128 - fi
129 -}
130 -
131 -src_install() {
132 - local OPENRCDIR="${WORKDIR}/gentoo/openrc"
133 - local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
134 -
135 - emake DESTDIR="${ED}" install_nolibafs
136 -
137 - insinto /etc/openafs
138 - doins src/afsd/CellServDB
139 - echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
140 - echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
141 -
142 - # pam_afs and pam_afs.krb have been installed in irregular locations, fix
143 - if use pam ; then
144 - dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
145 - fi
146 - rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
147 -
148 - # remove kdump stuff provided by kexec-tools #222455
149 - rm -rf "${ED}"/usr/sbin/kdump*
150 -
151 - # avoid collision with mit_krb5's version of kpasswd
152 - mv "${ED}"/usr/bin/kpasswd{,_afs} || die
153 - mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
154 -
155 - # move lwp stuff around #200674 #330061
156 - mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
157 - mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
158 - # update paths to the relocated lwp headers
159 - sed -ri \
160 - -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
161 - "${ED}"/usr/include/*.h \
162 - "${ED}"/usr/include/*/*.h \
163 - || die
164 -
165 - # minimal documentation
166 - use pam && doman src/pam/pam_afs.5
167 - dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
168 -
169 - # documentation package
170 - if use doc ; then
171 - dodoc -r doc/{arch,examples,protocol,txt}
172 - dohtml -r doc/xml/*
173 - fi
174 -
175 - # Gentoo related scripts
176 - newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
177 - newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
178 - newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
179 - newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
180 - systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
181 - systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
182 - systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
183 -
184 - # used directories: client
185 - keepdir /etc/openafs
186 -
187 - # used directories: server
188 - keepdir /etc/openafs/server
189 - diropts -m0700
190 - keepdir /var/lib/openafs
191 - keepdir /var/lib/openafs/db
192 - diropts -m0755
193 - keepdir /var/lib/openafs/logs
194 -
195 - # link logfiles to /var/log
196 - dosym ../lib/openafs/logs /var/log/openafs
197 -}
198 -
199 -pkg_preinst() {
200 - ## Somewhat intelligently install default configuration files
201 - ## (when they are not present)
202 - local x
203 - for x in cacheinfo CellServDB ThisCell ; do
204 - if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
205 - cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
206 - fi
207 - done
208 -}
209 -
210 -pkg_postinst() {
211 - elog "This installation should work out of the box (at least the"
212 - elog "client part doing global afs-cell browsing, unless you had"
213 - elog "a previous and different configuration). If you want to"
214 - elog "set up your own cell or modify the standard config,"
215 - elog "please have a look at the Gentoo OpenAFS documentation"
216 - elog "(warning: it is not yet up to date wrt the new file locations)"
217 - elog
218 - elog "The documentation can be found at:"
219 - elog " https://wiki.gentoo.org/wiki/OpenAFS"
220 -}
221
222 diff --git a/net-fs/openafs/openafs-1.6.14.ebuild b/net-fs/openafs/openafs-1.6.14.ebuild
223 deleted file mode 100644
224 index e820249..0000000
225 --- a/net-fs/openafs/openafs-1.6.14.ebuild
226 +++ /dev/null
227 @@ -1,175 +0,0 @@
228 -# Copyright 1999-2015 Gentoo Foundation
229 -# Distributed under the terms of the GNU General Public License v2
230 -# $Id$
231 -
232 -EAPI="5"
233 -
234 -inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
235 -
236 -MY_PV=$(delete_version_separator '_')
237 -MY_P="${PN}-${MY_PV}"
238 -PVER="20150626"
239 -
240 -DESCRIPTION="The OpenAFS distributed file system"
241 -HOMEPAGE="http://www.openafs.org/"
242 -# We always d/l the doc tarball as man pages are not USE=doc material
243 -[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
244 -SRC_URI="
245 - http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
246 - http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
247 - https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
248 -"
249 -
250 -LICENSE="IBM BSD openafs-krb5-a APSL-2"
251 -SLOT="0"
252 -KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
253 -
254 -IUSE="doc kerberos +modules pam"
255 -
256 -CDEPEND="
257 - sys-libs/ncurses:0=
258 - pam? ( virtual/pam )
259 - kerberos? ( virtual/krb5 )"
260 -
261 -DEPEND="${CDEPEND}
262 - doc? (
263 - app-text/docbook-xsl-stylesheets
264 - dev-libs/libxslt
265 - )"
266 -
267 -RDEPEND="${CDEPEND}
268 - modules? ( ~net-fs/openafs-kernel-${PV} )"
269 -
270 -S="${WORKDIR}/${MY_P}"
271 -
272 -src_prepare() {
273 - EPATCH_EXCLUDE="050_all_job_server.patch" \
274 - EPATCH_SUFFIX="patch" \
275 - epatch "${WORKDIR}"/gentoo/patches
276 - epatch_user
277 -
278 - # fixing 2-nd level makefiles to honor flags
279 - sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
280 - src/*/Makefile.in || die '*/Makefile.in sed failed'
281 -
282 - # packaging is f-ed up, so we can't run eautoreconf
283 - # run autotools commands based on what is listed in regen.sh
284 - eaclocal -I src/cf
285 - eautoconf
286 - eautoconf -o configure-libafs configure-libafs.ac
287 - eautoheader
288 - einfo "Deleting autom4te.cache directory"
289 - rm -rf autom4te.cache
290 -}
291 -
292 -src_configure() {
293 - AFS_SYSKVERS=26 \
294 - econf \
295 - --disable-kernel-module \
296 - --disable-strip-binaries \
297 - --enable-supergroups \
298 - $(use_enable pam) \
299 - $(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
300 - $(use_with kerberos krb5)
301 -}
302 -
303 -src_compile() {
304 - emake all_nolibafs
305 - local d
306 - if use doc; then
307 - for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
308 - emake -C "${d}" html;
309 - done
310 - fi
311 -}
312 -
313 -src_install() {
314 - local OPENRCDIR="${WORKDIR}/gentoo/openrc"
315 - local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
316 -
317 - emake DESTDIR="${ED}" install_nolibafs
318 -
319 - insinto /etc/openafs
320 - doins src/afsd/CellServDB
321 - echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
322 - echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
323 -
324 - # pam_afs and pam_afs.krb have been installed in irregular locations, fix
325 - if use pam ; then
326 - dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
327 - fi
328 - rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
329 -
330 - # remove kdump stuff provided by kexec-tools #222455
331 - rm -rf "${ED}"/usr/sbin/kdump*
332 -
333 - # avoid collision with mit_krb5's version of kpasswd
334 - mv "${ED}"/usr/bin/kpasswd{,_afs} || die
335 - mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
336 -
337 - # move lwp stuff around #200674 #330061
338 - mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
339 - mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
340 - # update paths to the relocated lwp headers
341 - sed -ri \
342 - -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
343 - "${ED}"/usr/include/*.h \
344 - "${ED}"/usr/include/*/*.h \
345 - || die
346 -
347 - # minimal documentation
348 - use pam && doman src/pam/pam_afs.5
349 - dodoc "${WORKDIR}/gentoo/README" src/afsd/CellServDB
350 -
351 - # documentation package
352 - if use doc ; then
353 - dodoc -r doc/{arch,examples,protocol,txt}
354 - dohtml -r doc/xml/*
355 - fi
356 -
357 - # Gentoo related scripts
358 - newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
359 - newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
360 - newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
361 - newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
362 - systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
363 - systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
364 - systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
365 -
366 - # used directories: client
367 - keepdir /etc/openafs
368 -
369 - # used directories: server
370 - keepdir /etc/openafs/server
371 - diropts -m0700
372 - keepdir /var/lib/openafs
373 - keepdir /var/lib/openafs/db
374 - diropts -m0755
375 - keepdir /var/lib/openafs/logs
376 -
377 - # link logfiles to /var/log
378 - dosym ../lib/openafs/logs /var/log/openafs
379 -}
380 -
381 -pkg_preinst() {
382 - ## Somewhat intelligently install default configuration files
383 - ## (when they are not present)
384 - local x
385 - for x in cacheinfo CellServDB ThisCell ; do
386 - if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
387 - cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
388 - fi
389 - done
390 -}
391 -
392 -pkg_postinst() {
393 - elog "This installation should work out of the box (at least the"
394 - elog "client part doing global afs-cell browsing, unless you had"
395 - elog "a previous and different configuration). If you want to"
396 - elog "set up your own cell or modify the standard config,"
397 - elog "please have a look at the Gentoo OpenAFS documentation"
398 - elog "(warning: it is not yet up to date wrt the new file locations)"
399 - elog
400 - elog "The documentation can be found at:"
401 - elog " https://wiki.gentoo.org/wiki/OpenAFS"
402 -}
403
404 diff --git a/net-fs/openafs/openafs-1.6.16.ebuild b/net-fs/openafs/openafs-1.6.16.ebuild
405 deleted file mode 100644
406 index 429eecb..0000000
407 --- a/net-fs/openafs/openafs-1.6.16.ebuild
408 +++ /dev/null
409 @@ -1,177 +0,0 @@
410 -# Copyright 1999-2016 Gentoo Foundation
411 -# Distributed under the terms of the GNU General Public License v2
412 -# $Id$
413 -
414 -EAPI="6"
415 -
416 -inherit autotools eutils flag-o-matic multilib pam systemd toolchain-funcs versionator
417 -
418 -MY_PV=$(delete_version_separator '_')
419 -MY_P="${PN}-${MY_PV}"
420 -PVER="20160223"
421 -
422 -DESCRIPTION="The OpenAFS distributed file system"
423 -HOMEPAGE="http://www.openafs.org/"
424 -# We always d/l the doc tarball as man pages are not USE=doc material
425 -[[ ${PV} == *_pre* ]] && MY_PRE="candidate/" || MY_PRE=""
426 -SRC_URI="
427 - http://openafs.org/dl/openafs/${MY_PRE}${MY_PV}/${MY_P}-src.tar.bz2
428 - http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
429 - https://dev.gentoo.org/~bircoph/afs/${PN}-patches-${PVER}.tar.xz
430 -"
431 -
432 -LICENSE="IBM BSD openafs-krb5-a APSL-2"
433 -SLOT="0"
434 -KEYWORDS="~amd64 ~amd64-fbsd ~amd64-linux ~sparc ~x86 ~x86-fbsd ~x86-linux"
435 -
436 -IUSE="doc kerberos +modules pam"
437 -
438 -CDEPEND="
439 - sys-libs/ncurses:0=
440 - pam? ( virtual/pam )
441 - kerberos? ( virtual/krb5 )"
442 -
443 -DEPEND="${CDEPEND}
444 - doc? (
445 - app-text/docbook-xsl-stylesheets
446 - dev-libs/libxslt
447 - )"
448 -
449 -RDEPEND="${CDEPEND}
450 - modules? ( ~net-fs/openafs-kernel-${PV} )"
451 -
452 -S="${WORKDIR}/${MY_P}"
453 -
454 -PATCHES=( "${WORKDIR}/gentoo/patches" )
455 -
456 -src_prepare() {
457 - default
458 -
459 - # fixing 2-nd level makefiles to honor flags
460 - sed -i -r 's/\<CFLAGS[[:space:]]*=/CFLAGS+=/; s/\<LDFLAGS[[:space:]]*=/LDFLAGS+=/' \
461 - src/*/Makefile.in || die '*/Makefile.in sed failed'
462 -
463 - # packaging is f-ed up, so we can't run eautoreconf
464 - # run autotools commands based on what is listed in regen.sh
465 - eaclocal -I src/cf
466 - eautoconf
467 - eautoconf -o configure-libafs configure-libafs.ac
468 - eautoheader
469 - einfo "Deleting autom4te.cache directory"
470 - rm -rf autom4te.cache
471 -}
472 -
473 -src_configure() {
474 - AFS_SYSKVERS=26 \
475 - econf \
476 - --disable-kernel-module \
477 - --disable-strip-binaries \
478 - --enable-supergroups \
479 - $(use_enable pam) \
480 - $(use_with doc html-xsl /usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl) \
481 - $(use_with kerberos krb5)
482 -}
483 -
484 -src_compile() {
485 - emake all_nolibafs
486 - local d
487 - if use doc; then
488 - for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do
489 - emake -C "${d}" html;
490 - done
491 - fi
492 -}
493 -
494 -src_install() {
495 - local OPENRCDIR="${WORKDIR}/gentoo/openrc"
496 - local SYSTEMDDIR="${WORKDIR}/gentoo/systemd"
497 -
498 - emake DESTDIR="${ED}" install_nolibafs
499 -
500 - insinto /etc/openafs
501 - doins src/afsd/CellServDB
502 - echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
503 - echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
504 -
505 - # pam_afs and pam_afs.krb have been installed in irregular locations, fix
506 - if use pam ; then
507 - dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
508 - fi
509 - rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
510 -
511 - # remove kdump stuff provided by kexec-tools #222455
512 - rm -rf "${ED}"/usr/sbin/kdump*
513 -
514 - # avoid collision with mit_krb5's version of kpasswd
515 - mv "${ED}"/usr/bin/kpasswd{,_afs} || die
516 - mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
517 -
518 - # move lwp stuff around #200674 #330061
519 - mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
520 - mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
521 - # update paths to the relocated lwp headers
522 - sed -ri \
523 - -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
524 - "${ED}"/usr/include/*.h \
525 - "${ED}"/usr/include/*/*.h \
526 - || die
527 -
528 - # minimal documentation
529 - use pam && doman src/pam/pam_afs.5
530 - DOCS=( "${WORKDIR}/gentoo/README.Gentoo"
531 - src/afsd/CellServDB NEWS README )
532 -
533 - # documentation package
534 - if use doc ; then
535 - DOCS+=( doc/{arch,examples,pdf,protocol,txt} )
536 - dohtml -r doc/xml/
537 - fi
538 -
539 - einstalldocs
540 -
541 - # Gentoo related scripts
542 - newinitd "${OPENRCDIR}"/openafs-client.initd openafs-client
543 - newconfd "${OPENRCDIR}"/openafs-client.confd openafs-client
544 - newinitd "${OPENRCDIR}"/openafs-server.initd openafs-server
545 - newconfd "${OPENRCDIR}"/openafs-server.confd openafs-server
546 - systemd_dotmpfilesd "${SYSTEMDDIR}"/tmpfiles.d/openafs-client.conf
547 - systemd_dounit "${SYSTEMDDIR}"/openafs-client.service
548 - systemd_dounit "${SYSTEMDDIR}"/openafs-server.service
549 -
550 - # used directories: client
551 - keepdir /etc/openafs
552 -
553 - # used directories: server
554 - keepdir /etc/openafs/server
555 - diropts -m0700
556 - keepdir /var/lib/openafs
557 - keepdir /var/lib/openafs/db
558 - diropts -m0755
559 - keepdir /var/lib/openafs/logs
560 -
561 - # link logfiles to /var/log
562 - dosym ../lib/openafs/logs /var/log/openafs
563 -}
564 -
565 -pkg_preinst() {
566 - ## Somewhat intelligently install default configuration files
567 - ## (when they are not present)
568 - local x
569 - for x in cacheinfo CellServDB ThisCell ; do
570 - if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
571 - cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
572 - fi
573 - done
574 -}
575 -
576 -pkg_postinst() {
577 - elog "This installation should work out of the box (at least the"
578 - elog "client part doing global afs-cell browsing, unless you had"
579 - elog "a previous and different configuration). If you want to"
580 - elog "set up your own cell or modify the standard config,"
581 - elog "please have a look at the Gentoo OpenAFS documentation"
582 - elog "(warning: it is not yet up to date wrt the new file locations)"
583 - elog
584 - elog "The documentation can be found at:"
585 - elog " https://wiki.gentoo.org/wiki/OpenAFS"
586 -}