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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.5  
changed lines
  Added in v.1.54

  ViewVC Help
Powered by ViewVC 1.1.20