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

Diff of /eclass/eutils.eclass

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

Revision 1.168 Revision 1.206
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2005 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/eutils.eclass,v 1.168 2005/04/29 03:59:15 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.206 2005/10/07 16:21:48 flameeyes Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
118EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 118# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 120# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
123EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
125# and not the full path .. 125# and not the full path ..
126EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 127# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
129# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
130# 132#
131# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
132# 134#
133EPATCH_FORCE="no" 135EPATCH_FORCE="no"
170 local STDERR_TARGET="${T}/$$.out" 172 local STDERR_TARGET="${T}/$$.out"
171 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
172 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
173 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
174 local x="" 176 local x=""
177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
175 179
176 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
177 then 181 then
178 local m="" 182 local m=""
179 for m in "$@" ; do 183 for m in "$@" ; do
237 ;; 241 ;;
238 esac 242 esac
239 243
240 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
241 then 245 then
242 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
243 fi 247 fi
244 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
245 do 249 do
246 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
247 # 251 #
248 # ???_arch_foo.patch 252 # ???_arch_foo.patch
249 # 253 #
250 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
251 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
252 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
253 then 257 then
254 local count=0 258 local count=0
255 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
256 local patchname=${x##*/} 260 local patchname=${x##*/}
366 then 370 then
367 einfo "Done with patching" 371 einfo "Done with patching"
368 fi 372 fi
369} 373}
370 374
371# This function return true if we are using the NPTL pthreads
372# implementation.
373#
374# <azarah@gentoo.org> (06 March 2003)
375#
376have_NPTL() {
377 cat > ${T}/test-nptl.c <<-"END"
378 #define _XOPEN_SOURCE
379 #include <unistd.h>
380 #include <stdio.h>
381
382 int main()
383 {
384 char buf[255];
385 char *str = buf;
386
387 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
388 if (NULL != str) {
389 printf("%s\n", str);
390 if (NULL != strstr(str, "NPTL"))
391 return 0;
392 }
393
394 return 1;
395 }
396 END
397
398 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
399 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
400 then
401 echo "yes"
402 einfon "Checking what PTHREADS implementation we have ..."
403 if ${T}/nptl
404 then
405 return 0
406 else
407 return 1
408 fi
409 else
410 echo "no"
411 fi
412
413 return 1
414}
415
416# This function check how many cpu's are present, and then set
417# -j in MAKEOPTS accordingly.
418#
419# Thanks to nall <nall@gentoo.org> for this.
420#
421get_number_of_jobs() {
422 local jobs=0
423
424 if [ ! -r /proc/cpuinfo ]
425 then
426 return 1
427 fi
428
429 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
430 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
431 then
432 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
433 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
434 ADMINPARAM="${ADMINPARAM/-j}"
435 fi
436
437 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
438
439 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
440 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
441 then
442 # these archs will always have "[Pp]rocessor"
443 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
444
445 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
446 then
447 # sparc always has "ncpus active"
448 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
449
450 elif [ "${ARCH}" = "alpha" ]
451 then
452 # alpha has "cpus active", but only when compiled with SMP
453 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
454 then
455 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
456 else
457 jobs=2
458 fi
459
460 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
461 then
462 # ppc has "processor", but only when compiled with SMP
463 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
464 then
465 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
466 else
467 jobs=2
468 fi
469 elif [ "${ARCH}" = "s390" ]
470 then
471 # s390 has "# processors : "
472 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
473 else
474 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
475 die "Unknown ARCH -- ${ARCH}!"
476 fi
477
478 # Make sure the number is valid ...
479 if [ "${jobs}" -lt 1 ]
480 then
481 jobs=1
482 fi
483
484 if [ -n "${ADMINPARAM}" ]
485 then
486 if [ "${jobs}" -gt "${ADMINPARAM}" ]
487 then
488 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
489 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
490 else
491 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
492 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
493 fi
494 fi
495}
496
497# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
498# does not exist on the users system 376# does not exist on the users system
499# vapier@gentoo.org 377# vapier@gentoo.org
500# 378#
501# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
502emktemp() { 380emktemp() {
503 local exe="touch" 381 local exe="touch"
504 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
505 local topdir="$1" 383 local topdir=$1
506 384
507 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
508 then
509 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
510 && topdir="/tmp" \ 387 && topdir="/tmp" \
511 || topdir="${T}" 388 || topdir=${T}
512 fi 389 fi
513 390
514 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
515 then
516 local tmp=/ 392 local tmp=/
517 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
518 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
519 done 395 done
520 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
521 echo "${tmp}" 397 echo "${tmp}"
522 else 398 else
523 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
524 && exe="-p" \ 400 && exe="-p" \
525 || exe="-d" 401 || exe="-d"
526 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
527 fi 403 fi
528} 404}
532# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
533# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
534# 410#
535# egetent(database, key) 411# egetent(database, key)
536egetent() { 412egetent() {
537 if useq ppc-macos ; then 413 case ${CHOST} in
414 *-darwin*)
538 case "$2" in 415 case "$2" in
539 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
540 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
541 ;; 418 ;;
542 *) # Numeric 419 *) # Numeric
543 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
544 ;; 421 ;;
545 esac 422 esac
546 elif useq x86-fbsd ; then 423 ;;
547 local action 424 *-freebsd*)
548 if [ "$1" == "passwd" ] 425 local opts action="user"
549 then 426 [[ $1 == "passwd" ]] || action="group"
550 action="user" 427
551 else 428 # lookup by uid/gid
552 action="group" 429 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
553 fi 431 fi
432
554 pw show "${action}" "$2" -q 433 pw show ${action} ${opts} "$2" -q
555 else 434 ;;
435 *-netbsd*)
436 grep "$2:\*:" /etc/$1
437 ;;
438 *)
556 which nscd >& /dev/null && nscd -i "$1" 439 type -p nscd >& /dev/null && nscd -i "$1"
557 getent "$1" "$2" 440 getent "$1" "$2"
558 fi 441 ;;
442 esac
559} 443}
560 444
561# Simplify/standardize adding users to the system 445# Simplify/standardize adding users to the system
562# vapier@gentoo.org 446# vapier@gentoo.org
563# 447#
571# homedir: /dev/null 455# homedir: /dev/null
572# groups: none 456# groups: none
573# extra: comment of 'added by portage for ${PN}' 457# extra: comment of 'added by portage for ${PN}'
574enewuser() { 458enewuser() {
575 # get the username 459 # get the username
576 local euser="$1"; shift 460 local euser=$1; shift
577 if [ -z "${euser}" ] 461 if [[ -z ${euser} ]] ; then
578 then
579 eerror "No username specified !" 462 eerror "No username specified !"
580 die "Cannot call enewuser without a username" 463 die "Cannot call enewuser without a username"
581 fi 464 fi
582 465
583 # lets see if the username already exists 466 # lets see if the username already exists
584 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 467 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
585 then
586 return 0 468 return 0
587 fi 469 fi
588 einfo "Adding user '${euser}' to your system ..." 470 einfo "Adding user '${euser}' to your system ..."
589 471
590 # options to pass to useradd 472 # options to pass to useradd
591 local opts= 473 local opts=
592 474
593 # handle uid 475 # handle uid
594 local euid="$1"; shift 476 local euid=$1; shift
595 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 477 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
596 then
597 if [ "${euid}" -gt 0 ] 478 if [[ ${euid} -gt 0 ]] ; then
598 then
599 if [ ! -z "`egetent passwd ${euid}`" ] 479 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
600 then
601 euid="next" 480 euid="next"
602 fi 481 fi
603 else 482 else
604 eerror "Userid given but is not greater than 0 !" 483 eerror "Userid given but is not greater than 0 !"
605 die "${euid} is not a valid UID" 484 die "${euid} is not a valid UID"
606 fi 485 fi
607 else 486 else
608 euid="next" 487 euid="next"
609 fi 488 fi
610 if [ "${euid}" == "next" ] 489 if [[ ${euid} == "next" ]] ; then
611 then 490 for euid in $(seq 101 999) ; do
612 local pwrange
613 if [ "${USERLAND}" == "BSD" ] ; then
614 pwrange="`jot 898 101`"
615 else
616 pwrange="`seq 101 999`"
617 fi
618 for euid in ${pwrange} ; do
619 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
620 done 492 done
621 fi 493 fi
622 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
623 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
624 496
625 # handle shell 497 # handle shell
626 local eshell="$1"; shift 498 local eshell=$1; shift
627 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
628 then
629 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
630 then
631 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
632 die "${eshell} does not exist" 502 die "${eshell} does not exist"
633 fi 503 fi
634 else 504 else
635 if [ "${USERLAND}" == "BSD" ] 505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
636 then 506 [[ -x ${ROOT}${shell} ]] && break
637 eshell="/usr/bin/false" 507 done
638 else 508
639 eshell="/bin/false" 509 if [[ ${shell} == "/dev/null" ]] ; then
510 eerror "Unable to identify the shell to use"
511 die "Unable to identify the shell to use"
640 fi 512 fi
513
514 eshell=${shell}
641 fi 515 fi
642 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
643 opts="${opts} -s ${eshell}" 517 opts="${opts} -s ${eshell}"
644 518
645 # handle homedir 519 # handle homedir
646 local ehome="$1"; shift 520 local ehome=$1; shift
647 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 521 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
648 then
649 ehome="/dev/null" 522 ehome="/dev/null"
650 fi 523 fi
651 einfo " - Home: ${ehome}" 524 einfo " - Home: ${ehome}"
652 opts="${opts} -d ${ehome}" 525 opts="${opts} -d ${ehome}"
653 526
654 # handle groups 527 # handle groups
655 local egroups="$1"; shift 528 local egroups=$1; shift
656 if [ ! -z "${egroups}" ] 529 if [[ ! -z ${egroups} ]] ; then
657 then
658 local oldifs="${IFS}" 530 local oldifs=${IFS}
659 local defgroup="" exgroups="" 531 local defgroup="" exgroups=""
660 532
661 export IFS="," 533 export IFS=","
662 for g in ${egroups} 534 for g in ${egroups} ; do
663 do
664 export IFS="${oldifs}" 535 export IFS=${oldifs}
665 if [ -z "`egetent group \"${g}\"`" ] 536 if [[ -z $(egetent group "${g}") ]] ; then
666 then
667 eerror "You must add group ${g} to the system first" 537 eerror "You must add group ${g} to the system first"
668 die "${g} is not a valid GID" 538 die "${g} is not a valid GID"
669 fi 539 fi
670 if [ -z "${defgroup}" ] 540 if [[ -z ${defgroup} ]] ; then
671 then
672 defgroup="${g}" 541 defgroup=${g}
673 else 542 else
674 exgroups="${exgroups},${g}" 543 exgroups="${exgroups},${g}"
675 fi 544 fi
676 export IFS="," 545 export IFS=","
677 done 546 done
678 export IFS="${oldifs}" 547 export IFS=${oldifs}
679 548
680 opts="${opts} -g ${defgroup}" 549 opts="${opts} -g ${defgroup}"
681 if [ ! -z "${exgroups}" ] 550 if [[ ! -z ${exgroups} ]] ; then
682 then
683 opts="${opts} -G ${exgroups:1}" 551 opts="${opts} -G ${exgroups:1}"
684 fi 552 fi
685 else 553 else
686 egroups="(none)" 554 egroups="(none)"
687 fi 555 fi
688 einfo " - Groups: ${egroups}" 556 einfo " - Groups: ${egroups}"
689 557
690 # handle extra and add the user 558 # handle extra and add the user
691 local eextra="$@"
692 local oldsandbox="${SANDBOX_ON}" 559 local oldsandbox=${SANDBOX_ON}
693 export SANDBOX_ON="0" 560 export SANDBOX_ON="0"
694 if useq ppc-macos 561 case ${CHOST} in
695 then 562 *-darwin*)
696 ### Make the user 563 ### Make the user
697 if [ -z "${eextra}" ] 564 if [[ -z $@ ]] ; then
698 then
699 dscl . create /users/${euser} uid ${euid} 565 dscl . create /users/${euser} uid ${euid}
700 dscl . create /users/${euser} shell ${eshell} 566 dscl . create /users/${euser} shell ${eshell}
701 dscl . create /users/${euser} home ${ehome} 567 dscl . create /users/${euser} home ${ehome}
702 dscl . create /users/${euser} realname "added by portage for ${PN}" 568 dscl . create /users/${euser} realname "added by portage for ${PN}"
703 ### Add the user to the groups specified 569 ### Add the user to the groups specified
704 local oldifs="${IFS}" 570 local oldifs=${IFS}
705 export IFS="," 571 export IFS=","
706 for g in ${egroups} 572 for g in ${egroups} ; do
707 do
708 dscl . merge /groups/${g} users ${euser} 573 dscl . merge /groups/${g} users ${euser}
709 done 574 done
710 export IFS="${oldifs}" 575 export IFS=${oldifs}
711 else 576 else
712 einfo "Extra options are not supported on macos yet" 577 einfo "Extra options are not supported on Darwin yet"
713 einfo "Please report the ebuild along with the info below" 578 einfo "Please report the ebuild along with the info below"
714 einfo "eextra: ${eextra}" 579 einfo "eextra: $@"
715 die "Required function missing" 580 die "Required function missing"
716 fi 581 fi
717 elif use x86-fbsd ; then 582 ;;
718 if [ -z "${eextra}" ] 583 *-freebsd*)
719 then 584 if [[ -z $@ ]] ; then
720 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
721 -c "added by portage for ${PN}" \ 586 -c "added by portage for ${PN}" \
722 die "enewuser failed" 587 die "enewuser failed"
723 else 588 else
724 einfo " - Extra: ${eextra}" 589 einfo " - Extra: $@"
725 pw useradd ${euser} ${opts} \ 590 pw useradd ${euser} ${opts} \
726 -c ${eextra} || die "enewuser failed" 591 "$@" || die "enewuser failed"
727 fi 592 fi
728 else 593 ;;
729 if [ -z "${eextra}" ] 594 *)
730 then 595 if [[ -z $@ ]] ; then
731 useradd ${opts} ${euser} \ 596 useradd ${opts} ${euser} \
732 -c "added by portage for ${PN}" \ 597 -c "added by portage for ${PN}" \
733 || die "enewuser failed" 598 || die "enewuser failed"
734 else 599 else
735 einfo " - Extra: ${eextra}" 600 einfo " - Extra: $@"
736 useradd ${opts} ${euser} ${eextra} \ 601 useradd ${opts} ${euser} "$@" \
737 || die "enewuser failed" 602 || die "enewuser failed"
738 fi 603 fi
604 ;;
605 esac
606
607 if [[ ! -e ${ROOT}/${ehome} ]] ; then
608 einfo " - Creating ${ehome} in ${ROOT}"
609 mkdir -p "${ROOT}/${ehome}"
610 chown ${euser} "${ROOT}/${ehome}"
611 chmod 755 "${ROOT}/${ehome}"
739 fi 612 fi
613
740 export SANDBOX_ON="${oldsandbox}" 614 export SANDBOX_ON=${oldsandbox}
741
742 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
743 then
744 einfo " - Creating ${ehome} in ${D}"
745 dodir ${ehome}
746 fowners ${euser} ${ehome}
747 fperms 755 ${ehome}
748 fi
749} 615}
750 616
751# Simplify/standardize adding groups to the system 617# Simplify/standardize adding groups to the system
752# vapier@gentoo.org 618# vapier@gentoo.org
753# 619#
782 then 648 then
783 if [ "${egid}" -gt 0 ] 649 if [ "${egid}" -gt 0 ]
784 then 650 then
785 if [ -z "`egetent group ${egid}`" ] 651 if [ -z "`egetent group ${egid}`" ]
786 then 652 then
787 if useq ppc-macos ; then 653 if [[ "${CHOST}" == *-darwin* ]]; then
788 opts="${opts} ${egid}" 654 opts="${opts} ${egid}"
789 else 655 else
790 opts="${opts} -g ${egid}" 656 opts="${opts} -g ${egid}"
791 fi 657 fi
792 else 658 else
806 opts="${opts} ${eextra}" 672 opts="${opts} ${eextra}"
807 673
808 # add the group 674 # add the group
809 local oldsandbox="${SANDBOX_ON}" 675 local oldsandbox="${SANDBOX_ON}"
810 export SANDBOX_ON="0" 676 export SANDBOX_ON="0"
811 if useq ppc-macos ; then 677 case ${CHOST} in
678 *-darwin*)
812 if [ ! -z "${eextra}" ]; 679 if [ ! -z "${eextra}" ];
813 then 680 then
814 einfo "Extra options are not supported on macos yet" 681 einfo "Extra options are not supported on Darwin/OS X yet"
815 einfo "Please report the ebuild along with the info below" 682 einfo "Please report the ebuild along with the info below"
816 einfo "eextra: ${eextra}" 683 einfo "eextra: ${eextra}"
817 die "Required function missing" 684 die "Required function missing"
818 fi 685 fi
819 686
820 # If we need the next available 687 # If we need the next available
821 case ${egid} in 688 case ${egid} in
822 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
823 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
824 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
825 done 692 done
826 esac 693 esac
827 dscl . create /groups/${egroup} gid ${egid} 694 dscl . create /groups/${egroup} gid ${egid}
828 dscl . create /groups/${egroup} passwd '*' 695 dscl . create /groups/${egroup} passwd '*'
829 elif use x86-fbsd ; then 696 ;;
697
698 *-freebsd*)
830 case ${egid} in 699 case ${egid} in
831 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
832 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
833 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
834 done 703 done
835 esac 704 esac
836 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 705 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
837 else 706 ;;
707
708 *-netbsd*)
709 case ${egid} in
710 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do
712 [ -z "`egetent group ${egid}`" ] && break
713 done
714 esac
715 groupadd ${egroup} -g ${egid} || die "enewgroup failed"
716 ;;
717
718 *)
838 groupadd ${opts} ${egroup} || die "enewgroup failed" 719 groupadd ${opts} ${egroup} || die "enewgroup failed"
839 fi 720 ;;
721 esac
840 export SANDBOX_ON="${oldsandbox}" 722 export SANDBOX_ON="${oldsandbox}"
841} 723}
842 724
843# Simple script to replace 'dos2unix' binaries 725# Simple script to replace 'dos2unix' binaries
844# vapier@gentoo.org 726# vapier@gentoo.org
869# name: the name that will show up in the menu 751# name: the name that will show up in the menu
870# icon: give your little like a pretty little icon ... 752# icon: give your little like a pretty little icon ...
871# this can be relative (to /usr/share/pixmaps) or 753# this can be relative (to /usr/share/pixmaps) or
872# a full path to an icon 754# a full path to an icon
873# type: what kind of application is this ? for categories: 755# type: what kind of application is this ? for categories:
874# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 756# http://www.freedesktop.org/Standards/desktop-entry-spec
875# path: if your app needs to startup in a specific dir 757# path: if your app needs to startup in a specific dir
876make_desktop_entry() { 758make_desktop_entry() {
877 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 759 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
878 760
879 local exec=${1} 761 local exec=${1}
905 dev) 787 dev)
906 type="Development" 788 type="Development"
907 ;; 789 ;;
908 790
909 games) 791 games)
910 [[ -z ${path} ]] && path=${GAMES_BINDIR}
911
912 case ${catmin} in 792 case ${catmin} in
913 action) type=ActionGame;; 793 action) type=ActionGame;;
914 arcade) type=ArcadeGame;; 794 arcade) type=ArcadeGame;;
915 board) type=BoardGame;; 795 board) type=BoardGame;;
916 kid) type=KidsGame;; 796 kid) type=KidsGame;;
981 *) 861 *)
982 type= 862 type=
983 ;; 863 ;;
984 esac 864 esac
985 fi 865 fi
986 866 if [ "${SLOT}" == "0" ] ; then
867 local desktop_name="${PN}"
868 else
869 local desktop_name="${PN}-${SLOT}"
870 fi
987 local desktop=${T}/${exec%% *}-${P}.desktop 871 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
988 872
989echo "[Desktop Entry] 873echo "[Desktop Entry]
990Encoding=UTF-8 874Encoding=UTF-8
991Version=0.9.2 875Version=0.9.2
992Name=${name} 876Name=${name}
995Exec=${exec} 879Exec=${exec}
996Path=${path} 880Path=${path}
997Icon=${icon} 881Icon=${icon}
998Categories=Application;${type};" > "${desktop}" 882Categories=Application;${type};" > "${desktop}"
999 883
884 (
885 # wrap the env here so that the 'insinto' call
886 # doesn't corrupt the env of the caller
1000 insinto /usr/share/applications 887 insinto /usr/share/applications
1001 doins "${desktop}" 888 doins "${desktop}"
1002 889 )
1003 return 0
1004} 890}
1005 891
1006# Make a GDM/KDM Session file 892# Make a GDM/KDM Session file
1007# 893#
1008# make_desktop_entry(<title>, <command>) 894# make_desktop_entry(<title>, <command>)
1037 doins "${i}" 923 doins "${i}"
1038 elif [[ -d ${i} ]] ; then 924 elif [[ -d ${i} ]] ; then
1039 for j in "${i}"/*.desktop ; do 925 for j in "${i}"/*.desktop ; do
1040 doins "${j}" 926 doins "${j}"
1041 done 927 done
1042 fi 928 fi
1043 done 929 done
1044} 930}
1045newmenu() { 931newmenu() {
1046 insinto /usr/share/applications 932 insinto /usr/share/applications
1047 newins "$1" "$2" 933 newins "$1" "$2"
1055 doins "${i}" 941 doins "${i}"
1056 elif [[ -d ${i} ]] ; then 942 elif [[ -d ${i} ]] ; then
1057 for j in "${i}"/*.png ; do 943 for j in "${i}"/*.png ; do
1058 doins "${j}" 944 doins "${j}"
1059 done 945 done
1060 fi 946 fi
1061 done 947 done
1062} 948}
1063newicon() { 949newicon() {
1064 insinto /usr/share/pixmaps 950 insinto /usr/share/pixmaps
1065 newins "$1" "$2" 951 newins "$1" "$2"
1070############################################################## 956##############################################################
1071 957
1072 958
1073# for internal use only (unpack_pdv and unpack_makeself) 959# for internal use only (unpack_pdv and unpack_makeself)
1074find_unpackable_file() { 960find_unpackable_file() {
1075 local src="$1" 961 local src=$1
1076 if [ -z "${src}" ] 962 if [[ -z ${src} ]] ; then
1077 then
1078 src="${DISTDIR}/${A}" 963 src=${DISTDIR}/${A}
1079 else 964 else
1080 if [ -e "${DISTDIR}/${src}" ] 965 if [[ -e ${DISTDIR}/${src} ]] ; then
1081 then
1082 src="${DISTDIR}/${src}" 966 src=${DISTDIR}/${src}
1083 elif [ -e "${PWD}/${src}" ] 967 elif [[ -e ${PWD}/${src} ]] ; then
1084 then
1085 src="${PWD}/${src}" 968 src=${PWD}/${src}
1086 elif [ -e "${src}" ] 969 elif [[ -e ${src} ]] ; then
1087 then
1088 src="${src}" 970 src=${src}
1089 fi
1090 fi 971 fi
1091 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 972 fi
973 [[ ! -e ${src} ]] && return 1
1092 echo "${src}" 974 echo "${src}"
1093} 975}
1094 976
1095# Unpack those pesky pdv generated files ... 977# Unpack those pesky pdv generated files ...
1096# They're self-unpacking programs with the binary package stuffed in 978# They're self-unpacking programs with the binary package stuffed in
1111# lseek 993# lseek
1112# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1113# lseek(3, -4, SEEK_END) = 2981250 995# lseek(3, -4, SEEK_END) = 2981250
1114# thus we would pass in the value of '4' as the second parameter. 996# thus we would pass in the value of '4' as the second parameter.
1115unpack_pdv() { 997unpack_pdv() {
1116 local src="`find_unpackable_file $1`" 998 local src=$(find_unpackable_file $1)
1117 local sizeoff_t="$2" 999 local sizeoff_t=$2
1118 1000
1001 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1119 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1002 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1120 1003
1121 local shrtsrc="`basename ${src}`" 1004 local shrtsrc="`basename ${src}`"
1122 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1123 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1006 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1124 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1007 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1190# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1191# - If the file is not specified then unpack will utilize ${A}. 1074# - If the file is not specified then unpack will utilize ${A}.
1192# - If the offset is not specified then we will attempt to extract 1075# - If the offset is not specified then we will attempt to extract
1193# the proper offset from the script itself. 1076# the proper offset from the script itself.
1194unpack_makeself() { 1077unpack_makeself() {
1195 local src="$(find_unpackable_file "$1")" 1078 local src=$(find_unpackable_file "$1")
1196 local skip="$2" 1079 local skip=$2
1197 local exe="$3" 1080 local exe=$3
1198 1081
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083
1199 local shrtsrc="$(basename "${src}")" 1084 local shrtsrc=$(basename "${src}")
1200 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1201 if [ -z "${skip}" ] 1086 if [ -z "${skip}" ]
1202 then 1087 then
1203 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1204 local skip=0 1089 local skip=0
1275check_license() { 1160check_license() {
1276 local lic=$1 1161 local lic=$1
1277 if [ -z "${lic}" ] ; then 1162 if [ -z "${lic}" ] ; then
1278 lic="${PORTDIR}/licenses/${LICENSE}" 1163 lic="${PORTDIR}/licenses/${LICENSE}"
1279 else 1164 else
1280 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1165 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1281 lic="${PORTDIR}/licenses/${src}" 1166 lic="${PORTDIR}/licenses/${lic}"
1282 elif [ -e "${PWD}/${src}" ] ; then 1167 elif [ -e "${PWD}/${lic}" ] ; then
1283 lic="${PWD}/${src}" 1168 lic="${PWD}/${lic}"
1284 elif [ -e "${src}" ] ; then 1169 elif [ -e "${lic}" ] ; then
1285 lic="${src}" 1170 lic="${lic}"
1286 fi
1287 fi 1171 fi
1172 fi
1288 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1173 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1289 local l="`basename ${lic}`" 1174 local l="`basename ${lic}`"
1290 1175
1291 # here is where we check for the licenses the user already 1176 # here is where we check for the licenses the user already
1292 # accepted ... if we don't find a match, we make the user accept 1177 # accepted ... if we don't find a match, we make the user accept
1293 local shopts=$- 1178 local shopts=$-
1464# displayed and we'll hang out here until: 1349# displayed and we'll hang out here until:
1465# (1) the file is found on a mounted cdrom 1350# (1) the file is found on a mounted cdrom
1466# (2) the user hits CTRL+C 1351# (2) the user hits CTRL+C
1467cdrom_locate_file_on_cd() { 1352cdrom_locate_file_on_cd() {
1468 while [[ -z ${CDROM_ROOT} ]] ; do 1353 while [[ -z ${CDROM_ROOT} ]] ; do
1469 local dir="$(dirname ${@})" 1354 local dir=$(dirname "$*")
1470 local file="$(basename ${@})" 1355 local file=$(basename "$*")
1471 local mline="" 1356 local mline=""
1472 local showedmsg=0 1357 local showedmsg=0
1473 1358
1474 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1359 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1475 [[ -d ${mline}/${dir} ]] || continue 1360 [[ -d ${mline}/${dir} ]] || continue
1476 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1361 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1477 && export CDROM_ROOT=${mline} 1362 && export CDROM_ROOT=${mline}
1478 done 1363 done
1479 1364
1480 if [[ -z ${CDROM_ROOT} ]] ; then 1365 if [[ -z ${CDROM_ROOT} ]] ; then
1481 echo 1366 echo
1496 fi 1381 fi
1497 showedmsg=1 1382 showedmsg=1
1498 fi 1383 fi
1499 einfo "Press return to scan for the cd again" 1384 einfo "Press return to scan for the cd again"
1500 einfo "or hit CTRL+C to abort the emerge." 1385 einfo "or hit CTRL+C to abort the emerge."
1386 echo
1387 einfo "If you are having trouble with the detection"
1388 einfo "of your CD, it is possible that you do not have"
1389 einfo "Joliet support enabled in your kernel. Please"
1390 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1501 read 1391 read
1502 fi 1392 fi
1503 done 1393 done
1504} 1394}
1505 1395
1569 while ((i--)) ; do 1459 while ((i--)) ; do
1570 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1460 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1571 done 1461 done
1572 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1462 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1573 case ${ARCH} in 1463 case ${ARCH} in
1574 x86) export ARCH="i386";; 1464 x86) export ARCH="i386";;
1575 amd64) export ARCH="x86_64";; 1465 amd64) export ARCH="x86_64";;
1576 hppa) export ARCH="parisc";; 1466 hppa) export ARCH="parisc";;
1577 mips) export ARCH="mips";; 1467 mips) export ARCH="mips";;
1578 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one! 1468 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1579 *) export ARCH="${ARCH}";; 1469 *) export ARCH="${ARCH}";;
1580 esac 1470 esac
1581} 1471}
1582 1472
1583# set's ARCH back to what portage expects 1473# set's ARCH back to what portage expects
1584set_arch_to_portage() { 1474set_arch_to_portage() {
1628 LIB=$1 1518 LIB=$1
1629 1519
1630 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1520 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1631 SONAME=`basename ${LIB}` 1521 SONAME=`basename ${LIB}`
1632 1522
1633 einfo "An old version of an installed library was detected on your system." 1523 ewarn "An old version of an installed library was detected on your system."
1634 einfo "In order to avoid breaking packages that link against is, this older version" 1524 ewarn "In order to avoid breaking packages that link against it, this older version"
1635 einfo "is not being removed. In order to make full use of this newer version," 1525 ewarn "is not being removed. In order to make full use of this newer version,"
1636 einfo "you will need to execute the following command:" 1526 ewarn "you will need to execute the following command:"
1637 einfo " revdep-rebuild --soname ${SONAME}" 1527 ewarn " revdep-rebuild --soname ${SONAME}"
1638 einfo 1528 ewarn
1639 einfo "After doing that, you can safely remove ${LIB}" 1529 ewarn "After doing that, you can safely remove ${LIB}"
1640 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1530 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1641 fi 1531 fi
1642} 1532}
1643 1533
1644# Hack for people to figure out if a package was built with 1534# Hack for people to figure out if a package was built with
1645# certain USE flags 1535# certain USE flags
1691dopamd() { 1581dopamd() {
1692 [[ -z $1 ]] && die "dopamd requires at least one argument" 1582 [[ -z $1 ]] && die "dopamd requires at least one argument"
1693 1583
1694 use pam || return 0 1584 use pam || return 0
1695 1585
1696 insinto /etc/pam.d 1586 INSDESTTREE=/etc/pam.d \
1697 doins "$@" || die "failed to install $@" 1587 doins "$@" || die "failed to install $@"
1698} 1588}
1699# newpamd <old name> <new name> 1589# newpamd <old name> <new name>
1700# 1590#
1701# Install pam file <old name> as <new name> in /etc/pam.d 1591# Install pam file <old name> as <new name> in /etc/pam.d
1702newpamd() { 1592newpamd() {
1703 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1593 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1704 1594
1705 use pam || return 0 1595 use pam || return 0
1706 1596
1707 insinto /etc/pam.d 1597 INSDESTTREE=/etc/pam.d \
1708 newins "$1" "$2" || die "failed to install $1 as $2" 1598 newins "$1" "$2" || die "failed to install $1 as $2"
1709} 1599}
1710 1600
1711# make a wrapper script ... 1601# make a wrapper script ...
1712# NOTE: this was originally games_make_wrapper, but I noticed other places where 1602# NOTE: this was originally games_make_wrapper, but I noticed other places where
1718# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1608# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1719# $5 == path for wrapper 1609# $5 == path for wrapper
1720make_wrapper() { 1610make_wrapper() {
1721 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1611 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1722 local tmpwrapper=$(emktemp) 1612 local tmpwrapper=$(emktemp)
1613 # We don't want to quote ${bin} so that people can pass complex
1614 # things as $bin ... "./someprog --args"
1723 cat << EOF > "${tmpwrapper}" 1615 cat << EOF > "${tmpwrapper}"
1724#!/bin/sh 1616#!/bin/sh
1725cd "${chdir}" 1617cd "${chdir:-.}"
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1726export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1620fi
1727exec ${bin} "\$@" 1621exec ${bin} "\$@"
1728EOF 1622EOF
1729 chmod go+rx "${tmpwrapper}" 1623 chmod go+rx "${tmpwrapper}"
1730 if [ -n "${5}" ] 1624 if [[ -n ${path} ]] ; then
1731 then
1732 exeinto ${5} 1625 exeinto "${path}"
1733 newexe "${tmpwrapper}" "${wrapper}" 1626 newexe "${tmpwrapper}" "${wrapper}"
1734 else 1627 else
1735 newbin "${tmpwrapper}" "${wrapper}" 1628 newbin "${tmpwrapper}" "${wrapper}"
1736 fi 1629 fi
1737} 1630}

Legend:
Removed from v.1.168  
changed lines
  Added in v.1.206

  ViewVC Help
Powered by ViewVC 1.1.20