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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.60

  ViewVC Help
Powered by ViewVC 1.1.20