/[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.69
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2008 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.69 2008/03/06 00:54:07 zlin Exp $
4# 4
5# Author Dan Armak <danarmak@gentoo.org> 5# @ECLASS: cvs.eclass
6# 6# @MAINTAINER:
7# vapier@gentoo.org (and anyone who wants to help)
7# 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.
8 15
9ECLASS=cvs 16inherit eutils
10INHERITED="$INHERITED $ECLASS"
11 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
12# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass 26# 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, 27# this eclass will take care of that. If you want to set the global
14# see the comments in kde-source.eclass. 28# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
15 29
16# --- begin ebuild-configurable settings 30# @ECLASS-VARIABLE: ECVS_CVS_COMMAND
17 31# @DESCRIPTION:
32# CVS command to run
33#
18# 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
19# 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
20# the ~/.cvsrc config file and to use maximum compression. 36# quiet, to disregard the ~/.cvsrc config file and to use maximum
21[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 37# compression.
22 38
23# cvs options given after the command (i.e. cvs update foo) 39# @ECLASS-VARIABLE: ECVS_CVS_COMPRESS
24# don't remove -dP or things won't work 40# @DESCRIPTION:
41# Set the compression level.
42[[ -z ${ECVS_CVS_COMPRESS} ]] && ECVS_CVS_COMPRESS="-z1"
43
44# @ECLASS-VARIABLE: ECVS_CVS_OPTIONS
45# @DESCRIPTION:
46# Additional options to the cvs commands.
25[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP" 47[[ -z ${ECVS_CVS_OPTIONS} ]] && ECVS_CVS_OPTIONS="-q -f"
26 48
27# set this for the module/subdir to be fetched non-recursively 49# @ECLASS-VARIABLE: ECVS_CVS_COMMAND
28#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 50# @DESCRIPTION:
51# The cvs command.
52[[ -z ${ECVS_CVS_COMMAND} ]] && ECVS_CVS_COMMAND="cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}"
29 53
30# Where the cvs modules are stored/accessed 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_LOCLANAME
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.
31[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 87[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"
32 88
33# Name of cvs server, set to "offline" to disable fetching 89# @ECLASS-VARIABLE: ECVS_SERVER
34# (i.e. to assume module is checked out already and don't update it). 90# @DESCRIPTION:
91# CVS path
92#
35# 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".
36# parts of the full CVSROOT (which looks like 94# Remove the other parts of the full CVSROOT, which might look like
37# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 95# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
38# 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).
39[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 100[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
40 101
41# Anonymous cvs login? 102# @ECLASS-VARIABLE: ECVS_MODULE
42# if 'yes' uses :pserver: with empty password, if 'no' uses :ext: with $ECVS_PASS, other values not allowed 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
43[ -z "$ECVS_ANON" ] && ECVS_ANON="yes" 118#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
44 119
45# Authentication method to use on ECVS_ANON="no" - possible values are "pserver" and "ext" 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 )
46[ -z "$ECVS_AUTH" ] && ECVS_AUTH="ext" 135[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
47 136
48# Use su to run cvs as user 137# @ECLASS-VARIABLE: ECVS_USER
49[ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`" 138# @DESCRIPTION:
50 139# Username to use for authentication on the remote server.
51# Username to use
52[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 140[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
53 141
54# Password to use if anonymous login is off, or if 'anonymous' pserver access 142# @ECLASS-VARIABLE: ECVS_PASS
55# uses a password and ECVS_ANON = yes 143# @DESCRIPTION:
144# Password to use for authentication on the remote server
56[ -z "$ECVS_PASS" ] && ECVS_PASS="" 145[ -z "$ECVS_PASS" ] && ECVS_PASS=""
57 146
58# Module to be fetched, must be set explicitly - 147# @ECLASS-VARIABLE: ECVS_SSH_HOST_KEY
59# I don't like the former ="$PN" default setting 148# @DESCRIPTION:
60[ -z "$ECVS_MODULE" ] && debug-print "$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.
61 155
62# Branch/tag to use, default is HEAD 156# @ECLASS-VARIABLE: ECVS_CLEAN
63# uncomment the following line to enable the reset-branch-to-HEAD behaviour 157# @DESCRIPTION:
64[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 158# Set this to get a clean copy when updating (passes the
159# -C option to cvs update)
65 160
66# Subdirectory in module to be fetched, default is not defined = whole module 161# @ECLASS-VARIABLE: ECVS_RUNAS
67# DO NOT set default to "", if it's defined at all code will break! 162# @DESCRIPTION:
68# don't uncomment following line! 163# Specifies an alternate (non-root) user to use to run cvs. Currently
69#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR="" 164# b0rked and wouldn't work with portage userpriv anyway without
165# special magic.
70 166
71# --- end ebuild-configurable settings --- 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."
72 171
73# add cvs to deps 172# add cvs to deps
74DEPEND="$DEPEND dev-util/cvs dev-python/pexpect" 173# ssh is used for ext auth
174# sudo is used to run as a specified user
175DEPEND="dev-util/cvs"
75 176
76# since we now longer have src_fetch as a redefinable ebuild function, 177[ -n "$ECVS_RUNAS" ] && DEPEND="$DEPEND app-admin/sudo"
77# 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
78cvs_fetch() { 189cvs_fetch() {
79 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
80 debug-print-function $FUNCNAME $* 198 debug-print-function $FUNCNAME $*
81 199
82 debug-print "$FUNCNAME: init: 200 # Update variables that are modified by ebuild parameters, which
839ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 201 # should be effective every time cvs_fetch is called, and not just
84ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 202 # 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 203
95 # a shorthand 204 # Handle parameter for local (non-recursive) fetching
96 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
97 debug-print "$FUNCNAME: now DIR=$DIR"
98 205
99 if [ "$ECVS_SERVER" == "offline" ]; then 206 if [ -n "$ECVS_LOCAL" ]; then
100 # we're not required to fetch anything, the module already exists and shouldn't be updated 207 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
101 if [ -d "$DIR" ]; then 208 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
102 debug-print "$FUNCNAME: offline mode, exiting" 209 fi
103 return 0 210
211 # Handle ECVS_BRANCH option
212 #
213 # Because CVS auto-switches branches, we just have to pass the
214 # correct -rBRANCH option when updating.
215
216 if [ -n "$ECVS_BRANCH" ]; then
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=""
104 else 240 else
105 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 241 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 242 fi
109 fi
110 243
111 # create target directory as needed 244 # Create the top dir if needed
245
112 if [ ! -d "$DIR" ]; then 246 if [ ! -d "$ECVS_TOP_DIR" ]; then
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
113 debug-print "$FUNCNAME: creating cvs directory $DIR" 257 debug-print "$FUNCNAME: checkout mode. creating cvs directory"
114 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
115 addwrite /foobar 258 addwrite /foobar
116 addwrite / 259 addwrite /
117 mkdir -p "/$DIR" 260 $run mkdir -p "/$ECVS_TOP_DIR"
118 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}" 261 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
119 fi 262 fi
120 263
121 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path, 264 # In case ECVS_TOP_DIR is a symlink to a dir, get the real path,
122 # otherwise addwrite() doesn't work. 265 # otherwise addwrite() doesn't work.
266
123 cd -P "$ECVS_TOP_DIR" > /dev/null 267 cd -P "$ECVS_TOP_DIR" > /dev/null
124 ECVS_TOP_DIR="`/bin/pwd`" 268 ECVS_TOP_DIR="`/bin/pwd`"
125 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 269
126 cd "$OLDPWD"
127
128 debug-print "$FUNCNAME: now DIR=$DIR"
129
130 # disable the sandbox for this dir 270 # 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" 271 addwrite "$ECVS_TOP_DIR"
133 272
134 # add option for local (non-recursive) fetching 273 # Chown the directory and all of its contents
135 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 274 if [ -n "$ECVS_RUNAS" ]; then
136 275 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR"
276 fi
277
278 # Determine the CVS command mode (checkout or update)
279 if [ ! -d "$ECVS_TOP_DIR/$ECVS_LOCALNAME/CVS" ]; then
280 mode=checkout
281 else
282 mode=update
283 fi
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
298 # Switch servers automagically if needed
299 if [ "$mode" == "update" ]; then
300 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
301 local oldserver="`$run cat CVS/Root`"
302 if [ "$server" != "$oldserver" ]; then
303
304 einfo "Changing the CVS server from $oldserver to $server:"
305 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:"
306
307 einfo "Searching for CVS directories ..."
308 local cvsdirs="`$run find . -iname CVS -print`"
309 debug-print "$FUNCNAME: CVS directories found:"
310 debug-print "$cvsdirs"
311
312 einfo "Modifying CVS directories ..."
313 for x in $cvsdirs; do
314 debug-print "In $x"
315 $run echo "$server" > "$x/Root"
316 done
317
318 fi
319 fi
320
137 # prepare a cvspass file just for this session, we don't want to mess with ~/.cvspass 321 # Prepare a cvspass file just for this session, we don't want to
322 # mess with ~/.cvspass
138 touch "${T}/cvspass" 323 touch "${T}/cvspass"
139 export CVS_PASSFILE="${T}/cvspass" 324 export CVS_PASSFILE="${T}/cvspass"
325 if [ -n "$ECVS_RUNAS" ]; then
140 chown $ECVS_RUNAS "${T}/cvspass" 326 chown "$ECVS_RUNAS" "${T}/cvspass"
327 fi
141 328
142 # Note: cvs update and checkout commands are unified. 329 # 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 330 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
144 # Root and Repository entries in it and cvs update. 331
145 332 # Ditto without the password, for checkout/update after login, so
146 [ "${ECVS_ANON}" == "yes" ] && \ 333 # that the CVS/Root files don't contain the password in plaintext
147 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \ 334 if [ "$ECVS_AUTH" == "no" ]
148 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 335 then
149 336 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
150
151 # CVS/Repository files can't (I think) contain two concatenated slashes
152 if [ -n "$ECVS_SUBDIR" ]; then
153 repository="${ECVS_MODULE}/${ECVS_SUBDIR}"
154 else 337 else
155 repository="${ECVS_MODULE}" 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"
156 fi 358 fi
157 359 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then
158 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository" 360
159 debug-print "$FUNCNAME: entering directory $DIR" 361 # Hack to support SSH password authentication
160 cd "/$DIR" 362
161 363 # Backup environment variable values
162 if [ ! -d "CVS" ]; then 364 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}"
163 # create a new CVS/ directory (checkout) 365
164 debug-print "$FUNCNAME: creating new cvs directory" 366 if [ "${SSH_ASKPASS+set}" == "set" ]; then
165 367 local CVS_ECLASS_ORIG_SSH_ASKPASS="${SSH_ASKPASS}"
166 mkdir CVS 368 else
167 echo $newserver > CVS/Root 369 unset CVS_ECLASS_ORIG_SSH_ASKPASS
168 echo $repository > CVS/Repository 370 fi
169 touch CVS/Entries 371
170 372 if [ "${DISPLAY+set}" == "set" ]; then
171 # if we're checking out a subdirectory only, create a CVS/ dir 373 local CVS_ECLASS_ORIG_DISPLAY="${DISPLAY}"
172 # in the module's top dir so that the user (and we) can cvs update 374 else
173 # from there to get the full module. 375 unset CVS_ECLASS_ORIG_DISPLAY
174 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 376 fi
175 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 377
176 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/" 378 if [ "${CVS_RSH}" == "ssh" ]; then
177 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository" 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}"
178 fi 422 fi
179 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
481
482}
483
484# @FUNCTION: cvs_src_unpack
485# @DESCRIPTION:
486# The cvs src_unpack function, which will be exported
487cvs_src_unpack() {
488
489 debug-print-function $FUNCNAME $*
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
530 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..."
531 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..."
532
533 # This is probably redundant, but best to make sure.
534 mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
535
536 if [ -n "$ECVS_LOCAL" ]; then
537 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME"
180 else 538 else
181 #update existing module 539 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.."
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
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 540 fi
205 541
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. 542 # 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. 543 # exist in cvs. This happens when, for example, kde-source
544 # requests module/doc/subdir which doesn't exist. Still create
357 # still create the empty directory in workdir though. 545 # the empty directory in workdir though.
358 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then 546 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_LOCALNAME}\"`" == "CVS" ]; then
359 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 547 debug-print "$FUNCNAME: removing empty CVS directory $ECVS_LOCALNAME"
360 rm -rf "$DIR" 548 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
361 fi 549 fi
362 550
363 # implement some of base_src_unpack's functionality; 551 # Implement some of base_src_unpack's functionality; note however
364 # note however that base.eclass may not have been inherited! 552 # that base.eclass may not have been inherited!
365 if [ -n "$PATCHES" ]; then 553 if [ -n "$PATCHES" ]; then
366 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 554 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
367 cd "$S" 555 cd "$S"
368 for x in $PATCHES; do 556 epatch ${PATCHES}
369 debug-print "patching from $x"
370 patch -p0 < "$x"
371 done
372 # make sure we don't try to apply patches more than once, since 557 # 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 558 # since cvs_src_unpack is usually called several times from
559 # e.g. kde-source_src_unpack
374 export PATCHES="" 560 export PATCHES=""
375 fi 561 fi
376 562
563 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
377} 564}
378 565
379EXPORT_FUNCTIONS src_unpack 566EXPORT_FUNCTIONS src_unpack

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

  ViewVC Help
Powered by ViewVC 1.1.20