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

Diff of /eclass/cvs.eclass

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

Revision 1.31 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.31 2003/02/16 04:26:21 vapier 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
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.
8 15
9ECLASS=cvs 16inherit eutils
10INHERITED="$INHERITED $ECLASS"
11 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
12# You shouldn't change these settings yourself! The ebuild/eclass inheriting this eclass 26# Users shouldn't change these settings! The ebuild/eclass inheriting
13# 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
14# see the comments in kde-source.eclass. 28# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
15 29
16# --- 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}
17 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#
18# 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
19# 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
20# the ~/.cvsrc config file and to use maximum compression. 48# quiet, to disregard the ~/.cvsrc config file and to use maximum
21[ -z "$ECVS_CVS_COMMAND" ] && ECVS_CVS_COMMAND="cvs -q -f -z4" 49# compression.
50: ${ECVS_CVS_COMMAND:=cvs ${ECVS_CVS_OPTIONS} ${ECVS_CVS_COMPRESS}}
22 51
23# cvs options given after the command (i.e. cvs update foo) 52# @ECLASS-VARIABLE: ECVS_UP_OPTS
24# don't remove -dP or things won't work 53# @DESCRIPTION:
25[ -z "$ECVS_CVS_OPTIONS" ] && ECVS_CVS_OPTIONS="-dP" 54# CVS options given after the cvs update command. Don't remove "-dP" or things
55# won't work.
56: ${ECVS_UP_OPTS:=-dP}
26 57
27# set this for the module/subdir to be fetched non-recursively 58# @ECLASS-VARIABLE: ECVS_CO_OPTS
28#[ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l" 59# @DEFAULT_UNSET
60# @DESCRIPTION:
61# CVS options given after the cvs checkout command.
29 62
30# 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.
31[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 93[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"
32 94
33# Name of cvs server, set to "offline" to disable fetching 95# @ECLASS-VARIABLE: ECVS_SERVER
34# (i.e. to assume module is checked out already and don't update it). 96# @DESCRIPTION:
97# CVS path
98#
35# 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".
36# parts of the full CVSROOT (which looks like 100# Remove the other parts of the full CVSROOT, which might look like
37# ":pserver:anonymous@anoncvs.kde.org:/home/kde"); these are added from 101# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
38# other settings 102# using other settings also.
103#
104# Set this to "offline" to disable fetching (i.e. to assume the module
105# is already checked out in ECVS_TOP_DIR).
39[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline" 106[ -z "$ECVS_SERVER" ] && ECVS_SERVER="offline"
40 107
41# Anonymous cvs login? 108# @ECLASS-VARIABLE: ECVS_MODULE
42# if 'yes' uses :pserver: with empty password, if 'no' uses :ext: with $ECVS_PASS, other values not allowed 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
43[ -z "$ECVS_ANON" ] && ECVS_ANON="yes" 126#[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD"
44 127
45# Authentication method to use on ECVS_ANON="no" - possible values are "pserver" and "ext" 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 )
46[ -z "$ECVS_AUTH" ] && ECVS_AUTH="ext" 143[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
47 144
48# Use su to run cvs as user 145# @ECLASS-VARIABLE: ECVS_USER
49[ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`" 146# @DESCRIPTION:
50 147# Username to use for authentication on the remote server.
51# Username to use
52[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 148[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
53 149
54# Password to use if anonymous login is off 150# @ECLASS-VARIABLE: ECVS_PASS
151# @DESCRIPTION:
152# Password to use for authentication on the remote server
55[ -z "$ECVS_PASS" ] && ECVS_PASS="" 153[ -z "$ECVS_PASS" ] && ECVS_PASS=""
56 154
57# Module to be fetched, must be set explicitly - 155# @ECLASS-VARIABLE: ECVS_SSH_HOST_KEY
58# I don't like the former ="$PN" default setting 156# @DEFAULT_UNSET
59[ -z "$ECVS_MODULE" ] && debug-print "$ECLASS: error: ECVS_MODULE not set, cannot continue" 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.
60 164
61# Branch/tag to use, default is HEAD 165# @ECLASS-VARIABLE: ECVS_CLEAN
62# uncomment the following line to enable the reset-branch-to-HEAD behaviour 166# @DEFAULT_UNSET
63[ -z "$ECVS_BRANCH" ] && ECVS_BRANCH="HEAD" 167# @DESCRIPTION:
168# Set this to get a clean copy when updating (passes the
169# -C option to cvs update)
64 170
65# Subdirectory in module to be fetched, default is not defined = whole module 171# @ECLASS-VARIABLE: ECVS_RUNAS
66# DO NOT set default to "", if it's defined at all code will break! 172# @DEFAULT_UNSET
67# don't uncomment following line! 173# @DESCRIPTION:
68#[ -z "$ECVS_SUBDIR" ] && ECVS_SUBDIR="" 174# Specifies an alternate (non-root) user to use to run cvs. Currently
175# b0rked and wouldn't work with portage userpriv anyway without
176# special magic.
69 177
70# --- end ebuild-configurable settings --- 178# [ -z "$ECVS_RUNAS" ] && ECVS_RUNAS="`whoami`"
179
180# ECVS_SUBDIR -- deprecated, do not use
181[ -n "$ECVS_SUBDIR" ] && die "ERROR: deprecated ECVS_SUBDIR defined. Please fix this ebuild."
71 182
72# add cvs to deps 183# add cvs to deps
73DEPEND="$DEPEND dev-util/cvs dev-python/pexpect" 184# ssh is used for ext auth
185# sudo is used to run as a specified user
186DEPEND="dev-vcs/cvs"
74 187
75# since we now longer have src_fetch as a redefinable ebuild function, 188[ -n "$ECVS_RUNAS" ] && DEPEND="$DEPEND app-admin/sudo"
76# we are forced to call this function from cvs_src_unpack 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
77cvs_fetch() { 200cvs_fetch() {
78 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
79 debug-print-function $FUNCNAME $* 209 debug-print-function $FUNCNAME $*
80 210
81 debug-print "$FUNCNAME: init: 211 # Update variables that are modified by ebuild parameters, which
82ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND 212 # should be effective every time cvs_fetch is called, and not just
83ECVS_CVS_OPTIONS=$ECVS_CVS_OPTIONS 213 # every time cvs.eclass is inherited
84ECVS_TOP_DIR=$ECVS_TOP_DIR
85ECVS_SERVER=$ECVS_SERVER
86ECVS_ANON=$ECVS_ANON
87ECVS_USER=$ECVS_USER
88ECVS_PASS=$ECVS_PASS
89ECS_MODULE=$ECVS_MODULE
90ECVS_SUBDIR=$ECVS_SUBDIR
91ECVS_LOCAL=$ECVS_LOCAL
92DIR=$DIR"
93 214
94 # a shorthand 215 # Handle parameter for local (non-recursive) fetching
95 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}"
96 debug-print "$FUNCNAME: now DIR=$DIR"
97 216
98 if [ "$ECVS_SERVER" == "offline" ]; then 217 if [ -n "$ECVS_LOCAL" ]; then
99 # we're not required to fetch anything, the module already exists and shouldn't be updated 218 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
100 if [ -d "$DIR" ]; then 219 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
101 debug-print "$FUNCNAME: offline mode, exiting" 220 fi
102 return 0 221
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
227 if [ -n "$ECVS_BRANCH" ]; then
228 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
229 ECVS_CO_OPTS="$ECVS_CO_OPTS -r$ECVS_BRANCH"
230 fi
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
246 # It would be easiest to always be in "run-as mode", logic-wise,
247 # if sudo didn't ask for a password even when sudo'ing to `whoami`.
248
249 if [ -z "$ECVS_RUNAS" ]; then
250 run=""
103 else 251 else
104 einfo "ERROR: Offline mode specified, but module/subdir not found. Aborting." 252 run="sudo -u $ECVS_RUNAS"
105 debug-print "$FUNCNAME: offline mode specified but module/subdir not found, exiting with error"
106 return 1
107 fi 253 fi
108 fi
109 254
110 # create target directory as needed 255 # Create the top dir if needed
256
111 if [ ! -d "$DIR" ]; then 257 if [ ! -d "$ECVS_TOP_DIR" ]; then
258
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
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
265 # real path and not a symlink for things to work (so we can't
266 # just remove the last path element in the string)
267
112 debug-print "$FUNCNAME: creating cvs directory $DIR" 268 debug-print "$FUNCNAME: checkout mode. creating cvs directory"
113 #export SANDBOX_WRITE="$SANDBOX_WRITE:/foobar:/"
114 addwrite /foobar 269 addwrite /foobar
115 addwrite / 270 addwrite /
116 mkdir -p "/$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 DIR="${ECVS_TOP_DIR}/${ECVS_MODULE}/${ECVS_SUBDIR}" 280
125 cd "$OLDPWD"
126
127 debug-print "$FUNCNAME: now DIR=$DIR"
128
129 # disable the sandbox for this dir 281 # Disable the sandbox for this dir
130 # not just $DIR because we want to create moduletopdir/CVS too
131 addwrite "$ECVS_TOP_DIR/$ECVS_MODULE" 282 addwrite "$ECVS_TOP_DIR"
132 283
133 # add option for local (non-recursive) fetching 284 # Chown the directory and all of its contents
134 [ -n "$ECVS_LOCAL" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -l"
135
136 # prepare a cvspass file just for this session so that cvs thinks we're logged
137 # in at the cvs server. we don't want to mess with ~/.cvspass.
138 echo ":pserver:${ECVS_SERVER} A" > "${T}/cvspass"
139 export CVS_PASSFILE="${T}/cvspass"
140 chown $ECVS_RUNAS "${T}/cvspass"
141 #export CVSROOT=:pserver:${ECVS_USER}@${ECVS_SERVER}
142
143 # Note: cvs update and checkout commands are unified.
144 # we make sure a CVS/ dir exists in our module subdir with the right
145 # Root and Repository entries in it and cvs update.
146
147 [ "${ECVS_ANON}" == "yes" ] && \
148 newserver=":pserver:${ECVS_USER}@${ECVS_SERVER}" || \
149 newserver=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
150
151
152 # CVS/Repository files can't (I think) contain two concatenated slashes
153 if [ -n "$ECVS_SUBDIR" ]; then 285 if [ -n "$ECVS_RUNAS" ]; then
154 repository="${ECVS_MODULE}/${ECVS_SUBDIR}" 286 $run chown -R "$ECVS_RUNAS" "/$ECVS_TOP_DIR"
287 fi
288
289 # Determine the CVS command mode (checkout or update)
290 if [ ! -d "$ECVS_TOP_DIR/$ECVS_LOCALNAME/CVS" ]; then
291 mode=checkout
155 else 292 else
156 repository="${ECVS_MODULE}" 293 mode=update
157 fi
158
159 debug-print "$FUNCNAME: Root<-$newserver, Repository<-$repository"
160 debug-print "$FUNCNAME: entering directory $DIR"
161 cd "/$DIR"
162
163 if [ ! -d "CVS" ]; then
164 # create a new CVS/ directory (checkout)
165 debug-print "$FUNCNAME: creating new cvs directory"
166
167 mkdir CVS
168 echo $newserver > CVS/Root
169 echo $repository > CVS/Repository
170 touch CVS/Entries
171
172 # if we're checking out a subdirectory only, create a CVS/ dir
173 # in the module's top dir so that the user (and we) can cvs update
174 # from there to get the full module.
175 if [ ! -d "$ECVS_TOP_DIR/$ECVS_MODULE/CVS" ]; then
176 debug-print "$FUNCNAME: Copying CVS/ directory to module top-level dir"
177 cp -r CVS "$ECVS_TOP_DIR/$ECVS_MODULE/"
178 echo $ECVS_MODULE > "$ECVS_TOP_DIR/$ECVS_MODULE/CVS/Repository"
179 fi 294 fi
180 295
296
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
301 local server="${ECVS_USER}@${ECVS_SERVER}"
181 else 302 else
182 #update existing module 303 local connection="${ECVS_AUTH}"
183 debug-print "$FUNCNAME: updating existing module/subdir" 304 [[ -n ${ECVS_PROXY} ]] && connection="${connection};proxy=${ECVS_PROXY}"
184 305 [[ -n ${ECVS_PROXY_PORT} ]] && connection="${connection};proxyport=${ECVS_PROXY_PORT}"
306 local server=":${connection}:${ECVS_USER}@${ECVS_SERVER}"
307 fi
308
185 # Switch servers if needed 309 # Switch servers automagically if needed
186 # cvs keeps the server info in the CVS/Root file in every checked-out dir; 310 if [ "$mode" == "update" ]; then
187 # we can fix those files to point to the new server 311 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
188 oldserver="`cat CVS/Root`" 312 local oldserver="`$run cat CVS/Root`"
189 if [ "$newserver" != "$oldserver" ]; then 313 if [ "$server" != "$oldserver" ]; then
190 314
191 einfo "Changing CVS server from $oldserver to $newserver:" 315 einfo "Changing the CVS server from $oldserver to $server:"
192 debug-print "$FUNCNAME: Changing CVS server from $oldserver to $newserver:" 316 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:"
193 317
194 einfo "Searching for CVS dirs..." 318 einfo "Searching for CVS directories ..."
195 cvsdirs="`find . -iname CVS -print`" 319 local cvsdirs="`$run find . -iname CVS -print`"
196 debug-print "$FUNCNAME: CVS dirs found:" 320 debug-print "$FUNCNAME: CVS directories found:"
197 debug-print "$cvsdirs" 321 debug-print "$cvsdirs"
198 322
199 einfo "Modifying CVS dirs..." 323 einfo "Modifying CVS directories ..."
200 for x in $cvsdirs; do 324 for x in $cvsdirs; do
201 debug-print "In $x" 325 debug-print "In $x"
202 echo $newserver > "$x/Root" 326 $run echo "$server" > "$x/Root"
203 done 327 done
204 328
205 fi 329 fi
206
207 fi 330 fi
208 331
209 # cvs auto-switches branches, how nice 332 # Prepare a cvspass file just for this session, we don't want to
210 # warning: if we do it this way we get multiple -rX options - harmless i think 333 # mess with ~/.cvspass
211 [ -n "$ECVS_BRANCH" ] && ECVS_CVS_OPTIONS="$ECVS_CVS_OPTIONS -r$ECVS_BRANCH" 334 touch "${T}/cvspass"
212 335 export CVS_PASSFILE="${T}/cvspass"
213 # Chowning the directory 336 if [ -n "$ECVS_RUNAS" ]; then
214 if [ "${ECVS_RUNAS}" != "`whoami`" ]; then 337 chown "$ECVS_RUNAS" "${T}/cvspass"
215 chown -R "$ECVS_RUNAS" "/$DIR"
216 fi 338 fi
217 339
218 # finally run the cvs update command 340 # The server string with the password in it, for login
219 debug-print "$FUNCNAME: is in dir `/bin/pwd`" 341 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
220 debug-print "$FUNCNAME: running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for module $ECVS_MODULE subdir $ECVS_SUBDIR"
221 einfo "Running $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS with $ECVS_SERVER for $ECVS_MODULE/$ECVS_SUBDIR..."
222 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
223 if [ "${ECVS_ANON}" == "no" ]; then 345 if [ "$ECVS_AUTH" == "no" ]
224 346 then
225 debug-print "$FUNCNAME: starting non-anonymous cvs login..." 347 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
226 # CVS Login - written in python :: the right way ;)
227 # Tilman Klar, <phoenix@gentoo.org>
228
229 export CVS_RSH="/usr/bin/ssh"
230
231############################## inline-python #####################################
232/usr/bin/env python << EndOfFile
233
234import pexpect,os
235
236mypasswd = "${ECVS_PASS}"
237myauth = "${ECVS_AUTH}"
238mytimeout = 10
239
240if "${ECVS_RUNAS}" == "`whoami`":
241 mycommand = "${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}"
242else:
243 mycommand = "su ${ECVS_RUNAS} -c \"${ECVS_CVS_COMMAND} update ${ECVS_CVS_OPTIONS}\""
244
245if myauth == "ext":
246 child = pexpect.spawn(mycommand)
247
248 index = child.expect(['continue connecting','word:'], mytimeout)
249 if index == 0:
250 child.sendline('yes')
251 ## Added server to ~/.ssh/known_hosts
252 child.expect('word:', mytimeout)
253 else: 348 else
254 ## Server already is in ~/.ssh/known_hosts 349 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
350 fi
351
352 # Commands to run
353 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
354 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
355 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
356
357 # Execute commands
358
359 cd "${ECVS_TOP_DIR}"
360 if [ "${ECVS_AUTH}" == "pserver" ]; then
361 einfo "Running $cmdlogin"
362 eval $cmdlogin || die "cvs login command failed"
363 if [ "${mode}" == "update" ]; then
364 einfo "Running $cmdupdate"
365 eval $cmdupdate || die "cvs update command failed"
366 elif [ "${mode}" == "checkout" ]; then
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:
255 pass 405 pass
406 os.close(fd)
407except:
408 pass
409newarglist = sys.argv[:]
410EOF
256 411
257 child.sendline(mypasswd) 412 # disable X11 forwarding which causes .xauth access violations
258 child.expect(pexpect.EOF) 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}"
259 418
260elif myauth == "pserver": 419 # Handle SSH host key checking
261 if "${ECVS_RUNAS}" == "`whoami`": 420
262 mycommand2 = "cvs login" 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}"
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"
453 if [ "${ECVS_AUTH}" != "no" ]; then
454 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \
455 > "${SSH_ASKPASS}"
456 else
457 echo -en "#!/bin/bash\nreturn\n" \
458 > "${SSH_ASKPASS}"
459
460 fi
461 chmod a+x "${SSH_ASKPASS}"
462 fi
463
464 if [ "${mode}" == "update" ]; then
465 einfo "Running $cmdupdate"
466 eval $cmdupdate || die "cvs update command failed"
467 elif [ "${mode}" == "checkout" ]; then
468 einfo "Running $cmdcheckout"
469 eval $cmdcheckout|| die "cvs checkout command failed"
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}"
263 else: 476 else
264 mycommand2 = "su ${ECVS_RUNAS} -c \"cvs login\"" 477 unset SSH_ASKPASS
265 child = pexpect.spawn(mycommand2) 478 fi
266 child.expect("CVS password:",mytimeout)
267 child.sendline(mypasswd)
268 child.expect(pexpect.EOF)
269 479
270 # Logged in - checking out 480 if [ "${CVS_ECLASS_ORIG_DISPLAY+set}" == "set" ]; then
271 os.system(mycommand) 481 export DISPLAY="${CVS_ECLASS_ORIG_DISPLAY}"
272 482 else
273EndOfFile 483 unset DISPLAY
274########################### End of inline-python ################################## 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.
489 if [ -n "$ECVS_RUNAS" ]; then
490 chown `whoami` "${T}/cvspass"
491 fi
492
493}
494
495# @FUNCTION: cvs_src_unpack
496# @DESCRIPTION:
497# The cvs src_unpack function, which will be exported
498cvs_src_unpack() {
499
500 debug-print-function $FUNCNAME $*
501
502 debug-print "$FUNCNAME: init:
503 ECVS_CVS_COMMAND=$ECVS_CVS_COMMAND
504 ECVS_UP_OPTS=$ECVS_UP_OPTS
505 ECVS_CO_OPTS=$ECVS_CO_OPTS
506 ECVS_TOP_DIR=$ECVS_TOP_DIR
507 ECVS_SERVER=$ECVS_SERVER
508 ECVS_USER=$ECVS_USER
509 ECVS_PASS=$ECVS_PASS
510 ECVS_MODULE=$ECVS_MODULE
511 ECVS_LOCAL=$ECVS_LOCAL
512 ECVS_RUNAS=$ECVS_RUNAS
513 ECVS_LOCALNAME=$ECVS_LOCALNAME"
514
515 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
516
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
526 # We're not required to fetch anything; the module already
527 # exists and shouldn't be updated.
528 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
529 debug-print "$FUNCNAME: offline mode"
530 else
531 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
532 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
533 fi
534 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
535 einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR ..."
536 cvs_fetch
537 else # ECVS_SERVER not set
538 die "ERROR: CVS server not specified, cannot continue."
539 fi
540
541 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..."
542 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..."
543
544 # This is probably redundant, but best to make sure.
545 mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
546
547 if [ -n "$ECVS_LOCAL" ]; then
548 cp -f "$ECVS_TOP_DIR/$ECVS_LOCALNAME"/* "$WORKDIR/$ECVS_LOCALNAME"
275 else 549 else
276 debug-print "$FUNCNAME: using anonymous cvs login" 550 cp -Rf "$ECVS_TOP_DIR/$ECVS_LOCALNAME" "$WORKDIR/$ECVS_LOCALNAME/.."
277 $ECVS_CVS_COMMAND update $ECVS_CVS_OPTIONS || die "died running cvs update"
278 fi
279
280 # log out and restore ownership
281 if [ "$ECVS_RUNAS" == "`whoami`" ]; then
282 cvs logout &> /dev/null
283 else
284 su $ECVS_RUNAS -c "cvs logout" &> /dev/null
285 fi
286 chown `whoami` "${T}/cvspass"
287}
288
289cvs_src_unpack() {
290
291 debug-print-function $FUNCNAME $*
292 cvs_fetch || die "died running cvs_fetch"
293
294 einfo "Copying $ECVS_MODULE/$ECVS_SUBDIR from $ECVS_TOP_DIR..."
295 debug-print "Copying module $ECVS_MODULE subdir $ECVS_SUBDIR local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..."
296
297 # probably redundant, but best to make sure
298 mkdir -p "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
299
300 if [ -n "$ECVS_SUBDIR" ]; then
301 if [ -n "$ECVS_LOCAL" ]; then
302 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR"/* "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR"
303 else
304 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE/$ECVS_SUBDIR" "$WORKDIR/$ECVS_MODULE/$ECVS_SUBDIR/.."
305 fi
306 else
307 if [ -n "$ECVS_LOCAL" ]; then
308 cp -f "$ECVS_TOP_DIR/$ECVS_MODULE"/* $WORKDIR/$ECVS_MODULE
309 else
310 cp -Rf "$ECVS_TOP_DIR/$ECVS_MODULE" "$WORKDIR"
311 fi 551 fi
312 fi 552
313 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
314 # if the directory is empty, remove it; empty directories cannot exist in cvs. 556 # If the directory is empty, remove it; empty directories cannot
315 # 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
316 # still create the empty directory in workdir though. 559 # the empty directory in workdir though.
317 if [ "`ls -A \"$DIR\"`" == "CVS" ]; then 560 if [ "`ls -A \"${ECVS_TOP_DIR}/${ECVS_LOCALNAME}\"`" == "CVS" ]; then
318 debug-print "$FUNCNAME: removing cvs-empty directory $ECVS_MODULE/$ECVS_SUBDIR" 561 debug-print "$FUNCNAME: removing empty CVS directory $ECVS_LOCALNAME"
319 rm -rf "$DIR" 562 rm -rf "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}"
320 fi 563 fi
321 564
322 # implement some of base_src_unpack's functionality; 565 # Implement some of base_src_unpack's functionality; note however
323 # note however that base.eclass may not have been inherited! 566 # that base.eclass may not have been inherited!
324 if [ -n "$PATCHES" ]; then 567 if [ -n "$PATCHES" ]; then
325 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 568 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
326 cd "$S" 569 cd "$S"
327 for x in $PATCHES; do 570 epatch ${PATCHES}
328 debug-print "patching from $x"
329 patch -p0 < "$x"
330 done
331 # 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,
332 # 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
333 export PATCHES="" 574 export PATCHES=""
334 fi 575 fi
335 576
577 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
336} 578}
337 579
338EXPORT_FUNCTIONS src_unpack 580EXPORT_FUNCTIONS src_unpack

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

  ViewVC Help
Powered by ViewVC 1.1.20