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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.44  
changed lines
  Added in v.1.64

  ViewVC Help
Powered by ViewVC 1.1.20