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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20