Hello community, here is the log from the commit of package bash for openSUSE:Factory checked in at 2013-01-11 15:53:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bash (Old) and /work/SRC/openSUSE:Factory/.bash.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bash", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/bash/bash.changes 2012-11-10 16:54:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.bash.new/bash.changes 2013-01-11 15:53:47.000000000 +0100 @@ -1,0 +2,26 @@ +Wed Jan 9 08:55:09 UTC 2013 - [email protected] + +- Avoid autoconf on older products +- Apply audit patch variant to readline as well as we use a shared + libreadline +- Avoid bash-devel on older products as older GNU make do not have + a realpath builtin + +------------------------------------------------------------------- +Tue Jan 8 17:43:01 UTC 2013 - [email protected] + +- Do not trigger the export of COLUMNS or LINES due enforced + checkwinsize (bnc#793536) + +------------------------------------------------------------------- +Tue Jan 8 14:57:17 UTC 2013 - [email protected] + +- Update bash 4.2 to patch level 42 + * Missing I/O errors if output redirection applied to builtin + commands when the file descriptor was closed + * Process substitution incorrectly inherited a flag that + inhibited using the temporary environment for variable lookups + if it was providing the filename to a redirection. + * Compilation failed after specifying the `minimal config' option + +------------------------------------------------------------------- New: ---- audit-rl-patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bash.spec ++++++ --- /var/tmp/diff_new_pack.FK1jog/_old 2013-01-11 15:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.FK1jog/_new 2013-01-11 15:53:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bash # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -88,6 +88,7 @@ Patch30: readline-6.2-destdir.patch Patch40: bash-4.1-bash.bashrc.dif Patch42: audit-patch +Patch43: audit-rl-patch Patch46: man2html-no-timestamp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %global _sysconfdir /etc @@ -132,6 +133,7 @@ Provides translations to the package bash %endif +%if 0%suse_version >= 1100 %package -n bash-devel Summary: Include Files mandatory for Development of bash loadable builtins Group: Development/Languages/C and C++ @@ -142,6 +144,7 @@ This package contains the C header files for writing loadable new builtins for the interpreter Bash. Use -I /usr/include/bash/<version> on the compilers command line. +%endif %package -n bash-loadables Summary: Loadable bash builtins @@ -209,7 +212,7 @@ Provides: bash:/%{_lib}/libreadline.so.%{rl_major} Version: 6.2 Release: 0 -%if %suse_version > 1020 +%if 0%suse_version > 1020 Recommends: readline-doc = %{version} %endif # bug437293 @@ -233,7 +236,7 @@ Release: 0 Requires: libreadline6 = %{version} Requires: ncurses-devel -%if %suse_version > 1020 +%if 0%suse_version > 1020 Recommends: readline-doc = %{version} %endif # bug437293 @@ -253,7 +256,7 @@ PreReq: %install_info_prereq Version: 6.2 Release: 0 -%if %suse_version > 1120 +%if 0%suse_version > 1120 BuildArch: noarch %endif @@ -295,7 +298,9 @@ #%patch25 -p0 -b .endpw %patch26 -p0 -b .msgdy %patch40 -p0 -b .bashrc +%if 0%suse_version >= 1100 %patch42 -p1 -b .audit +%endif %patch46 -p0 -b .notimestamp %patch0 -p0 -b .0 pushd ../readline-%{rl_vers}%{extend} @@ -312,6 +317,9 @@ %patch26 -p2 -b .msgdy %patch27 -p0 -b .xm %patch30 -p0 -b .destdir +%if 0%suse_version >= 1100 +%patch43 -p1 -b .audit +%endif %patch20 -p0 -b .0 %build @@ -323,7 +331,9 @@ MACHTYPE=${CPU}-suse-linux export LANG LC_ALL HOSTTYPE MACHTYPE pushd ../readline-%{rl_vers}%{extend} +%if 0%suse_version >= 1100 autoconf +%endif cflags () { local flag=$1; shift @@ -422,7 +432,9 @@ CC_FOR_BUILD="$CC" CFLAGS_FOR_BUILD="$CFLAGS" export CC_FOR_BUILD CFLAGS_FOR_BUILD CFLAGS LDFLAGS CC +%if 0%suse_version >= 1100 autoconf +%endif # # We have a malloc with our glibc # @@ -623,6 +635,7 @@ %doc %{_mandir}/man1/rbash.1.gz %doc %{_defaultdocdir}/bash/ +%if 0%suse_version >= 1100 %files -n bash-devel %defattr(-,root,root) %dir /%{_includedir}/bash/ @@ -630,6 +643,7 @@ %dir /%{_includedir}/bash/%{bash_vers}/builtins/ /%{_incdir}/bash/%{bash_vers}/*.h /%{_incdir}/bash/%{bash_vers}/builtins/*.h +%endif %files -n bash-loadables %defattr(-,root,root) ++++++ audit-rl-patch ++++++ --- readline-6.2/config.h.in +++ readline-6.2/config.h.in 2013-01-09 09:31:06.833952652 +0000 @@ -251,6 +251,9 @@ #undef CTYPE_NON_ASCII +/* Define if you have <linux/audit.h> and it defines AUDIT_USER_TTY */ +#undef HAVE_DECL_AUDIT_USER_TTY + /* modify settings or make new ones based on what autoconf tells us. */ /* Ultrix botches type-ahead when switching from canonical to --- readline-6.2/configure.in +++ readline-6.2/configure.in 2013-01-09 09:33:09.125452625 +0000 @@ -159,6 +159,8 @@ AC_CHECK_HEADERS(sys/ptem.h,,, AC_SYS_LARGEFILE +AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include <linux/audit.h>]]) + BASH_SYS_SIGNAL_VINTAGE BASH_SYS_REINSTALL_SIGHANDLERS --- readline-6.2/readline.c +++ readline-6.2/readline.c 2009-01-21 16:40:12.000000000 +0000 @@ -55,6 +55,12 @@ extern int errno; #endif /* !errno */ +#if defined (HAVE_DECL_AUDIT_USER_TTY) +# include <sys/socket.h> +# include <linux/audit.h> +# include <linux/netlink.h> +#endif + /* System-specific feature definitions and include files. */ #include "rldefs.h" #include "rlmbutil.h" @@ -297,7 +303,47 @@ rl_set_prompt (prompt) rl_visible_prompt_length = rl_expand_prompt (rl_prompt); return 0; } - + +#if defined (HAVE_DECL_AUDIT_USER_TTY) +/* Report STRING to the audit system. */ +static void +audit_tty (char *string) +{ + struct sockaddr_nl addr; + struct msghdr msg; + struct nlmsghdr nlm; + struct iovec iov[2]; + size_t size; + int fd; + + size = strlen (string) + 1; + fd = socket (AF_NETLINK, SOCK_RAW, NETLINK_AUDIT); + if (fd < 0) + return; + nlm.nlmsg_len = NLMSG_LENGTH (size); + nlm.nlmsg_type = AUDIT_USER_TTY; + nlm.nlmsg_flags = NLM_F_REQUEST; + nlm.nlmsg_seq = 0; + nlm.nlmsg_pid = 0; + iov[0].iov_base = &nlm; + iov[0].iov_len = sizeof (nlm); + iov[1].iov_base = string; + iov[1].iov_len = size; + addr.nl_family = AF_NETLINK; + addr.nl_pid = 0; + addr.nl_groups = 0; + msg.msg_name = &addr; + msg.msg_namelen = sizeof (addr); + msg.msg_iov = iov; + msg.msg_iovlen = 2; + msg.msg_control = NULL; + msg.msg_controllen = 0; + msg.msg_flags = 0; + (void)sendmsg (fd, &msg, 0); + close (fd); +} +#endif + /* Read a line of input. Prompt with PROMPT. An empty PROMPT means none. A return value of NULL means that EOF was encountered. */ char * @@ -348,6 +394,11 @@ readline (prompt) RL_SETSTATE (RL_STATE_CALLBACK); #endif +#if defined (HAVE_DECL_AUDIT_USER_TTY) + if (value != NULL) + audit_tty (value); +#endif + return (value); } ++++++ bash-4.2-patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash42-040 new/bash-4.2-patches/bash42-040 --- old/bash-4.2-patches/bash42-040 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash42-040 2012-12-31 17:58:35.000000000 +0100 @@ -0,0 +1,56 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-040 + +Bug-Reported-by: Andrey Zaitsev <[email protected]> +Bug-Reference-ID: <caezvqt5pj1mb_zh8lt5qz8sv+-9q6hgfq5du9zxdj+gv7xb...@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-04/msg00144.html + +Bug-Description: + +Output redirection applied to builtin commands missed I/O errors if +they happened when the file descriptor was closed, rather than on write +(e.g., like with an out-of-space error on a remote NFS file system). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/redir.c 2011-01-02 16:00:31.000000000 -0500 +--- redir.c 2012-04-24 20:42:12.000000000 -0400 +*************** +*** 1092,1099 **** + #if defined (BUFFERED_INPUT) + check_bash_input (redirector); +! close_buffered_fd (redirector); + #else /* !BUFFERED_INPUT */ +! close (redirector); + #endif /* !BUFFERED_INPUT */ + } + break; +--- 1092,1101 ---- + #if defined (BUFFERED_INPUT) + check_bash_input (redirector); +! r = close_buffered_fd (redirector); + #else /* !BUFFERED_INPUT */ +! r = close (redirector); + #endif /* !BUFFERED_INPUT */ ++ if (r < 0 && (flags & RX_INTERNAL) && (errno == EIO || errno == ENOSPC)) ++ REDIRECTION_ERROR (r, errno, -1); + } + break; +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 39 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 40 + + #endif /* _PATCHLEVEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash42-041 new/bash-4.2-patches/bash42-041 --- old/bash-4.2-patches/bash42-041 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash42-041 2012-12-31 17:58:49.000000000 +0100 @@ -0,0 +1,47 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-041 + +Bug-Reported-by: Andrey Borzenkov <[email protected]> +Bug-Reference-ID: <[email protected]> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-12/msg00008.html + +Bug-Description: + +Process substitution incorrectly inherited a flag that inhibited using the +(local) temporary environment for variable lookups if it was providing +the filename to a redirection. The intent the flag is to enforce the +Posix command expansion ordering rules. + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/subst.c 2012-07-14 15:53:20.000000000 -0400 +--- subst.c 2012-12-02 22:26:54.000000000 -0500 +*************** +*** 5125,5128 **** +--- 5129,5136 ---- + #endif /* HAVE_DEV_FD */ + ++ /* subshells shouldn't have this flag, which controls using the temporary ++ environment for variable lookups. */ ++ expanding_redir = 0; ++ + result = parse_and_execute (string, "process substitution", (SEVAL_NONINT|SEVAL_NOHIST)); + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 40 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 41 + + #endif /* _PATCHLEVEL_H_ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bash-4.2-patches/bash42-042 new/bash-4.2-patches/bash42-042 --- old/bash-4.2-patches/bash42-042 1970-01-01 01:00:00.000000000 +0100 +++ new/bash-4.2-patches/bash42-042 2012-12-31 17:59:01.000000000 +0100 @@ -0,0 +1,57 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 4.2 +Patch-ID: bash42-042 + +Bug-Reported-by: Adam Pippin <[email protected]> +Bug-Reference-ID: <capybnhr6uczfoowsrdujj6kp3ju0j1bkesa_cmb7iu+kzwd...@mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-11/msg00087.html + +Bug-Description: + +Compilation failed after specifying the `--enable-minimal-config' option to +configure (more specifically, specifying `--disable-alias'). + +Patch (apply with `patch -p0'): + +*** ../bash-4.2-patched/parse.y 2012-07-08 21:53:33.000000000 -0400 +--- parse.y 2012-10-14 20:20:34.000000000 -0400 +*************** +*** 2394,2397 **** +--- 2392,2396 ---- + to consume the quoted newline and move to the next character in + the expansion. */ ++ #if defined (ALIAS) + if (expanding_alias () && shell_input_line[shell_input_line_index+1] == '\0') + { +*************** +*** 2404,2408 **** + goto next_alias_char; /* and get next character */ + } +! else + goto restart_read; + } +--- 2403,2408 ---- + goto next_alias_char; /* and get next character */ + } +! else +! #endif + goto restart_read; + } + +*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010 +--- patchlevel.h Thu Feb 24 21:41:34 2011 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 41 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 42 + + #endif /* _PATCHLEVEL_H_ */ ++++++ bash-4.2.dif ++++++ --- /var/tmp/diff_new_pack.FK1jog/_old 2013-01-11 15:53:51.000000000 +0100 +++ /var/tmp/diff_new_pack.FK1jog/_new 2013-01-11 15:53:51.000000000 +0100 @@ -73,15 +73,6 @@ /* The pipeline currently being built. */ PROCESS *the_pipeline = (PROCESS *)NULL; -@@ -215,7 +215,7 @@ int already_making_children = 0; - - /* If this is non-zero, $LINES and $COLUMNS are reset after every process - exits from get_tty_state(). */ --int check_window_size; -+int check_window_size = 1; - - /* Functions local to this file. */ - --- jobs.h +++ jobs.h 2006-03-27 12:15:25.000000000 +0000 @@ -165,7 +165,7 @@ extern pid_t fork (), getpid (), getpgrp -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
