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

Diff of /eclass/cvs.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20