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

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

  ViewVC Help
Powered by ViewVC 1.1.20