1 |
stefaan 07/11/27 17:29:53 |
2 |
|
3 |
Modified: openafs-1.5.27.ebuild ChangeLog |
4 |
openafs-1.4.5-r2.ebuild |
5 |
Log: |
6 |
QA + synchronizing 1.5.x with 1.4.x |
7 |
(Portage version: 2.1.3.19) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 net-fs/openafs/openafs-1.5.27.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/openafs/openafs-1.5.27.ebuild?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/openafs/openafs-1.5.27.ebuild?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/openafs/openafs-1.5.27.ebuild?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: openafs-1.5.27.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.5.27.ebuild,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- openafs-1.5.27.ebuild 15 Nov 2007 11:52:45 -0000 1.1 |
23 |
+++ openafs-1.5.27.ebuild 27 Nov 2007 17:29:53 -0000 1.2 |
24 |
@@ -1,14 +1,14 @@ |
25 |
# Copyright 1999-2007 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.5.27.ebuild,v 1.1 2007/11/15 11:52:45 stefaan Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.5.27.ebuild,v 1.2 2007/11/27 17:29:53 stefaan Exp $ |
29 |
|
30 |
-inherit flag-o-matic eutils toolchain-funcs versionator |
31 |
+inherit flag-o-matic eutils toolchain-funcs versionator pam |
32 |
|
33 |
PATCHVER=0.14 |
34 |
DESCRIPTION="The OpenAFS distributed file system" |
35 |
HOMEPAGE="http://www.openafs.org/" |
36 |
-SRC_URI="http://openafs.org/dl/${PN}/${PV}/${P}-src.tar.bz2 |
37 |
- doc? ( http://openafs.org/dl/${PN}/${PV}/${P}-doc.tar.bz2 ) |
38 |
+SRC_URI="http://openafs.org/dl/${PV}/${P}-src.tar.bz2 |
39 |
+ doc? ( http://openafs.org/dl/${PV}/${P}-doc.tar.bz2 ) |
40 |
mirror://gentoo/${PN}-gentoo-${PATCHVER}.tar.bz2" |
41 |
|
42 |
LICENSE="IBM openafs-krb5 openafs-krb5-a APSL-2 sun-rpc" |
43 |
@@ -25,7 +25,7 @@ |
44 |
SCRIPTDIR=${WORKDIR}/gentoo/scripts |
45 |
|
46 |
src_unpack() { |
47 |
- unpack ${A}; cd ${S} |
48 |
+ unpack ${A}; cd "${S}" |
49 |
|
50 |
# Apply patches to apply chosen compiler settings, fix the hardcoded paths |
51 |
# to be more FHS friendly, and the fix the incorrect typecasts for va_arg |
52 |
@@ -58,32 +58,29 @@ |
53 |
} |
54 |
|
55 |
src_install() { |
56 |
- make DESTDIR=${D} install_nolibafs || die "Installing failed" |
57 |
+ make DESTDIR="${D}" install_nolibafs || die "Installing failed" |
58 |
|
59 |
# pam_afs and pam_afs.krb have been installed in irregular locations, fix |
60 |
if use pam; then |
61 |
- dodir /$(get_libdir)/security |
62 |
- mv ${D}/usr/$(get_libdir)/pam_afs* ${D}/$(get_libdir)/security |
63 |
+ dopammod "${D}"/usr/$(get_libdir)/pam_afs* |
64 |
+ rm -f "${D}"/usr/$(get_libdir)/pam_afs* |
65 |
fi |
66 |
|
67 |
# compile_et collides with com_err. Remove it from this package. |
68 |
- rm ${D}/usr/bin/compile_et |
69 |
+ rm "${D}"/usr/bin/compile_et |
70 |
|
71 |
# avoid collision with mit_krb5's version of kpasswd |
72 |
- (cd ${D}/usr/bin; mv kpasswd kpasswd_afs) |
73 |
- use doc && (cd doc/man-pages/man1; mv kpasswd.1 kpasswd_afs.1) |
74 |
+ (cd "${D}"/usr/bin; mv kpasswd kpasswd_afs) |
75 |
+ use doc && (cd "${D}"/usr/share/man/man1; mv kpasswd.1 kpasswd_afs.1) |
76 |
|
77 |
# minimal documentation |
78 |
dodoc ${CONFDIR}/README ${CONFDIR}/CellServDB |
79 |
|
80 |
# documentation package |
81 |
if use doc; then |
82 |
- # install manuals |
83 |
- doman doc/man-pages/man?/*.? |
84 |
- |
85 |
use pam && doman src/pam/pam_afs.5 |
86 |
|
87 |
- cp -pPR doc/* ${D}/usr/share/doc/${PF} |
88 |
+ cp -pPR doc/* "${D}"/usr/share/doc/${PF} |
89 |
fi |
90 |
|
91 |
# Gentoo related scripts |
92 |
@@ -108,206 +105,29 @@ |
93 |
dosym ../lib/openafs/logs /var/log/openafs |
94 |
} |
95 |
|
96 |
-migrate_to_fhs() { |
97 |
- # conventions: |
98 |
- # only automatically migrate if the destination directories are |
99 |
- # as of yet non-existant |
100 |
- |
101 |
- # path translations |
102 |
- local oldafsconfdir=${ROOT}usr/afs/etc |
103 |
- local newafsconfdir=${ROOT}etc/openafs/server |
104 |
- local oldviceetcdir=${ROOT}usr/vice/etc |
105 |
- local newviceetcdir=${ROOT}etc/openafs |
106 |
- local oldafslocaldir=${ROOT}usr/afs/local |
107 |
- local newafslocaldir=${ROOT}var/lib/openafs |
108 |
- local oldafsdbdir=${ROOT}usr/afs/db |
109 |
- local newafsdbdir=${ROOT}var/lib/openafs/db |
110 |
- |
111 |
- # detect Transarc afsconfdir |
112 |
- local afsconfdir=0 |
113 |
- [ ! -L ${oldafsconfdir} -a -d ${oldafsconfdir} -a ! -e ${newafsconfdir} ] && afsconfdir=1 |
114 |
- |
115 |
- # detect Transarc viceetcdir |
116 |
- local viceetcdir=0 |
117 |
- local viceetcsoftlink=0 |
118 |
- if [ -d ${oldviceetcdir} -a ! -e ${newviceetcdir} ]; then |
119 |
- if [ ! -L ${oldviceetcdir} ]; then |
120 |
- viceetcdir=1 |
121 |
- else |
122 |
- if [ $(readlink ${oldviceetcdir}) = /etc/afs ]; then |
123 |
- viceetcdir=1 |
124 |
- viceetcsoftlink=1 |
125 |
- fi |
126 |
- fi |
127 |
- fi |
128 |
- |
129 |
- # detect Transarc afslocaldir |
130 |
- local afslocaldir=0 |
131 |
- [ ! -L ${oldafslocaldir} -a -d ${oldafslocaldir} -a ! -e ${newafslocaldir} ] && afslocaldir=1 |
132 |
- |
133 |
- # detect Transarc afsdbdir |
134 |
- local afsdbdir=0 |
135 |
- [ ! -L ${oldafsdbdir} -a -d ${oldafsdbdir} -a ! -e ${newafsdbdir} ] && afsdbdir=1 |
136 |
- |
137 |
- # detect Transarc afsbosconfigdir |
138 |
- local afsbosconfigdir=0 |
139 |
- [ ${afslocaldir} = 1 -a -f ${oldafslocaldir}/BosConfig ] && afsbosconfigdir=1 |
140 |
- |
141 |
- # any of these? |
142 |
- local any=$((${afsconfdir}+${viceetcdir}+${afsdbdir}+${afslocaldir})) |
143 |
- |
144 |
- # No migration needed? Then bail out |
145 |
- if [ ${any} = 0 ]; then |
146 |
- return 0 |
147 |
- fi |
148 |
- |
149 |
- # Root not / ? Then do not attempt automatic migration |
150 |
- if [ "$ROOT" != "/" ]; then |
151 |
- ewarn Old-style configuration files found, but not migrating |
152 |
- ewarn because installation rootdir is not / |
153 |
- ebeep 5 |
154 |
- return 0 |
155 |
- fi |
156 |
- |
157 |
- # detect whether an installation with old config files is running |
158 |
- local pid |
159 |
- if pid=$(pgrep -n -U 0 bosserver) &>/dev/null; then |
160 |
- # find location of executable |
161 |
- if ! executable=$(readlink /proc/${pid}/exe); then |
162 |
- die "Couldn't execute readlink on bosserver process" |
163 |
- fi |
164 |
- # if executable is not located in /usr/sbin, assume Transarc locations |
165 |
- if [[ $executable != ${ROOT}usr/sbin/* ]]; then |
166 |
- ewarn "Found a running process with the name \"bosserver\" and pid ${pid}" |
167 |
- ewarn "that is not located in /usr/sbin. This suggests a running" |
168 |
- ewarn "OpenAFS-server with traditional TransARC path conventions." |
169 |
- ewarn "This installation procedure aims to migrate old" |
170 |
- ewarn "configuration files to new FHS-conform locations." |
171 |
- ewarn "Please stop the running server and reattempt the upgrade" |
172 |
- die "Installation aborted because of running OpenAFS server" |
173 |
- fi |
174 |
- fi |
175 |
- |
176 |
- # warn about migration |
177 |
- ewarn |
178 |
- ewarn "OpenAFS configuration/data-files have been found in old" |
179 |
- ewarn "TransARC-style locations, for which the standard FHS equivalents" |
180 |
- ewarn "do not exist yet. " |
181 |
- ewarn "Following procedure will copy those files to the new locations such" |
182 |
- ewarn "that, given a previously working configuration, both server" |
183 |
- ewarn "and client should restart without problems. Files will be copied" |
184 |
- ewarn "only, and not removed from the old locations. For assistance" |
185 |
- ewarn "in removing the old files, consult the section on Upgrading in" |
186 |
- ewarn "the Gentoo OpenAFS documentation" |
187 |
- ewarn "(see http://www.gentoo.org/doc/en/openafs.xml)" |
188 |
- ewarn "Will continue in 30 seconds, press Ctrl-C to abort" |
189 |
- ewarn |
190 |
- ebeep 10 |
191 |
- epause 20 |
192 |
- |
193 |
- # fortunately, there's no overlap between the old locations and the new ones |
194 |
- |
195 |
- # afsconfdir: migrate /usr/afs/etc to /etc/openafs/server |
196 |
- if [ ${afsconfdir} = 1 ]; then |
197 |
- mkdir -m 755 -p ${newafsconfdir} |
198 |
- cp ${oldafsconfdir}/* ${newafsconfdir} |
199 |
- fi |
200 |
- |
201 |
- # viceetcdir: migrate /usr/vice/etc (likely a link to /etc/afs) to /etc/openafs |
202 |
- if [ ${viceetcdir} = 1 ]; then |
203 |
- mkdir -m 755 -p ${newviceetcdir} |
204 |
- cp ${oldviceetcdir}/* ${newviceetcdir} |
205 |
- fi |
206 |
- |
207 |
- # afslocaldir: migrate /usr/afs/local to /var/lib/openafs |
208 |
- if [ ${afslocaldir} = 1 ]; then |
209 |
- mkdir -m 700 -p ${newafslocaldir} |
210 |
- cp ${oldafslocaldir}/* ${newafslocaldir} |
211 |
- |
212 |
- # afsbosconfigdir: migrate /usr/afs/local/BosConfig to /etc/openafs/BosConfig |
213 |
- if [ ${afsbosconfigdir} = 1 ]; then |
214 |
- sed -i \ |
215 |
- -e 's:/usr/afs/bin/:/usr/libexec/openafs/:g' \ |
216 |
- -e 's:/usr/afs/etc:/etc/openafs/server:g' \ |
217 |
- -e 's:/usr/afs/bin:/usr/bin:g' \ |
218 |
- ${newafslocaldir}/BosConfig |
219 |
- if [ -d ${newviceetcdir} ]; then |
220 |
- mv ${newafslocaldir}/BosConfig ${newviceetcdir} |
221 |
- else |
222 |
- ewarn |
223 |
- ewarn "No ${newviceetcdir} found, couldn't move BosConfig there," |
224 |
- ewarn "it will remain in ${newafslocaldir}. Please investigate" |
225 |
- ewarn "before attempting to start the server" |
226 |
- ewarn |
227 |
- ebeep 3 |
228 |
- fi |
229 |
- fi |
230 |
- fi |
231 |
- |
232 |
- # afsdbdir: migrate /usr/afs/db to /var/lib/openafs/db |
233 |
- if [ ${afsdbdir} = 1 ]; then |
234 |
- mkdir -m 700 -p ${newafsdbdir} |
235 |
- cp ${oldafsdbdir}/* ${newafsdbdir} |
236 |
- fi |
237 |
- |
238 |
- ewarn "Migration finished" |
239 |
- ewarn "Please remember to manually migrate disk-cache (if present)" |
240 |
- ewarn "Alter /etc/openafs/cacheinfo to do so" |
241 |
- ebeep 5 |
242 |
-} |
243 |
- |
244 |
-migrate_configfile() { |
245 |
- local oldconfigfile=${ROOT}etc/conf.d/afs |
246 |
- local oldconfigfile2=${ROOT}etc/conf.d/afs-client |
247 |
- local newconfigfile=${ROOT}etc/conf.d/openafs-client |
248 |
- |
249 |
- if [ -f ${oldconfigfile} -a ! -e ${newconfigfile} ]; then |
250 |
- cp ${oldconfigfile} ${newconfigfile} |
251 |
- elif [ -f ${oldconfigfile2} -a ! -e ${newconfigfile} ]; then |
252 |
- cp ${oldconfigfile2} ${newconfigfile} |
253 |
- fi |
254 |
- |
255 |
- oldconfigfile=${ROOT}etc/conf.d/afs-server |
256 |
- newconfigfile=${ROOT}etc/conf.d/openafs-server |
257 |
- if [ -f ${oldconfigfile} -a ! -e ${newconfigfile} ]; then |
258 |
- cp ${oldconfigfile} ${newconfigfile} |
259 |
- fi |
260 |
-} |
261 |
- |
262 |
pkg_preinst() { |
263 |
- migrate_to_fhs |
264 |
- migrate_configfile |
265 |
- |
266 |
## Somewhat intelligently install default configuration files |
267 |
## (when they are not present) |
268 |
# CellServDB |
269 |
- if [ ! -e ${ROOT}etc/openafs/CellServDB ] \ |
270 |
- || grep "GCO Public CellServDB" ${ROOT}etc/openafs/CellServDB &> /dev/null |
271 |
+ if [ ! -e "${ROOT}"etc/openafs/CellServDB ] \ |
272 |
+ || grep "GCO Public CellServDB" "${ROOT}"etc/openafs/CellServDB &> /dev/null |
273 |
then |
274 |
- cp ${CONFDIR}/CellServDB ${D}etc/openafs |
275 |
+ cp ${CONFDIR}/CellServDB "${D}"etc/openafs |
276 |
fi |
277 |
# cacheinfo: use a default location cache, 200 megabyte in size |
278 |
# (should be safe for about any root partition, the user can increase |
279 |
# the size as required) |
280 |
- if [ ! -e ${ROOT}etc/openafs/cacheinfo ]; then |
281 |
- echo "/afs:/var/cache/openafs:200000" > ${D}etc/openafs/cacheinfo |
282 |
+ if [ ! -e "${ROOT}"etc/openafs/cacheinfo ]; then |
283 |
+ echo "/afs:/var/cache/openafs:200000" > "${D}"etc/openafs/cacheinfo |
284 |
fi |
285 |
# ThisCell: default to "openafs.org" |
286 |
- if [ ! -e ${ROOT}etc/openafs/ThisCell ]; then |
287 |
- echo "openafs.org" > ${D}etc/openafs/ThisCell |
288 |
+ if [ ! -e "${ROOT}"etc/openafs/ThisCell ]; then |
289 |
+ echo "openafs.org" > "${D}"etc/openafs/ThisCell |
290 |
fi |
291 |
} |
292 |
|
293 |
pkg_postinst() { |
294 |
elog |
295 |
- elog "If you are upgrading from a < 1.4.0_rc8 version of the ebuild," |
296 |
- elog "we urge you to look at the upgrade-section of the" |
297 |
- elog "Gentoo OpenAFS documentation. (If you're upgrading from" |
298 |
- elog "< 1.3.85, then you really really should)" |
299 |
- |
300 |
- ebeep 5 |
301 |
- |
302 |
- elog |
303 |
elog "This installation should work out of the box (at least the" |
304 |
elog "client part doing global afs-cell browsing, unless you had" |
305 |
elog "a previous and different configuration). If you want to" |
306 |
@@ -317,6 +137,4 @@ |
307 |
elog |
308 |
elog "The documentation can be found at:" |
309 |
elog " http://www.gentoo.org/doc/en/openafs.xml" |
310 |
- |
311 |
- epause 5 |
312 |
} |
313 |
|
314 |
|
315 |
|
316 |
1.128 net-fs/openafs/ChangeLog |
317 |
|
318 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/openafs/ChangeLog?rev=1.128&view=markup |
319 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/openafs/ChangeLog?rev=1.128&content-type=text/plain |
320 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/openafs/ChangeLog?r1=1.127&r2=1.128 |
321 |
|
322 |
Index: ChangeLog |
323 |
=================================================================== |
324 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v |
325 |
retrieving revision 1.127 |
326 |
retrieving revision 1.128 |
327 |
diff -u -r1.127 -r1.128 |
328 |
--- ChangeLog 27 Nov 2007 17:19:46 -0000 1.127 |
329 |
+++ ChangeLog 27 Nov 2007 17:29:53 -0000 1.128 |
330 |
@@ -1,6 +1,10 @@ |
331 |
# ChangeLog for net-fs/openafs |
332 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
333 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.127 2007/11/27 17:19:46 stefaan Exp $ |
334 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/ChangeLog,v 1.128 2007/11/27 17:29:53 stefaan Exp $ |
335 |
+ |
336 |
+ 27 Nov 2007; Stefaan De Roeck <stefaan@g.o> |
337 |
+ openafs-1.4.5-r2.ebuild, openafs-1.5.27.ebuild: |
338 |
+ QA + synchronizing 1.5.x with 1.4.x |
339 |
|
340 |
*openafs-1.4.5-r2 (27 Nov 2007) |
341 |
|
342 |
|
343 |
|
344 |
|
345 |
1.2 net-fs/openafs/openafs-1.4.5-r2.ebuild |
346 |
|
347 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/openafs/openafs-1.4.5-r2.ebuild?rev=1.2&view=markup |
348 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/openafs/openafs-1.4.5-r2.ebuild?rev=1.2&content-type=text/plain |
349 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/openafs/openafs-1.4.5-r2.ebuild?r1=1.1&r2=1.2 |
350 |
|
351 |
Index: openafs-1.4.5-r2.ebuild |
352 |
=================================================================== |
353 |
RCS file: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.5-r2.ebuild,v |
354 |
retrieving revision 1.1 |
355 |
retrieving revision 1.2 |
356 |
diff -u -r1.1 -r1.2 |
357 |
--- openafs-1.4.5-r2.ebuild 27 Nov 2007 17:19:46 -0000 1.1 |
358 |
+++ openafs-1.4.5-r2.ebuild 27 Nov 2007 17:29:53 -0000 1.2 |
359 |
@@ -1,6 +1,6 @@ |
360 |
# Copyright 1999-2007 Gentoo Foundation |
361 |
# Distributed under the terms of the GNU General Public License v2 |
362 |
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.5-r2.ebuild,v 1.1 2007/11/27 17:19:46 stefaan Exp $ |
363 |
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs/openafs-1.4.5-r2.ebuild,v 1.2 2007/11/27 17:29:53 stefaan Exp $ |
364 |
|
365 |
inherit flag-o-matic eutils toolchain-funcs versionator pam |
366 |
|
367 |
@@ -31,7 +31,7 @@ |
368 |
# to be more FHS friendly, and the fix the incorrect typecasts for va_arg |
369 |
EPATCH_SUFFIX="patch" epatch ${PATCHDIR} |
370 |
|
371 |
- epatch ${FILESDIR}/openafs-alpha-ucontext.patch |
372 |
+ epatch "${FILESDIR}"/openafs-alpha-ucontext.patch |
373 |
|
374 |
sed -i 's/^[ \t]*XCFLAGS.*//' src/cf/osconf.m4 |
375 |
|
376 |
|
377 |
|
378 |
|
379 |
-- |
380 |
gentoo-commits@g.o mailing list |