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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.22  
changed lines
  Added in v.1.74

  ViewVC Help
Powered by ViewVC 1.1.20