/[gentoo-x86]/eclass/cvs.eclass
Gentoo

Diff of /eclass/cvs.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.33 Revision 1.57
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2004 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.33 2003/03/19 11:54:21 danarmak Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.57 2005/07/06 20:23:20 agriffis Exp $
4# 4
5# Current Maintainer: Tal Peer <coredumb@gentoo.org>
5# Author Dan Armak <danarmak@gentoo.org> 6# Original Author: Dan Armak <danarmak@gentoo.org>
6# 7
8# SSH auth code by Danny <danny.milo@gmx.net>
9
10# SSH password authentication support and host key verification
11# support by Jeremy Maitin-Shepard <jbms@gentoo.org>
12
13
7# This eclass provides the generic cvs fetching functions. 14# This eclass provides the generic cvs fetching functions. To use
15# this from an ebuild, set the `ebuild-configurable settings' as
16# specified below in your ebuild before inheriting. Then either leave
17# the default src_unpack or extend over cvs_src_unpack. If you find
18# that you need to call the cvs_* functions directly, I'd be
19# interested to hear about it.
8 20
9ECLASS=cvs 21# TODO:
10INHERITED="$INHERITED $ECLASS"
11 22
23# Implement more auth types (gserver?, kserver?)
24
25# Support additional remote shells with `ext' authentication (does
26# anyone actually need to use it with anything other than SSH?)
27
28
29
12# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass 30# Users shouldn't change these settings! The ebuild/eclass inheriting
13# will take care of that. If you want to set the global KDE cvs ebuilds' settings, 31# this eclass will take care of that. If you want to set the global
14# see the comments in kde-source.eclass. 32# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
15 33
16# --- begin ebuild-configurable settings 34# --- begin ebuild-configurable settings
17 35
36# ECVS_CVS_COMMAND -- CVS command to run
37#
18# cvs command to run. you can set fex. "cvs -t" for extensive debug information 38# You can set, for example, "cvs -t" for extensive debug information
19# on the cvs onnection. the default of "cvs -q -f -z4" means to be quiet, to disregard 39# on the cvs connection. The default of "cvs -q -f -z4" means to be
20# the ~/.cvsrc config file and to use maximum compression. 40# quiet, to disregard the ~/.cvsrc config file and to use maximum
41# compression.
42
21[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 43[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4"
22 44
23# cvs options given after the command (i.e. cvs update foo) 45
46# ECVS_UP_OPTS, ECVS_CO_OPTS -- CVS options given after the cvs
47# command (update or checkout).
48#
24# don't remove -dP or things won't work 49# Don't remove -dP from update or things won't work.
50
51[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
25[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP" 52[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
26 53
27# set this for the module/subdir to be fetched non-recursively
28#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
29 54
30# Where the cvs modules are stored/accessed 55# ECVS_LOCAL -- If this is set, the CVS module will be fetched
56# non-recursively. Refer to the information in the CVS man page
57# regarding the -l command option (not the -l global option).
58
59
60# ECVS_LOCALNAME -- local name of checkout directory
61#
62# This is useful if the module on the server is called something
63# common like 'driver' or is nested deep in a tree, and you don't like
64# useless empty directories.
65#
66# WARNING: Set this only from within ebuilds! If set in your shell or
67# some such, things will break because the ebuild won't expect it and
68# have e.g. a wrong $S setting.
69
70
71# ECVS_TOP_DIR -- The directory under which CVS modules are checked
72# out.
73
31[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 74[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src"
32 75
33# Name of cvs server, set to "offline" to disable fetching 76# ECVS_SERVER -- CVS path
34# (i.e. to assume module is checked out already and don't update it). 77#
35# Format is server:/dir e.g. "anoncvs.kde.org:/home/kde". remove the other 78# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde".
36# parts of the full CVSROOT (which looks like 79# Remove the other parts of the full CVSROOT, which might look like
37# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 80# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
38# other settings 81# using other settings also.
82#
83# Set this to "offline" to disable fetching (i.e. to assume the module
84# is already checked out in ECVS_TOP_DIR).
85
39[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 86[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
40 87
41# Anonymous cvs login? 88
42# if 'yes' uses :pserver: with empty password, if 'no' uses :ext: with $ECVS_PASS, other values not allowed 89# ECVS_MODULE -- the name of the CVS module to be fetched
90#
91# This must be set when cvs_src_unpack is called. This can include
92# several directory levels, i.e. "foo/bar/baz"
93
94#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
95
96
97# ECVS_BRANCH -- the name of the branch/tag to use
98
99# The default is "HEAD". The following default _will_ reset your
100# branch checkout to head if used.
101
43[ -z "$ECVS_ANON" ] && ECVS_ANON="yes" 102#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
44 103
45# Authentication method to use on ECVS_ANON="no" - possible values are "pserver" and "ext" 104
105# ECVS_AUTH -- authentication method to use
106#
107# Possible values are "pserver" and "ext". If `ext' authentication is
108# used, the remote shell to use can be specified in CVS_RSH (SSH is
109# used by default). Currently, the only supported remote shell for
110# `ext' authentication is SSH.
111#
112# Armando Di Cianno <fafhrd@gentoo.org> 2004/09/27
113# - Added "no" as a server type, which uses no AUTH method, nor
114# does it login
115# e.g.
116# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System"
117# ( from gnustep-apps/textedit )
46[ -z "$ECVS_AUTH" ] && ECVS_AUTH="ext" 118[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
47 119
48# Use su to run cvs as user 120# ECVS_USER -- Username to use for authentication on the remote server
49[ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
50
51# Username to use
52[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 121[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
53 122
54# Password to use if anonymous login is off, or if 'anonymous' pserver access 123
55# uses a password and ECVS_ANON = yes 124# ECVS_PASS -- Password to use for authentication on the remote server
56[ -z "$ECVS_PASS" ] && ECVS_PASS="" 125[ -z "$ECVS_PASS" ] && ECVS_PASS=""
57 126
58# Module to be fetched, must be set explicitly -
59# I don't like the former ="$PN" default setting
60[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue"
61 127
62# Branch/tag to use, default is HEAD 128# ECVS_SSH_HOST_KEY
63# uncomment the following line to enable the reset-branch-to-HEAD behaviour 129#
64[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 130# If SSH is used for `ext' authentication, use this variable to
131# specify the host key of the remote server. The format of the value
132# should be the same format that is used for the SSH known hosts file.
133#
134# WARNING: If a SSH host key is not specified using this variable, the
135# remote host key will not be verified.
65 136
66# Subdirectory in module to be fetched, default is not defined = whole module 137
67# DO NOT set default to "", if it's defined at all code will break! 138# ECVS_CLEAN -- Set this to get a clean copy when updating (passes the
68# don't uncomment following line! 139# -C option to cvs update)
69#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR="" 140
141
142# ECVS_RUNAS
143#
144# Specifies an alternate (non-root) user to use to run cvs. Currently
145# b0rked and wouldn't work with portage userpriv anyway without
146# special magic.
147
148# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
149
150
151# ECVS_SUBDIR -- deprecated, do not use
152[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
153
70 154
71# --- end ebuild-configurable settings --- 155# --- end ebuild-configurable settings ---
72 156
73# add cvs to deps 157# add cvs to deps
74DEPEND="$DEPEND dev-util/cvs dev-python/pexpect" 158# ssh is used for ext auth
159# sudo is used to run as a specified user
160DEPEND="$DEPEND dev-util/cvs app-admin/sudo"
75 161
76# since we now longer have src_fetch as a redefinable ebuild function, 162if [ "$ECVS_AUTH" == "ext" ]; then
77# we are forced to call this function from cvs_src_unpack 163 #default to ssh
164 [ -z "$CVS_RSH" ] && export SSH_RSH="ssh"
165 if [ "$CVS_RSH" != "ssh" ]; then
166 die "Support for ext auth with clients other than ssh has not been implemented yet"
167 fi
168 DEPEND="$DEPEND net-misc/openssh"
169fi
170
171# called from cvs_src_unpack
78cvs_fetch() { 172cvs_fetch() {
79 173
174 # Make these options local variables so that the global values are
175 # not affected by modifications in this function.
176
177 local ECVS_COMMAND="${ECVS_COMMAND}"
178 local ECVS_UP_OPTS="${ECVS_UP_OPTS}"
179 local ECVS_CO_OPTS="${ECVS_CO_OPTS}"
180
181 # Fix for sourceforge which doesnt want -z>3 anymore.
182
183 (echo $ECVS_SERVER | grep -q sourceforge) \
184 && [ "$ECVS_CVS_COMMAND" == "cvs -q -f -z4" ] \
185 && ECVS_CVS_COMMAND="cvs -q -f -z3"
186
80 debug-print-function $FUNCNAME $* 187 debug-print-function $FUNCNAME $*
81 188
82 debug-print "$FUNCNAME: init: 189 # Update variables that are modified by ebuild parameters, which
839ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 190 # should be effective every time cvs_fetch is called, and not just
84ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 191 # every time cvs.eclass is inherited
85ECVS_TOP_DIR=$ECVS_TOP_DIR
86ECVS_SERVER=$ECVS_SERVER
87ECVS_ANON=$ECVS_ANON
88ECVS_USER=$ECVS_USER
89ECVS_PASS=$ECVS_PASS
90ECS_MODULE=$ECVS_MODULE
91ECVS_SUBDIR=$ECVS_SUBDIR
92ECVS_LOCAL=$ECVS_LOCAL
93DIR=$DIR"
94 192
95 # a shorthand
96 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
97 debug-print "$FUNCNAME: now DIR=$DIR"
98 193
99 if [ "$ECVS_SERVER" == "offline" ]; then 194 # Handle parameter for local (non-recursive) fetching
100 # we're not required to fetch anything, the module already exists and shouldn't be updated 195
101 if [ -d "$DIR" ]; then 196 if [ -n "$ECVS_LOCAL" ]; then
102 debug-print "$FUNCNAME: offline mode, exiting" 197 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
103 return 0 198 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
199 fi
200
201 # Handle ECVS_BRANCH option
202 #
203 # Because CVS auto-switches branches, we just have to pass the
204 # correct -rBRANCH option when updating.
205
206 if [ -n "$ECVS_BRANCH" ]; then
207 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
208 ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH"
209 fi
210
211 # Handle ECVS_LOCALNAME, which specifies the local directory name
212 # to use. Note that the -d command option is not equivalent to
213 # the global -d option.
214
215 if [ "$ECVS_LOCALNAME" != "$ECVS_MODULE" ]; then
216 ECVS_CO_OPTS="$ECVS_CO_OPTS -d $ECVS_LOCALNAME"
217 fi
218
219
220 if [ -n "$ECVS_CLEAN" ]; then
221 ECVS_UP_OPTS="$ECVS_UP_OPTS -C"
222 fi
223
224
225 # It would be easiest to always be in "run-as mode", logic-wise,
226 # if sudo didn't ask for a password even when sudo'ing to `whoami`.
227
228 if [ -z "$ECVS_RUNAS" ]; then
229 run=""
104 else 230 else
105 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 231 run="sudo -u $ECVS_RUNAS"
106 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
107 return 1
108 fi 232 fi
109 fi
110 233
111 # create target directory as needed 234 # Create the top dir if needed
235
112 if [ ! -d "$DIR" ]; then 236 if [ ! -d "$ECVS_TOP_DIR" ]; then
237
238 # Note that the addwrite statements in this block are only
239 # there to allow creating ECVS_TOP_DIR; we allow writing
240 # inside it separately.
241
242 # This is because it's simpler than trying to find out the
243 # parent path of the directory, which would need to be the
244 # real path and not a symlink for things to work (so we can't
245 # just remove the last path element in the string)
246
113 debug-print "$FUNCNAME: creating cvs directory $DIR" 247 debug-print "$FUNCNAME: checkout mode. creating cvs directory"
114 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
115 addwrite /foobar 248 addwrite /foobar
116 addwrite / 249 addwrite /
117 mkdir -p "/$DIR" 250 $run mkdir -p "/$ECVS_TOP_DIR"
118 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}" 251 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
119 fi 252 fi
120 253
121 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path, 254 # In case ECVS_TOP_DIR is a symlink to a dir, get the real path,
122 # otherwise addwrite() doesn't work. 255 # otherwise addwrite() doesn't work.
256
123 cd -P "$ECVS_TOP_DIR" > /dev/null 257 cd -P "$ECVS_TOP_DIR" > /dev/null
124 ECVS_TOP_DIR="`/bin/pwd`" 258 ECVS_TOP_DIR="`/bin/pwd`"
125 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 259
126 cd "$OLDPWD"
127
128 debug-print "$FUNCNAME: now DIR=$DIR"
129
130 # disable the sandbox for this dir 260 # Disable the sandbox for this dir
131 # not just $DIR because we want to create moduletopdir/CVS too
132 addwrite "$ECVS_TOP_DIR/$ECVS_MODULE" 261 addwrite "$ECVS_TOP_DIR"
133 262
134 # add option for local (non-recursive) fetching 263 # Chown the directory and all of its contents
135 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 264 if [ -n "$ECVS_RUNAS" ]; then
136 265 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR"
266 fi
267
268 # Determine the CVS command mode (checkout or update)
269 if [ ! -d "$ECVS_TOP_DIR/$ECVS_LOCALNAME/CVS" ]; then
270 mode=checkout
271 else
272 mode=update
273 fi
274
275
276 # Our server string (i.e. CVSROOT) without the password so it can
277 # be put in Root
278 if [ "$ECVS_AUTH" == "no" ]
279 then
280 local server="${ECVS_USER}@${ECVS_SERVER}"
281 else
282 local server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
283 fi
284
285 # Switch servers automagically if needed
286 if [ "$mode" == "update" ]; then
287 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
288 local oldserver="`$run cat CVS/Root`"
289 if [ "$server" != "$oldserver" ]; then
290
291 einfo "Changing the CVS server from $oldserver to $server:"
292 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:"
293
294 einfo "Searching for CVS directories ..."
295 local cvsdirs="`$run find . -iname CVS -print`"
296 debug-print "$FUNCNAME: CVS directories found:"
297 debug-print "$cvsdirs"
298
299 einfo "Modifying CVS directories ..."
300 for x in $cvsdirs; do
301 debug-print "In $x"
302 $run echo "$server" > "$x/Root"
303 done
304
305 fi
306 fi
307
137 # prepare a cvspass file just for this session, we don't want to mess with ~/.cvspass 308 # Prepare a cvspass file just for this session, we don't want to
309 # mess with ~/.cvspass
138 touch "${T}/cvspass" 310 touch "${T}/cvspass"
139 export CVS_PASSFILE="${T}/cvspass" 311 export CVS_PASSFILE="${T}/cvspass"
312 if [ -n "$ECVS_RUNAS" ]; then
140 chown $ECVS_RUNAS "${T}/cvspass" 313 chown "$ECVS_RUNAS" "${T}/cvspass"
314 fi
141 315
142 # Note: cvs update and checkout commands are unified. 316 # The server string with the password in it, for login
143 # we make sure a CVS/ dir exists in our module subdir with the right 317 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
144 # Root and Repository entries in it and cvs update. 318
145 319 # Ditto without the password, for checkout/update after login, so
146 [ "${ECVS_ANON}" == "yes" ] && \ 320 # that the CVS/Root files don't contain the password in plaintext
147 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \ 321 if [ "$ECVS_AUTH" == "no" ]
322 then
323 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
324 else
148 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 325 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
326 fi
327
328 # Commands to run
329 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
330 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
331 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
332
333 # Execute commands
334
335 cd "${ECVS_TOP_DIR}"
336 if [ "${ECVS_AUTH}" == "pserver" ]; then
337 einfo "Running $cmdlogin"
338 eval $cmdlogin || die "cvs login command failed"
339 if [ "${mode}" == "update" ]; then
340 einfo "Running $cmdupdate"
341 eval $cmdupdate || die "cvs update command failed"
342 elif [ "${mode}" == "checkout" ]; then
343 einfo "Running $cmdcheckout"
344 eval $cmdcheckout|| die "cvs checkout command failed"
345 fi
346 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then
347
348 # Hack to support SSH password authentication
349
350 # Backup environment variable values
351 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}"
352
353 if [ "${SSH_ASKPASS+set}" == "set" ]; then
354 local CVS_ECLASS_ORIG_SSH_ASKPASS="${SSH_ASKPASS}"
355 else
356 unset CVS_ECLASS_ORIG_SSH_ASKPASS
357 fi
358
359 if [ "${DISPLAY+set}" == "set" ]; then
360 local CVS_ECLASS_ORIG_DISPLAY="${DISPLAY}"
361 else
362 unset CVS_ECLASS_ORIG_DISPLAY
363 fi
364
365 if [ "${CVS_RSH}" == "ssh" ]; then
366
367 # Force SSH to use SSH_ASKPASS by creating python wrapper
368
369 export CVS_RSH="${T}/cvs_sshwrapper"
370 cat > "${CVS_RSH}"<<EOF
371#!/usr/bin/python
372import fcntl
373import os
374import sys
375try:
376 fd = os.open('/dev/tty', 2)
377 TIOCNOTTY=0x5422
378 try:
379 fcntl.ioctl(fd, TIOCNOTTY)
380 except:
381 pass
382 os.close(fd)
383except:
384 pass
385newarglist = sys.argv[:]
386EOF
387
388 # disable X11 forwarding which causes .xauth access violations
389 # - 20041205 Armando Di Cianno <fafhrd@gentoo.org>
390 echo "newarglist.insert(1, '-oClearAllForwardings=yes')" \
391 >> "${CVS_RSH}"
392 echo "newarglist.insert(1, '-oForwardX11=no')" \
393 >> "${CVS_RSH}"
394
395 # Handle SSH host key checking
396
397 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts"
398 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \
399 >> "${CVS_RSH}"
400
401 if [ -z "${ECVS_SSH_HOST_KEY}" ]; then
402 ewarn "Warning: The SSH host key of the remote server will not be verified."
403 einfo "A temporary known hosts list will be used."
404 local CVS_ECLASS_STRICT_HOST_CHECKING="no"
405 touch "${CVS_ECLASS_KNOWN_HOSTS}"
406 else
407 local CVS_ECLASS_STRICT_HOST_CHECKING="yes"
408 echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}"
409 fi
410
411 echo -n "newarglist.insert(1, '-oStrictHostKeyChecking=" \
412 >> "${CVS_RSH}"
413 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
414 >> "${CVS_RSH}"
415 echo "os.execv('/usr/bin/ssh', newarglist)" \
416 >> "${CVS_RSH}"
417
418 chmod a+x "${CVS_RSH}"
419
420 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
421 # if DISPLAY is not set)
422
423 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY"
424 export DISPLAY
425
426 # Create a dummy executable to echo $ECVS_PASS
427
428 export SSH_ASKPASS="${T}/cvs_sshechopass"
429 if [ "${ECVS_AUTH}" != "no" ]; then
430 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \
431 > "${SSH_ASKPASS}"
432 else
433 echo -en "#!/bin/bash\nreturn\n" \
434 > "${SSH_ASKPASS}"
435
436 fi
437 chmod a+x "${SSH_ASKPASS}"
438 fi
439
440 if [ "${mode}" == "update" ]; then
441 einfo "Running $cmdupdate"
442 eval $cmdupdate || die "cvs update command failed"
443 elif [ "${mode}" == "checkout" ]; then
444 einfo "Running $cmdcheckout"
445 eval $cmdcheckout|| die "cvs checkout command failed"
446 fi
149 447
150 448 # Restore environment variable values
151 # CVS/Repository files can't (I think) contain two concatenated slashes 449 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
450 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then
451 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
452 else
453 unset SSH_ASKPASS
454 fi
455
456 if [ "${CVS_ECLASS_ORIG_DISPLAY+set}" == "set" ]; then
457 export DISPLAY="${CVS_ECLASS_ORIG_DISPLAY}"
458 else
459 unset DISPLAY
460 fi
461 fi
462
463 # Restore ownership. Not sure why this is needed, but someone
464 # added it in the orig ECVS_RUNAS stuff.
152 if [ -n "$ECVS_SUBDIR" ]; then 465 if [ -n "$ECVS_RUNAS" ]; then
153 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 466 chown `whoami` "${T}/cvspass"
467 fi
468
469}
470
471
472cvs_src_unpack() {
473
474 debug-print-function $FUNCNAME $*
475
476 debug-print "$FUNCNAME: init:
477 ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
478 ECVS_UP_OPTS=$ECVS_UP_OPTS
479 ECVS_CO_OPTS=$ECVS_CO_OPTS
480 ECVS_TOP_DIR=$ECVS_TOP_DIR
481 ECVS_SERVER=$ECVS_SERVER
482 ECVS_USER=$ECVS_USER
483 ECVS_PASS=$ECVS_PASS
484 ECVS_MODULE=$ECVS_MODULE
485 ECVS_LOCAL=$ECVS_LOCAL
486 ECVS_RUNAS=$ECVS_RUNAS
487 ECVS_LOCALNAME=$ECVS_LOCALNAME"
488
489 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
490
491 local ECVS_LOCALNAME="${ECVS_LOCALNAME}"
492
493 if [ -z "$ECVS_LOCALNAME" ]; then
494 ECVS_LOCALNAME="$ECVS_MODULE"
495 fi
496
497 if [ "$ECVS_SERVER" == "offline" ]; then
498 # We're not required to fetch anything; the module already
499 # exists and shouldn't be updated.
500 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
501 debug-print "$FUNCNAME: offline mode"
502 else
503 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
504 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
505 fi
506 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
507 einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR ..."
508 cvs_fetch
509 else # ECVS_SERVER not set
510 die "ERROR: CVS server not specified, cannot continue."
511 fi
512
513 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..."
514 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..."
515
516 # This is probably redundant, but best to make sure.
517 mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
518
519 if [ -n "$ECVS_LOCAL" ]; then
520 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME"
154 else 521 else
155 repository="${ECVS_MODULE}" 522 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.."
156 fi
157
158 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
159 debug-print "$FUNCNAME: entering directory $DIR"
160 cd "/$DIR"
161
162 if [ ! -d "CVS" ]; then
163 # create a new CVS/ directory (checkout)
164 debug-print "$FUNCNAME: creating new cvs directory"
165
166 mkdir CVS
167 echo $newserver > CVS/Root
168 echo $repository > CVS/Repository
169 touch CVS/Entries
170
171 # if we're checking out a subdirectory only, create a CVS/ dir
172 # in the module's top dir so that the user (and we) can cvs update
173 # from there to get the full module.
174 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
175 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
176 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
177 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
178 fi 523 fi
179
180 else
181 #update existing module
182 debug-print "$FUNCNAME: updating existing module/subdir"
183
184 # Switch servers if needed
185 # cvs keeps the server info in the CVS/Root file in every checked-out dir;
186 # we can fix those files to point to the new server
187 oldserver="`cat CVS/Root`"
188 if [ "$newserver" != "$oldserver" ]; then
189 524
190 einfo "Changing CVS server from $oldserver to $newserver:"
191 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:"
192
193 einfo "Searching for CVS dirs..."
194 cvsdirs="`find . -iname CVS -print`"
195 debug-print "$FUNCNAME: CVS dirs found:"
196 debug-print "$cvsdirs"
197
198 einfo "Modifying CVS dirs..."
199 for x in $cvsdirs; do
200 debug-print "In $x"
201 echo $newserver > "$x/Root"
202 done
203
204 fi
205
206 fi
207
208 # cvs auto-switches branches, how nice
209 # warning: if we do it this way we get multiple -rX options - harmless i think
210 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH"
211
212 # Chowning the directory
213 if [ "${ECVS_RUNAS}" != "`whoami`" ]; then
214 chown -R "$ECVS_RUNAS" "/$DIR"
215 fi
216
217 # finally run the cvs update command
218 debug-print "$FUNCNAME: is in dir `/bin/pwd`"
219 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
220 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
221
222 if [ "${ECVS_ANON}" == "no" ]; then
223
224 debug-print "$FUNCNAME: starting non-anonymous cvs login..."
225 # CVS Login - written in python :: the right way ;)
226 # Tilman Klar, <phoenix@gentoo.org>
227
228 export CVS_RSH="/usr/bin/ssh"
229
230############################## inline-python #####################################
231/usr/bin/env python << EndOfFile
232
233import pexpect,os
234
235mypasswd = "${ECVS_PASS}"
236myauth = "${ECVS_AUTH}"
237mytimeout = 10
238
239if "${ECVS_RUNAS}" == "`whoami`":
240 mycommand = "${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}"
241else:
242 mycommand = "su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\""
243
244if myauth == "ext":
245 child = pexpect.spawn(mycommand)
246
247 index = child.expect(['continue connecting','word:'], mytimeout)
248 if index == 0:
249 child.sendline('yes')
250 ## Added server to ~/.ssh/known_hosts
251 child.expect('word:', mytimeout)
252 else:
253 ## Server already is in ~/.ssh/known_hosts
254 pass
255
256 child.sendline(mypasswd)
257 child.expect(pexpect.EOF)
258
259elif myauth == "pserver":
260 if "${ECVS_RUNAS}" == "`whoami`":
261 mycommand2 = "cvs login"
262 else:
263 mycommand2 = "su ${ECVS_RUNAS} -c \"cvs login\""
264 child = pexpect.spawn(mycommand2)
265 child.expect("CVS password:",mytimeout)
266 child.sendline(mypasswd)
267 child.expect(pexpect.EOF)
268
269 # Logged in - checking out
270 os.system(mycommand)
271
272EndOfFile
273########################### End of inline-python ##################################
274 else
275 # is anonymous cvs.
276 # is there a password to use for login with this "anonymous" login
277 if [ -n "$ECVS_PASS" ]; then
278 debug-print "$FUNCNAME: using anonymous cvs login with password"
279
280# inline-python #
281/usr/bin/env python << EndOfFile
282
283import pexpect,os
284
285myuser = "${ECVS_USER}"
286mypasswd = "${ECVS_PASS}"
287
288mytimeout = 10
289
290# implicitly myauth == "pserver" here.
291mycommand = "cvs login"
292child = pexpect.spawn(mycommand)
293child.expect("CVS password:",mytimeout)
294child.sendline(mypasswd)
295child.expect(pexpect.EOF)
296EndOfFile
297# End of inline-python #
298
299 else
300 debug-print "$FUNCNAME: using anonymous cvs login (without password)"
301 # passwordless, truly anonymous login; or login with empty (but existing)
302 # password.
303 # make cvs think we're logged in at the cvs server,
304 # because i don't trust myself to write the right code for the case
305 # where the password is empty but still required (what's the bash test
306 # to see if a variable is defined? -n returns false if it is defined
307 # but empty...)
308 echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
309 # remember we did this so we don't try to run cvs logout later
310 DONT_LOGOUT=yes
311 fi
312
313 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS"
314 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
315
316 fi
317
318 # log out and restore ownership as needed
319 if [ -z "$DONT_LOGOUT" ]; then
320 debug-print "$FUNCNAME: cvs logout stuff"
321 if [ "$ECVS_RUNAS" == "`whoami`" ]; then
322 cvs logout &> /dev/null
323 else
324 su $ECVS_RUNAS -c "cvs logout" &> /dev/null
325 fi
326 fi
327 chown `whoami` "${T}/cvspass"
328}
329
330cvs_src_unpack() {
331
332 debug-print-function $FUNCNAME $*
333 cvs_fetch || die "died running cvs_fetch"
334
335 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
336 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
337
338 # probably redundant, but best to make sure
339 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
340
341 if [ -n "$ECVS_SUBDIR" ]; then
342 if [ -n "$ECVS_LOCAL" ]; then
343 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR"/* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
344 else
345 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
346 fi
347 else
348 if [ -n "$ECVS_LOCAL" ]; then
349 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE"/* $WORKDIR/$ECVS_MODULE
350 else
351 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
352 fi
353 fi
354
355 # if the directory is empty, remove it; empty directories cannot exist in cvs. 525 # If the directory is empty, remove it; empty directories cannot
356 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist. 526 # exist in cvs. This happens when, for example, kde-source
527 # requests module/doc/subdir which doesn't exist. Still create
357 # still create the empty directory in workdir though. 528 # the empty directory in workdir though.
358 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then 529 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_LOCALNAME}\"`" == "CVS" ]; then
359 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 530 debug-print "$FUNCNAME: removing empty CVS directory $ECVS_LOCALNAME"
360 rm -rf "$DIR" 531 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
361 fi 532 fi
362 533
363 # implement some of base_src_unpack's functionality; 534 # Implement some of base_src_unpack's functionality; note however
364 # note however that base.eclass may not have been inherited! 535 # that base.eclass may not have been inherited!
365 if [ -n "$PATCHES" ]; then 536 if [ -n "$PATCHES" ]; then
366 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 537 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
367 cd "$S" 538 cd "$S"
368 for x in $PATCHES; do 539 for x in $PATCHES; do
369 debug-print "patching from $x" 540 debug-print "patching from $x"
370 patch -p0 < "$x" 541 patch -p0 < "$x"
371 done 542 done
372 # make sure we don't try to apply patches more than once, since 543 # Make sure we don't try to apply patches more than once,
373 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack 544 # since cvs_src_unpack is usually called several times from
545 # e.g. kde-source_src_unpack
374 export PATCHES="" 546 export PATCHES=""
375 fi 547 fi
376 548
549 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
377} 550}
378 551
379EXPORT_FUNCTIONS src_unpack 552EXPORT_FUNCTIONS src_unpack

Legend:
Removed from v.1.33  
changed lines
  Added in v.1.57

  ViewVC Help
Powered by ViewVC 1.1.20