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

Diff of /eclass/eutils.eclass

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

Revision 1.180 Revision 1.212
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.180 2005/06/03 21:58:01 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.212 2005/10/22 02:32:48 vapier 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}"
167# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
168# 167#
169# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
170# 169#
171epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 172 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
177 local x="" 177 local x=""
178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 180
179 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
180 then 182 then
181 local m="" 183 local m=""
182 for m in "$@" ; do 184 for m in "$@" ; do
312 count=5 314 count=5
313 break 315 break
314 fi 316 fi
315 fi 317 fi
316 318
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 320 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 326
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
326 329
327 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
328 then 331 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 333 echo
376# vapier@gentoo.org 379# vapier@gentoo.org
377# 380#
378# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
379emktemp() { 382emktemp() {
380 local exe="touch" 383 local exe="touch"
381 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
382 local topdir="$1" 385 local topdir=$1
383 386
384 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
385 then
386 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
387 && topdir="/tmp" \ 389 && topdir="/tmp" \
388 || topdir="${T}" 390 || topdir=${T}
389 fi 391 fi
390 392
391 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
392 then
393 local tmp=/ 394 local tmp=/
394 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
395 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
396 done 397 done
397 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
398 echo "${tmp}" 399 echo "${tmp}"
399 else 400 else
400 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
401 && exe="-p" \ 402 && exe="-p" \
402 || exe="-d" 403 || exe="-d"
403 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
404 fi 405 fi
405} 406}
409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
411# 412#
412# egetent(database, key) 413# egetent(database, key)
413egetent() { 414egetent() {
414 if [[ "${USERLAND}" == "Darwin" ]] ; then 415 case ${CHOST} in
416 *-darwin*)
415 case "$2" in 417 case "$2" in
416 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
418 ;; 420 ;;
419 *) # Numeric 421 *) # Numeric
420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
421 ;; 423 ;;
422 esac 424 esac
423 elif [[ "${USERLAND}" == "BSD" ]] ; then 425 ;;
424 local action 426 *-freebsd*)
425 if [ "$1" == "passwd" ] 427 local opts action="user"
426 then 428 [[ $1 == "passwd" ]] || action="group"
427 action="user" 429
428 else 430 # lookup by uid/gid
429 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
430 fi 433 fi
434
431 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
432 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
433 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
434 getent "$1" "$2" 442 getent "$1" "$2"
435 fi 443 ;;
444 esac
436} 445}
437 446
438# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
439# vapier@gentoo.org 448# vapier@gentoo.org
440# 449#
448# homedir: /dev/null 457# homedir: /dev/null
449# groups: none 458# groups: none
450# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
451enewuser() { 460enewuser() {
452 # get the username 461 # get the username
453 local euser="$1"; shift 462 local euser=$1; shift
454 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
455 then
456 eerror "No username specified !" 464 eerror "No username specified !"
457 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
458 fi 466 fi
459 467
460 # lets see if the username already exists 468 # lets see if the username already exists
461 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
462 then
463 return 0 470 return 0
464 fi 471 fi
465 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
466 473
467 # options to pass to useradd 474 # options to pass to useradd
468 local opts= 475 local opts=
469 476
470 # handle uid 477 # handle uid
471 local euid="$1"; shift 478 local euid=$1; shift
472 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
473 then
474 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
475 then
476 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
477 then
478 euid="next" 482 euid="next"
479 fi 483 fi
480 else 484 else
481 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
482 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
483 fi 487 fi
484 else 488 else
485 euid="next" 489 euid="next"
486 fi 490 fi
487 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
488 then 492 for euid in $(seq 101 999) ; do
489 local pwrange
490 if [ "${USERLAND}" == "BSD" ] ; then
491 pwrange="`jot 898 101`"
492 else
493 pwrange="`seq 101 999`"
494 fi
495 for euid in ${pwrange} ; do
496 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
497 done 494 done
498 fi 495 fi
499 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
500 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
501 498
502 # handle shell 499 # handle shell
503 local eshell="$1"; shift 500 local eshell=$1; shift
504 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
505 then
506 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
507 then
508 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
509 die "${eshell} does not exist" 504 die "${eshell} does not exist"
510 fi 505 fi
511 else 506 else
512 if [[ "${USERLAND}" == "Darwin" ]]; then 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
513 eshell="/usr/bin/false" 508 [[ -x ${ROOT}${shell} ]] && break
514 elif [[ "${USERLAND}" == "BSD" ]]; then 509 done
515 eshell="/usr/sbin/nologin" 510
516 else 511 if [[ ${shell} == "/dev/null" ]] ; then
517 eshell="/bin/false" 512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
518 fi 514 fi
515
516 eshell=${shell}
519 fi 517 fi
520 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
521 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
522 520
523 # handle homedir 521 # handle homedir
524 local ehome="$1"; shift 522 local ehome=$1; shift
525 if [ -z "${ehome}" ] || [ "${ehome}" == "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
526 then
527 ehome="/dev/null" 524 ehome="/dev/null"
528 fi 525 fi
529 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
530 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
531 528
532 # handle groups 529 # handle groups
533 local egroups="$1"; shift 530 local egroups=$1; shift
534 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
535 then
536 local oldifs="${IFS}" 532 local oldifs=${IFS}
537 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
538 534
539 export IFS="," 535 export IFS=","
540 for g in ${egroups} 536 for g in ${egroups} ; do
541 do
542 export IFS="${oldifs}" 537 export IFS=${oldifs}
543 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
544 then
545 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
546 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
547 fi 541 fi
548 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
549 then
550 defgroup="${g}" 543 defgroup=${g}
551 else 544 else
552 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
553 fi 546 fi
554 export IFS="," 547 export IFS=","
555 done 548 done
556 export IFS="${oldifs}" 549 export IFS=${oldifs}
557 550
558 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
559 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
560 then
561 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
562 fi 554 fi
563 else 555 else
564 egroups="(none)" 556 egroups="(none)"
565 fi 557 fi
566 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
567 559
568 # handle extra and add the user 560 # handle extra and add the user
569 local eextra="$@"
570 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
571 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
572 if [[ "${USERLAND}" == "Darwin" ]] 563 case ${CHOST} in
573 then 564 *-darwin*)
574 ### Make the user 565 ### Make the user
575 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
576 then
577 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
578 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
579 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
580 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
581 ### Add the user to the groups specified 571 ### Add the user to the groups specified
582 local oldifs="${IFS}" 572 local oldifs=${IFS}
583 export IFS="," 573 export IFS=","
584 for g in ${egroups} 574 for g in ${egroups} ; do
585 do
586 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
587 done 576 done
588 export IFS="${oldifs}" 577 export IFS=${oldifs}
589 else 578 else
590 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
591 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
592 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
593 die "Required function missing" 582 die "Required function missing"
594 fi 583 fi
595 elif [[ "${USERLAND}" == "BSD" ]] ; then 584 ;;
596 if [ -z "${eextra}" ] 585 *-freebsd*)
597 then 586 if [[ -z $@ ]] ; then
598 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
599 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
600 die "enewuser failed" 589 die "enewuser failed"
601 else 590 else
602 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
603 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
604 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
605 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
606 else 600 else
607 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
608 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
609 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
610 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
611 || die "enewuser failed" 609 || die "enewuser failed"
612 else 610 else
613 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
614 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
615 || die "enewuser failed" 613 || die "enewuser failed"
616 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
617 fi 623 fi
624
618 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
619
620 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
621 then
622 einfo " - Creating ${ehome} in ${D}"
623 dodir ${ehome}
624 fowners ${euser} ${ehome}
625 fperms 755 ${ehome}
626 fi
627} 626}
628 627
629# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
630# vapier@gentoo.org 629# vapier@gentoo.org
631# 630#
660 then 659 then
661 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
662 then 661 then
663 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
664 then 663 then
665 if [[ "${USERLAND}" == "Darwin" ]]; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
666 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
667 else 666 else
668 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
669 fi 668 fi
670 else 669 else
684 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
685 684
686 # add the group 685 # add the group
687 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
688 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
689 if [[ "${USERLAND}" == "Darwin" ]]; then 688 case ${CHOST} in
689 *-darwin*)
690 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
691 then 691 then
692 einfo "Extra options are not supported on Darwin/OS X yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
693 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
694 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
695 die "Required function missing" 695 die "Required function missing"
696 fi 696 fi
697 697
698 # If we need the next available 698 # If we need the next available
699 case ${egid} in 699 case ${egid} in
700 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
701 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
702 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
703 done 703 done
704 esac 704 esac
705 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
706 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
707 elif [[ "${USERLAND}" == "BSD" ]] ; then 707 ;;
708
709 *-freebsd*)
708 case ${egid} in 710 case ${egid} in
709 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
710 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
711 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
712 done 714 done
713 esac 715 esac
714 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
715 else 717 ;;
718
719 *-netbsd*)
720 case ${egid} in
721 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do
723 [ -z "`egetent group ${egid}`" ] && break
724 done
725 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;;
728
729 *)
716 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
717 fi 731 ;;
732 esac
718 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
719} 734}
720 735
721# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
722# vapier@gentoo.org 737# vapier@gentoo.org
747# name: the name that will show up in the menu 762# name: the name that will show up in the menu
748# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
749# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
750# a full path to an icon 765# a full path to an icon
751# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
752# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 767# http://www.freedesktop.org/Standards/desktop-entry-spec
753# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
754make_desktop_entry() { 769make_desktop_entry() {
755 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 770 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
756 771
757 local exec=${1} 772 local exec=${1}
783 dev) 798 dev)
784 type="Development" 799 type="Development"
785 ;; 800 ;;
786 801
787 games) 802 games)
788 [[ -z ${path} ]] && path=${GAMES_BINDIR}
789
790 case ${catmin} in 803 case ${catmin} in
791 action) type=ActionGame;; 804 action) type=ActionGame;;
792 arcade) type=ArcadeGame;; 805 arcade) type=ArcadeGame;;
793 board) type=BoardGame;; 806 board) type=BoardGame;;
794 kid) type=KidsGame;; 807 kid) type=KidsGame;;
877Exec=${exec} 890Exec=${exec}
878Path=${path} 891Path=${path}
879Icon=${icon} 892Icon=${icon}
880Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
881 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
882 insinto /usr/share/applications 898 insinto /usr/share/applications
883 doins "${desktop}" 899 doins "${desktop}"
884 900 )
885 return 0
886} 901}
887 902
888# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
889# 904#
890# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
919 doins "${i}" 934 doins "${i}"
920 elif [[ -d ${i} ]] ; then 935 elif [[ -d ${i} ]] ; then
921 for j in "${i}"/*.desktop ; do 936 for j in "${i}"/*.desktop ; do
922 doins "${j}" 937 doins "${j}"
923 done 938 done
924 fi 939 fi
925 done 940 done
926} 941}
927newmenu() { 942newmenu() {
928 insinto /usr/share/applications 943 insinto /usr/share/applications
929 newins "$1" "$2" 944 newins "$1" "$2"
937 doins "${i}" 952 doins "${i}"
938 elif [[ -d ${i} ]] ; then 953 elif [[ -d ${i} ]] ; then
939 for j in "${i}"/*.png ; do 954 for j in "${i}"/*.png ; do
940 doins "${j}" 955 doins "${j}"
941 done 956 done
942 fi 957 fi
943 done 958 done
944} 959}
945newicon() { 960newicon() {
946 insinto /usr/share/pixmaps 961 insinto /usr/share/pixmaps
947 newins "$1" "$2" 962 newins "$1" "$2"
952############################################################## 967##############################################################
953 968
954 969
955# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
956find_unpackable_file() { 971find_unpackable_file() {
957 local src="$1" 972 local src=$1
958 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
959 then
960 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
961 else 975 else
962 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
963 then
964 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
965 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
966 then
967 src="${PWD}/${src}" 979 src=${PWD}/${src}
968 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
969 then
970 src="${src}" 981 src=${src}
971 fi
972 fi 982 fi
973 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
974 echo "${src}" 985 echo "${src}"
975} 986}
976 987
977# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
978# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
993# lseek 1004# lseek
994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
995# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
996# thus we would pass in the value of '4' as the second parameter. 1007# thus we would pass in the value of '4' as the second parameter.
997unpack_pdv() { 1008unpack_pdv() {
998 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
999 local sizeoff_t="$2" 1010 local sizeoff_t=$2
1000 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1001 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1002 1014
1003 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
1004 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1005 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1006 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1007 1019
1008 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1072# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1073# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1074# - If the offset is not specified then we will attempt to extract 1086# - If the offset is not specified then we will attempt to extract
1075# the proper offset from the script itself. 1087# the proper offset from the script itself.
1076unpack_makeself() { 1088unpack_makeself() {
1077 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1078 local skip="$2" 1090 local skip=$2
1079 local exe="$3" 1091 local exe=$3
1080 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1081 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1082 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1083 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1084 then
1085 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1086 local skip=0 1099 local skip=0
1087 exe=tail 1100 exe=tail
1088 case ${ver} in 1101 case ${ver} in
1089 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1090 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1102 ;; 1115 ;;
1103 2.1.3) 1116 2.1.3)
1104 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1105 let skip="skip + 1" 1118 let skip="skip + 1"
1106 ;; 1119 ;;
1107 2.1.4) 1120 2.1.4|2.1.5)
1108 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1121 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1109 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1110 exe="dd" 1123 exe="dd"
1111 ;; 1124 ;;
1112 *) 1125 *)
1157check_license() { 1170check_license() {
1158 local lic=$1 1171 local lic=$1
1159 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1160 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1161 else 1174 else
1162 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1163 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1164 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1165 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1166 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1167 lic="${src}" 1180 lic="${lic}"
1168 fi
1169 fi 1181 fi
1182 fi
1170 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1171 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1172 1185
1173 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1174 # accepted ... if we don't find a match, we make the user accept 1187 # accepted ... if we don't find a match, we make the user accept
1175 local shopts=$- 1188 local shopts=$-
1346# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1347# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1348# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1349cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1350 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1351 local dir="$(dirname ${@})" 1364 local dir=$(dirname "$*")
1352 local file="$(basename ${@})" 1365 local file=$(basename "$*")
1353 local mline="" 1366 local mline=""
1354 local showedmsg=0 1367 local showedmsg=0
1355 1368
1356 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1369 for mline in $(mount | egrep -e '(iso|cdrom|fs=cdfss)' | awk '{print $3}') ; do
1357 [[ -d ${mline}/${dir} ]] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1358 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1359 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1360 done 1373 done
1361 1374
1378 fi 1391 fi
1379 showedmsg=1 1392 showedmsg=1
1380 fi 1393 fi
1381 einfo "Press return to scan for the cd again" 1394 einfo "Press return to scan for the cd again"
1382 einfo "or hit CTRL+C to abort the emerge." 1395 einfo "or hit CTRL+C to abort the emerge."
1396 echo
1397 einfo "If you are having trouble with the detection"
1398 einfo "of your CD, it is possible that you do not have"
1399 einfo "Joliet support enabled in your kernel. Please"
1400 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1383 read 1401 read
1384 fi 1402 fi
1385 done 1403 done
1386} 1404}
1387 1405
1510 LIB=$1 1528 LIB=$1
1511 1529
1512 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1530 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1513 SONAME=`basename ${LIB}` 1531 SONAME=`basename ${LIB}`
1514 1532
1515 einfo "An old version of an installed library was detected on your system." 1533 ewarn "An old version of an installed library was detected on your system."
1516 einfo "In order to avoid breaking packages that link against is, this older version" 1534 ewarn "In order to avoid breaking packages that link against it, this older version"
1517 einfo "is not being removed. In order to make full use of this newer version," 1535 ewarn "is not being removed. In order to make full use of this newer version,"
1518 einfo "you will need to execute the following command:" 1536 ewarn "you will need to execute the following command:"
1519 einfo " revdep-rebuild --soname ${SONAME}" 1537 ewarn " revdep-rebuild --soname ${SONAME}"
1520 einfo 1538 ewarn
1521 einfo "After doing that, you can safely remove ${LIB}" 1539 ewarn "After doing that, you can safely remove ${LIB}"
1522 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1523 fi 1541 fi
1524} 1542}
1525 1543
1526# Hack for people to figure out if a package was built with 1544# Hack for people to figure out if a package was built with
1527# certain USE flags 1545# certain USE flags
1600# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1618# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1601# $5 == path for wrapper 1619# $5 == path for wrapper
1602make_wrapper() { 1620make_wrapper() {
1603 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1621 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1604 local tmpwrapper=$(emktemp) 1622 local tmpwrapper=$(emktemp)
1623 # We don't want to quote ${bin} so that people can pass complex
1624 # things as $bin ... "./someprog --args"
1605 cat << EOF > "${tmpwrapper}" 1625 cat << EOF > "${tmpwrapper}"
1606#!/bin/sh 1626#!/bin/sh
1607cd "${chdir}" 1627cd "${chdir:-.}"
1628if [ -n "${libdir}" ] ; then
1629 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1608export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1631 else
1632 export LD_LIBRARY_PATH="${libdir}"
1633 fi
1634fi
1609exec ${bin} "\$@" 1635exec ${bin} "\$@"
1610EOF 1636EOF
1611 chmod go+rx "${tmpwrapper}" 1637 chmod go+rx "${tmpwrapper}"
1612 if [ -n "${5}" ] 1638 if [[ -n ${path} ]] ; then
1613 then
1614 exeinto ${5} 1639 exeinto "${path}"
1615 newexe "${tmpwrapper}" "${wrapper}" 1640 newexe "${tmpwrapper}" "${wrapper}"
1616 else 1641 else
1617 newbin "${tmpwrapper}" "${wrapper}" 1642 newbin "${tmpwrapper}" "${wrapper}"
1618 fi 1643 fi
1619} 1644}

Legend:
Removed from v.1.180  
changed lines
  Added in v.1.212

  ViewVC Help
Powered by ViewVC 1.1.20