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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.80

  ViewVC Help
Powered by ViewVC 1.1.20