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