Gentoo Archives: gentoo-commits

From: "Tom Wijsman (tomwij)" <tomwij@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/openafs: ChangeLog openafs-1.6.2.ebuild openafs-1.6.5.ebuild
Date: Tue, 27 Aug 2013 08:15:33
Message-Id: 20130827081530.448FE2004C@flycatcher.gentoo.org
1 tomwij 13/08/27 08:15:30
2
3 Modified: ChangeLog openafs-1.6.2.ebuild
4 Added: openafs-1.6.5.ebuild
5 Log:
6 Version bump to 1.6.5. Fixes bug #478498 which fixes security bug #478296, security bug #478282, bug #472184, bug #469992, bug #463477 and bug #460494. Proxied commit for Andrej Filipcic. Drop autotools eclass because none of its functions are used.
7
8 (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
9
10 Revision Changes Path
11 1.194 net-fs/openafs/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/ChangeLog?rev=1.194&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/ChangeLog?rev=1.194&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/ChangeLog?r1=1.193&r2=1.194
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v
20 retrieving revision 1.193
21 retrieving revision 1.194
22 diff -u -r1.193 -r1.194
23 --- ChangeLog 13 Apr 2013 14:21:07 -0000 1.193
24 +++ ChangeLog 27 Aug 2013 08:15:30 -0000 1.194
25 @@ -1,6 +1,13 @@
26 # ChangeLog for net-fs/openafs
27 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.193 2013/04/13 14:21:07 ago Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.194 2013/08/27 08:15:30 tomwij Exp $
30 +
31 +*openafs-1.6.5 (27 Aug 2013)
32 +
33 + 27 Aug 2013; Tom Wijsman <TomWij@g.o> +openafs-1.6.5.ebuild:
34 + Version bump to 1.6.5. Fixes bug #478498 which fixes security bug #478296,
35 + security bug #478282, bug #472184, bug #469992, bug #463477 and bug #460494.
36 + Proxied commit for Andrej Filipcic.
37
38 13 Apr 2013; Agostino Sarubbo <ago@g.o> -openafs-1.4.14.1-r1.ebuild,
39 -openafs-1.4.14.1.ebuild, -openafs-1.6.1-r2.ebuild, -openafs-1.6.1-r3.ebuild,
40
41
42
43 1.5 net-fs/openafs/openafs-1.6.2.ebuild
44
45 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.2.ebuild?rev=1.5&view=markup
46 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.2.ebuild?rev=1.5&content-type=text/plain
47 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.2.ebuild?r1=1.4&r2=1.5
48
49 Index: openafs-1.6.2.ebuild
50 ===================================================================
51 RCS file: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.2.ebuild,v
52 retrieving revision 1.4
53 retrieving revision 1.5
54 diff -u -r1.4 -r1.5
55 --- openafs-1.6.2.ebuild 13 Apr 2013 14:20:09 -0000 1.4
56 +++ openafs-1.6.2.ebuild 27 Aug 2013 08:15:30 -0000 1.5
57 @@ -1,10 +1,10 @@
58 # Copyright 1999-2013 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 -# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.2.ebuild,v 1.4 2013/04/13 14:20:09 ago Exp $
61 +# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.2.ebuild,v 1.5 2013/08/27 08:15:30 tomwij Exp $
62
63 EAPI="4"
64
65 -inherit flag-o-matic eutils autotools multilib toolchain-funcs versionator pam
66 +inherit flag-o-matic eutils multilib toolchain-funcs versionator pam
67
68 MY_PV=$(delete_version_separator '_')
69 MY_P="${PN}-${MY_PV}"
70
71
72
73 1.1 net-fs/openafs/openafs-1.6.5.ebuild
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.5.ebuild?rev=1.1&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/openafs/openafs-1.6.5.ebuild?rev=1.1&content-type=text/plain
77
78 Index: openafs-1.6.5.ebuild
79 ===================================================================
80 # Copyright 1999-2013 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 # $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.6.5.ebuild,v 1.1 2013/08/27 08:15:30 tomwij Exp $
83
84 EAPI="4"
85
86 inherit flag-o-matic eutils multilib toolchain-funcs versionator pam
87
88 MY_PV=$(delete_version_separator '_')
89 MY_P="${PN}-${MY_PV}"
90 PVER="1"
91 DESCRIPTION="The OpenAFS distributed file system"
92 HOMEPAGE="http://www.openafs.org/"
93 # We always d/l the doc tarball as man pages are not USE=doc material
94 SRC_URI="http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-src.tar.bz2
95 http://openafs.org/dl/openafs/${MY_PV}/${MY_P}-doc.tar.bz2
96 mirror://gentoo/${P}-patches-${PVER}.tar.bz2"
97
98 LICENSE="IBM BSD openafs-krb5-a APSL-2"
99 SLOT="0"
100 KEYWORDS="~amd64 ~sparc ~x86 ~amd64-linux ~x86-linux"
101 IUSE="doc kerberos pam"
102
103 RDEPEND="~net-fs/openafs-kernel-${PV}
104 sys-libs/ncurses
105 pam? ( sys-libs/pam )
106 kerberos? ( virtual/krb5 )"
107
108 S="${WORKDIR}/${MY_P}"
109
110 src_prepare() {
111 EPATCH_SUFFIX="patch" \
112 epatch "${WORKDIR}"/gentoo/patches
113
114 # packaging is f-ed up, so we can't run automake (i.e. eautoreconf)
115 sed -i 's/^\(\s*\)a/\1ea/' regen.sh
116 : # this line makes repoman ok with not calling eautoconf etc. directly
117 skipman=1
118 . regen.sh
119 }
120
121 src_configure() {
122 # cannot use "use_with" macro, as --without-krb5-config crashes the econf
123 local myconf=""
124 if use kerberos; then
125 myconf="--with-krb5-conf=$(type -p krb5-config)"
126 fi
127
128 AFS_SYSKVERS=26 \
129 XCFLAGS="${CFLAGS}" \
130 econf \
131 $(use_enable pam) \
132 --enable-supergroups \
133 --disable-kernel-module \
134 --disable-strip-binaries \
135 ${myconf}
136 }
137
138 src_compile() {
139 emake all_nolibafs
140 }
141
142 src_install() {
143 local CONFDIR=${WORKDIR}/gentoo/configs
144 local SCRIPTDIR=${WORKDIR}/gentoo/scripts
145
146 emake DESTDIR="${ED}" install_nolibafs
147
148 insinto /etc/openafs
149 doins src/afsd/CellServDB
150 echo "/afs:/var/cache/openafs:200000" > "${ED}"/etc/openafs/cacheinfo
151 echo "openafs.org" > "${ED}"/etc/openafs/ThisCell
152
153 # pam_afs and pam_afs.krb have been installed in irregular locations, fix
154 if use pam ; then
155 dopammod "${ED}"/usr/$(get_libdir)/pam_afs*
156 fi
157 rm -f "${ED}"/usr/$(get_libdir)/pam_afs* || die
158
159 # remove kdump stuff provided by kexec-tools #222455
160 rm -rf "${ED}"/usr/sbin/kdump*
161
162 # avoid collision with mit_krb5's version of kpasswd
163 mv "${ED}"/usr/bin/kpasswd{,_afs} || die
164 mv "${ED}"/usr/share/man/man1/kpasswd{,_afs}.1 || die
165
166 # move lwp stuff around #200674 #330061
167 mv "${ED}"/usr/include/{lwp,lock,timer}.h "${ED}"/usr/include/afs/ || die
168 mv "${ED}"/usr/$(get_libdir)/liblwp* "${ED}"/usr/$(get_libdir)/afs/ || die
169 # update paths to the relocated lwp headers
170 sed -ri \
171 -e '/^#include <(lwp|lock|timer).h>/s:<([^>]*)>:<afs/\1>:' \
172 "${ED}"/usr/include/*.h \
173 "${ED}"/usr/include/*/*.h \
174 || die
175
176 # minimal documentation
177 use pam && doman src/pam/pam_afs.5
178 dodoc "${CONFDIR}"/README src/afsd/CellServDB
179
180 # documentation package
181 if use doc ; then
182 find doc/{arch,examples,pdf,protocol,txt}/ -type f -exec dodoc {} +
183 dohtml -A xml -r doc/{html,xml}/*
184 fi
185
186 # Gentoo related scripts
187 newinitd "${SCRIPTDIR}"/openafs-client openafs-client || die
188 newconfd "${CONFDIR}"/openafs-client openafs-client || die
189 newinitd "${SCRIPTDIR}"/openafs-server openafs-server || die
190 newconfd "${CONFDIR}"/openafs-server openafs-server || die
191
192 # used directories: client
193 keepdir /etc/openafs
194 keepdir /var/cache/openafs
195
196 # used directories: server
197 keepdir /etc/openafs/server
198 diropts -m0700
199 keepdir /var/lib/openafs
200 keepdir /var/lib/openafs/db
201 diropts -m0755
202 keepdir /var/lib/openafs/logs
203
204 # link logfiles to /var/log
205 dosym ../lib/openafs/logs /var/log/openafs
206 }
207
208 pkg_preinst() {
209 ## Somewhat intelligently install default configuration files
210 ## (when they are not present)
211 local x
212 for x in cacheinfo CellServDB ThisCell ; do
213 if [ -e "${EROOT}"/etc/openafs/${x} ] ; then
214 cp "${EROOT}"/etc/openafs/${x} "${ED}"/etc/openafs/
215 fi
216 done
217 }
218
219 pkg_postinst() {
220 elog "This installation should work out of the box (at least the"
221 elog "client part doing global afs-cell browsing, unless you had"
222 elog "a previous and different configuration). If you want to"
223 elog "set up your own cell or modify the standard config,"
224 elog "please have a look at the Gentoo OpenAFS documentation"
225 elog "(warning: it is not yet up to date wrt the new file locations)"
226 elog
227 elog "The documentation can be found at:"
228 elog " http://www.gentoo.org/doc/en/openafs.xml"
229 }