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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.36  
changed lines
  Added in v.1.80

  ViewVC Help
Powered by ViewVC 1.1.20