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

Diff of /eclass/cvs.eclass

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

Revision 1.58 Revision 1.81
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.58 2005/07/11 15:08:06 swegener Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.81 2013/01/22 07:29:02 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
120# @ECLASS-VARIABLE: ECVS_DATE
121# @DEFAULT_UNSET
122# @DESCRIPTION:
123# The date of the checkout. See the -D date_spec option in the cvs
124# man page for more details.
96 125
126# @ECLASS-VARIABLE: ECVS_BRANCH
127# @DEFAULT_UNSET
128# @DESCRIPTION:
97# ECVS_BRANCH -- the name of the branch/tag to use 129# The name of the branch/tag to use
98 130#
99# The default is "HEAD". The following default _will_ reset your 131# The default is "HEAD". The following default _will_ reset your
100# branch checkout to head if used. 132# branch checkout to head if used.
133#: ${ECVS_BRANCH:="HEAD"}
101 134
102#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 135# @ECLASS-VARIABLE: ECVS_AUTH
103 136# @DESCRIPTION:
104
105# ECVS_AUTH -- authentication method to use 137# Authentication method to use
106# 138#
107# Possible values are "pserver" and "ext". If `ext' authentication is 139# 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 140# 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 141# used by default). Currently, the only supported remote shell for
110# `ext' authentication is SSH. 142# `ext' authentication is SSH.
113# - Added "no" as a server type, which uses no AUTH method, nor 145# - Added "no" as a server type, which uses no AUTH method, nor
114# does it login 146# does it login
115# e.g. 147# e.g.
116# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System" 148# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System"
117# ( from gnustep-apps/textedit ) 149# ( from gnustep-apps/textedit )
118[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver" 150: ${ECVS_AUTH:="pserver"}
119 151
152# @ECLASS-VARIABLE: ECVS_USER
153# @DESCRIPTION:
120# ECVS_USER -- Username to use for authentication on the remote server 154# Username to use for authentication on the remote server.
121[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 155: ${ECVS_USER:="anonymous"}
122 156
123 157# @ECLASS-VARIABLE: ECVS_PASS
158# @DEFAULT_UNSET
159# @DESCRIPTION:
124# ECVS_PASS -- Password to use for authentication on the remote server 160# Password to use for authentication on the remote server
125[ -z "$ECVS_PASS" ] && ECVS_PASS=""
126 161
127 162# @ECLASS-VARIABLE: ECVS_SSH_HOST_KEY
128# ECVS_SSH_HOST_KEY 163# @DEFAULT_UNSET
129# 164# @DESCRIPTION:
130# If SSH is used for `ext' authentication, use this variable to 165# 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 166# 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. 167# should be the same format that is used for the SSH known hosts file.
133# 168#
134# WARNING: If a SSH host key is not specified using this variable, the 169# WARNING: If a SSH host key is not specified using this variable, the
135# remote host key will not be verified. 170# remote host key will not be verified.
136 171
137 172# @ECLASS-VARIABLE: ECVS_CLEAN
173# @DEFAULT_UNSET
174# @DESCRIPTION:
138# ECVS_CLEAN -- Set this to get a clean copy when updating (passes the 175# Set this to get a clean copy when updating (passes the
139# -C option to cvs update) 176# -C option to cvs update)
140 177
141 178# @ECLASS-VARIABLE: ECVS_RUNAS
142# ECVS_RUNAS 179# @DEFAULT_UNSET
143# 180# @DESCRIPTION:
144# Specifies an alternate (non-root) user to use to run cvs. Currently 181# Specifies an alternate (non-root) user to use to run cvs. Currently
145# b0rked and wouldn't work with portage userpriv anyway without 182# b0rked and wouldn't work with portage userpriv anyway without
146# special magic. 183# special magic.
147 184
148# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`" 185# : ${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 186
157# add cvs to deps 187# add cvs to deps
158# ssh is used for ext auth 188# ssh is used for ext auth
159# sudo is used to run as a specified user 189# sudo is used to run as a specified user
160DEPEND="dev-util/cvs app-admin/sudo" 190DEPEND="dev-vcs/cvs"
161 191
192[[ -n ${ECVS_RUNAS} ]] && DEPEND+=" app-admin/sudo"
193
162if [ "$ECVS_AUTH" == "ext" ]; then 194if [[ ${ECVS_AUTH} == "ext" ]] ; then
163 #default to ssh 195 #default to ssh
164 [ -z "$CVS_RSH" ] && export SSH_RSH="ssh" 196 [[ -z ${CVS_RSH} ]] && export CVS_RSH="ssh"
165 if [ "$CVS_RSH" != "ssh" ]; then 197 if [[ ${CVS_RSH} != "ssh" ]] ; then
166 die "Support for ext auth with clients other than ssh has not been implemented yet" 198 die "Support for ext auth with clients other than ssh has not been implemented yet"
167 fi 199 fi
168 DEPEND="${DEPEND} net-misc/openssh" 200 DEPEND+=" net-misc/openssh"
169fi 201fi
170 202
171# called from cvs_src_unpack 203# called from cvs_src_unpack
172cvs_fetch() { 204cvs_fetch() {
173 205
174 # Make these options local variables so that the global values are 206 # Make these options local variables so that the global values are
175 # not affected by modifications in this function. 207 # not affected by modifications in this function.
176 208
177 local ECVS_COMMAND="${ECVS_COMMAND}" 209 local ECVS_COMMAND=${ECVS_COMMAND}
178 local ECVS_UP_OPTS="${ECVS_UP_OPTS}" 210 local ECVS_UP_OPTS=${ECVS_UP_OPTS}
179 local ECVS_CO_OPTS="${ECVS_CO_OPTS}" 211 local ECVS_CO_OPTS=${ECVS_CO_OPTS}
180 212
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 $* 213 debug-print-function ${FUNCNAME} "$@"
188 214
189 # Update variables that are modified by ebuild parameters, which 215 # Update variables that are modified by ebuild parameters, which
190 # should be effective every time cvs_fetch is called, and not just 216 # should be effective every time cvs_fetch is called, and not just
191 # every time cvs.eclass is inherited 217 # every time cvs.eclass is inherited
192 218
193 # Handle parameter for local (non-recursive) fetching 219 # Handle parameter for local (non-recursive) fetching
194 220
195 if [ -n "$ECVS_LOCAL" ]; then 221 if [[ -n ${ECVS_LOCAL} ]] ; then
196 ECVS_UP_OPTS="$ECVS_UP_OPTS -l" 222 ECVS_UP_OPTS+=" -l"
197 ECVS_CO_OPTS="$ECVS_CO_OPTS -l" 223 ECVS_CO_OPTS+=" -l"
198 fi 224 fi
199 225
200 # Handle ECVS_BRANCH option 226 # Handle ECVS_BRANCH option
201 # 227 #
202 # Because CVS auto-switches branches, we just have to pass the 228 # Because CVS auto-switches branches, we just have to pass the
203 # correct -rBRANCH option when updating. 229 # correct -rBRANCH option when updating.
204 230
205 if [ -n "$ECVS_BRANCH" ]; then 231 if [[ -n ${ECVS_BRANCH} ]] ; then
206 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH" 232 ECVS_UP_OPTS+=" -r${ECVS_BRANCH}"
207 ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH" 233 ECVS_CO_OPTS+=" -r${ECVS_BRANCH}"
208 fi 234 fi
209 235
210 # Handle ECVS_LOCALNAME, which specifies the local directory name 236 # Handle ECVS_LOCALNAME, which specifies the local directory name
211 # to use. Note that the -d command option is not equivalent to 237 # to use. Note that the -d command option is not equivalent to
212 # the global -d option. 238 # the global -d option.
213 239
214 if [ "$ECVS_LOCALNAME" != "$ECVS_MODULE" ]; then 240 if [[ ${ECVS_LOCALNAME} != "${ECVS_MODULE}" ]] ; then
215 ECVS_CO_OPTS="$ECVS_CO_OPTS -d $ECVS_LOCALNAME" 241 ECVS_CO_OPTS+=" -d ${ECVS_LOCALNAME}"
216 fi 242 fi
217 243
218
219 if [ -n "$ECVS_CLEAN" ]; then 244 if [[ -n ${ECVS_CLEAN} ]] ; then
220 ECVS_UP_OPTS="$ECVS_UP_OPTS -C" 245 ECVS_UP_OPTS+=" -C"
221 fi 246 fi
222 247
248 if [[ -n ${ECVS_DATE} ]] ; then
249 ECVS_CO_OPTS+=" -D ${ECVS_DATE}"
250 ECVS_UP_OPTS+=" -D ${ECVS_DATE}"
251 fi
223 252
224 # It would be easiest to always be in "run-as mode", logic-wise, 253 # 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`. 254 # if sudo didn't ask for a password even when sudo'ing to `whoami`.
226 255
227 if [ -z "$ECVS_RUNAS" ]; then 256 if [[ -z ${ECVS_RUNAS} ]] ; then
228 run="" 257 run=""
229 else 258 else
230 run="sudo -u $ECVS_RUNAS" 259 run="sudo -u ${ECVS_RUNAS}"
231 fi 260 fi
232 261
233 # Create the top dir if needed 262 # Create the top dir if needed
234 263
235 if [ ! -d "$ECVS_TOP_DIR" ]; then 264 if [[ ! -d ${ECVS_TOP_DIR} ]] ; then
236
237 # Note that the addwrite statements in this block are only 265 # Note that the addwrite statements in this block are only
238 # there to allow creating ECVS_TOP_DIR; we allow writing 266 # there to allow creating ECVS_TOP_DIR; we allow writing
239 # inside it separately. 267 # inside it separately.
240 268
241 # This is because it's simpler than trying to find out the 269 # This is because it's simpler than trying to find out the
242 # parent path of the directory, which would need to be the 270 # 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 271 # real path and not a symlink for things to work (so we can't
244 # just remove the last path element in the string) 272 # just remove the last path element in the string)
245 273
246 debug-print "$FUNCNAME: checkout mode. creating cvs directory" 274 debug-print "${FUNCNAME}: checkout mode. creating cvs directory"
247 addwrite /foobar 275 addwrite /foobar
248 addwrite / 276 addwrite /
249 $run mkdir -p "/$ECVS_TOP_DIR" 277 ${run} mkdir -p "/${ECVS_TOP_DIR}"
250 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}" 278 export SANDBOX_WRITE="${SANDBOX_WRITE//:\/foobar:\/}"
251 fi 279 fi
252 280
253 # In case ECVS_TOP_DIR is a symlink to a dir, get the real path, 281 # In case ECVS_TOP_DIR is a symlink to a dir, get the real path,
254 # otherwise addwrite() doesn't work. 282 # otherwise addwrite() doesn't work.
255 283
256 cd -P "$ECVS_TOP_DIR" > /dev/null 284 cd -P "${ECVS_TOP_DIR}" >/dev/null
257 ECVS_TOP_DIR="`/bin/pwd`" 285 ECVS_TOP_DIR=$(pwd)
258 286
259 # Disable the sandbox for this dir 287 # Disable the sandbox for this dir
260 addwrite "$ECVS_TOP_DIR" 288 addwrite "${ECVS_TOP_DIR}"
261 289
262 # Chown the directory and all of its contents 290 # Chown the directory and all of its contents
263 if [ -n "$ECVS_RUNAS" ]; then 291 if [[ -n ${ECVS_RUNAS} ]] ; then
264 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR" 292 ${run} chown -R "${ECVS_RUNAS}" "/${ECVS_TOP_DIR}"
265 fi 293 fi
266 294
267 # Determine the CVS command mode (checkout or update) 295 # Determine the CVS command mode (checkout or update)
268 if [ ! -d "$ECVS_TOP_DIR/$ECVS_LOCALNAME/CVS" ]; then 296 if [[ ! -d ${ECVS_TOP_DIR}/${ECVS_LOCALNAME}/CVS ]] ; then
269 mode=checkout 297 mode=checkout
270 else 298 else
271 mode=update 299 mode=update
272 fi 300 fi
273 301
274
275 # Our server string (i.e. CVSROOT) without the password so it can 302 # Our server string (i.e. CVSROOT) without the password so it can
276 # be put in Root 303 # be put in Root
277 if [ "$ECVS_AUTH" == "no" ] 304 if [[ ${ECVS_AUTH} == "no" ]] ; then
278 then
279 local server="${ECVS_USER}@${ECVS_SERVER}" 305 local server="${ECVS_USER}@${ECVS_SERVER}"
280 else 306 else
307 local connection="${ECVS_AUTH}"
308 [[ -n ${ECVS_PROXY} ]] && connection+=";proxy=${ECVS_PROXY}"
309 [[ -n ${ECVS_PROXY_PORT} ]] && connection+=";proxyport=${ECVS_PROXY_PORT}"
281 local server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 310 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
282 fi 311 fi
283 312
284 # Switch servers automagically if needed 313 # Switch servers automagically if needed
285 if [ "$mode" == "update" ]; then 314 if [[ ${mode} == "update" ]] ; then
286 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME 315 cd "/${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
287 local oldserver="`$run cat CVS/Root`" 316 local oldserver=$(${run} cat CVS/Root)
288 if [ "$server" != "$oldserver" ]; then 317 if [[ ${server} != "${oldserver}" ]] ; then
289
290 einfo "Changing the CVS server from $oldserver to $server:" 318 einfo "Changing the CVS server from ${oldserver} to ${server}:"
291 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:" 319 debug-print "${FUNCNAME}: Changing the CVS server from ${oldserver} to ${server}:"
292 320
293 einfo "Searching for CVS directories ..." 321 einfo "Searching for CVS directories ..."
294 local cvsdirs="`$run find . -iname CVS -print`" 322 local cvsdirs=$(${run} find . -iname CVS -print)
295 debug-print "$FUNCNAME: CVS directories found:" 323 debug-print "${FUNCNAME}: CVS directories found:"
296 debug-print "$cvsdirs" 324 debug-print "${cvsdirs}"
297 325
298 einfo "Modifying CVS directories ..." 326 einfo "Modifying CVS directories ..."
327 local x
299 for x in $cvsdirs; do 328 for x in ${cvsdirs} ; do
300 debug-print "In $x" 329 debug-print "In ${x}"
301 $run echo "$server" > "$x/Root" 330 ${run} echo "${server}" > "${x}/Root"
302 done 331 done
303
304 fi 332 fi
305 fi 333 fi
306 334
307 # Prepare a cvspass file just for this session, we don't want to 335 # Prepare a cvspass file just for this session, we don't want to
308 # mess with ~/.cvspass 336 # mess with ~/.cvspass
309 touch "${T}/cvspass" 337 touch "${T}/cvspass"
310 export CVS_PASSFILE="${T}/cvspass" 338 export CVS_PASSFILE="${T}/cvspass"
311 if [ -n "$ECVS_RUNAS" ]; then 339 if [[ -n ${ECVS_RUNAS} ]] ; then
312 chown "$ECVS_RUNAS" "${T}/cvspass" 340 chown "${ECVS_RUNAS}" "${T}/cvspass"
313 fi 341 fi
314 342
315 # The server string with the password in it, for login 343 # The server string with the password in it, for login
316 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}" 344 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
317 345
318 # Ditto without the password, for checkout/update after login, so 346 # Ditto without the password, for checkout/update after login, so
319 # that the CVS/Root files don't contain the password in plaintext 347 # that the CVS/Root files don't contain the password in plaintext
320 if [ "$ECVS_AUTH" == "no" ] 348 if [[ ${ECVS_AUTH} == "no" ]] ; then
321 then
322 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}" 349 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
323 else 350 else
324 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 351 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
325 fi 352 fi
326 353
330 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}" 357 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
331 358
332 # Execute commands 359 # Execute commands
333 360
334 cd "${ECVS_TOP_DIR}" 361 cd "${ECVS_TOP_DIR}"
335 if [ "${ECVS_AUTH}" == "pserver" ]; then 362 if [[ ${ECVS_AUTH} == "pserver" ]] ; then
336 einfo "Running $cmdlogin" 363 einfo "Running ${cmdlogin}"
337 eval $cmdlogin || die "cvs login command failed" 364 eval ${cmdlogin} || die "cvs login command failed"
338 if [ "${mode}" == "update" ]; then 365 if [[ ${mode} == "update" ]] ; then
339 einfo "Running $cmdupdate" 366 einfo "Running ${cmdupdate}"
340 eval $cmdupdate || die "cvs update command failed" 367 eval ${cmdupdate} || die "cvs update command failed"
341 elif [ "${mode}" == "checkout" ]; then 368 elif [[ ${mode} == "checkout" ]] ; then
342 einfo "Running $cmdcheckout" 369 einfo "Running ${cmdcheckout}"
343 eval $cmdcheckout|| die "cvs checkout command failed" 370 eval ${cmdcheckout} || die "cvs checkout command failed"
344 fi 371 fi
345 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then 372 elif [[ ${ECVS_AUTH} == "ext" || ${ECVS_AUTH} == "no" ]] ; then
346
347 # Hack to support SSH password authentication 373 # Hack to support SSH password authentication
348 374
349 # Backup environment variable values 375 # Backup environment variable values
350 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}" 376 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}"
351 377
352 if [ "${SSH_ASKPASS+set}" == "set" ]; then 378 if [[ ${SSH_ASKPASS+set} == "set" ]] ; then
353 local CVS_ECLASS_ORIG_SSH_ASKPASS="${SSH_ASKPASS}" 379 local CVS_ECLASS_ORIG_SSH_ASKPASS="${SSH_ASKPASS}"
354 else 380 else
355 unset CVS_ECLASS_ORIG_SSH_ASKPASS 381 unset CVS_ECLASS_ORIG_SSH_ASKPASS
356 fi 382 fi
357 383
358 if [ "${DISPLAY+set}" == "set" ]; then 384 if [[ ${DISPLAY+set} == "set" ]] ; then
359 local CVS_ECLASS_ORIG_DISPLAY="${DISPLAY}" 385 local CVS_ECLASS_ORIG_DISPLAY="${DISPLAY}"
360 else 386 else
361 unset CVS_ECLASS_ORIG_DISPLAY 387 unset CVS_ECLASS_ORIG_DISPLAY
362 fi 388 fi
363 389
364 if [ "${CVS_RSH}" == "ssh" ]; then 390 if [[ ${CVS_RSH} == "ssh" ]] ; then
365
366 # Force SSH to use SSH_ASKPASS by creating python wrapper 391 # Force SSH to use SSH_ASKPASS by creating python wrapper
367 392
368 export CVS_RSH="${T}/cvs_sshwrapper" 393 export CVS_RSH="${T}/cvs_sshwrapper"
369 cat > "${CVS_RSH}"<<EOF 394 cat > "${CVS_RSH}"<<EOF
370#!/usr/bin/python 395#!/usr/bin/python
395 420
396 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts" 421 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts"
397 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \ 422 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \
398 >> "${CVS_RSH}" 423 >> "${CVS_RSH}"
399 424
400 if [ -z "${ECVS_SSH_HOST_KEY}" ]; then 425 if [[ -z ${ECVS_SSH_HOST_KEY} ]] ; then
401 ewarn "Warning: The SSH host key of the remote server will not be verified." 426 ewarn "Warning: The SSH host key of the remote server will not be verified."
402 einfo "A temporary known hosts list will be used." 427 einfo "A temporary known hosts list will be used."
403 local CVS_ECLASS_STRICT_HOST_CHECKING="no" 428 local CVS_ECLASS_STRICT_HOST_CHECKING="no"
404 touch "${CVS_ECLASS_KNOWN_HOSTS}" 429 touch "${CVS_ECLASS_KNOWN_HOSTS}"
405 else 430 else
417 chmod a+x "${CVS_RSH}" 442 chmod a+x "${CVS_RSH}"
418 443
419 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS 444 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
420 # if DISPLAY is not set) 445 # if DISPLAY is not set)
421 446
422 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY" 447 : ${DISPLAY:="DISPLAY"}
423 export DISPLAY 448 export DISPLAY
424 449
425 # Create a dummy executable to echo $ECVS_PASS 450 # Create a dummy executable to echo ${ECVS_PASS}
426 451
427 export SSH_ASKPASS="${T}/cvs_sshechopass" 452 export SSH_ASKPASS="${T}/cvs_sshechopass"
428 if [ "${ECVS_AUTH}" != "no" ]; then 453 if [[ ${ECVS_AUTH} != "no" ]] ; then
429 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \ 454 echo -en "#!/bin/bash\necho \"${ECVS_PASS}\"\n" \
430 > "${SSH_ASKPASS}" 455 > "${SSH_ASKPASS}"
431 else 456 else
432 echo -en "#!/bin/bash\nreturn\n" \ 457 echo -en "#!/bin/bash\nreturn\n" \
433 > "${SSH_ASKPASS}" 458 > "${SSH_ASKPASS}"
434
435 fi 459 fi
436 chmod a+x "${SSH_ASKPASS}" 460 chmod a+x "${SSH_ASKPASS}"
437 fi 461 fi
438 462
439 if [ "${mode}" == "update" ]; then 463 if [[ ${mode} == "update" ]] ; then
440 einfo "Running $cmdupdate" 464 einfo "Running ${cmdupdate}"
441 eval $cmdupdate || die "cvs update command failed" 465 eval ${cmdupdate} || die "cvs update command failed"
442 elif [ "${mode}" == "checkout" ]; then 466 elif [[ ${mode} == "checkout" ]] ; then
443 einfo "Running $cmdcheckout" 467 einfo "Running ${cmdcheckout}"
444 eval $cmdcheckout|| die "cvs checkout command failed" 468 eval ${cmdcheckout} || die "cvs checkout command failed"
445 fi 469 fi
446 470
447 # Restore environment variable values 471 # Restore environment variable values
448 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}" 472 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
449 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then 473 if [[ ${CVS_ECLASS_ORIG_SSH_ASKPASS+set} == "set" ]] ; then
450 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}" 474 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
451 else 475 else
452 unset SSH_ASKPASS 476 unset SSH_ASKPASS
453 fi 477 fi
454 478
455 if [ "${CVS_ECLASS_ORIG_DISPLAY+set}" == "set" ]; then 479 if [[ ${CVS_ECLASS_ORIG_DISPLAY+set} == "set" ]] ; then
456 export DISPLAY="${CVS_ECLASS_ORIG_DISPLAY}" 480 export DISPLAY="${CVS_ECLASS_ORIG_DISPLAY}"
457 else 481 else
458 unset DISPLAY 482 unset DISPLAY
459 fi 483 fi
460 fi 484 fi
461 485
462 # Restore ownership. Not sure why this is needed, but someone 486 # Restore ownership. Not sure why this is needed, but someone
463 # added it in the orig ECVS_RUNAS stuff. 487 # added it in the orig ECVS_RUNAS stuff.
464 if [ -n "$ECVS_RUNAS" ]; then 488 if [[ -n ${ECVS_RUNAS} ]] ; then
465 chown `whoami` "${T}/cvspass" 489 chown $(whoami) "${T}/cvspass"
466 fi 490 fi
467 491
468} 492}
469 493
470 494# @FUNCTION: cvs_src_unpack
495# @DESCRIPTION:
496# The cvs src_unpack function, which will be exported
471cvs_src_unpack() { 497cvs_src_unpack() {
472 498
473 debug-print-function $FUNCNAME $* 499 debug-print-function ${FUNCNAME} "$@"
474 500
475 debug-print "$FUNCNAME: init: 501 debug-print "${FUNCNAME}: init:
476 ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 502 ECVS_CVS_COMMAND=${ECVS_CVS_COMMAND}
477 ECVS_UP_OPTS=$ECVS_UP_OPTS 503 ECVS_UP_OPTS=${ECVS_UP_OPTS}
478 ECVS_CO_OPTS=$ECVS_CO_OPTS 504 ECVS_CO_OPTS=${ECVS_CO_OPTS}
479 ECVS_TOP_DIR=$ECVS_TOP_DIR 505 ECVS_TOP_DIR=${ECVS_TOP_DIR}
480 ECVS_SERVER=$ECVS_SERVER 506 ECVS_SERVER=${ECVS_SERVER}
481 ECVS_USER=$ECVS_USER 507 ECVS_USER=${ECVS_USER}
482 ECVS_PASS=$ECVS_PASS 508 ECVS_PASS=${ECVS_PASS}
483 ECVS_MODULE=$ECVS_MODULE 509 ECVS_MODULE=${ECVS_MODULE}
484 ECVS_LOCAL=$ECVS_LOCAL 510 ECVS_LOCAL=${ECVS_LOCAL}
485 ECVS_RUNAS=$ECVS_RUNAS 511 ECVS_RUNAS=${ECVS_RUNAS}
486 ECVS_LOCALNAME=$ECVS_LOCALNAME" 512 ECVS_LOCALNAME=${ECVS_LOCALNAME}"
487 513
488 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue." 514 [[ -z ${ECVS_MODULE} ]] && die "ERROR: CVS module not set, cannot continue."
489 515
490 local ECVS_LOCALNAME="${ECVS_LOCALNAME}" 516 local ECVS_LOCALNAME=${ECVS_LOCALNAME:-${ECVS_MODULE}}
491 517
492 if [ -z "$ECVS_LOCALNAME" ]; then 518 local sanitized_pn=$(echo "${PN}" | LC_ALL=C sed -e 's:[^A-Za-z0-9_]:_:g')
493 ECVS_LOCALNAME="$ECVS_MODULE" 519 local offline_pkg_var="ECVS_OFFLINE_${sanitized_pn}"
494 fi 520 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 521 # We're not required to fetch anything; the module already
498 # exists and shouldn't be updated. 522 # exists and shouldn't be updated.
499 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then 523 if [[ -d ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} ]] ; then
500 debug-print "$FUNCNAME: offline mode" 524 debug-print "${FUNCNAME}: offline mode"
501 else 525 else
502 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error" 526 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." 527 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
504 fi 528 fi
505 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode 529 elif [[ -n ${ECVS_SERVER} ]] ; then # ECVS_SERVER!=offline --> real fetching mode
506 einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR ..." 530 einfo "Fetching CVS module ${ECVS_MODULE} into ${ECVS_TOP_DIR} ..."
507 cvs_fetch 531 cvs_fetch
508 else # ECVS_SERVER not set 532 else # ECVS_SERVER not set
509 die "ERROR: CVS server not specified, cannot continue." 533 die "ERROR: CVS server not specified, cannot continue."
510 fi 534 fi
511 535
512 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..." 536 einfo "Copying ${ECVS_MODULE} from ${ECVS_TOP_DIR} ..."
513 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..." 537 debug-print "Copying module ${ECVS_MODULE} local_mode=${ECVS_LOCAL} from ${ECVS_TOP_DIR} ..."
514 538
515 # This is probably redundant, but best to make sure. 539 # This is probably redundant, but best to make sure.
516 mkdir -p "$WORKDIR/$ECVS_LOCALNAME" 540 mkdir -p "${WORKDIR}/${ECVS_LOCALNAME}"
517 541
518 if [ -n "$ECVS_LOCAL" ]; then 542 if [[ -n ${ECVS_LOCAL} ]] ; then
519 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME" 543 cp -f "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"/* "${WORKDIR}/${ECVS_LOCALNAME}"
520 else 544 else
521 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.." 545 cp -Rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" "${WORKDIR}/${ECVS_LOCALNAME}/.."
522 fi 546 fi
547
548 # Not exactly perfect, but should be pretty close #333773
549 export ECVS_VERSION=$(
550 find "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}/" -ipath '*/CVS/Entries' -exec cat {} + | \
551 LC_ALL=C sort | \
552 sha1sum | \
553 awk '{print $1}'
554 )
523 555
524 # If the directory is empty, remove it; empty directories cannot 556 # If the directory is empty, remove it; empty directories cannot
525 # exist in cvs. This happens when, for example, kde-source 557 # exist in cvs. This happens when, for example, kde-source
526 # requests module/doc/subdir which doesn't exist. Still create 558 # requests module/doc/subdir which doesn't exist. Still create
527 # the empty directory in workdir though. 559 # the empty directory in workdir though.
528 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_LOCALNAME}\"`" == "CVS" ]; then 560 if [[ $(ls -A "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}") == "CVS" ]] ; then
529 debug-print "$FUNCNAME: removing empty CVS directory $ECVS_LOCALNAME" 561 debug-print "${FUNCNAME}: removing empty CVS directory ${ECVS_LOCALNAME}"
530 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" 562 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
531 fi 563 fi
532 564
533 # Implement some of base_src_unpack's functionality; note however 565 # Implement some of base_src_unpack's functionality; note however
534 # that base.eclass may not have been inherited! 566 # that base.eclass may not have been inherited!
535 if [ -n "$PATCHES" ]; then 567 if [[ -n ${PATCHES} ]] ; then
536 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 568 debug-print "${FUNCNAME}: PATCHES=${PATCHES,} S=${S}, autopatching"
537 cd "$S" 569 cd "${S}"
538 for x in $PATCHES; do 570 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, 571 # Make sure we don't try to apply patches more than once,
543 # since cvs_src_unpack is usually called several times from 572 # since cvs_src_unpack is usually called several times from
544 # e.g. kde-source_src_unpack 573 # e.g. kde-source_src_unpack
545 export PATCHES="" 574 export PATCHES=""
546 fi 575 fi
547 576
548 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}" 577 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
549} 578}
550 579
551EXPORT_FUNCTIONS src_unpack 580EXPORT_FUNCTIONS src_unpack
581
582fi

Legend:
Removed from v.1.58  
changed lines
  Added in v.1.81

  ViewVC Help
Powered by ViewVC 1.1.20