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

Diff of /eclass/cvs.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20