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

Diff of /eclass/cvs.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20