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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.83

  ViewVC Help
Powered by ViewVC 1.1.20