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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.36  
changed lines
  Added in v.1.72

  ViewVC Help
Powered by ViewVC 1.1.20