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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.70

  ViewVC Help
Powered by ViewVC 1.1.20