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

Diff of /eclass/cvs.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20