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

Diff of /eclass/cvs.eclass

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

Revision 1.50 Revision 1.65
1# Copyright 1999-2003 Gentoo Technologies, Inc. 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.50 2004/01/04 14:35:12 coredumb Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/cvs.eclass,v 1.65 2006/10/14 20:27:21 swegener Exp $
4#
5# Maintainer: vapier@gentoo.org (and anyone who wants to help)
4 6
5# Current Maintainer: Tal Peer <coredumb@gentoo.org> 7inherit eutils
6# Original Author: Dan Armak <danarmak@gentoo.org>
7
8# SSH auth code by Danny <danny.milo@gmx.net>
9
10# SSH password authentication support and host key verification
11# support by Jeremy Maitin-Shepard <jbms@gentoo.org>
12
13 8
14# This eclass provides the generic cvs fetching functions. To use 9# This eclass provides the generic cvs fetching functions. To use
15# this from an ebuild, set the `ebuild-configurable settings' as 10# this from an ebuild, set the `ebuild-configurable settings' as
16# specified below in your ebuild before inheriting. Then either leave 11# specified below in your ebuild before inheriting. Then either leave
17# the default src_unpack or extend over cvs_src_unpack. If you find 12# the default src_unpack or extend over cvs_src_unpack. If you find
24 19
25# Support additional remote shells with `ext' authentication (does 20# Support additional remote shells with `ext' authentication (does
26# anyone actually need to use it with anything other than SSH?) 21# anyone actually need to use it with anything other than SSH?)
27 22
28 23
29ECLASS=cvs
30INHERITED="$INHERITED $ECLASS"
31 24
32# Users shouldn't change these settings! The ebuild/eclass inheriting 25# Users shouldn't change these settings! The ebuild/eclass inheriting
33# this eclass will take care of that. If you want to set the global 26# this eclass will take care of that. If you want to set the global
34# KDE cvs ebuilds' settings, see the comments in kde-source.eclass. 27# KDE cvs ebuilds' settings, see the comments in kde-source.eclass.
35 28
71 64
72 65
73# ECVS_TOP_DIR -- The directory under which CVS modules are checked 66# ECVS_TOP_DIR -- The directory under which CVS modules are checked
74# out. 67# out.
75 68
76[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${DISTDIR}/cvs-src" 69[ -z "$ECVS_TOP_DIR" ] && ECVS_TOP_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/cvs-src"
77 70
78# ECVS_NAME -- CVS path 71# ECVS_SERVER -- CVS path
79# 72#
80# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde". 73# The format is "server:/dir", e.g. "anoncvs.kde.org:/home/kde".
81# Remove the other parts of the full CVSROOT, which might look like 74# Remove the other parts of the full CVSROOT, which might look like
82# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated 75# ":pserver:anonymous@anoncvs.kde.org:/home/kde"; this is generated
83# using other settings also. 76# using other settings also.
108# 101#
109# Possible values are "pserver" and "ext". If `ext' authentication is 102# Possible values are "pserver" and "ext". If `ext' authentication is
110# used, the remote shell to use can be specified in CVS_RSH (SSH is 103# used, the remote shell to use can be specified in CVS_RSH (SSH is
111# used by default). Currently, the only supported remote shell for 104# used by default). Currently, the only supported remote shell for
112# `ext' authentication is SSH. 105# `ext' authentication is SSH.
106#
107# Armando Di Cianno <fafhrd@gentoo.org> 2004/09/27
108# - Added "no" as a server type, which uses no AUTH method, nor
109# does it login
110# e.g.
111# "cvs -danoncvs@savannah.gnu.org:/cvsroot/backbone co System"
112# ( from gnustep-apps/textedit )
113[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver" 113[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
114 114
115# ECVS_USER -- Username to use for authentication on the remote server 115# ECVS_USER -- Username to use for authentication on the remote server
116[ -z "$ECVS_USER" ] && ECVS_USER="anonymous" 116[ -z "$ECVS_USER" ] && ECVS_USER="anonymous"
117 117
150# --- end ebuild-configurable settings --- 150# --- end ebuild-configurable settings ---
151 151
152# add cvs to deps 152# add cvs to deps
153# ssh is used for ext auth 153# ssh is used for ext auth
154# sudo is used to run as a specified user 154# sudo is used to run as a specified user
155DEPEND="$DEPEND dev-util/cvs app-admin/sudo" 155DEPEND="dev-util/cvs"
156
157[ -n "$ECVS_RUNAS" ] && DEPEND="$DEPEND app-admin/sudo"
156 158
157if [ "$ECVS_AUTH" == "ext" ]; then 159if [ "$ECVS_AUTH" == "ext" ]; then
158 #default to ssh 160 #default to ssh
159 [ -z "$CVS_RSH" ] && export SSH_RSH="ssh" 161 [ -z "$CVS_RSH" ] && export CVS_RSH="ssh"
160 if [ "$CVS_RSH" != "ssh" ]; then 162 if [ "$CVS_RSH" != "ssh" ]; then
161 die "Support for ext auth with clients other than ssh has not been implemented yet" 163 die "Support for ext auth with clients other than ssh has not been implemented yet"
162 fi 164 fi
163 DEPEND="$DEPEND net-misc/openssh" 165 DEPEND="${DEPEND} net-misc/openssh"
164fi 166fi
165 167
166# called from cvs_src_unpack 168# called from cvs_src_unpack
167cvs_fetch() { 169cvs_fetch() {
168 170
183 185
184 # Update variables that are modified by ebuild parameters, which 186 # Update variables that are modified by ebuild parameters, which
185 # should be effective every time cvs_fetch is called, and not just 187 # should be effective every time cvs_fetch is called, and not just
186 # every time cvs.eclass is inherited 188 # every time cvs.eclass is inherited
187 189
188
189 # Handle parameter for local (non-recursive) fetching 190 # Handle parameter for local (non-recursive) fetching
190 191
191 if [ -n "$ECVS_LOCAL" ]; then 192 if [ -n "$ECVS_LOCAL" ]; then
192 ECVS_UP_OPTS="$ECVS_UP_OPTS -l" 193 ECVS_UP_OPTS="$ECVS_UP_OPTS -l"
193 ECVS_CO_OPTS="$ECVS_CO_OPTS -l" 194 ECVS_CO_OPTS="$ECVS_CO_OPTS -l"
194 fi 195 fi
195 196
196 # Handle ECVS_BRANCH option 197 # Handle ECVS_BRANCH option
197 # 198 #
198 # Because CVS auto-switches branches, we just have to pass the 199 # Because CVS auto-switches branches, we just have to pass the
199 # correct -rBRANCH option when updating. 200 # correct -rBRANCH option when updating.
200 201
201 if [ -n "$ECVS_BRANCH" ]; then 202 if [ -n "$ECVS_BRANCH" ]; then
202 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH" 203 ECVS_UP_OPTS="$ECVS_UP_OPTS -r$ECVS_BRANCH"
268 fi 269 fi
269 270
270 271
271 # Our server string (i.e. CVSROOT) without the password so it can 272 # Our server string (i.e. CVSROOT) without the password so it can
272 # be put in Root 273 # be put in Root
274 if [ "$ECVS_AUTH" == "no" ]
275 then
276 local server="${ECVS_USER}@${ECVS_SERVER}"
277 else
273 local server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 278 local server=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
279 fi
274 280
275 # Switch servers automagically if needed 281 # Switch servers automagically if needed
276 if [ "$mode" == "update" ]; then 282 if [ "$mode" == "update" ]; then
277 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME 283 cd /$ECVS_TOP_DIR/$ECVS_LOCALNAME
278 local oldserver="`$run cat CVS/Root`" 284 local oldserver="`$run cat CVS/Root`"
279 if [ "$server" != "$oldserver" ]; then 285 if [ "$server" != "$oldserver" ]; then
280 286
281 einfo "Changing the CVS server from $oldserver to $server:" 287 einfo "Changing the CVS server from $oldserver to $server:"
282 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:" 288 debug-print "$FUNCNAME: Changing the CVS server from $oldserver to $server:"
283 289
284 einfo "Searching for CVS directories..." 290 einfo "Searching for CVS directories ..."
285 local cvsdirs="`$run find . -iname CVS -print`" 291 local cvsdirs="`$run find . -iname CVS -print`"
286 debug-print "$FUNCNAME: CVS directories found:" 292 debug-print "$FUNCNAME: CVS directories found:"
287 debug-print "$cvsdirs" 293 debug-print "$cvsdirs"
288 294
289 einfo "Modifying CVS directories..." 295 einfo "Modifying CVS directories ..."
290 for x in $cvsdirs; do 296 for x in $cvsdirs; do
291 debug-print "In $x" 297 debug-print "In $x"
292 $run echo "$server" > "$x/Root" 298 $run echo "$server" > "$x/Root"
293 done 299 done
294 300
306 # The server string with the password in it, for login 312 # The server string with the password in it, for login
307 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}" 313 cvsroot_pass=":${ECVS_AUTH}:${ECVS_USER}:${ECVS_PASS}@${ECVS_SERVER}"
308 314
309 # Ditto without the password, for checkout/update after login, so 315 # Ditto without the password, for checkout/update after login, so
310 # that the CVS/Root files don't contain the password in plaintext 316 # that the CVS/Root files don't contain the password in plaintext
317 if [ "$ECVS_AUTH" == "no" ]
318 then
319 cvsroot_nopass="${ECVS_USER}@${ECVS_SERVER}"
320 else
311 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}" 321 cvsroot_nopass=":${ECVS_AUTH}:${ECVS_USER}@${ECVS_SERVER}"
322 fi
312 323
313 # Commands to run 324 # Commands to run
314 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login" 325 cmdlogin="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_pass}\" login"
315 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}" 326 cmdupdate="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" update ${ECVS_UP_OPTS} ${ECVS_LOCALNAME}"
316 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}" 327 cmdcheckout="${run} ${ECVS_CVS_COMMAND} -d \"${cvsroot_nopass}\" checkout ${ECVS_CO_OPTS} ${ECVS_MODULE}"
323 eval $cmdlogin || die "cvs login command failed" 334 eval $cmdlogin || die "cvs login command failed"
324 if [ "${mode}" == "update" ]; then 335 if [ "${mode}" == "update" ]; then
325 einfo "Running $cmdupdate" 336 einfo "Running $cmdupdate"
326 eval $cmdupdate || die "cvs update command failed" 337 eval $cmdupdate || die "cvs update command failed"
327 elif [ "${mode}" == "checkout" ]; then 338 elif [ "${mode}" == "checkout" ]; then
328 einfo "Running $cmdcheckout" 339 einfo "Running $cmdcheckout"
329 eval $cmdcheckout|| die "cvs checkout command failed" 340 eval $cmdcheckout|| die "cvs checkout command failed"
330 fi 341 fi
331 elif [ "${ECVS_AUTH}" == "ext" ]; then 342 elif [ "${ECVS_AUTH}" == "ext" ] || [ "${ECVS_AUTH}" == "no" ]; then
332 343
333 # Hack to support SSH password authentication 344 # Hack to support SSH password authentication
334 345
335 # Backup environment variable values 346 # Backup environment variable values
336 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}" 347 local CVS_ECLASS_ORIG_CVS_RSH="${CVS_RSH}"
368except: 379except:
369 pass 380 pass
370newarglist = sys.argv[:] 381newarglist = sys.argv[:]
371EOF 382EOF
372 383
384 # disable X11 forwarding which causes .xauth access violations
385 # - 20041205 Armando Di Cianno <fafhrd@gentoo.org>
386 echo "newarglist.insert(1, '-oClearAllForwardings=yes')" \
387 >> "${CVS_RSH}"
388 echo "newarglist.insert(1, '-oForwardX11=no')" \
389 >> "${CVS_RSH}"
390
373 # Handle SSH host key checking 391 # Handle SSH host key checking
374 392
375 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts" 393 local CVS_ECLASS_KNOWN_HOSTS="${T}/cvs_ssh_known_hosts"
376 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \ 394 echo "newarglist.insert(1, '-oUserKnownHostsFile=${CVS_ECLASS_KNOWN_HOSTS}')" \
377 >> "${CVS_RSH}" 395 >> "${CVS_RSH}"
379 if [ -z "${ECVS_SSH_HOST_KEY}" ]; then 397 if [ -z "${ECVS_SSH_HOST_KEY}" ]; then
380 ewarn "Warning: The SSH host key of the remote server will not be verified." 398 ewarn "Warning: The SSH host key of the remote server will not be verified."
381 einfo "A temporary known hosts list will be used." 399 einfo "A temporary known hosts list will be used."
382 local CVS_ECLASS_STRICT_HOST_CHECKING="no" 400 local CVS_ECLASS_STRICT_HOST_CHECKING="no"
383 touch "${CVS_ECLASS_KNOWN_HOSTS}" 401 touch "${CVS_ECLASS_KNOWN_HOSTS}"
384 echo "newarglist.insert(1, '-oStrictHostKeyChecking=no')" \
385 >> "${CVS_RSH}"
386 else 402 else
387 local CVS_ECLASS_STRICT_HOST_CHECKING="yes" 403 local CVS_ECLASS_STRICT_HOST_CHECKING="yes"
388 echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}" 404 echo "${ECVS_SSH_HOST_KEY}" > "${CVS_ECLASS_KNOWN_HOSTS}"
389 fi 405 fi
390 406
393 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \ 409 echo "${CVS_ECLASS_STRICT_HOST_CHECKING}')" \
394 >> "${CVS_RSH}" 410 >> "${CVS_RSH}"
395 echo "os.execv('/usr/bin/ssh', newarglist)" \ 411 echo "os.execv('/usr/bin/ssh', newarglist)" \
396 >> "${CVS_RSH}" 412 >> "${CVS_RSH}"
397 413
398 chmod a+x "${CVS_RSH}" 414 chmod a+x "${CVS_RSH}"
399 415
400 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS 416 # Make sure DISPLAY is set (SSH will not use SSH_ASKPASS
401 # if DISPLAY is not set) 417 # if DISPLAY is not set)
402 418
403 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY" 419 [ -z "${DISPLAY}" ] && DISPLAY="DISPLAY"
404 export DISPLAY 420 export DISPLAY
405 421
406 # Create a dummy executable to echo $ECVS_PASS 422 # Create a dummy executable to echo $ECVS_PASS
407 423
408 export SSH_ASKPASS="${T}/cvs_sshechopass" 424 export SSH_ASKPASS="${T}/cvs_sshechopass"
409 425 if [ "${ECVS_AUTH}" != "no" ]; then
410 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \ 426 echo -en "#!/bin/bash\necho \"$ECVS_PASS\"\n" \
411 > "${SSH_ASKPASS}" 427 > "${SSH_ASKPASS}"
428 else
429 echo -en "#!/bin/bash\nreturn\n" \
430 > "${SSH_ASKPASS}"
412 431
432 fi
413 chmod a+x "${SSH_ASKPASS}" 433 chmod a+x "${SSH_ASKPASS}"
414 fi 434 fi
415 435
416 if [ "${mode}" == "update" ]; then 436 if [ "${mode}" == "update" ]; then
417 einfo "Running $cmdupdate" 437 einfo "Running $cmdupdate"
418 eval $cmdupdate || die "cvs update command failed" 438 eval $cmdupdate || die "cvs update command failed"
419 elif [ "${mode}" == "checkout" ]; then 439 elif [ "${mode}" == "checkout" ]; then
420 einfo "Running $cmdcheckout" 440 einfo "Running $cmdcheckout"
421 eval $cmdcheckout|| die "cvs checkout command failed" 441 eval $cmdcheckout|| die "cvs checkout command failed"
422 fi 442 fi
423 443
424 # Restore environment variable values 444 # Restore environment variable values
425 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}" 445 export CVS_RSH="${CVS_ECLASS_ORIG_CVS_RSH}"
426 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then 446 if [ "${CVS_ECLASS_ORIG_SSH_ASKPASS+set}" == "set" ]; then
427 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}" 447 export SSH_ASKPASS="${CVS_ECLASS_ORIG_SSH_ASKPASS}"
428 else 448 else
465 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue." 485 [ -z "$ECVS_MODULE" ] && die "ERROR: CVS module not set, cannot continue."
466 486
467 local ECVS_LOCALNAME="${ECVS_LOCALNAME}" 487 local ECVS_LOCALNAME="${ECVS_LOCALNAME}"
468 488
469 if [ -z "$ECVS_LOCALNAME" ]; then 489 if [ -z "$ECVS_LOCALNAME" ]; then
470 ECVS_LOCALNAME="$ECVS_MODULE" 490 ECVS_LOCALNAME="$ECVS_MODULE"
471 fi 491 fi
472 492
473 if [ "$ECVS_SERVER" == "offline" ]; then 493 local offline_pkg_var="ECVS_OFFLINE_${PN}"
494 if [ "${!offline_pkg_var}" == "1" -o "$ECVS_OFFLINE" == "1" -o "$ECVS_SERVER" == "offline" ]; then
474 # We're not required to fetch anything; the module already 495 # We're not required to fetch anything; the module already
475 # exists and shouldn't be updated. 496 # exists and shouldn't be updated.
476 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then 497 if [ -d "${ECVS_TOP_DIR}/${ECVS_LOCALNAME}" ]; then
477 debug-print "$FUNCNAME: offline mode" 498 debug-print "$FUNCNAME: offline mode"
478 else 499 else
479 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error" 500 debug-print "$FUNCNAME: Offline mode specified but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found, exiting with error"
480 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting." 501 die "ERROR: Offline mode specified, but directory ${ECVS_TOP_DIR}/${ECVS_LOCALNAME} not found. Aborting."
481 fi 502 fi
482 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode 503 elif [ -n "$ECVS_SERVER" ]; then # ECVS_SERVER!=offline --> real fetching mode
483 einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR..." 504 einfo "Fetching CVS module $ECVS_MODULE into $ECVS_TOP_DIR ..."
484 cvs_fetch 505 cvs_fetch
485 else # ECVS_SERVER not set 506 else # ECVS_SERVER not set
486 die "ERROR: CVS server not specified, cannot continue." 507 die "ERROR: CVS server not specified, cannot continue."
487 fi 508 fi
488 509
489 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR..." 510 einfo "Copying $ECVS_MODULE from $ECVS_TOP_DIR ..."
490 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR..." 511 debug-print "Copying module $ECVS_MODULE local_mode=$ECVS_LOCAL from $ECVS_TOP_DIR ..."
491 512
492 # This is probably redundant, but best to make sure. 513 # This is probably redundant, but best to make sure.
493 mkdir -p "$WORKDIR/$ECVS_LOCALNAME" 514 mkdir -p "$WORKDIR/$ECVS_LOCALNAME"
494 515
495 if [ -n "$ECVS_LOCAL" ]; then 516 if [ -n "$ECVS_LOCAL" ]; then
510 # Implement some of base_src_unpack's functionality; note however 531 # Implement some of base_src_unpack's functionality; note however
511 # that base.eclass may not have been inherited! 532 # that base.eclass may not have been inherited!
512 if [ -n "$PATCHES" ]; then 533 if [ -n "$PATCHES" ]; then
513 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching" 534 debug-print "$FUNCNAME: PATCHES=$PATCHES, S=$S, autopatching"
514 cd "$S" 535 cd "$S"
515 for x in $PATCHES; do 536 epatch ${PATCHES}
516 debug-print "patching from $x"
517 patch -p0 < "$x"
518 done
519 # Make sure we don't try to apply patches more than once, 537 # Make sure we don't try to apply patches more than once,
520 # since cvs_src_unpack is usually called several times from 538 # since cvs_src_unpack is usually called several times from
521 # e.g. kde-source_src_unpack 539 # e.g. kde-source_src_unpack
522 export PATCHES="" 540 export PATCHES=""
523 fi 541 fi
524 542
525 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}" 543 einfo "CVS module ${ECVS_MODULE} is now in ${WORKDIR}"
526} 544}
527 545
528EXPORT_FUNCTIONS src_unpack 546EXPORT_FUNCTIONS src_unpack

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

  ViewVC Help
Powered by ViewVC 1.1.20