Hello community, here is the log from the commit of package aaa_base checked in at Sun Jun 22 04:11:19 CEST 2008. -------- --- aaa_base/aaa_base.changes 2008-06-04 19:20:46.000000000 +0200 +++ aaa_base/aaa_base.changes 2008-06-20 17:02:52.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Jun 20 17:02:22 CEST 2008 - dmueller@suse.de + +- readd malloc debugging hooks for 11.1 +- bump version + +------------------------------------------------------------------- +Fri Jun 13 14:48:06 CEST 2008 - werner@suse.de + +- Detect SIGWINCH during boot and runlevel switch + +------------------------------------------------------------------- +Mon Jun 9 14:21:35 CEST 2008 - werner@suse.de + +- Better workaround for colon in directors names (bnc#398369) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.B22370/_old 2008-06-22 04:04:37.000000000 +0200 +++ /var/tmp/diff_new_pack.B22370/_new 2008-06-22 04:04:37.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package aaa_base (Version 11.0) +# spec file for package aaa_base (Version 11.0.42) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -20,8 +20,8 @@ Recommends: cron logrotate PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on -Version: 11.0 -Release: 78 +Version: 11.0.42 +Release: 1 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -143,6 +143,13 @@ %defattr(-,root,root) %changelog +* Fri Jun 20 2008 dmueller@suse.de +- readd malloc debugging hooks for 11.1 +- bump version +* Fri Jun 13 2008 werner@suse.de +- Detect SIGWINCH during boot and runlevel switch +* Mon Jun 09 2008 werner@suse.de +- Better workaround for colon in directors names (bnc#398369) * Wed Jun 04 2008 werner@suse.de - More on bnc#388327: do not umnount tmpfs devices like /dev * Wed Jun 04 2008 meissner@suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/boot new/aaa_base/etc/init.d/boot --- old/aaa_base/etc/init.d/boot 2008-03-18 14:11:30.000000000 +0100 +++ new/aaa_base/etc/init.d/boot 2008-06-13 14:38:32.000000000 +0200 @@ -22,13 +22,11 @@ set +e # -# Get terminal size of standard input of the system console +# Standard input from the system console # test -z "$CONSOLE" && CONSOLE=/dev/console -set -- $(stty size < $CONSOLE) - LINES=$1 -COLUMNS=$2 -export LINES COLUMNS CONSOLE +REDIRECT="$(showconsole 2>/dev/null)" +export CONSOLE REDIRECT # # Set I/O of this script and its childs to console @@ -36,23 +34,50 @@ exec 0<> $CONSOLE 1>&0 2>&0 # +# Configuration and coloring of the boot messages +# + +. /etc/rc.status +. /etc/sysconfig/boot + +# +# Reset status of this script +# +rc_reset + +# # Export the real device in variable REDIRECT. # -REDIRECT="$(showconsole 2>/dev/null)" -export REDIRECT -if test $COLUMNS -eq 0 ; then - # Serial: columns and lines are not defined - LINES=24 - COLUMNS=80 +if test -x /sbin/isserial && /sbin/isserial ; then test "$TERM" = "linux" -o -z "$TERM" && TERM=vt102 fi # -# Configuration and coloring of the boot messages +# Save old terminal settings and set -nl to avoid staircase +# effect, do not lock scrolling, and avoid break characters. # +otty=$(stty -g) +if test "$FLOW_CONTROL" = "yes" ; then + stty -nl ixon ignbrk -brkint +else + stty -nl -ixon ignbrk -brkint +fi -. /etc/rc.status -. /etc/sysconfig/boot +# +# Start blogd, requires /proc and /dev/pts. +# Export the real device in variable REDIRECT. +# +if test -z "$REDIRECT" ; then + if (echo -n > /dev/tty) 2>/dev/null ; then + REDIRECT=/dev/tty + else + REDIRECT=/dev/console + fi +else + if -x /sbin/blogd ; then + /sbin/blogd $REDIRECT + fi +fi echo -n "System Boot Control: " echo "Running $0" @@ -60,7 +85,6 @@ # # Start of e.g. blogd, requires /proc and /dev/pts. # -rc_reset echo -n "Mounting procfs at /proc" mount -n -t proc proc /proc rc_status -v -r @@ -106,17 +130,6 @@ rc_status -v -r # -# Save old terminal settings and set -nl to avoid staircase -# effect, do not lock scrolling, and avoid break characters. -# -otty=$(stty -g) -if test "$FLOW_CONTROL" = "yes" ; then - stty -nl ixon ignbrk -brkint -else - stty -nl -ixon ignbrk -brkint -fi - -# # Should we ask for interactive boot mode # DO_CONFIRM="" @@ -141,19 +154,6 @@ export DO_CONFIRM # -# Start blogd, requires /proc and /dev/pts. -# Export the real device in variable REDIRECT. -# -test -x /sbin/blogd -a -n "$REDIRECT" && /sbin/blogd $REDIRECT -if test -z "$REDIRECT" ; then - if (echo -n > /dev/tty) 2>/dev/null ; then - REDIRECT=/dev/tty - else - REDIRECT=/dev/console - fi -fi - -# # Common used variables # bootrc=/etc/init.d/boot.d @@ -282,7 +282,7 @@ # Remember for master resource script # if test "$DO_CONFIRM" = "yes" ; then - touch /var/run/do_confirm + > /var/run/do_confirm fi # @@ -299,7 +299,7 @@ exec 0<> $REDIRECT 1>&0 2>&0 # if yast2 failed, this ensures proper system setup #ulimit -c unlimited - touch /var/lib/YaST2/run_suseconfig + > /var/lib/YaST2/run_suseconfig if test -x /usr/lib/YaST2/startup/YaST2.Second-Stage; then /usr/lib/YaST2/startup/YaST2.Second-Stage else @@ -324,5 +324,4 @@ rm -f /var/lib/YaST2/run_suseconfig fi -rc_reset exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/rc new/aaa_base/etc/init.d/rc --- old/aaa_base/etc/init.d/rc 2008-03-18 14:11:02.000000000 +0100 +++ new/aaa_base/etc/init.d/rc 2008-06-13 14:38:57.000000000 +0200 @@ -100,13 +100,11 @@ fi # -# Get terminal size of standard input of the system console +# Standard input from the system console # test -z "$CONSOLE" && CONSOLE=/dev/console -set -- $(stty size < $CONSOLE) - LINES=$1 -COLUMNS=$2 -export LINES COLUMNS CONSOLE +REDIRECT="$(showconsole 2>/dev/null)" +export CONSOLE REDIRECT # # Set I/O of this script and its childs to console @@ -114,20 +112,29 @@ exec 0<> $CONSOLE 1>&0 2>&0 # -# Dummy shell function +# Configuration and coloring of the boot messages # -chvt () { true; } + +. /etc/rc.status +. /etc/sysconfig/boot + +# +# Reset status of this script +# +rc_reset + +# +# First kill all vlock sessions +# +if vlock=$(type -p vlock) ; then + killall -q $vlock +fi # # This redirects all rc messages during reboot and halt # to tty1 if the system console is bound on VGA (tty0). # -REDIRECT="$(showconsole 2>/dev/null)" -export REDIRECT if test -x /sbin/isserial && /sbin/isserial ; then - # Serial: columns and lines are not defined - : ${LINES:=24} - : ${COLUMNS:=80} test "$TERM" = "linux" -o -z "$TERM" && TERM=vt102 else # VGA @@ -135,30 +142,12 @@ case "$REDIRECT" in /dev/tty[1-9]*) REDIRECT=/dev/tty1 setconsole $REDIRECT < $CONSOLE - # Overwrite chvt shell function - chvt () { test -x /usr/bin/chvt && /usr/bin/chvt 1 ; } - set -- $(stty size < $REDIRECT) - LINES=$1 - COLUMNS=$2 - export LINES COLUMNS + command -p chvt 1 > /dev/null 2>&1 esac fi fi # -# May change to first terminal, but first we kill all vlock sessions -# -killall -q /usr/bin/vlock &> /dev/null || true -chvt - -# -# Configuration and coloring of the boot messages -# - -. /etc/rc.status -. /etc/sysconfig/boot - -# # Save old terminal settings and set -nl to avoid staircase # effect, do not lock scrolling, and avoid break characters. # @@ -172,15 +161,16 @@ # # Start blogd if not in single user mode # -if test "$RUNLEVEL" != "S" -a -x /sbin/blogd -a -n "$REDIRECT" ; then - /sbin/blogd $REDIRECT -fi if test -z "$REDIRECT" ; then if (echo -n > /dev/tty) 2>/dev/null ; then REDIRECT=/dev/tty else REDIRECT=/dev/console fi +else + if test "$RUNLEVEL" != "S" -a -x /sbin/blogd ; then + /sbin/blogd $REDIRECT + fi fi if test "$DO_CONFIRM" = "yes" ; then 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 2008-05-28 19:01:46.000000000 +0200 +++ new/aaa_base/etc/profile.d/complete.bash 2008-06-09 14:21:12.000000000 +0200 @@ -26,10 +26,9 @@ function _cd_ () { local c=${COMP_WORDS[COMP_CWORD]} - local s g=0 x o C + local s g=0 x local IFS=$'\n' - declare -a C=() - declare -i o + local -i o shopt -q extglob && g=1 test $g -eq 0 && shopt -s extglob @@ -50,10 +49,13 @@ \~*/*) COMPREPLY=($(compgen -d $s -- "${c}")) ;; \~*) COMPREPLY=($(compgen -u $s -- "${c}")) ;; *\:*) - if [[ $COMP_WORDBREAKS =~ : ]] ; then - COMPREPLY=($(compgen -d $s -- "${c}")) - COMPREPLY=(${COMPREPLY[*]//${c%:*}:/}) - fi + if [[ $COMP_WORDBREAKS =~ : ]] ; then + local C=${c%"${c##*[^\\]:}"} + COMPREPLY=($(compgen -d $s -- "${c}")) + for ((o=0; o<${#COMPREPLY[@]}; o++)) ; do + COMPREPLY[o]=${COMPREPLY[o]#"$C"} + done + fi esac if test "${1##*/}" = "cd" -a ${#COMPREPLY[@]} -gt 0 ; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/malloc-debug.csh new/aaa_base/etc/profile.d/malloc-debug.csh --- old/aaa_base/etc/profile.d/malloc-debug.csh 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base/etc/profile.d/malloc-debug.csh 2008-06-20 17:01:58.000000000 +0200 @@ -0,0 +1,8 @@ +# +# This is for FACTORY only and should be removed for the release. +# - meissner@suse.de +# +# fill new malloc areas with 0x44 +setenv MALLOC_PERTURB_ D +# Abort on any malloc related error. +setenv MALLOC_CHECK_ 2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/profile.d/malloc-debug.sh new/aaa_base/etc/profile.d/malloc-debug.sh --- old/aaa_base/etc/profile.d/malloc-debug.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/aaa_base/etc/profile.d/malloc-debug.sh 2008-06-20 17:01:58.000000000 +0200 @@ -0,0 +1,8 @@ +# +# This is for FACTORY only and should be removed for the release. +# - meissner@suse.de +# +# fill new malloc areas with 0x44 +export MALLOC_PERTURB_=D +# Abort on any malloc related error. +export MALLOC_CHECK_=2 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/rc.status new/aaa_base/etc/rc.status --- old/aaa_base/etc/rc.status 2008-01-08 13:37:27.000000000 +0100 +++ new/aaa_base/etc/rc.status 2008-06-13 14:41:13.000000000 +0200 @@ -37,13 +37,20 @@ export LC_ALL # Seek for terminal size and, if needed, set default size -if test -z "$LINES" -o -z "$COLUMNS" ; then - eval `exec 3<&1; stty size <&3 2>/dev/null | (read L C; \ - echo LINES=${L:-24} COLUMNS=${C:-80})` -fi -test $LINES -eq 0 && LINES=24 -test $COLUMNS -eq 0 && COLUMNS=80 -export LINES COLUMNS +rc_lc () { + if test -n "$REDIRECT" ; then + set -- $(stty size < "$REDIRECT") + else + set -- $(stty size) + fi + LINES=$1 + COLUMNS=$2 + test $LINES -eq 0 && LINES=24 + test $COLUMNS -eq 0 && COLUMNS=80 + export LINES COLUMNS +} +trap 'rc_lc' SIGWINCH +rc_lc # Make sure we have /sbin and /usr/sbin in PATH case ":$PATH:" in @@ -77,14 +84,14 @@ rc_reset="${norm}${esc}[?25h" rc_save="${esc}7${esc}[?25l" rc_restore="${esc}8${esc}[?25h" - function rc_cuu () { test $1 -eq 0 && return; echo -en "\033[${1}A"; } - function rc_cud () { test $1 -eq 0 && return; echo -en "\033[${1}B"; } - function rc_timer_on () { + rc_cuu () { test $1 -eq 0 && return; echo -en "\033[${1}A"; } + rc_cud () { test $1 -eq 0 && return; echo -en "\033[${1}B"; } + rc_timer_on () { # Draw seconds of running timout to column. # Two arguments: timeout in seconds and offset local n=$1 local c=$2 - (trap "exit 0" TERM + (trap "exit 0" SIGTERM while test $((n--)) -gt 0; do sleep 1; if test $n -gt 9 ; then @@ -94,7 +101,7 @@ fi done) & _rc_timer_pid=$! } - function rc_timer_off () { + rc_timer_off () { if test -n "$_rc_timer_pid" ; then kill -TERM $_rc_timer_pid > /dev/null 2>&1 fi @@ -122,10 +129,10 @@ rc_reset="" rc_save="" rc_restore="" - function rc_cuu () { return; } - function rc_cud () { return; } - function rc_timer_on () { return; } - function rc_timer_off () { return; } + rc_cuu () { return; } + rc_cud () { return; } + rc_timer_on () { return; } + rc_timer_off () { return; } fi _rc_service=${0##*/[SK][0-9][0-9]} @@ -133,7 +140,7 @@ _rc_status_all=0 _rc_todo=$1 -function rc_check () +rc_check () { _rc_status_ret=$? test $_rc_status_ret -eq 0 || _rc_status=$_rc_status_ret @@ -141,7 +148,7 @@ return $_rc_status_ret } -function rc_reset () +rc_reset () { _rc_status=0 _rc_status_all=0 @@ -150,7 +157,7 @@ } if test "$_rc_todo" = "status" ; then -function rc_status () +rc_status () { rc_check _rc_status_ret=$_rc_status @@ -183,7 +190,7 @@ return $_rc_status_ret } elif test -n "$_rc_todo" ; then -function rc_status () +rc_status () { rc_check test "$_rc_status" -gt 7 && rc_failed 1 @@ -227,7 +234,7 @@ return $_rc_status_ret } else -function rc_status () +rc_status () { rc_check _rc_status_ret=$_rc_status @@ -258,7 +265,7 @@ } fi -function rc_failed () +rc_failed () { rc_reset case "$1" in @@ -269,12 +276,12 @@ return $_rc_status } -function rc_exit () +rc_exit () { exit $_rc_status_all } -function rc_confirm() +rc_confirm() { local timeout="30" local answer="" @@ -299,7 +306,7 @@ return $ret } -function rc_active () +rc_active () { local x for x in /etc/init.d/*.d/S[0-9][0-9]${1} ; do @@ -309,7 +316,7 @@ return 1 } -function rc_splash() +rc_splash() { return 0 } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org