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

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

  ViewVC Help
Powered by ViewVC 1.1.20