Hello community, here is the log from the commit of package aaa_base checked in at Thu Feb 15 17:55:50 CET 2007. -------- --- aaa_base/aaa_base.changes 2007-01-29 16:39:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/aaa_base/aaa_base.changes 2007-02-15 14:29:01.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Feb 15 14:19:58 CET 2007 - werner@suse.de + +- Use plain bourne shell syntax for bug #231716 (bug #245740) + +------------------------------------------------------------------- +Wed Feb 14 10:46:01 CET 2007 - werner@suse.de + +- Both bash and tcsh should have the same path (bug #227416) +- Be carefull about X11 paths (bug #227416) +- bash complete: if cdable_vars is set expand variables on cd, + handle CDPATH variable, and append the / on the result if missed + +------------------------------------------------------------------- +Tue Feb 13 17:11:13 CET 2007 - werner@suse.de + +- Correct lang.sh (bug #241056) +- Add support for new init feature INIT_HALT=POWEROFF/HALT + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.hg6053/_old 2007-02-15 17:53:27.000000000 +0100 +++ /var/tmp/diff_new_pack.hg6053/_new 2007-02-15 17:53:27.000000000 +0100 @@ -19,7 +19,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools Autoreqprov: on Version: 10.3 -Release: 8 +Release: 11 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -145,6 +145,16 @@ %defattr(-,root,root) %changelog -n aaa_base +* Thu Feb 15 2007 - werner@suse.de +- Use plain bourne shell syntax for bug #231716 (bug #245740) +* Wed Feb 14 2007 - werner@suse.de +- Both bash and tcsh should have the same path (bug #227416) +- Be carefull about X11 paths (bug #227416) +- bash complete: if cdable_vars is set expand variables on cd, + handle CDPATH variable, and append the / on the result if missed +* Tue Feb 13 2007 - werner@suse.de +- Correct lang.sh (bug #241056) +- Add support for new init feature INIT_HALT=POWEROFF/HALT * Mon Jan 29 2007 - sbrabec@suse.cz - Removed references to /opt/gnome. * Mon Jan 29 2007 - werner@suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/bash.bashrc new/aaa_base/etc/bash.bashrc --- old/aaa_base/etc/bash.bashrc 2007-01-12 18:56:12.000000000 +0100 +++ new/aaa_base/etc/bash.bashrc 2007-02-15 14:24:27.000000000 +0100 @@ -216,7 +216,7 @@ fi alias rd=rmdir alias md='mkdir -p' - if test "$is" = "bash" && ! type -p which &> /dev/null ; then + if test "$is" = "bash" && ! type -p which > /dev/null 2>&1 ; then # # Other shells use the which command in path (e.g. ash) or # their own builtin for the which command (e.g. ksh and zsh). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/csh.login new/aaa_base/etc/csh.login --- old/aaa_base/etc/csh.login 2007-01-29 15:53:49.000000000 +0100 +++ new/aaa_base/etc/csh.login 2007-02-14 10:45:30.000000000 +0100 @@ -86,14 +86,21 @@ # Make path more comfortable # unset noglob -set _xpath -set _upath +set _hpath set _spath +set _upath=( /usr/local/bin /usr/bin /bin ) +if ( "$HOME" != "/" ) then + foreach _d (${HOME}/bin/${CPU} ${HOME}/bin) + if ( -d $_d ) set _hpath=( $_hpath $_d ) + end +endif if ( "$uid" == "0" ) then -if ( -d /opt/kde3/sbin ) set _spath=( /opt/kde3/sbin ) + if ( -d /opt/kde3/sbin ) set _spath=( /opt/kde3/sbin ) set _spath=( /sbin /usr/sbin /usr/local/sbin $_spath ) endif -foreach _d (${HOME}/bin/${CPU} ${HOME}/bin \ +foreach _d (/usr/X11/bin \ + /usr/bin/X11 \ + /usr/X11R6/bin \ /var/lib/dosemu \ /usr/games \ /opt/bin \ @@ -108,26 +115,17 @@ if ( ${?OPENWINHOME} ) then if ( -d $OPENWINHOME/bin ) then - set _xpath=( $OPENWINHOME/bin ) + set _upath=( $_upath $OPENWINHOME/bin ) endif endif -if ( -d /usr/bin/X11 ) then - set _xpath=( /usr/bin/X11 $_xpath ) -else if ( -d /usr/X11R6/bin ) then - set _xpath=( /usr/X11R6/bin $_xpath ) -else if ( -d /usr/X11/bin ) then - set _xpath=( /usr/X11/bin $_xpath ) -endif - -set _upath=( $_upath $_xpath ) -unset _xpath # # Doing only one rehash # -set -f path=( $_spath $path $_upath ) +set -f path=( $_hpath $_spath $path $_upath ) unset _upath unset _spath +unset _hpath set noglob # diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/halt new/aaa_base/etc/init.d/halt --- old/aaa_base/etc/init.d/halt 2006-03-17 16:38:37.000000000 +0100 +++ new/aaa_base/etc/init.d/halt 2007-02-14 12:20:00.000000000 +0100 @@ -20,45 +20,82 @@ trap "echo" SIGINT SIGSEGV SIGQUIT SIGTERM set +e -case "$0" in - *halt) - message="The system will be halted immediately." - case `/bin/uname -m` in - i?86) - command="halt" - if test -e /proc/apm -o -e /proc/acpi -o -e /proc/sys/acpi ; then - command="halt -p" - else - read cmdline < /proc/cmdline - case "$cmdline" in - *apm=smp-power-off*|*apm=power-off*) command="halt -p" ;; - esac - fi - ;; - *) - command="halt -p" - ;; - esac - ;; - *reboot) - message="Please stand by while rebooting the system..." - command="reboot" - ;; - *) - echo "$0: call me as \"halt\" or \"reboot\" please!" - exit 1 - ;; +case "${0##*/}" in + *halt) + message="The system will be halted immediately." + arch=$(/bin/uname -m) + opts="" + command="halt" + # + # Sysvinit's shutdown is knowning about the option -P and -H to set + # the environment variable INIT_HALT within init for the runlevel 0. + # If this variable is not set we use the system default. + # + if test -z "$INIT_HALT" ; then + case "$HALT" in + [Pp]*) INIT_HALT=POWEROFF ;; + [Hh]*) INIT_HALT=HALT ;; + *) + INIT_HALT=POWEROFF + # + # Check this if valid for AMD/Intel based systems + # + case "$arch" in + i?86|x86_64) + if test -e /proc/apm -o -e /proc/acpi -o -e /proc/sys/acpi ; then + INIT_HALT=POWEROFF + else + INIT_HALT=HALT + read -t 2 cmdline < /proc/cmdline + case "$cmdline" in + *apm=smp-power-off*|*apm=power-off*) INIT_HALT=POWEROFF + esac + fi + esac + esac + fi + if test "$INIT_HALT" = "POWEROFF" ; then + opts="${opts:+$opts }-p" + fi + # + # Sometimes wake-on-lan isn't wanted, if so stop network + # + if test "$HALT_NETWORK" = "yes" ; then + opts="${opts:+$opts }-i" + fi + # + # Sometimes it is wanted to stop also the disks, but + # do not do this for software raids. + # + if test "$HALT_DISKS" = "yes" ; then + while read line ; do + case "$line" in + md.*active) HALT_DISKS=no; break + esac + done < /proc/mdstat + test "$HALT_DISKS" = "no" || opts="${opts:+$opts }-h" + fi + ;; + *reboot) + message="Please stand by while rebooting the system..." + opts="-i" + command="reboot" + ;; + *) + echo "$0: call me as \"halt\" or \"reboot\" please!" + exit 1 + ;; esac # # first do local stuff # rc_reset -test -e /etc/init.d/halt.local && { +if test -e /etc/init.d/halt.local ; then echo Running /etc/init.d/halt.local /bin/sh /etc/init.d/halt.local rc_status -v1 -r -} +fi # Write to wtmp file before unmounting /var $command -w @@ -90,14 +127,14 @@ if test -d /etc/init.d/boot.d/ ; then for i in /etc/init.d/boot.d/K*; do - test -f $i || continue - if test -x "$i" ; then - # Active boot scripts, should have their own messages - $i stop - else - # Old boot scripts, may not have any message - echo Skipping $i, not executable - fi + test -f $i || continue + if test -x "$i" ; then + # Active boot scripts, should have their own messages + $i stop + else + # Old boot scripts, may not have any message + echo Skipping $i, not executable + fi done fi @@ -154,4 +191,4 @@ test -n "$REDIRECT" -a -n "$CONSOLE" && setconsole $REDIRECT < $CONSOLE # Now talk to kernel -exec $command -d -f +exec $command -d -f $opts diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile new/aaa_base/etc/profile --- old/aaa_base/etc/profile 2007-01-29 15:54:50.000000000 +0100 +++ new/aaa_base/etc/profile 2007-02-14 10:40:58.000000000 +0100 @@ -105,7 +105,7 @@ # Make path more comfortable # if test -z "$PROFILEREAD" ; then - PATH=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin + PATH=/usr/local/bin:/usr/bin:/bin if test "$HOME" != "/" ; then for dir in $HOME/bin/$CPU $HOME/bin ; do test -d $dir && PATH=$dir:$PATH @@ -115,7 +115,10 @@ test -d /opt/kde3/sbin && PATH=/opt/kde3/sbin:$PATH PATH=/sbin:/usr/sbin:/usr/local/sbin:$PATH fi - for dir in /var/lib/dosemu \ + for dir in /usr/X11/bin \ + /usr/bin/X11 \ + /usr/X11R6/bin \ + /var/lib/dosemu \ /usr/games \ /opt/bin \ /opt/kde3/bin \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/complete.bash new/aaa_base/etc/profile.d/complete.bash --- old/aaa_base/etc/profile.d/complete.bash 2006-12-04 15:29:34.000000000 +0100 +++ new/aaa_base/etc/profile.d/complete.bash 2007-02-14 12:03:23.000000000 +0100 @@ -27,8 +27,10 @@ { local c=${COMP_WORDS[COMP_CWORD]} local s g=0 x o C - local IFS=' -' + local IFS=$'\n' + declare -a C=() + declare -i o + shopt -q extglob && g=1 test $g -eq 0 && shopt -s extglob @@ -49,15 +51,33 @@ \~*) COMPREPLY=($(compgen -u $s -- "${c}")) ;; esac + if test "${1##*/}" = "cd" ; then + # + # Handle the CDPATH variable + # + x="$(bind -v)" + local dir=$([[ $x =~ mark-directories+([[:space:]])on ]] && echo on) + local sym=$([[ $x =~ mark-symlinked-directories+([[:space:]])on ]] && echo on) + + for x in ${CDPATH//:/$'\n'}; do + o=${#COMPREPLY[@]} + for s in $(compgen -d $x/$c); do + if [[ (($sym == on && -h $s) || ($dir == on && ! -h $s)) && ! -d ${s#$x/} ]] ; then + s="${s}/" + fi + COMPREPLY[o++]=${s#$x/} + done + done + fi + + # # Escape spaces and braces in path names with `\' + # s="${COMP_WORDBREAKS// }" s="${s// }" s="${s//[\{\}()\[\]]}" s="${s} (){}[]" - declare -a C=() - declare -i o - for x in ${COMPREPLY[@]} ; do o=${#s} while test $((o--)) -gt 0 ; do @@ -68,10 +88,26 @@ done COMPREPLY=(${C[@]}) + # + # Append a slash on the real result, avoid annoying double tab + # + if test "${1##*/}" != "mkdir" -a ${#COMPREPLY[@]} -eq 1 ; then + x=${COMPREPLY[0]} + o=$((${#x} - 1)) + if test "$x" = "$c" -a "${x:${o}:1}" != "/"; then + COMPREPLY[0]="${x}/" + fi + fi + test $g -eq 0 && shopt -u extglob } -complete ${_minusdd} -F _cd_ cd rmdir pushd chroot chrootx +if shopt -q cdable_vars; then + complete ${_minusdd} -vF _cd_ cd +else + complete ${_minusdd} -F _cd_ cd +fi +complete ${_minusdd} -F _cd_ rmdir pushd chroot chrootx complete ${_minusdf} -F _cd_ mkdir # General expanding shell function @@ -145,8 +181,7 @@ *) s="-S/" esac - IFS=' -' + IFS=$'\n' case "$c" in \$\(*\)) eval COMPREPLY=\(${c}\) ;; \$\(*) COMPREPLY=($(compgen -c -P '$(' -S ')' -- ${c#??})) ;; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/lang.csh new/aaa_base/etc/profile.d/lang.csh --- old/aaa_base/etc/profile.d/lang.csh 2007-01-19 13:45:43.000000000 +0100 +++ new/aaa_base/etc/profile.d/lang.csh 2007-02-01 15:24:56.000000000 +0100 @@ -25,7 +25,7 @@ if ( -s $HOME/.i18n ) then eval `sed -n \ -e 's/^\(\(LANG\|LC_[A-Z_]\+\)\)=/set \1=/p' \ - < $HOME/.i18n + < $HOME/.i18n` endif # @@ -68,6 +68,7 @@ # overwrites all LC but not the LANG variable # if ( ${?LC_ALL} ) then + set LC_ALL=$LC_ALL if ( ${%LC_ALL} > 0 && "$LC_ALL" != "$LANG" ) then setenv LC_ALL $LC_ALL else ++++++ sysconfig_parts.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sysconfig_parts/sysconfig.shutdown new/sysconfig_parts/sysconfig.shutdown --- old/sysconfig_parts/sysconfig.shutdown 2006-03-17 16:31:42.000000000 +0100 +++ new/sysconfig_parts/sysconfig.shutdown 2007-02-14 12:19:21.000000000 +0100 @@ -1,3 +1,5 @@ +## Path: System/Boot +## Description: Variables used on system shutdown, reboot, or halt ## Type: list(no,yes,octave) ## Default: no # @@ -6,10 +8,36 @@ # HALT_SOUND="no" -## Path: System/Boot -## Default: "" ## Type: string +## Default: "" # # Hook during system shutdown to run extra command # HALT_POWERDOWN_INSERT="" + +## Type: list(poweroff,halt,auto) +## Default: auto +# +# What should the system do on halt? With poweroff the +# system not only halt the OS but also switch the power +# down. On ix86 or x86_64 this depends on the APM and/or +# ACPI capabilities of the hardware, therefore "auto" will +# cause the system to check about. +# +HALT="auto" + +## Type: list(no,yes) +## Default: no +# +# By default the network is not stopped at halt/poweroff. +# Sometimes this may be to "yes" to avoid wake-on-lan. +# +HALT_NETWORK="no" + +## Type: list(no,yes) +## Default: yes +# +# By default the disk are also halted at halt/poweroff. +# For software raids this option is ignored. +# +HALT_DISKS="yes" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org