/[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.79
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.33 2003/03/19 11:54:21 danarmak Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.79 2013/01/22 07:25:59 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, or if 'anonymous' pserver access
55# uses a password and ECVS_ANON = yes
56[ -z "$ECVS_PASS" ] && ECVS_PASS=""
57
58# Module to be fetched, must be set explicitly -
59# I don't like the former ="$PN" default setting
60[ -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"
61 119
62# Branch/tag to use, default is HEAD 120# @ECLASS-VARIABLE: ECVS_BRANCH
63# uncomment the following line to enable the reset-branch-to-HEAD behaviour 121# @DEFAULT_UNSET
64[ -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"}
65 128
66# Subdirectory in module to be fetched, default is not defined = whole module 129# @ECLASS-VARIABLE: ECVS_AUTH
67# DO NOT set default to "", if it's defined at all code will break! 130# @DESCRIPTION:
68# don't uncomment following line! 131# Authentication method to use
69#[ -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"}
70 145
71# --- 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)}
180
181# ECVS_SUBDIR -- deprecated, do not use
182[[ -n ${ECVS_SUBDIR} ]] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
72 183
73# add cvs to deps 184# add cvs to deps
74DEPEND="$DEPEND dev-util/cvs dev-python/pexpect" 185# ssh is used for ext auth
186# sudo is used to run as a specified user
187DEPEND="dev-vcs/cvs"
75 188
76# since we now longer have src_fetch as a redefinable ebuild function, 189[[ -n ${ECVS_RUNAS} ]] && DEPEND+=" app-admin/sudo"
77# we are forced to call this function from cvs_src_unpack 190
191if [[ ${ECVS_AUTH} == "ext" ]] ; then
192 #default to ssh
193 [[ -z ${CVS_RSH} ]] && export CVS_RSH="ssh"
194 if [[ ${CVS_RSH} != "ssh" ]] ; then
195 die "Support for ext auth with clients other than ssh has not been implemented yet"
196 fi
197 DEPEND+=" net-misc/openssh"
198fi
199
200# called from cvs_src_unpack
78cvs_fetch() { 201cvs_fetch() {
79 202
203 # Make these options local variables so that the global values are
204 # not affected by modifications in this function.
205
206 local ECVS_COMMAND=${ECVS_COMMAND}
207 local ECVS_UP_OPTS=${ECVS_UP_OPTS}
208 local ECVS_CO_OPTS=${ECVS_CO_OPTS}
209
80 debug-print-function $FUNCNAME $* 210 debug-print-function ${FUNCNAME} "$@"
81 211
82 debug-print "$FUNCNAME: init: 212 # Update variables that are modified by ebuild parameters, which
839ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 213 # should be effective every time cvs_fetch is called, and not just
84ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 214 # 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 215
95 # a shorthand 216 # Handle parameter for local (non-recursive) fetching
96 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
97 debug-print "$FUNCNAME: now DIR=$DIR"
98 217
99 if [ "$ECVS_SERVER" == "offline" ]; then 218 if [[ -n ${ECVS_LOCAL} ]] ; then
100 # we're not required to fetch anything, the module already exists and shouldn't be updated 219 ECVS_UP_OPTS+=" -l"
101 if [ -d "$DIR" ]; then 220 ECVS_CO_OPTS+=" -l"
102 debug-print "$FUNCNAME: offline mode, exiting" 221 fi
103 return 0 222
223 # Handle ECVS_BRANCH option
224 #
225 # Because CVS auto-switches branches, we just have to pass the
226 # correct -rBRANCH option when updating.
227
228 if [[ -n ${ECVS_BRANCH} ]] ; then
229 ECVS_UP_OPTS+=" -r${ECVS_BRANCH}"
230 ECVS_CO_OPTS+=" -r${ECVS_BRANCH}"
231 fi
232
233 # Handle ECVS_LOCALNAME, which specifies the local directory name
234 # to use. Note that the -d command option is not equivalent to
235 # the global -d option.
236
237 if [[ ${ECVS_LOCALNAME} != "${ECVS_MODULE}" ]] ; then
238 ECVS_CO_OPTS+=" -d ${ECVS_LOCALNAME}"
239 fi
240
241 if [[ -n ${ECVS_CLEAN} ]] ; then
242 ECVS_UP_OPTS+=" -C"
243 fi
244
245 # It would be easiest to always be in "run-as mode", logic-wise,
246 # if sudo didn't ask for a password even when sudo'ing to `whoami`.
247
248 if [[ -z ${ECVS_RUNAS} ]] ; then
249 run=""
104 else 250 else
105 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 251 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 252 fi
109 fi
110 253
111 # create target directory as needed 254 # Create the top dir if needed
112 if [ ! -d "$DIR" ]; then 255
256 if [[ ! -d ${ECVS_TOP_DIR} ]] ; then
257 # Note that the addwrite statements in this block are only
258 # there to allow creating ECVS_TOP_DIR; we allow writing
259 # inside it separately.
260
261 # This is because it's simpler than trying to find out the
262 # parent path of the directory, which would need to be the
263 # real path and not a symlink for things to work (so we can't
264 # just remove the last path element in the string)
265
113 debug-print "$FUNCNAME: creating cvs directory $DIR" 266 debug-print "${FUNCNAME}: checkout mode. creating cvs directory"
114 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
115 addwrite /foobar 267 addwrite /foobar
116 addwrite / 268 addwrite /
117 mkdir -p "/$DIR" 269 ${run} mkdir -p "/${ECVS_TOP_DIR}"
118 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}" 270 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
119 fi 271 fi
120 272
121 # in case ECVS_TOP_DIR is a symlink to a dir, get the real dir's path, 273 # In case ECVS_TOP_DIR is a symlink to a dir, get the real path,
122 # otherwise addwrite() doesn't work. 274 # otherwise addwrite() doesn't work.
275
123 cd -P "$ECVS_TOP_DIR" > /dev/null 276 cd -P "${ECVS_TOP_DIR}" >/dev/null
124 ECVS_TOP_DIR="`/bin/pwd`" 277 ECVS_TOP_DIR=$(pwd)
125 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 278
126 cd "$OLDPWD"
127
128 debug-print "$FUNCNAME: now DIR=$DIR"
129
130 # disable the sandbox for this dir 279 # 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" 280 addwrite "${ECVS_TOP_DIR}"
133 281
134 # add option for local (non-recursive) fetching 282 # Chown the directory and all of its contents
135 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 283 if [[ -n ${ECVS_RUNAS} ]] ; then
136 284 ${run} chown -R "${ECVS_RUNAS}" "/${ECVS_TOP_DIR}"
285 fi
286
287 # Determine the CVS command mode (checkout or update)
288 if [[ ! -d ${ECVS_TOP_DIR}/${ECVS_LOCALNAME}/CVS ]] ; then
289 mode=checkout
290 else
291 mode=update
292 fi
293
294 # Our server string (i.e. CVSROOT) without the password so it can
295 # be put in Root
296 if [[ ${ECVS_AUTH} == "no" ]] ; then
297 local server="${ECVS_USER}@${ECVS_SERVER}"
298 else
299 local connection="${ECVS_AUTH}"
300 [[ -n ${ECVS_PROXY} ]] && connection+=";proxy=${ECVS_PROXY}"
301 [[ -n ${ECVS_PROXY_PORT} ]] && connection+=";proxyport=${ECVS_PROXY_PORT}"
302 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
303 fi
304
305 # Switch servers automagically if needed
306 if [[ ${mode} == "update" ]] ; then
307 cd "/${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
308 local oldserver=$(${run} cat CVS/Root)
309 if [[ ${server} != "${oldserver}" ]] ; then
310 einfo "Changing the CVS server from ${oldserver} to ${server}:"
311 debug-print "${FUNCNAME}: Changing the CVS server from ${oldserver} to ${server}:"
312
313 einfo "Searching for CVS directories ..."
314 local cvsdirs=$(${run} find . -iname CVS -print)
315 debug-print "${FUNCNAME}: CVS directories found:"
316 debug-print "${cvsdirs}"
317
318 einfo "Modifying CVS directories ..."
319 local x
320 for x in ${cvsdirs} ; do
321 debug-print "In ${x}"
322 ${run} echo "${server}" > "${x}/Root"
323 done
324 fi
325 fi
326
137 # prepare a cvspass file just for this session, we don't want to mess with ~/.cvspass 327 # Prepare a cvspass file just for this session, we don't want to
328 # mess with ~/.cvspass
138 touch "${T}/cvspass" 329 touch "${T}/cvspass"
139 export CVS_PASSFILE="${T}/cvspass" 330 export CVS_PASSFILE="${T}/cvspass"
331 if [[ -n ${ECVS_RUNAS} ]] ; then
140 chown $ECVS_RUNAS "${T}/cvspass" 332 chown "${ECVS_RUNAS}" "${T}/cvspass"
333 fi
141 334
142 # Note: cvs update and checkout commands are unified. 335 # 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 336 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
144 # Root and Repository entries in it and cvs update. 337
145 338 # Ditto without the password, for checkout/update after login, so
146 [ "${ECVS_ANON}" == "yes" ] && \ 339 # that the CVS/Root files don't contain the password in plaintext
147 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \ 340 if [[ ${ECVS_AUTH} == "no" ]] ; then
148 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 341 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
149
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 342 else
155 repository="${ECVS_MODULE}" 343 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
344 fi
345
346 # Commands to run
347 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
348 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
349 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
350
351 # Execute commands
352
353 cd "${ECVS_TOP_DIR}"
354 if [[ ${ECVS_AUTH} == "pserver" ]] ; then
355 einfo "Running ${cmdlogin}"
356 eval ${cmdlogin} || die "cvs login command failed"
357 if [[ ${mode} == "update" ]] ; then
358 einfo "Running ${cmdupdate}"
359 eval ${cmdupdate} || die "cvs update command failed"
360 elif [[ ${mode} == "checkout" ]] ; then
361 einfo "Running ${cmdcheckout}"
362 eval ${cmdcheckout} || die "cvs checkout command failed"
156 fi 363 fi
157 364 elif [[ ${ECVS_AUTH} == "ext" || ${ECVS_AUTH} == "no" ]] ; then
158 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository" 365 # Hack to support SSH password authentication
159 debug-print "$FUNCNAME: entering directory $DIR" 366
160 cd "/$DIR" 367 # Backup environment variable values
161 368 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}"
162 if [ ! -d "CVS" ]; then 369
163 # create a new CVS/ directory (checkout) 370 if [[ ${SSH_ASKPASS+set} == "set" ]] ; then
164 debug-print "$FUNCNAME: creating new cvs directory" 371 local CVS_ECLASS_ORIG_SSH_ASKPASS="${SSH_ASKPASS}"
165 372 else
166 mkdir CVS 373 unset CVS_ECLASS_ORIG_SSH_ASKPASS
167 echo $newserver > CVS/Root 374 fi
168 echo $repository > CVS/Repository 375
169 touch CVS/Entries 376 if [[ ${DISPLAY+set} == "set" ]] ; then
170 377 local CVS_ECLASS_ORIG_DISPLAY="${DISPLAY}"
171 # if we're checking out a subdirectory only, create a CVS/ dir 378 else
172 # in the module's top dir so that the user (and we) can cvs update 379 unset CVS_ECLASS_ORIG_DISPLAY
173 # from there to get the full module. 380 fi
174 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then 381
175 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir" 382 if [[ ${CVS_RSH} == "ssh" ]] ; then
176 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/" 383 # Force SSH to use SSH_ASKPASS by creating python wrapper
177 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository" 384
385 export CVS_RSH="${T}/cvs_sshwrapper"
386 cat > "${CVS_RSH}"<<EOF
387#!/usr/bin/python
388import fcntl
389import os
390import sys
391try:
392 fd = os.open('/dev/tty', 2)
393 TIOCNOTTY=0x5422
394 try:
395 fcntl.ioctl(fd, TIOCNOTTY)
396 except:
397 pass
398 os.close(fd)
399except:
400 pass
401newarglist = sys.argv[:]
402EOF
403
404 # disable X11 forwarding which causes .xauth access violations
405 # - 20041205 Armando Di Cianno <fafhrd@gentoo.org>
406 echo "newarglist.insert(1, '-oClearAllForwardings=yes')" \
407 >> "${CVS_RSH}"
408 echo "newarglist.insert(1, '-oForwardX11=no')" \
409 >> "${CVS_RSH}"
410
411 # Handle SSH host key checking
412
413 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts"
414 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \
415 >> "${CVS_RSH}"
416
417 if [[ -z ${ECVS_SSH_HOST_KEY} ]] ; then
418 ewarn "Warning: The SSH host key of the remote server will not be verified."
419 einfo "A temporary known hosts list will be used."
420 local CVS_ECLASS_STRICT_HOST_CHECKING="no"
421 touch "${CVS_ECLASS_KNOWN_HOSTS}"
422 else
423 local CVS_ECLASS_STRICT_HOST_CHECKING="yes"
424 echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}"
178 fi 425 fi
179 426
427 echo -n "newarglist.insert(1, '-oStrictHostKeyChecking=" \
428 >> "${CVS_RSH}"
429 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
430 >> "${CVS_RSH}"
431 echo "os.execv('/usr/bin/ssh', newarglist)" \
432 >> "${CVS_RSH}"
433
434 chmod a+x "${CVS_RSH}"
435
436 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
437 # if DISPLAY is not set)
438
439 : ${DISPLAY:="DISPLAY"}
440 export DISPLAY
441
442 # Create a dummy executable to echo ${ECVS_PASS}
443
444 export SSH_ASKPASS="${T}/cvs_sshechopass"
445 if [[ ${ECVS_AUTH} != "no" ]] ; then
446 echo -en "#!/bin/bash\necho \"${ECVS_PASS}\"\n" \
447 > "${SSH_ASKPASS}"
448 else
449 echo -en "#!/bin/bash\nreturn\n" \
450 > "${SSH_ASKPASS}"
451 fi
452 chmod a+x "${SSH_ASKPASS}"
453 fi
454
455 if [[ ${mode} == "update" ]] ; then
456 einfo "Running ${cmdupdate}"
457 eval ${cmdupdate} || die "cvs update command failed"
458 elif [[ ${mode} == "checkout" ]] ; then
459 einfo "Running ${cmdcheckout}"
460 eval ${cmdcheckout} || die "cvs checkout command failed"
461 fi
462
463 # Restore environment variable values
464 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
465 if [[ ${CVS_ECLASS_ORIG_SSH_ASKPASS+set} == "set" ]] ; then
466 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
467 else
468 unset SSH_ASKPASS
469 fi
470
471 if [[ ${CVS_ECLASS_ORIG_DISPLAY+set} == "set" ]] ; then
472 export DISPLAY="${CVS_ECLASS_ORIG_DISPLAY}"
473 else
474 unset DISPLAY
475 fi
476 fi
477
478 # Restore ownership. Not sure why this is needed, but someone
479 # added it in the orig ECVS_RUNAS stuff.
480 if [[ -n ${ECVS_RUNAS} ]] ; then
481 chown $(whoami) "${T}/cvspass"
482 fi
483
484}
485
486# @FUNCTION: cvs_src_unpack
487# @DESCRIPTION:
488# The cvs src_unpack function, which will be exported
489cvs_src_unpack() {
490
491 debug-print-function ${FUNCNAME} "$@"
492
493 debug-print "${FUNCNAME}: init:
494 ECVS_CVS_COMMAND=${ECVS_CVS_COMMAND}
495 ECVS_UP_OPTS=${ECVS_UP_OPTS}
496 ECVS_CO_OPTS=${ECVS_CO_OPTS}
497 ECVS_TOP_DIR=${ECVS_TOP_DIR}
498 ECVS_SERVER=${ECVS_SERVER}
499 ECVS_USER=${ECVS_USER}
500 ECVS_PASS=${ECVS_PASS}
501 ECVS_MODULE=${ECVS_MODULE}
502 ECVS_LOCAL=${ECVS_LOCAL}
503 ECVS_RUNAS=${ECVS_RUNAS}
504 ECVS_LOCALNAME=${ECVS_LOCALNAME}"
505
506 [[ -z ${ECVS_MODULE} ]] && die "ERROR: CVS module not set, cannot continue."
507
508 local ECVS_LOCALNAME=${ECVS_LOCALNAME:-${ECVS_MODULE}}
509
510 local sanitized_pn=$(echo "${PN}" | LC_ALL=C sed -e 's:[^A-Za-z0-9_]:_:g')
511 local offline_pkg_var="ECVS_OFFLINE_${sanitized_pn}"
512 if [[ -n ${!offline_pkg_var}${ECVS_OFFLINE} ]] || [[ ${ECVS_SERVER} == "offline" ]] ; then
513 # We're not required to fetch anything; the module already
514 # exists and shouldn't be updated.
515 if [[ -d ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} ]] ; then
516 debug-print "${FUNCNAME}: offline mode"
517 else
518 debug-print "${FUNCNAME}: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
519 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
520 fi
521 elif [[ -n ${ECVS_SERVER} ]] ; then # ECVS_SERVER!=offline --> real fetching mode
522 einfo "Fetching CVS module ${ECVS_MODULE} into ${ECVS_TOP_DIR} ..."
523 cvs_fetch
524 else # ECVS_SERVER not set
525 die "ERROR: CVS server not specified, cannot continue."
526 fi
527
528 einfo "Copying ${ECVS_MODULE} from ${ECVS_TOP_DIR} ..."
529 debug-print "Copying module ${ECVS_MODULE} local_mode=${ECVS_LOCAL} from ${ECVS_TOP_DIR} ..."
530
531 # This is probably redundant, but best to make sure.
532 mkdir -p "${WORKDIR}/${ECVS_LOCALNAME}"
533
534 if [[ -n ${ECVS_LOCAL} ]] ; then
535 cp -f "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"/* "${WORKDIR}/${ECVS_LOCALNAME}"
180 else 536 else
181 #update existing module 537 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 538 fi
205 539
206 fi 540 # Not exactly perfect, but should be pretty close #333773
541 export ECVS_VERSION=$(
542 find "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}/" -ipath '*/CVS/Entries' -exec cat {} + | \
543 LC_ALL=C sort | \
544 sha1sum | \
545 awk '{print $1}'
546 )
207 547
208 # cvs auto-switches branches, how nice 548 # If the directory is empty, remove it; empty directories cannot
209 # warning: if we do it this way we get multiple -rX options - harmless i think 549 # exist in cvs. This happens when, for example, kde-source
210 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH" 550 # requests module/doc/subdir which doesn't exist. Still create
211 551 # the empty directory in workdir though.
212 # Chowning the directory 552 if [[ $(ls -A "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}") == "CVS" ]] ; then
213 if [ "${ECVS_RUNAS}" != "`whoami`" ]; then 553 debug-print "${FUNCNAME}: removing empty CVS directory ${ECVS_LOCALNAME}"
214 chown -R "$ECVS_RUNAS" "/$DIR" 554 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
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 555 fi
312 556
313 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS" 557 # Implement some of base_src_unpack's functionality; note however
314 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update" 558 # that base.eclass may not have been inherited!
315 559 if [[ -n ${PATCHES} ]] ; then
560 debug-print "${FUNCNAME}: PATCHES=${PATCHES,} S=${S}, autopatching"
561 cd "${S}"
562 epatch ${PATCHES}
563 # Make sure we don't try to apply patches more than once,
564 # since cvs_src_unpack is usually called several times from
565 # e.g. kde-source_src_unpack
566 export PATCHES=""
316 fi 567 fi
317 568
318 # log out and restore ownership as needed 569 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
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} 570}
329 571
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.
356 # this happens when fex. kde-source requests module/doc/subdir which doesn't exist.
357 # still create the empty directory in workdir though.
358 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then
359 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR"
360 rm -rf "$DIR"
361 fi
362
363 # implement some of base_src_unpack's functionality;
364 # note however that base.eclass may not have been inherited!
365 if [ -n "$PATCHES" ]; then
366 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
367 cd "$S"
368 for x in $PATCHES; do
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
373 # cvs_src_unpack is usually called several times from e.g. kde-source_src_unpack
374 export PATCHES=""
375 fi
376
377}
378
379EXPORT_FUNCTIONS src_unpack 572EXPORT_FUNCTIONS src_unpack
573
574fi

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

  ViewVC Help
Powered by ViewVC 1.1.20