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

Diff of /eclass/cvs.eclass

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

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