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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.43  
changed lines
  Added in v.1.61

  ViewVC Help
Powered by ViewVC 1.1.20