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

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

  ViewVC Help
Powered by ViewVC 1.1.20