.

OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=148

bash-3.2-longjmp.dif

@@ -12,19 +12,19 @@
    /* We have committed to attempting to execute the contents of this file
       as shell commands. */
  
-+#if 1
++#if defined(BNC382214) && (BNC382214 == 1)
 +  larray = strvec_len(args) + 1;
 +  args = strvec_resize(args, larray + 1);
 +
 +  for (i = larray - 1; i; i--)
 +    args[i] = args[i - 1];
 +
-+  args[0] = savestring(_PATH_BSHELL);
++  args[0] = current_user.shell ? current_user.shell : savestring(_PATH_BSHELL);
 +  args[1] = command;
 +  args[larray] = (char *)0;
 +
 +  SETOSTYPE (0);		/* Some systems use for USG/POSIX semantics */
-+  execve ("/bin/sh", args, env);
++  execve (args[0], args, env);
 +  SETOSTYPE (1);
 +
 +  internal_error (_("%s: cannot execute: %s"), command, strerror (errno));

bash-4.2-patches.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:251f7aa87048b2ad274e6006e234a1d6270bc074cc779308c2117dcf17f73723
+oid sha256:441c0e7f90b24072c6acf50d14da277a5854e7f4446b03b2faae5c4748eb6c5f
-size 25471
+size 26485

bash.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Fri Mar 15 15:35:51 UTC 2013 - werner@suse.de
+
+- Disable workaround for bnc#382214 due bnc#806628, let's see when
+  the old bug will be up again.
+- Update bash 4.2 to patch level 45
+  * When SIGCHLD is trapped, and a SIGCHLD trap handler runs when
+    a pending `read -t' invocation times out and generates SIGALRM,
+    bash can crash with a segmentation fault.
+  * When converting a multibyte string to a wide character string
+    as part of pattern matching, bash does not handle the end of
+    the string correctly, causing the search for the NUL to go
+    beyond the end of the string and reference random memory.
+    Depending on the contents of that memory, bash can produce
+    errors or crash. 
+  * The <&n- and >&n- redirections, which move one file descriptor
+    to another, leave the file descriptor closed when applied to
+    builtins or compound commands.
+- Use screen to provide a controlling terminal for running the
+  test suite
+
 -------------------------------------------------------------------
 Tue Feb 12 07:58:08 UTC 2013 - schwab@suse.de
 

bash.spec

@@ -27,6 +27,7 @@ BuildRequires:  fdupes
 BuildRequires:  makeinfo
 %endif
 BuildRequires:  ncurses-devel
+BuildRequires:  screen
 %define         bash_vers 4.2
 %define         rl_vers   6.2
 %define         extend    ""
@@ -73,6 +74,7 @@ Patch11:        bash-4.0-loadables.dif
 Patch12:        bash-4.1-completion.dif
 Patch13:        bash-4.2-nscdunmap.dif
 Patch14:        bash-4.2-sigrestart.patch
+# PATCH-FIX-UPSTREAM bnc#382214 -- disabled due bnc#806628 by -DBNC382214=0
 Patch15:        bash-3.2-longjmp.dif
 Patch16:        bash-4.0-setlocale.dif
 Patch17:        bash-4.0-headers.dif
@@ -329,6 +331,22 @@ done
   LANG=POSIX
   LC_ALL=$LANG
   unset LC_CTYPE
+  SCREENDIR=$(mktemp -d ${PWD}/screen.XXXXXX) || exit 1
+  SCREENRC=${SCREENDIR}/bash
+  export SCREENRC SCREENDIR
+  exec 0< /dev/null
+  SCREENLOG=${SCREENDIR}/log
+  cat > $SCREENRC<<-EOF
+	deflogin off
+	logfile $SCREENLOG
+	logfile flush 1
+	logtstamp off
+	log on
+	setsid on
+	scrollback 0
+	silence on
+	utf8 on
+	EOF
   CPU=$(uname -m 2> /dev/null)
   HOSTTYPE=${CPU}
   MACHTYPE=${CPU}-suse-linux
@@ -387,6 +405,7 @@ pushd ../readline-%{rl_vers}%{extend}
   cflags -Wno-unused-parameter   CFLAGS
   cflags -ftree-loop-linear      CFLAGS
   cflags -pipe                   CFLAGS
+  cflags -DBNC382214=0           CFLAGS
   cflags -Wl,--as-needed         LDFLAGS
   cflags -Wl,-O2                 LDFLAGS
   cflags -Wl,--hash-size=8599    LDFLAGS
@@ -509,9 +528,13 @@ popd
 	--enable-separate-helpfiles=%{_datadir}/bash/helpfiles \
 	$READLINE
   make %{?do_profiling:CFLAGS="$CFLAGS %cflags_profile_generate"} \
-      all printenv recho zecho xcase
+	all printenv recho zecho xcase
   TMPDIR=$(mktemp -d /tmp/bash.XXXXXXXXXX) || exit 1
-  env -i HOME=$PWD TERM=$TERM LD_LIBRARY_PATH=$LD_LIBRARY_PATH TMPDIR=$TMPDIR make TESTSCRIPT=%{SOURCE4} check
+  > $SCREENLOG
+  env -i HOME=$PWD TERM=$TERM LD_LIBRARY_PATH=$LD_LIBRARY_PATH TMPDIR=$TMPDIR \
+	SCREENRC=$SCREENRC SCREENDIR=$SCREENDIR \
+	screen -L -D -m make TESTSCRIPT=%{SOURCE4} check
+  cat $SCREENLOG
   make %{?do_profiling:CFLAGS="$CFLAGS %cflags_profile_feedback" clean} all
   make -C examples/loadables/
   make documentation

run-tests

@@ -20,7 +20,7 @@ echo Any output from any test, unless otherwise noted, indicates a possible anom
 for x in run-*
 do
 	case $x in
-	$0|run-all|run-minimal|run-gprof|run-jobs|run-ifs-posix) ;;
+	$0|run-all|run-minimal|run-gprof|run-jobs) ;;
 	*.orig|*~) ;;
 	*)	echo $x ; sh $x ;;
 	esac
@@ -40,4 +40,8 @@ time while ((count-- > 0)) ; do
 	${THIS_SH} -c $tmp
 done
 echo '#########################'
+set -x
+read -t1 < /dev/tty
+set +x
+echo '#########################'
 exit 0