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

Diff of /eclass/cvs.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20