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

Diff of /eclass/cvs.eclass

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

Revision 1.50 Revision 1.75
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2008 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.50 2004/01/04 14:35:12 coredumb Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.75 2010/08/24 21:00:15 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
16inherit eutils
20 17
21# TODO: 18# TODO:
22 19
23# Implement more auth types (gserver?, kserver?) 20# Implement more auth types (gserver?, kserver?)
24 21
25# Support additional remote shells with `ext' authentication (does 22# Support additional remote shells with `ext' authentication (does
26# anyone actually need to use it with anything other than SSH?) 23# anyone actually need to use it with anything other than SSH?)
27 24
28
29ECLASS=cvs
30INHERITED="$INHERITED $ECLASS"
31 25
32# Users shouldn't change these settings! The ebuild/eclass inheriting 26# Users shouldn't change these settings! The ebuild/eclass inheriting
33# this eclass will take care of that. If you want to set the global 27# this eclass will take care of that. If you want to set the global
34# KDE cvs ebuilds' settings, see the comments in kde-source.eclass. 28# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
35 29
36# --- begin ebuild-configurable settings 30# @ECLASS-VARIABLE: ECVS_CVS_COMMAND
37 31# @DESCRIPTION:
38# ECVS_CVS_COMMAND -- CVS command to run 32# CVS command to run
39# 33#
40# You can set, for example, "cvs -t" for extensive debug information 34# You can set, for example, "cvs -t" for extensive debug information
41# on the cvs connection. The default of "cvs -q -f -z4" means to be 35# on the cvs connection. The default of "cvs -q -f -z4" means to be
42# quiet, to disregard the ~/.cvsrc config file and to use maximum 36# quiet, to disregard the ~/.cvsrc config file and to use maximum
43# compression. 37# compression.
38[[ -z ${ECVS_CVS_COMMAND} ]] && ECVS_CVS_COMMAND="cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}"
44 39
45[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 40# @ECLASS-VARIABLE: ECVS_CVS_COMPRESS
41# @DESCRIPTION:
42# Set the compression level.
43[[ -z ${ECVS_CVS_COMPRESS} ]] && ECVS_CVS_COMPRESS="-z1"
46 44
45# @ECLASS-VARIABLE: ECVS_CVS_OPTIONS
46# @DESCRIPTION:
47# Additional options to the cvs commands.
48[[ -z ${ECVS_CVS_OPTIONS} ]] && ECVS_CVS_OPTIONS="-q -f"
47 49
48# ECVS_UP_OPTS, ECVS_CO_OPTS -- CVS options given after the cvs 50# @ECLASS-VARIABLE: ECVS_UP_OPTS
49# command (update or checkout). 51# @DESCRIPTION:
50# 52# CVS options given after the cvs update command. Don't remove "-dP" or things
51# Don't remove -dP from update or things won't work. 53# won't work.
52
53[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP" 54[ -z "$ECVS_UP_OPTS" ] && ECVS_UP_OPTS="-dP"
55
56# @ECLASS-VARIABLE: ECVS_CO_OPTS
57# @DESCRIPTION:
58# CVS options given after the cvs checkout command.
54[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS="" 59[ -z "$ECVS_CO_OPTS" ] && ECVS_CO_OPTS=""
55 60
61# @ECLASS-VARIABLE: ECVS_OFFLINE
62# @DESCRIPTION:
63# Set this variable to a non-empty value to disable the automatic updating of
64# a CVS source tree. This is intended to be set outside the cvs source
65# tree by users.
66: ${ECVS_OFFLINE:=${ESCM_OFFLINE}}
56 67
68# @ECLASS-VARIABLE: ECVS_LOCAL
69# @DEFAULT_UNSET
70# @DESCRIPTION:
57# ECVS_LOCAL -- If this is set, the CVS module will be fetched 71# If this is set, the CVS module will be fetched non-recursively.
58# non-recursively. Refer to the information in the CVS man page 72# Refer to the information in the CVS man page regarding the -l
59# regarding the -l command option (not the -l global option). 73# command option (not the -l global option).
60 74
61 75# @ECLASS-VARIABLE: ECVS_LOCALNAME
76# @DEFAULT_UNSET
77# @DESCRIPTION:
62# ECVS_LOCALNAME -- local name of checkout directory 78# Local name of checkout directory
63# 79#
64# This is useful if the module on the server is called something 80# This is useful if the module on the server is called something
65# common like 'driver' or is nested deep in a tree, and you don't like 81# common like 'driver' or is nested deep in a tree, and you don't like
66# useless empty directories. 82# useless empty directories.
67# 83#
68# WARNING: Set this only from within ebuilds! If set in your shell or 84# WARNING: Set this only from within ebuilds! If set in your shell or
69# some such, things will break because the ebuild won't expect it and 85# some such, things will break because the ebuild won't expect it and
70# have e.g. a wrong $S setting. 86# have e.g. a wrong $S setting.
71 87
72 88# @ECLASS-VARIABLE: ECVS_TOP_DIR
89# @DESCRIPTION:
73# ECVS_TOP_DIR -- The directory under which CVS modules are checked 90# The directory under which CVS modules are checked out.
74# out.
75
76[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 91[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"
77 92
78# ECVS_NAME -- CVS path 93# @ECLASS-VARIABLE: ECVS_SERVER
94# @DESCRIPTION:
95# CVS path
79# 96#
80# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde". 97# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde".
81# Remove the other parts of the full CVSROOT, which might look like 98# Remove the other parts of the full CVSROOT, which might look like
82# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated 99# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
83# using other settings also. 100# using other settings also.
84# 101#
85# Set this to "offline" to disable fetching (i.e. to assume the module 102# Set this to "offline" to disable fetching (i.e. to assume the module
86# is already checked out in ECVS_TOP_DIR). 103# is already checked out in ECVS_TOP_DIR).
87
88[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 104[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
89 105
90 106# @ECLASS-VARIABLE: ECVS_MODULE
107# @REQUIRED
108# @DESCRIPTION:
91# ECVS_MODULE -- the name of the CVS module to be fetched 109# The name of the CVS module to be fetched
92# 110#
93# This must be set when cvs_src_unpack is called. This can include 111# This must be set when cvs_src_unpack is called. This can include
94# several directory levels, i.e. "foo/bar/baz" 112# several directory levels, i.e. "foo/bar/baz"
95 113
96#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue" 114#[ -z "$ECVS_MODULE" ] && die "$ECLASS: error: ECVS_MODULE not set, cannot continue"
97 115
98 116# @ECLASS-VARIABLE: ECVS_BRANCH
117# @DEFAULT_UNSET
118# @DESCRIPTION:
99# ECVS_BRANCH -- the name of the branch/tag to use 119# The name of the branch/tag to use
100 120#
101# The default is "HEAD". The following default _will_ reset your 121# The default is "HEAD". The following default _will_ reset your
102# branch checkout to head if used. 122# branch checkout to head if used.
103 123
104#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 124#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
105 125
106 126# @ECLASS-VARIABLE: ECVS_AUTH
127# @DESCRIPTION:
107# ECVS_AUTH -- authentication method to use 128# Authentication method to use
108# 129#
109# Possible values are "pserver" and "ext". If `ext' authentication is 130# Possible values are "pserver" and "ext". If `ext' authentication is
110# used, the remote shell to use can be specified in CVS_RSH (SSH is 131# used, the remote shell to use can be specified in CVS_RSH (SSH is
111# used by default). Currently, the only supported remote shell for 132# used by default). Currently, the only supported remote shell for
112# `ext' authentication is SSH. 133# `ext' authentication is SSH.
134#
135# Armando Di Cianno <fafhrd@gentoo.org> 2004/09/27
136# - Added "no" as a server type, which uses no AUTH method, nor
137# does it login
138# e.g.
139# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System"
140# ( from gnustep-apps/textedit )
113[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver" 141[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
114 142
143# @ECLASS-VARIABLE: ECVS_USER
144# @DESCRIPTION:
115# ECVS_USER -- Username to use for authentication on the remote server 145# Username to use for authentication on the remote server.
116[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 146[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
117 147
118 148# @ECLASS-VARIABLE: ECVS_PASS
149# @DESCRIPTION:
119# ECVS_PASS -- Password to use for authentication on the remote server 150# Password to use for authentication on the remote server
120[ -z "$ECVS_PASS" ] && ECVS_PASS="" 151[ -z "$ECVS_PASS" ] && ECVS_PASS=""
121 152
122 153# @ECLASS-VARIABLE: ECVS_SSH_HOST_KEY
123# ECVS_SSH_HOST_KEY 154# @DEFAULT_UNSET
124# 155# @DESCRIPTION:
125# If SSH is used for `ext' authentication, use this variable to 156# 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 157# 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. 158# should be the same format that is used for the SSH known hosts file.
128# 159#
129# WARNING: If a SSH host key is not specified using this variable, the 160# WARNING: If a SSH host key is not specified using this variable, the
130# remote host key will not be verified. 161# remote host key will not be verified.
131 162
132 163# @ECLASS-VARIABLE: ECVS_CLEAN
164# @DEFAULT_UNSET
165# @DESCRIPTION:
133# ECVS_CLEAN -- Set this to get a clean copy when updating (passes the 166# Set this to get a clean copy when updating (passes the
134# -C option to cvs update) 167# -C option to cvs update)
135 168
136 169# @ECLASS-VARIABLE: ECVS_RUNAS
137# ECVS_RUNAS 170# @DEFAULT_UNSET
138# 171# @DESCRIPTION:
139# Specifies an alternate (non-root) user to use to run cvs. Currently 172# Specifies an alternate (non-root) user to use to run cvs. Currently
140# b0rked and wouldn't work with portage userpriv anyway without 173# b0rked and wouldn't work with portage userpriv anyway without
141# special magic. 174# special magic.
142 175
143# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`" 176# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
144 177
145
146# ECVS_SUBDIR -- deprecated, do not use 178# ECVS_SUBDIR -- deprecated, do not use
147[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild." 179[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
148
149
150# --- end ebuild-configurable settings ---
151 180
152# add cvs to deps 181# add cvs to deps
153# ssh is used for ext auth 182# ssh is used for ext auth
154# sudo is used to run as a specified user 183# sudo is used to run as a specified user
155DEPEND="$DEPEND dev-util/cvs app-admin/sudo" 184DEPEND="dev-vcs/cvs"
185
186[ -n "$ECVS_RUNAS" ] && DEPEND="$DEPEND app-admin/sudo"
156 187
157if [ "$ECVS_AUTH" == "ext" ]; then 188if [ "$ECVS_AUTH" == "ext" ]; then
158 #default to ssh 189 #default to ssh
159 [ -z "$CVS_RSH" ] && export SSH_RSH="ssh" 190 [ -z "$CVS_RSH" ] && export CVS_RSH="ssh"
160 if [ "$CVS_RSH" != "ssh" ]; then 191 if [ "$CVS_RSH" != "ssh" ]; then
161 die "Support for ext auth with clients other than ssh has not been implemented yet" 192 die "Support for ext auth with clients other than ssh has not been implemented yet"
162 fi 193 fi
163 DEPEND="$DEPEND net-misc/openssh" 194 DEPEND="${DEPEND} net-misc/openssh"
164fi 195fi
165 196
166# called from cvs_src_unpack 197# called from cvs_src_unpack
167cvs_fetch() { 198cvs_fetch() {
168 199
171 202
172 local ECVS_COMMAND="${ECVS_COMMAND}" 203 local ECVS_COMMAND="${ECVS_COMMAND}"
173 local ECVS_UP_OPTS="${ECVS_UP_OPTS}" 204 local ECVS_UP_OPTS="${ECVS_UP_OPTS}"
174 local ECVS_CO_OPTS="${ECVS_CO_OPTS}" 205 local ECVS_CO_OPTS="${ECVS_CO_OPTS}"
175 206
176 # Fix for sourceforge which doesnt want -z>3 anymore.
177
178 (echo $ECVS_SERVER | grep -q sourceforge) \
179 && [ "$ECVS_CVS_COMMAND" == "cvs -q -f -z4" ] \
180 && ECVS_CVS_COMMAND="cvs -q -f -z3"
181
182 debug-print-function $FUNCNAME $* 207 debug-print-function $FUNCNAME $*
183 208
184 # Update variables that are modified by ebuild parameters, which 209 # Update variables that are modified by ebuild parameters, which
185 # should be effective every time cvs_fetch is called, and not just 210 # should be effective every time cvs_fetch is called, and not just
186 # every time cvs.eclass is inherited 211 # every time cvs.eclass is inherited
187 212
188
189 # Handle parameter for local (non-recursive) fetching 213 # Handle parameter for local (non-recursive) fetching
190 214
191 if [ -n "$ECVS_LOCAL" ]; then 215 if [ -n "$ECVS_LOCAL" ]; then
192 ECVS_UP_OPTS="$ECVS_UP_OPTS -l" 216 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
193 ECVS_CO_OPTS="$ECVS_CO_OPTS -l" 217 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
194 fi 218 fi
195 219
196 # Handle ECVS_BRANCH option 220 # Handle ECVS_BRANCH option
197 # 221 #
198 # Because CVS auto-switches branches, we just have to pass the 222 # Because CVS auto-switches branches, we just have to pass the
199 # correct -rBRANCH option when updating. 223 # correct -rBRANCH option when updating.
200 224
201 if [ -n "$ECVS_BRANCH" ]; then 225 if [ -n "$ECVS_BRANCH" ]; then
202 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH" 226 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
268 fi 292 fi
269 293
270 294
271 # Our server string (i.e. CVSROOT) without the password so it can 295 # Our server string (i.e. CVSROOT) without the password so it can
272 # be put in Root 296 # be put in Root
297 if [ "$ECVS_AUTH" == "no" ]
298 then
273 local server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 299 local server="${ECVS_USER}@${ECVS_SERVER}"
300 else
301 local connection="${ECVS_AUTH}"
302 [[ -n ${ECVS_PROXY} ]] && connection="${connection};proxy=${ECVS_PROXY}"
303 [[ -n ${ECVS_PROXY_PORT} ]] && connection="${connection};proxyport=${ECVS_PROXY_PORT}"
304 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
305 fi
274 306
275 # Switch servers automagically if needed 307 # Switch servers automagically if needed
276 if [ "$mode" == "update" ]; then 308 if [ "$mode" == "update" ]; then
277 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME 309 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
278 local oldserver="`$run cat CVS/Root`" 310 local oldserver="`$run cat CVS/Root`"
279 if [ "$server" != "$oldserver" ]; then 311 if [ "$server" != "$oldserver" ]; then
280 312
281 einfo "Changing the CVS server from $oldserver to $server:" 313 einfo "Changing the CVS server from $oldserver to $server:"
282 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:" 314 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:"
283 315
284 einfo "Searching for CVS directories..." 316 einfo "Searching for CVS directories ..."
285 local cvsdirs="`$run find . -iname CVS -print`" 317 local cvsdirs="`$run find . -iname CVS -print`"
286 debug-print "$FUNCNAME: CVS directories found:" 318 debug-print "$FUNCNAME: CVS directories found:"
287 debug-print "$cvsdirs" 319 debug-print "$cvsdirs"
288 320
289 einfo "Modifying CVS directories..." 321 einfo "Modifying CVS directories ..."
290 for x in $cvsdirs; do 322 for x in $cvsdirs; do
291 debug-print "In $x" 323 debug-print "In $x"
292 $run echo "$server" > "$x/Root" 324 $run echo "$server" > "$x/Root"
293 done 325 done
294 326
306 # The server string with the password in it, for login 338 # The server string with the password in it, for login
307 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}" 339 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
308 340
309 # Ditto without the password, for checkout/update after login, so 341 # Ditto without the password, for checkout/update after login, so
310 # that the CVS/Root files don't contain the password in plaintext 342 # that the CVS/Root files don't contain the password in plaintext
343 if [ "$ECVS_AUTH" == "no" ]
344 then
345 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
346 else
311 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 347 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
348 fi
312 349
313 # Commands to run 350 # Commands to run
314 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login" 351 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
315 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}" 352 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
316 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}" 353 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
323 eval $cmdlogin || die "cvs login command failed" 360 eval $cmdlogin || die "cvs login command failed"
324 if [ "${mode}" == "update" ]; then 361 if [ "${mode}" == "update" ]; then
325 einfo "Running $cmdupdate" 362 einfo "Running $cmdupdate"
326 eval $cmdupdate || die "cvs update command failed" 363 eval $cmdupdate || die "cvs update command failed"
327 elif [ "${mode}" == "checkout" ]; then 364 elif [ "${mode}" == "checkout" ]; then
328 einfo "Running $cmdcheckout" 365 einfo "Running $cmdcheckout"
329 eval $cmdcheckout|| die "cvs checkout command failed" 366 eval $cmdcheckout|| die "cvs checkout command failed"
330 fi 367 fi
331 elif [ "${ECVS_AUTH}" == "ext" ]; then 368 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then
332 369
333 # Hack to support SSH password authentication 370 # Hack to support SSH password authentication
334 371
335 # Backup environment variable values 372 # Backup environment variable values
336 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}" 373 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}"
368except: 405except:
369 pass 406 pass
370newarglist = sys.argv[:] 407newarglist = sys.argv[:]
371EOF 408EOF
372 409
410 # disable X11 forwarding which causes .xauth access violations
411 # - 20041205 Armando Di Cianno <fafhrd@gentoo.org>
412 echo "newarglist.insert(1, '-oClearAllForwardings=yes')" \
413 >> "${CVS_RSH}"
414 echo "newarglist.insert(1, '-oForwardX11=no')" \
415 >> "${CVS_RSH}"
416
373 # Handle SSH host key checking 417 # Handle SSH host key checking
374 418
375 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts" 419 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts"
376 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \ 420 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \
377 >> "${CVS_RSH}" 421 >> "${CVS_RSH}"
379 if [ -z "${ECVS_SSH_HOST_KEY}" ]; then 423 if [ -z "${ECVS_SSH_HOST_KEY}" ]; then
380 ewarn "Warning: The SSH host key of the remote server will not be verified." 424 ewarn "Warning: The SSH host key of the remote server will not be verified."
381 einfo "A temporary known hosts list will be used." 425 einfo "A temporary known hosts list will be used."
382 local CVS_ECLASS_STRICT_HOST_CHECKING="no" 426 local CVS_ECLASS_STRICT_HOST_CHECKING="no"
383 touch "${CVS_ECLASS_KNOWN_HOSTS}" 427 touch "${CVS_ECLASS_KNOWN_HOSTS}"
384 echo "newarglist.insert(1, '-oStrictHostKeyChecking=no')" \
385 >> "${CVS_RSH}"
386 else 428 else
387 local CVS_ECLASS_STRICT_HOST_CHECKING="yes" 429 local CVS_ECLASS_STRICT_HOST_CHECKING="yes"
388 echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}" 430 echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}"
389 fi 431 fi
390 432
393 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \ 435 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
394 >> "${CVS_RSH}" 436 >> "${CVS_RSH}"
395 echo "os.execv('/usr/bin/ssh', newarglist)" \ 437 echo "os.execv('/usr/bin/ssh', newarglist)" \
396 >> "${CVS_RSH}" 438 >> "${CVS_RSH}"
397 439
398 chmod a+x "${CVS_RSH}" 440 chmod a+x "${CVS_RSH}"
399 441
400 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS 442 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
401 # if DISPLAY is not set) 443 # if DISPLAY is not set)
402 444
403 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY" 445 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY"
404 export DISPLAY 446 export DISPLAY
405 447
406 # Create a dummy executable to echo $ECVS_PASS 448 # Create a dummy executable to echo $ECVS_PASS
407 449
408 export SSH_ASKPASS="${T}/cvs_sshechopass" 450 export SSH_ASKPASS="${T}/cvs_sshechopass"
409 451 if [ "${ECVS_AUTH}" != "no" ]; then
410 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \ 452 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \
411 > "${SSH_ASKPASS}" 453 > "${SSH_ASKPASS}"
454 else
455 echo -en "#!/bin/bash\nreturn\n" \
456 > "${SSH_ASKPASS}"
412 457
458 fi
413 chmod a+x "${SSH_ASKPASS}" 459 chmod a+x "${SSH_ASKPASS}"
414 fi 460 fi
415 461
416 if [ "${mode}" == "update" ]; then 462 if [ "${mode}" == "update" ]; then
417 einfo "Running $cmdupdate" 463 einfo "Running $cmdupdate"
418 eval $cmdupdate || die "cvs update command failed" 464 eval $cmdupdate || die "cvs update command failed"
419 elif [ "${mode}" == "checkout" ]; then 465 elif [ "${mode}" == "checkout" ]; then
420 einfo "Running $cmdcheckout" 466 einfo "Running $cmdcheckout"
421 eval $cmdcheckout|| die "cvs checkout command failed" 467 eval $cmdcheckout|| die "cvs checkout command failed"
422 fi 468 fi
423 469
424 # Restore environment variable values 470 # Restore environment variable values
425 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}" 471 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
426 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then 472 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then
427 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}" 473 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
428 else 474 else
442 chown `whoami` "${T}/cvspass" 488 chown `whoami` "${T}/cvspass"
443 fi 489 fi
444 490
445} 491}
446 492
447 493# @FUNCTION: cvs_src_unpack
494# @DESCRIPTION:
495# The cvs src_unpack function, which will be exported
448cvs_src_unpack() { 496cvs_src_unpack() {
449 497
450 debug-print-function $FUNCNAME $* 498 debug-print-function $FUNCNAME $*
451 499
452 debug-print "$FUNCNAME: init: 500 debug-print "$FUNCNAME: init:
465 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue." 513 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
466 514
467 local ECVS_LOCALNAME="${ECVS_LOCALNAME}" 515 local ECVS_LOCALNAME="${ECVS_LOCALNAME}"
468 516
469 if [ -z "$ECVS_LOCALNAME" ]; then 517 if [ -z "$ECVS_LOCALNAME" ]; then
470 ECVS_LOCALNAME="$ECVS_MODULE" 518 ECVS_LOCALNAME="$ECVS_MODULE"
471 fi 519 fi
472 520
473 if [ "$ECVS_SERVER" == "offline" ]; then 521 local sanitized_pn=$(echo "${PN}" | LC_ALL=C sed -e 's:[^A-Za-z0-9_]:_:g')
522 local offline_pkg_var="ECVS_OFFLINE_${sanitized_pn}"
523 if [[ -n ${!offline_pkg_var}${ECVS_OFFLINE} ]] || [[ "$ECVS_SERVER" == "offline" ]] ; then
474 # We're not required to fetch anything; the module already 524 # We're not required to fetch anything; the module already
475 # exists and shouldn't be updated. 525 # exists and shouldn't be updated.
476 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then 526 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
477 debug-print "$FUNCNAME: offline mode" 527 debug-print "$FUNCNAME: offline mode"
478 else 528 else
479 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error" 529 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
480 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting." 530 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
481 fi 531 fi
482 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode 532 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
483 einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR..." 533 einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR ..."
484 cvs_fetch 534 cvs_fetch
485 else # ECVS_SERVER not set 535 else # ECVS_SERVER not set
486 die "ERROR: CVS server not specified, cannot continue." 536 die "ERROR: CVS server not specified, cannot continue."
487 fi 537 fi
488 538
489 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR..." 539 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..."
490 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..." 540 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..."
491 541
492 # This is probably redundant, but best to make sure. 542 # This is probably redundant, but best to make sure.
493 mkdir -p "$WORKDIR/$ECVS_LOCALNAME" 543 mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
494 544
495 if [ -n "$ECVS_LOCAL" ]; then 545 if [ -n "$ECVS_LOCAL" ]; then
496 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME" 546 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME"
497 else 547 else
498 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.." 548 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.."
499 fi 549 fi
550
551 # Not exactly perfect, but should be pretty close #333773
552 export ECVS_VERSION=$(find "$ECVS_TOP_DIR/$ECVS_LOCALNAME/" -ipath '*/CVS/Entries' -exec cat {} + | LC_ALL=C sort | sha1sum | awk '{print $1}')
553 export ESCM_VERSION=${ECVS_VERSION}
500 554
501 # If the directory is empty, remove it; empty directories cannot 555 # If the directory is empty, remove it; empty directories cannot
502 # exist in cvs. This happens when, for example, kde-source 556 # exist in cvs. This happens when, for example, kde-source
503 # requests module/doc/subdir which doesn't exist. Still create 557 # requests module/doc/subdir which doesn't exist. Still create
504 # the empty directory in workdir though. 558 # the empty directory in workdir though.
510 # Implement some of base_src_unpack's functionality; note however 564 # Implement some of base_src_unpack's functionality; note however
511 # that base.eclass may not have been inherited! 565 # that base.eclass may not have been inherited!
512 if [ -n "$PATCHES" ]; then 566 if [ -n "$PATCHES" ]; then
513 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 567 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
514 cd "$S" 568 cd "$S"
515 for x in $PATCHES; do 569 epatch ${PATCHES}
516 debug-print "patching from $x"
517 patch -p0 < "$x"
518 done
519 # Make sure we don't try to apply patches more than once, 570 # Make sure we don't try to apply patches more than once,
520 # since cvs_src_unpack is usually called several times from 571 # since cvs_src_unpack is usually called several times from
521 # e.g. kde-source_src_unpack 572 # e.g. kde-source_src_unpack
522 export PATCHES="" 573 export PATCHES=""
523 fi 574 fi
524 575
525 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}" 576 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
526} 577}
527 578
528EXPORT_FUNCTIONS src_unpack 579EXPORT_FUNCTIONS src_unpack

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

  ViewVC Help
Powered by ViewVC 1.1.20