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

Diff of /eclass/cvs.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20