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

Diff of /eclass/cvs.eclass

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

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

Legend:
Removed from v.1.45  
changed lines
  Added in v.1.78

  ViewVC Help
Powered by ViewVC 1.1.20