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

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

  ViewVC Help
Powered by ViewVC 1.1.20