Hello community,
here is the log from the commit of package bash.647 for openSUSE:12.2:Update checked in at 2012-07-23 15:34:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.2:Update/bash.647 (Old)
and /work/SRC/openSUSE:12.2:Update/.bash.647.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bash.647", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2012-07-06 19:40:38.919402255 +0200
+++ /work/SRC/openSUSE:12.2:Update/.bash.647.new/bash.changes 2012-07-23 15:34:07.000000000 +0200
@@ -0,0 +1,1682 @@
+-------------------------------------------------------------------
+Wed Jul 11 06:36:05 UTC 2012 - werner@suse.de
+
+- Avoid possible buffer overflow when expanding the /dev/fd prefix
+ with e.g. the test builtin (bnc#770795)
+
+-------------------------------------------------------------------
+Tue Jun 26 12:49:53 UTC 2012 - cfarrell@suse.com
+
+- license update: GPL-3.0+
+ Upstream declares the bash license to be GPL-3.0+ - not GPL-2.0+
+
+-------------------------------------------------------------------
+Mon Jun 11 11:51:12 UTC 2012 - werner@suse.de
+
+- Enable auditing patch by simply applying it
+
+-------------------------------------------------------------------
+Wed May 23 23:37:53 UTC 2012 - meissner@suse.com
+
+- added auditing patch from
+ http://git.savannah.gnu.org/cgit/bash.git/plain/CWRU/audit-patch
+
+-------------------------------------------------------------------
+Thu Apr 5 11:48:02 UTC 2012 - werner@suse.de
+
+- Remove not required patch (was a fix for bnc#141394) which now
+ cause a wrong behaviour if applied (bnc#755453)
+
+-------------------------------------------------------------------
+Tue Mar 13 09:34:58 UTC 2012 - werner@suse.de
+
+- Update bash 4.2 to patch level 24
+
+-------------------------------------------------------------------
+Fri Mar 9 17:44:52 UTC 2012 - werner@suse.de
+
+- Avoid endless loop in user completion caused by endpw patches
+
+-------------------------------------------------------------------
+Tue Mar 6 12:15:18 UTC 2012 - werner@suse.de
+
+- Add small patch for be able to use nanoseconds in comparision
+ of time stamps of files (bnc#750640)
+
+-------------------------------------------------------------------
+Tue Mar 6 09:33:30 UTC 2012 - werner@suse.de
+
+- Reenable patch for bnc#725657 with latest change from latest
+ git repository of the patch.
+
+-------------------------------------------------------------------
+Tue Dec 20 20:01:48 UTC 2011 - coolo@suse.com
+
+- add autoconf as buildrequire to avoid implicit dependency
+
+-------------------------------------------------------------------
+Mon Dec 19 14:34:41 UTC 2011 - coolo@suse.de
+
+- remove suse_update_config calls - obsolete
+
+-------------------------------------------------------------------
+Fri Nov 25 17:08:30 UTC 2011 - werner@suse.de
+
+- Make build check quiet
+
+-------------------------------------------------------------------
+Fri Nov 25 16:32:14 UTC 2011 - werner@suse.de
+
+- Update bash 4.2 to patch level 20
+- Update readline 6.2 to patch level 2
+
+-------------------------------------------------------------------
+Mon Nov 21 15:35:05 UTC 2011 - werner@suse.de
+
+- Disable endpwent() in rl_username_completion_function() as this
+ cause a deadlock in a futex of the glibc (bnc#731556)
+
+-------------------------------------------------------------------
+Fri Nov 18 12:03:56 UTC 2011 - werner@suse.de
+
+- Enforce bind references to global function symbols to the
+ definition within libreadline
+
+-------------------------------------------------------------------
+Wed Nov 16 11:11:21 UTC 2011 - werner@suse.de
+
+- Use libtinfo if available otherwise libncurses, this avoids
+ linkage against libncursesw of libreadline (required due
+ bnc #729226)
+
+-------------------------------------------------------------------
+Fri Nov 11 15:27:12 UTC 2011 - werner@suse.de
+
+- Avoid memory mapped /var/run/nscd/passwd at shutdown by simply
+ unmapping this only used area if parent is systemd or SysVinit
+
+-------------------------------------------------------------------
+Fri Nov 11 13:45:40 UTC 2011 - werner@suse.de
+
+- Always close get(pw|gr)func with endpw() respectivly with endgr()
+ to avoid memory mapped passwd/groups of cache files from nscd
+
+-------------------------------------------------------------------
+Wed Nov 2 08:23:24 UTC 2011 - werner@suse.de
+
+- Disable last patch as it seems a bit broken (bnc#725657)
+
+-------------------------------------------------------------------
+Tue Oct 25 17:11:23 UTC 2011 - werner@suse.de
+
+- Add direxpand patch from upstream (bnc#725657)
+
+-------------------------------------------------------------------
+Fri Oct 7 15:01:42 UTC 2011 - werner@suse.de
+
+- Add patch from upstream mailing list to avoid memory leak by
+ reassigning associative array variable
+
+-------------------------------------------------------------------
+Mon Sep 19 14:59:39 UTC 2011 - coolo@suse.com
+
+- remove autoreqprov and author lists
+
+-------------------------------------------------------------------
+Tue Jun 21 18:58:56 CEST 2011 - werner@suse.de
+
+- Add fix from upstream mailing list to avoid crash
+
+-------------------------------------------------------------------
+Fri Jun 17 11:43:00 UTC 2011 - coolo@novell.com
+
+- use original source URLs
+
+-------------------------------------------------------------------
+Thu Jun 16 15:03:04 CEST 2011 - werner@suse.de
+
+- Fix the fix for bug bnc#681286 to be able to avoid both a not
+ expanding glob as well as the infinit loop in multi byte locale
+
+-------------------------------------------------------------------
+Thu May 12 12:04:28 CEST 2011 - werner@suse.de
+
+- Update bash 4.2 to patch level 10
+- Add patch from upstream to avoid loosing quoted-nulls
+- Add modified patch to avod endless loop in UTF-8 locale
+
+-------------------------------------------------------------------
+Tue Mar 22 13:16:43 CET 2011 - werner@suse.de
+
+- Remove patch to avod endless loop in UTF-8 locale as it breaks
+ glob expanding (bnc#681286)
+
+-------------------------------------------------------------------
+Tue Mar 15 18:28:58 CET 2011 - werner@suse.de
+
+- Update bash 4.2 to patch level 8
+- Add Ctr-C patch from upstream
+- Add fix for endless loop in UTF-8 locale
+
+-------------------------------------------------------------------
+Wed Mar 9 12:00:48 CET 2011 - werner@suse.de
+
+- Avoid siglongjmp, compare with
+ http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00070.html
+ use temprary solution from Chet
+
+-------------------------------------------------------------------
+Tue Mar 8 18:47:59 CET 2011 - werner@suse.de
+
+- Much better solution for saving history for system with sigsetjmp
+
+-------------------------------------------------------------------
+Tue Mar 8 12:51:29 CET 2011 - werner@suse.de
+
+- Reintroduce history saving at SIGHUP
+
+-------------------------------------------------------------------
+Tue Mar 7 15:25:33 CET 2011 - werner@suse.de
+
+- Update bash 4.2 to patch level 7
+
+-------------------------------------------------------------------
+Thu Feb 17 10:08:53 UTC 2011 - coolo@novell.com
+
+- having a bash man page is recommended (bnc#672528)
+
+-------------------------------------------------------------------
+Mon Feb 14 16:50:00 CET 2011 - werner@suse.de
+
+- Update to bash 4.2 -- changelog see entry for bash 4.2 rc1
+
+-------------------------------------------------------------------
+Mon Jan 17 16:19:59 CET 2011 - werner@suse.de
+
+- Update to bash 4.2 rc1
+ * `exec -a foo' now sets $0 to `foo' in an executable shell script
++++ 1485 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.2:Update/.bash.647.new/bash.changes
New:
----
audit-patch
baselibs.conf
bash-2.03-manual.patch
bash-3.0-decl.patch
bash-3.0-evalexp.patch
bash-3.0-warn-locale.patch
bash-3.2-longjmp.dif
bash-3.2-printf.patch
bash-4.0-async-bnc523667.dif
bash-4.0-headers.dif
bash-4.0-loadables.dif
bash-4.0-security.patch
bash-4.0-setlocale.dif
bash-4.1-bash.bashrc.dif
bash-4.1-completion.dif
bash-4.2-2.4.4.patch
bash-4.2-endpw.dif
bash-4.2-history-myown.dif.bz2
bash-4.2-nscdunmap.dif
bash-4.2-nsec.dif
bash-4.2-patches.tar.bz2
bash-4.2-sigrestart.patch
bash-4.2.dif
bash-4.2.tar.gz
bash-rpmlintrc
bash.changes
bash.spec
bash42-033-bnc770795.patch
dot.bashrc
dot.profile
man2html-no-timestamp.patch
readline-4.3-input.dif
readline-5.2-conf.patch
readline-6.1-wrap.patch
readline-6.2-destdir.patch
readline-6.2-endpw.dif
readline-6.2-metamode.patch
readline-6.2-patches.tar.bz2
readline-6.2.dif
readline-6.2.tar.gz
run-tests
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bash.spec ++++++
++++ 645 lines (skipped)
++++++ audit-patch ++++++
diff -up bash-4.0/config.h.in.audit bash-4.0/config.h.in
--- bash-4.0/config.h.in.audit 2009-01-21 11:34:34.000000000 -0500
+++ bash-4.0/config.h.in 2009-01-21 11:34:35.000000000 -0500
@@ -1077,6 +1077,14 @@
/* End additions for lib/intl */
+
+/* Additions for lib/readline */
+
+/* Define if you have and it defines AUDIT_USER_TTY */
+#undef HAVE_DECL_AUDIT_USER_TTY
+
+/* End additions for lib/readline */
+
#include "config-bot.h"
#endif /* _CONFIG_H_ */
diff -up bash-4.0/configure.in.audit bash-4.0/configure.in
--- bash-4.0/configure.in.audit 2009-01-21 11:34:34.000000000 -0500
+++ bash-4.0/configure.in 2009-01-21 11:34:35.000000000 -0500
@@ -875,6 +875,8 @@ BASH_FUNC_DUP2_CLOEXEC_CHECK
BASH_SYS_PGRP_SYNC
BASH_SYS_SIGNAL_VINTAGE
+AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include ]])
+
dnl checking for the presence of certain library symbols
BASH_SYS_ERRLIST
BASH_SYS_SIGLIST
diff -up bash-4.0/lib/readline/readline.c.audit bash-4.0/lib/readline/readline.c
--- bash-4.0/lib/readline/readline.c.audit 2009-01-21 11:34:34.000000000 -0500
+++ bash-4.0/lib/readline/readline.c 2009-01-21 11:40:12.000000000 -0500
@@ -55,6 +55,12 @@
extern int errno;
#endif /* !errno */
+#if defined (HAVE_DECL_AUDIT_USER_TTY)
+# include
+# include
+# include
+#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);
}
++++++ baselibs.conf ++++++
libreadline6
obsoletes "readline-<targettype> <= <version>"
provides "readline-<targettype> = <version>"
targettype x86 package bash
+^/bin/bash$
+^/bin/sh$
prereq -glibc-x86
readline-devel
requires -readline-<targettype>
requires "libreadline6-<targettype> = <version>"
++++++ bash-2.03-manual.patch ++++++
--- doc/bash.1
+++ doc/bash.1 2004-10-25 17:29:54.000000000 +0000
@@ -115,6 +115,12 @@ processing, then commands are read from
This option allows the positional parameters to be set
when invoking an interactive shell.
.TP
+.B \-v
+Print shell input lines as they are read.
+.TP
+.B \-x
+Print commands and their arguments as they are executed.
+.TP
.B \-D
A list of all double-quoted strings preceded by \fB$\fP
is printed on the standard output.
@@ -6211,6 +6217,11 @@ Apply the following `\fBs\fP' modifier o
.SH "SHELL BUILTIN COMMANDS"
.\" start of bash_builtins
.zZ
+.if !dFN \{\
+.de FN
+\fI\|\\$1\|\fP
+..
+.\}
.PP
Unless otherwise noted, each builtin command documented in this
section as accepting options preceded by
@@ -9205,6 +9216,11 @@ process or job waited for.
.SH "RESTRICTED SHELL"
.\" rbash.1
.zY
+.if !dFN \{\
+.de FN
+\fI\|\\$1\|\fP
+..
+.\}
.PP
If
.B bash
--- doc/builtins.1
+++ doc/builtins.1 2004-10-25 17:29:20.000000000 +0000
@@ -12,6 +12,6 @@ shift, shopt, source, suspend, test, tim
ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
.SH BASH BUILTIN COMMANDS
.nr zZ 1
-.so bash.1
+.so /usr/share/man/man1/bash.1
.SH SEE ALSO
bash(1), sh(1)
--- doc/rbash.1
+++ doc/rbash.1 2004-10-25 17:29:20.000000000 +0000
@@ -3,6 +3,6 @@
rbash \- restricted bash, see \fBbash\fR(1)
.SH RESTRICTED SHELL
.nr zY 1
-.so bash.1
+.so /usr/share/man/man1/bash.1
.SH SEE ALSO
bash(1)
++++++ bash-3.0-decl.patch ++++++
--- support/printenv.c
+++ support/printenv.c 2005-09-19 13:09:08.000000000 +0000
@@ -30,6 +30,7 @@
#include "bashansi.h"
+#include
extern char **environ;
int
++++++ bash-3.0-evalexp.patch ++++++
--- expr.c
+++ expr.c 2004-07-30 14:39:48.000000000 +0000
@@ -410,8 +410,8 @@ expassign ()
value = expcond ();
if (curtok == EQ || curtok == OP_ASSIGN)
{
- int special, op;
- intmax_t lvalue;
+ int special, op = -1;
+ intmax_t lvalue = 0;
special = curtok == OP_ASSIGN;
++++++ bash-3.0-warn-locale.patch ++++++
--- locale.c
+++ locale.c 2004-09-03 10:56:10.000000000 +0000
@@ -29,6 +29,10 @@
#include "bashintl.h"
#include "bashansi.h"
#include
+#include
+#include
+#include
+#include
#include "chartypes.h"
#include
@@ -68,6 +72,15 @@ void
set_default_locale ()
{
#if defined (HAVE_SETLOCALE)
+ struct stat st;
+
+ if (stat("/usr/lib/locale/locale-archive", &st) == 0 && st.st_size == 0) {
+ errno = EINVAL;
+ sys_error("set_default_locale: broken locale");
+ fprintf (stderr, "%s: Please remove /usr/lib/locale/locale-archive\n",
+ get_name_for_error());
+ sleep(1);
+ }
default_locale = setlocale (LC_ALL, "");
if (default_locale)
default_locale = savestring (default_locale);
++++++ bash-3.2-longjmp.dif ++++++
--- execute_cmd.c
+++ execute_cmd.c 2008-04-28 01:38:19.000000000 +0000
@@ -25,6 +25,7 @@
#endif /* _AIX && RISC6000 && !__GNUC__ */
#include
+#include
#include "chartypes.h"
#include "bashtypes.h"
#if !defined (_MINIX) && defined (HAVE_SYS_FILE_H)
@@ -4764,6 +4765,23 @@ shell_execve (command, args, env)
/* We have committed to attempting to execute the contents of this file
as shell commands. */
+#if 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[1] = command;
+ args[larray] = (char *)0;
+
+ SETOSTYPE (0); /* Some systems use for USG/POSIX semantics */
+ execve ("/bin/sh", args, env);
+ SETOSTYPE (1);
+
+ internal_error (_("%s: cannot execute: %s"), command, strerror (errno));
+#else
initialize_subshell ();
set_sigint_handler ();
@@ -4806,6 +4824,8 @@ shell_execve (command, args, env)
longjmp (subshell_top_level, 1);
/*NOTREACHED*/
+#endif
+ return (EX_NOEXEC);
}
static int
++++++ bash-3.2-printf.patch ++++++
--- builtins/printf.def
+++ builtins/printf.def 2006-07-27 15:11:19.000000000 +0000
@@ -47,6 +47,7 @@ error occurs.
$END
#include
+#include
#include "../bashtypes.h"
@@ -529,12 +530,20 @@ printf_builtin (list)
case 'A':
#endif
{
- char *f;
+ char *f, *lce = getenv("LC_NUMERIC"), *lcl = setlocale(LC_NUMERIC, NULL);
floatmax_t p;
p = getfloatmax ();
f = mklong (start, FLOATMAX_CONV, sizeof(FLOATMAX_CONV) - 1);
+
+ if (lce && lcl)
+ setlocale(LC_NUMERIC, lce);
+
PF (f, p);
+
+ if (lce && lcl)
+ setlocale(LC_NUMERIC, lcl);
+
break;
}
++++++ bash-4.0-async-bnc523667.dif ++++++
--- jobs.c
+++ jobs.c 2009-09-09 17:38:46.286401756 +0200
@@ -626,6 +626,7 @@ stop_pipeline (async, deferred)
if (newjob)
{
newjob->flags |= J_FOREGROUND;
+#if !defined(__linux__)
/*
* !!!!! NOTE !!!!! (chet@ins.cwru.edu)
*
@@ -640,6 +641,7 @@ stop_pipeline (async, deferred)
*/
if (job_control && newjob->pgrp && (subshell_environment&SUBSHELL_ASYNC) == 0)
maybe_give_terminal_to (shell_pgrp, newjob->pgrp, 0);
+#endif
}
}
++++++ bash-4.0-headers.dif ++++++
--- examples/loadables/Makefile.in
+++ examples/loadables/Makefile.in 2009-06-09 16:16:25.000000000 +0000
@@ -28,6 +28,9 @@ includedir = @includedir@
datarootdir = @datarootdir@
+# Support an alternate destination root directory for package building
+DESTDIR =
+
topdir = @top_srcdir@
BUILD_DIR = @BUILD_DIR@
srcdir = @srcdir@
@@ -61,6 +64,16 @@ LIBINTL_H = @LIBINTL_H@
CCFLAGS = $(DEFS) $(LOCAL_DEFS) $(LOCAL_CFLAGS) $(CFLAGS)
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALLMODE= -m 0755
+INSTALLMODE2 = -m 0555
+
+Name = bash
+Version = @BASHVERS@
+
#
# These values are generated for configure by ${topdir}/support/shobj-conf.
# If your system is not supported by that script, but includes facilities for
@@ -79,20 +92,45 @@ INC = -I. -I.. -I$(topdir) -I$(topdir)/l
-I$(BASHINCDIR) -I$(BUILD_DIR) -I$(LIBBUILD) \
-I$(BUILD_DIR)/builtins $(INTL_INC)
+.SUFFIXES: .d
+.c.d:
+ $(SHOBJ_CC) $(SHOBJ_CFLAGS) $(CCFLAGS) $(INC) -MM -MT install-headers -MF $@ $<
+
.c.o:
$(SHOBJ_CC) $(SHOBJ_CFLAGS) $(CCFLAGS) $(INC) -c -o $@ $<
+SUPPORT_SRC = $(topdir)/support/
ALLPROG = print sleep finfo logname basename dirname \
tty pathchk tee head mkdir rmdir printenv id whoami \
uname sync push ln unlink cut realpath getconf strftime mypid
OTHERPROG = necho hello cat
+HEADERS =
all: $(SHOBJ_STATUS)
supported: $(ALLPROG)
others: $(OTHERPROG)
+dependlist: template.d
+-include template.d
+install-headers: HEADERS = $(sort $(filter %.h,$(realpath $^)))
+install-headers:
+ @${SHELL} $(SUPPORT_SRC)mkinstalldirs $(DESTDIR)$(includedir)/$(Name)/$(Version)/builtins
+ for head in $(subst $(realpath $(topdir))/,,$(HEADERS)) ; do \
+ case $$head in \
+ builtins/*) dest=$(DESTDIR)$(includedir)/$(Name)/$(Version)/builtins ;; \
+ *) dest=$(DESTDIR)$(includedir)/$(Name)/$(Version) ;; \
+ esac; \
+ $(INSTALL_DATA) -t $$dest $(topdir)/$$head; \
+ done
+
+install-plugins: $(ALLPROG)
+ @${SHELL} $(SUPPORT_SRC)mkinstalldirs $(DESTDIR)$(libdir)/$(Name)/$(Version)
+ for plugin in $(ALLPROG) ; do \
+ $(INSTALL) $$plugin $(DESTDIR)$(libdir)/$(Name)/$(Version)/$$plugin.so ; \
+ done
+
unsupported:
@echo "Your system (${host_os}) is not supported by the"
@echo "${topdir}/support/shobj-conf script."
++++++ bash-4.0-loadables.dif ++++++
++++ 692 lines (skipped)
++++++ bash-4.0-security.patch ++++++
--- variables.c
+++ variables.c 2009-12-04 09:31:06.579929599 +0000
@@ -1216,6 +1216,7 @@ static unsigned long rseed = 1;
static int last_random_value;
static int seeded_subshell = 0;
+#if !defined(linux)
/* A linear congruential random number generator based on the example
one in the ANSI C standard. This one isn't very good, but a more
complicated one is overkill. */
@@ -1264,6 +1265,32 @@ seedrand ()
sbrand (tv.tv_sec ^ tv.tv_usec ^ getpid ());
}
+#else
+/* Use ISO C Random Number Functions of the glibc */
+static int
+brand (void)
+{
+ if (rseed == 0)
+ seedrand ();
+ return rand() & 32767;
+}
+
+static void
+sbrand (unsigned long seed)
+{
+ rseed = seed;
+ srand(seed);
+}
+
+static void
+seedrand (void)
+{
+ struct timeval tv;
+ gettimeofday (&tv, NULL);
+ srand (tv.tv_sec ^ tv.tv_usec ^ getpid ());
+}
+#endif
+
static SHELL_VAR *
assign_random (self, value, unused, key)
SHELL_VAR *self;
++++++ bash-4.0-setlocale.dif ++++++
--- locale.c
+++ locale.c 2008-11-25 13:41:50.000000000 +0000
@@ -47,6 +47,7 @@ extern int dump_translatable_strings, du
/* The current locale when the program begins */
static char *default_locale;
+static char fallback[128];
/* The current domain for textdomain(3). */
static char *default_domain;
@@ -314,11 +315,21 @@ get_locale_var (var)
if (locale == 0 || *locale == 0)
locale = lang;
if (locale == 0 || *locale == 0)
-#if 0
- locale = default_locale; /* system-dependent; not really portable. should it be "C"? */
-#else
- locale = "";
-#endif
+ {
+ char *ptr;
+ if (default_locale && *default_locale && (ptr = strstr(default_locale, var)) && (ptr = strchr(ptr, '=')) && ++ptr)
+ {
+ memset (fallback, 0, sizeof(fallback));
+ strncpy(fallback, ptr, sizeof(fallback)-1);
+
+ if ((ptr = strchr(fallback, ';')))
+ *ptr = '\0';
+
+ locale = fallback;
+ }
+ else
+ locale = default_locale; /* system-dependent; not really portable. should it be "C"? */
+ }
return (locale);
}
++++++ bash-4.1-bash.bashrc.dif ++++++
|BNC#577221 - Non-login, interactive bash executes /etc/bash.bashrc
| yet not documented
|
|Jared Hudson 2010-02-04 22:47:01 UTC
|
|bash-3.2-147.4.1 executes /etc/bash.bashrc when invoking an interactive,
|non-login shell yet this is not documented. The man page should mention
|this in its INVOCATION section. I've checked the source code and it's
|hard coded to execute /etc/bash.bashrc (SYS_BASHRC macro)
|
--- doc/bash.1
+++ doc/bash.1 2010-02-18 09:47:36.864126675 +0000
@@ -323,8 +323,8 @@ exists.
.PP
When an interactive shell that is not a login shell is started,
.B bash
-reads and executes commands from \fI~/.bashrc\fP, if that file exists.
-This may be inhibited by using the
+reads and executes commands from \fI/etc/bash.bashrc\fP then \fI~/.bashrc\fP
+when those files exist and are readable. This may be inhibited by using the
.B \-\-norc
option.
The \fB\-\-rcfile\fP \fIfile\fP option will force
@@ -415,7 +415,8 @@ daemon, usually \fIrshd\fP, or the secur
If
.B bash
determines it is being run in this fashion, it reads and executes
-commands from \fI~/.bashrc\fP, if that file exists and is readable.
+commands from \fI/etc/bash.bashrc\fP then \fI~/.bashrc\fP when
+those files exist and are readable.
It will not do this if invoked as \fBsh\fP.
The
.B \-\-norc
++++++ bash-4.1-completion.dif ++++++
--- bashline.c
+++ bashline.c 2010-03-09 14:11:27.612626475 +0000
@@ -1700,6 +1700,13 @@ globword:
return ((char *)NULL);
}
+ if (GLOB_FAILED (glob_matches) || glob_matches == 0)
+ {
+ glob_ignore_case = old_glob_ignore_case;
+ glob_matches = (char **)NULL;
+ return ((char *)NULL);
+ }
+
while (val = glob_matches[local_index++])
{
if (executable_or_directory (val))
++++++ bash-4.2-2.4.4.patch ++++++
--- array.c
+++ array.c 2006-11-14 09:54:22.000000000 +0000
@@ -922,7 +922,7 @@ char *s, *sep;
* To make a running version, compile -DTEST_ARRAY and link with:
* xmalloc.o syntax.o lib/malloc/libmalloc.a lib/sh/libsh.a
*/
-int interrupt_immediately = 0;
+volatile sig_atomic_t interrupt_immediately = 0;
int
signal_is_trapped(s)
--- examples/loadables/tee.c
+++ examples/loadables/tee.c 2006-11-14 10:31:29.000000000 +0000
@@ -35,6 +35,7 @@
#include "bashansi.h"
#include
+#include
#include
#include "builtins.h"
@@ -56,7 +57,7 @@ static FLIST *tee_flist;
#define TEE_BUFSIZE 8192
-extern int interrupt_immediately;
+extern volatile sig_atomic_t interrupt_immediately;
extern char *strerror ();
--- hashlib.c
+++ hashlib.c 2006-11-14 09:54:36.000000000 +0000
@@ -381,7 +381,7 @@ hash_pstats (table, name)
HASH_TABLE *table, *ntable;
-int interrupt_immediately = 0;
+volatile sig_atomic_t interrupt_immediately = 0;
int
signal_is_trapped (s)
--- jobs.c
+++ jobs.c 2001-05-02 16:20:31.000000000 +0000
@@ -1769,6 +1769,15 @@ make_child (command, async_p)
pid_t mypid;
mypid = getpid ();
+
+ if (interrupt_state)
+ {
+ struct timeval tv;
+ struct rusage rx;
+ (void) gettimeofday(&tv, NULL);
+ (void) getrusage(RUSAGE_SELF, &rx);
+ }
+
#if defined (BUFFERED_INPUT)
/* Close default_buffered_input if it's > 0. We don't close it if it's
0 because that's the file descriptor used when redirecting input,
--- quit.h
+++ quit.h 2006-11-14 09:43:18.000000000 +0000
@@ -21,9 +21,13 @@
#if !defined (_QUIT_H_)
#define _QUIT_H_
+#define __need_sig_atomic_t
+#include
+#undef __need_sig_atomic_t
+
/* Non-zero means SIGINT has already ocurred. */
-extern volatile int interrupt_state;
-extern volatile int terminating_signal;
+extern volatile sig_atomic_t interrupt_state;
+extern volatile sig_atomic_t terminating_signal;
/* Macro to call a great deal. SIGINT just sets the interrupt_state variable.
When it is safe, put QUIT in the code, and the "interrupt" will take
--- sig.c
+++ sig.c 2006-11-14 09:53:51.000000000 +0000
@@ -66,13 +66,13 @@ extern int history_lines_this_session;
extern void initialize_siglist ();
/* Non-zero after SIGINT. */
-volatile int interrupt_state = 0;
+volatile sig_atomic_t interrupt_state = 0;
/* Non-zero after SIGWINCH */
-volatile int sigwinch_received = 0;
+volatile sig_atomic_t sigwinch_received = 0;
/* Set to the value of any terminating signal received. */
-volatile int terminating_signal = 0;
+volatile sig_atomic_t terminating_signal = 0;
/* The environment at the top-level R-E loop. We use this in
the case of error return. */
@@ -84,10 +84,10 @@ sigset_t top_level_mask;
#endif /* JOB_CONTROL */
/* When non-zero, we throw_to_top_level (). */
-int interrupt_immediately = 0;
+volatile sig_atomic_t interrupt_immediately = 0;
/* When non-zero, we call the terminating signal handler immediately. */
-int terminate_immediately = 0;
+volatile sig_atomic_t terminate_immediately = 0;
#if defined (SIGWINCH)
static SigHandler *old_winch = (SigHandler *)SIG_DFL;
--- sig.h
+++ sig.h 2006-11-14 09:49:32.000000000 +0000
@@ -108,11 +108,15 @@ do { \
#endif /* JOB_CONTROL */
+#define __need_sig_atomic_t
+#include
+#undef __need_sig_atomic_t
+
/* Extern variables */
-extern volatile int sigwinch_received;
+extern volatile sig_atomic_t sigwinch_received;
-extern int interrupt_immediately;
-extern int terminate_immediately;
+extern volatile sig_atomic_t interrupt_immediately;
+extern volatile sig_atomic_t terminate_immediately;
/* Functions from sig.c. */
extern sighandler termsig_sighandler __P((int));
++++++ bash-4.2-endpw.dif ++++++
--- bashline.c
+++ bashline.c 2011-11-21 12:41:19.831646479 +0000
@@ -2149,6 +2149,7 @@ bash_groupname_completion_function (text
}
value = savestring (grent->gr_name);
+ endgrent ();
return (value);
#endif
}
--- examples/loadables/finfo.c
+++ examples/loadables/finfo.c 2011-11-21 12:23:17.331147246 +0000
@@ -269,6 +269,7 @@ struct stat *st;
pw = getpwuid(st->st_uid);
owner = pw ? pw->pw_name : "unknown";
printf("Uid of owner: %d (%s)\n", (int) st->st_uid, owner);
+ endpwent();
gr = getgrgid(st->st_gid);
owner = gr ? gr->gr_name : "unknown";
printf("Gid of owner: %d (%s)\n", (int) st->st_gid, owner);
@@ -277,6 +278,7 @@ struct stat *st;
printf("File last access time: %s", ctime (&st->st_atime));
printf("File last modify time: %s", ctime (&st->st_mtime));
printf("File last status change time: %s", ctime (&st->st_ctime));
+ endgrent();
fflush(stdout);
return(0);
}
@@ -345,16 +347,18 @@ int flags;
else if (flags & OPT_PMASK)
printf("%o\n", getperm(st->st_mode) & pmask);
else if (flags & OPT_UID) {
- pw = getpwuid(st->st_uid);
- if (flags & OPT_ASCII)
+ if (flags & OPT_ASCII) {
+ pw = getpwuid(st->st_uid);
printf("%s\n", pw ? pw->pw_name : "unknown");
- else
+ endpwent();
+ } else
printf("%d\n", st->st_uid);
} else if (flags & OPT_GID) {
- gr = getgrgid(st->st_gid);
- if (flags & OPT_ASCII)
+ if (flags & OPT_ASCII) {
+ gr = getgrgid(st->st_gid);
printf("%s\n", gr ? gr->gr_name : "unknown");
- else
+ endgrent();
+ } else
printf("%d\n", st->st_gid);
} else if (flags & OPT_SIZE)
printf("%ld\n", (long) st->st_size);
--- examples/loadables/id.c
+++ examples/loadables/id.c 2011-11-21 12:39:06.895646231 +0000
@@ -42,6 +42,7 @@
#if !defined (HAVE_GETPW_DECLS)
extern struct passwd *getpwuid ();
+extern void endpwent ();
#endif
extern struct group *getgrgid ();
@@ -136,18 +137,26 @@ static int
inituser (uname)
char *uname;
{
- struct passwd *pwd;
-
if (uname)
{
+ struct passwd *pwd;
+ int r;
+
+ r = 0;
pwd = getpwnam (uname);
if (pwd == 0)
{
builtin_error ("%s: no such user", uname);
- return -1;
+ r = -1;
}
- ruid = euid = pwd->pw_uid;
- rgid = egid = pwd->pw_gid;
+ else
+ {
+ ruid = euid = pwd->pw_uid;
+ rgid = egid = pwd->pw_gid;
+ }
+ endpwent ();
+ if (r < 0)
+ return r;
}
else
{
@@ -172,11 +181,12 @@ id_pruser (uid)
{
pwd = getpwuid (uid);
if (pwd == NULL)
- r = 1;
+ r = 1;
+ else
+ printf ("%s", pwd->pw_name);
+ endpwent ();
}
- if (pwd)
- printf ("%s", pwd->pw_name);
- else
+ if (pwd == NULL)
printf ("%u", (unsigned) uid);
return r;
@@ -197,11 +207,12 @@ id_prgrp (gid)
grp = getgrgid (gid);
if (grp == NULL)
r = 1;
+ else
+ printf ("%s", grp->gr_name);
+ endgrent ();
}
- if (grp)
- printf ("%s", grp->gr_name);
- else
+ if (grp == NULL)
printf ("%u", (unsigned) gid);
return r;
@@ -307,6 +318,8 @@ id_prall (uname)
else
printf ("(%s)", grp->gr_name);
}
+ endpwent ();
+ endgrent ();
return r;
}
--- lib/tilde/shell.c
+++ lib/tilde/shell.c 2011-11-21 13:07:02.099146925 +0000
@@ -45,9 +45,18 @@
#include
#if !defined (HAVE_GETPW_DECLS)
+# if defined (HAVE_GETPWUID)
extern struct passwd *getpwuid ();
+# endif
+# if defined (HAVE_GETPWENT)
+extern void endpwent ();
+# endif
#endif /* !HAVE_GETPW_DECLS */
+#if !defined (savestring)
+# define savestring(x) strcpy ((char *)xmalloc (1 + strlen (x)), (x))
+#endif /* !savestring */
+
char *
get_env_value (varname)
char *varname;
@@ -58,12 +67,19 @@ get_env_value (varname)
char *
get_home_dir ()
{
- char *home_dir;
+ static char *home_dir;
struct passwd *entry;
- home_dir = (char *)NULL;
+ if (home_dir)
+ goto out;
+#if defined (HAVE_GETPWUID)
entry = getpwuid (getuid ());
if (entry)
- home_dir = entry->pw_dir;
+ home_dir = savestring(entry->pw_dir);
+#endif
+#if defined (HAVE_GETPWENT)
+ endpwent ();
+#endif
+out:
return (home_dir);
}
--- lib/tilde/tilde.c
+++ lib/tilde/tilde.c 2011-11-11 13:10:07.000000000 +0000
@@ -61,6 +61,7 @@ extern struct passwd *getpwuid PARAMS((u
# endif
# if defined (HAVE_GETPWNAM)
extern struct passwd *getpwnam PARAMS((const char *));
+extern void endpwent ();
# endif
#endif /* !HAVE_GETPW_DECLS */
++++++ bash-4.2-history-myown.dif.bz2 ++++++
--- shell.c
+++ shell.c 2011-03-08 17:25:55.160426342 +0000
@@ -261,6 +261,11 @@ static const struct {
{ (char *)0x0, Int, (int *)0x0, (char **)0x0 }
};
+#if defined (HAVE_POSIX_SIGSETJMP)
+volatile procenv_t terminating_now;
+volatile sig_atomic_t jump_with_sig;
+#endif /* HAVE_POSIX_SIGSETJMP */
+
/* These are extern so execute_simple_command can set them, and then
longjmp back to main to execute a shell script, instead of calling
main () again and resulting in indefinite, possibly fatal, stack
@@ -379,6 +384,39 @@ main (argc, argv, env)
if (code)
exit (2);
+#if defined (HAVE_POSIX_SIGSETJMP)
+ /* Catch signals here */
+ if (sigsetjmp (terminating_now, 1))
+ {
+ int sig = jump_with_sig;
+
+ /* I don't believe this condition ever tests true. */
+ if (sig == SIGINT && signal_is_trapped (SIGINT))
+ run_interrupt_trap ();
+
+# if defined (HISTORY)
+ if (interactive_shell && sig != SIGABRT)
+ maybe_save_shell_history ();
+# endif /* HISTORY */
+
+# if defined (JOB_CONTROL)
+ if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
+ hangup_all_jobs ();
+ end_job_control ();
+# endif /* JOB_CONTROL */
+
+# if defined (PROCESS_SUBSTITUTION)
+ unlink_fifo_list ();
+# endif /* PROCESS_SUBSTITUTION */
+
+ run_exit_trap ();
+ set_signal_handler (sig, SIG_DFL);
+ kill (getpid (), sig);
+ _exit(0);
+ }
+ jump_with_sig = 0;
+#endif /* HAVE_POSIX_SIGSETJMP */
+
xtrace_init ();
#if defined (USING_BASH_MALLOC) && defined (DEBUG) && !defined (DISABLE_MALLOC_WRAPPERS)
--- sig.c
+++ sig.c 2011-03-08 17:26:31.627928783 +0000
@@ -503,7 +503,7 @@ termsig_sighandler (sig)
/* XXX - should this also trigger when interrupt_immediately is set? */
if (terminate_immediately)
{
-#if defined (HISTORY)
+#if defined (HISTORY) && ! defined (HAVE_POSIX_SIGSETJMP)
/* XXX - will inhibit history file being written */
history_lines_this_session = 0;
#endif
@@ -514,6 +514,11 @@ termsig_sighandler (sig)
SIGRETURN (0);
}
+#if defined (HAVE_POSIX_SIGSETJMP)
+extern volatile procenv_t terminating_now;
+extern volatile sig_atomic_t jump_with_sig;
+#endif /* HAVE_POSIX_SIGSETJMP */
+
void
termsig_handler (sig)
int sig;
@@ -528,32 +533,39 @@ termsig_handler (sig)
handling_termsig = 1;
terminating_signal = 0; /* keep macro from re-testing true. */
+#if ! defined (HAVE_POSIX_SIGSETJMP)
/* I don't believe this condition ever tests true. */
if (sig == SIGINT && signal_is_trapped (SIGINT))
run_interrupt_trap ();
-#if defined (HISTORY)
+# if defined (HISTORY)
if (interactive_shell && sig != SIGABRT)
maybe_save_shell_history ();
-#endif /* HISTORY */
+# endif /* HISTORY */
-#if defined (JOB_CONTROL)
+# if defined (JOB_CONTROL)
if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB))))
hangup_all_jobs ();
end_job_control ();
-#endif /* JOB_CONTROL */
+# endif /* JOB_CONTROL */
-#if defined (PROCESS_SUBSTITUTION)
+# if defined (PROCESS_SUBSTITUTION)
unlink_fifo_list ();
-#endif /* PROCESS_SUBSTITUTION */
+# endif /* PROCESS_SUBSTITUTION */
+#endif /* ! HAVE_POSIX_SIGSETJMP */
/* Reset execution context */
loop_level = continuing = breaking = funcnest = 0;
executing_list = comsub_ignore_return = return_catch_flag = 0;
+#if defined (HAVE_POSIX_SIGSETJMP)
+ jump_with_sig = sig;
+ siglongjmp(terminating_now, 1);
+#else /* ! HAVE_POSIX_SIGSETJMP */
run_exit_trap ();
set_signal_handler (sig, SIG_DFL);
kill (getpid (), sig);
+#endif /* ! HAVE_POSIX_SIGSETJMP */
}
/* What we really do when SIGINT occurs. */
++++++ bash-4.2-nscdunmap.dif ++++++
--- shell.c
+++ shell.c 2011-11-11 15:08:39.479158014 +0000
@@ -39,8 +39,8 @@
#include
#include "filecntl.h"
#include
-
#if defined (HAVE_UNISTD_H)
+# include
# include
#endif
@@ -1630,6 +1630,28 @@ init_interactive_script ()
expand_aliases = interactive_shell = startup_state = 1;
}
+static void
+maybe_unmap_nscd (void)
+{
+ unsigned long start, end, off;
+ char path[PATH_MAX];
+ FILE *maps;
+
+ if (getppid() != 1)
+ return;
+ if ((maps = fopen("/proc/self/maps", "r")) == NULL)
+ return;
+
+ while (fscanf(maps, "%lx-%lx %*s %lx %*x:%*x %*lu %s", &start, &end, &off, &path[0]) == 4)
+ {
+ if (strncmp(path, "/var/run/nscd/", 14) != 0)
+ continue;
+ munmap((void*)start, end - start);
+ }
+
+ fclose(maps);
+}
+
void
get_current_user_info ()
{
@@ -1655,6 +1677,7 @@ get_current_user_info ()
current_user.home_dir = savestring ("/");
}
endpwent ();
+ maybe_unmap_nscd ();
}
}
++++++ bash-4.2-nsec.dif ++++++
--- test.c
+++ test.c 2012-03-06 11:14:00.149934027 +0000
@@ -309,8 +309,17 @@ filecomp (s, t, op)
switch (op)
{
+#if defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || (defined(_XOPEN_SOURCE) && ((_XOPEN_SOURCE - 0) >= 700)) || (defined(_POSIX_C_SOURCE) && ((_POSIX_C_SOURCE - 0) >= 200809L))
+# define st_mtimcmp(t1, t2, CMP) \
+ (((t1).st_mtim.tv_sec == (t2).st_mtim.tv_sec) ? \
+ ((t1).st_mtim.tv_nsec CMP (t2).st_mtim.tv_nsec) : \
+ ((t1).st_mtim.tv_sec CMP (t2).st_mtim.tv_sec))
+ case OT: return (r1 < r2 || (r2 == 0 && st_mtimcmp(st1, st2, <)));
+ case NT: return (r1 > r2 || (r1 == 0 && st_mtimcmp(st1, st2, >)));
+#else
case OT: return (r1 < r2 || (r2 == 0 && st1.st_mtime < st2.st_mtime));
case NT: return (r1 > r2 || (r1 == 0 && st1.st_mtime > st2.st_mtime));
+#endif
case EF: return (same_file (s, t, &st1, &st2));
}
return (FALSE);
++++++ bash-4.2-sigrestart.patch ++++++
--- jobs.c
+++ jobs.c 2008-01-08 18:10:16.000000000 +0000
@@ -2454,7 +2454,11 @@ wait_for (pid)
act.sa_handler = SIG_DFL;
sigemptyset (&act.sa_mask);
sigemptyset (&oact.sa_mask);
+# if defined(MUST_REINSTALL_SIGHANDLERS)
act.sa_flags = 0;
+# else
+ act.sa_flags = SA_RESTART;
+# endif
sigaction (SIGCHLD, &act, &oact);
# endif
queue_sigchld = 1;
--- sig.c
+++ sig.c 2011-01-14 13:10:48.591925968 +0000
@@ -668,6 +668,16 @@ set_signal_handler (sig, handler)
if we take the time to reap children */
if (sig == SIGCHLD)
act.sa_flags |= SA_RESTART; /* XXX */
+#if !defined(MUST_REINSTALL_SIGHANDLERS)
+ if (sig != SIGALRM)
+ act.sa_flags |= SA_RESTART; /* XXX */
+ if (handler == (trap_handler))
+ act.sa_flags |= SA_NODEFER; /* XXX */
+ if (handler == (termsig_sighandler))
+ act.sa_flags |= SA_NODEFER; /* XXX */
+ if (sig == SIGTSTP || sig == SIGTTOU || sig == SIGTTIN || sig == SIGCONT)
+ act.sa_flags |= SA_NODEFER; /* XXX */
+#endif
sigemptyset (&act.sa_mask);
sigemptyset (&oact.sa_mask);
++++++ bash-4.2.dif ++++++
--- config-top.h
+++ config-top.h 2007-12-04 14:44:39.314025629 +0000
@@ -54,14 +54,14 @@
/* The default value of the PATH variable. */
#ifndef DEFAULT_PATH_VALUE
#define DEFAULT_PATH_VALUE \
- "/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin:."
+ "/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin:."
#endif
/* The value for PATH when invoking `command -p'. This is only used when
the Posix.2 confstr () function, or CS_PATH define are not present. */
#ifndef STANDARD_UTILS_PATH
#define STANDARD_UTILS_PATH \
- "/bin:/usr/bin:/sbin:/usr/sbin:/etc:/usr/etc"
+ "/bin:/usr/bin:/sbin:/usr/sbin"
#endif
/* Default primary and secondary prompt strings. */
@@ -75,20 +75,20 @@
#define KSH_COMPATIBLE_SELECT
/* System-wide .bashrc file for interactive shells. */
-/* #define SYS_BASHRC "/etc/bash.bashrc" */
+#define SYS_BASHRC "/etc/bash.bashrc"
/* System-wide .bash_logout for login shells. */
-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */
+#define SYS_BASH_LOGOUT "/etc/bash.bash_logout"
/* Define this to make non-interactive shells begun with argv[0][0] == '-'
run the startup files when not in posix mode. */
-/* #define NON_INTERACTIVE_LOGIN_SHELLS */
+#define NON_INTERACTIVE_LOGIN_SHELLS
/* Define this if you want bash to try to check whether it's being run by
sshd and source the .bashrc if so (like the rshd behavior). This checks
for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment,
which can be fooled under certain not-uncommon circumstances. */
-/* #define SSH_SOURCE_BASHRC */
+#define SSH_SOURCE_BASHRC
/* Define if you want the case-capitalizing operators (~[~]) and the
`capcase' variable attribute (declare -c). */
--- general.h
+++ general.h 2006-03-27 12:15:25.000000000 +0000
@@ -21,10 +21,13 @@
#if !defined (_GENERAL_H_)
#define _GENERAL_H_
+#include
+#include
#include "stdc.h"
#include "bashtypes.h"
#include "chartypes.h"
+#include "bashline.h"
#if defined (HAVE_SYS_RESOURCE_H) && defined (RLIMTYPE)
# if defined (HAVE_SYS_TIME_H)
--- jobs.c
+++ jobs.c 2006-03-27 12:15:25.000000000 +0000
@@ -199,10 +199,10 @@ int previous_job = NO_JOB;
#endif
/* Last child made by the shell. */
-pid_t last_made_pid = NO_PID;
+volatile pid_t last_made_pid = NO_PID;
/* Pid of the last asynchronous child. */
-pid_t last_asynchronous_pid = NO_PID;
+volatile pid_t last_asynchronous_pid = NO_PID;
/* 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
extern struct jobstats js;
extern pid_t original_pgrp, shell_pgrp, pipeline_pgrp;
-extern pid_t last_made_pid, last_asynchronous_pid;
+extern volatile pid_t last_made_pid, last_asynchronous_pid;
extern int asynchronous_notification;
extern JOB **jobs;
--- parse.y
+++ parse.y 2006-03-27 12:15:25.000000000 +0000
@@ -1283,7 +1283,7 @@ input_file_descriptor ()
#if defined (READLINE)
char *current_readline_prompt = (char *)NULL;
-char *current_readline_line = (char *)NULL;
+unsigned char *current_readline_line = (unsigned char *)NULL;
int current_readline_line_index = 0;
static int
@@ -5983,6 +5983,8 @@ save_input_line_state (ls)
/* force reallocation */
shell_input_line = 0;
shell_input_line_size = shell_input_line_len = shell_input_line_index = 0;
+
+ return ls;
}
void
--- shell.c
+++ shell.c 2006-03-27 12:15:25.000000000 +0000
@@ -479,7 +479,7 @@ main (argc, argv, env)
if (dump_translatable_strings)
read_but_dont_execute = 1;
- if (running_setuid && privileged_mode == 0)
+ if (running_setuid && privileged_mode == 0 /* && act_like_sh == 0 */)
disable_priv_mode ();
/* Need to get the argument to a -c option processed in the
--- subst.c
+++ subst.c 2006-03-27 12:15:25.000000000 +0000
@@ -2962,6 +2962,7 @@ call_expand_word_internal (w, q, i, c, e
last_command_exit_value = EXECUTION_FAILURE;
exp_jump_to_top_level ((result == &expand_word_error) ? DISCARD : FORCE_EOF);
/* NOTREACHED */
+ return NULL; /* make stupid compiler happy */
}
else
return (result);
--- builtins/shopt.def
+++ builtins/shopt.def 2006-03-27 12:15:25.000000000 +0000
@@ -279,9 +279,9 @@ reset_shopt_options ()
allow_null_glob_expansion = glob_dot_filenames = 0;
cdable_vars = mail_warning = 0;
no_exit_on_failed_exec = print_shift_error = 0;
- check_hashed_filenames = cdspelling = expand_aliases = check_window_size = 0;
+ check_hashed_filenames = cdspelling = expand_aliases = 0;
- source_uses_path = promptvars = 1;
+ check_window_size = source_uses_path = promptvars = 1;
#if defined (EXTENDED_GLOB)
extended_glob = 0;
--- doc/Makefile.in
+++ doc/Makefile.in 2006-03-27 12:15:25.000000000 +0000
@@ -142,7 +142,7 @@ BASHREF_FILES = $(srcdir)/bashref.texi $
${RM} $@
-${DVIPS} $<
-all: ps info dvi text html
+all: info html
nodvi: ps info text html
everything: all pdf
--- doc/bash.1
+++ doc/bash.1 2006-03-27 12:15:25.000000000 +0000
@@ -4620,8 +4620,8 @@ file (the \fIinputrc\fP file).
The name of this file is taken from the value of the
.SM
.B INPUTRC
-variable. If that variable is unset, the default is
-.IR ~/.inputrc .
+environment variable. If that variable is unset, readline will read both
+.IR /etc/inputrc " and " ~/.inputrc .
When a program which uses the readline library starts up, the
initialization file is read, and the key bindings and variables
are set.
@@ -9340,6 +9340,9 @@ The individual login shell cleanup file,
.TP
.FN ~/.inputrc
Individual \fIreadline\fP initialization file
+.TP
+.FN /etc/inputrc
+System \fBreadline\fP initialization file
.PD
.SH AUTHORS
Brian Fox, Free Software Foundation
--- support/man2html.c
+++ support/man2html.c 2011-11-25 17:07:28.895646776 +0000
@@ -77,6 +77,7 @@
#include
#include
#include
+#include
#define NULL_TERMINATED(n) ((n) + 1)
--- support/printenv.c
+++ support/printenv.c 2007-12-06 15:33:46.899561365 +0000
@@ -27,6 +27,7 @@
#if defined (HAVE_CONFIG_H)
# include
#endif
+#include
#include "bashansi.h"
--- support/rlvers.sh
+++ support/rlvers.sh 2006-03-27 12:15:25.000000000 +0000
@@ -27,10 +27,10 @@ TDIR=$TMPDIR/rlvers
# defaults
CC=cc
-RL_LIBDIR=/usr/local/lib
-RL_INCDIR=/usr/local/include
+RL_LIBDIR=/lib
+RL_INCDIR=/usr/include
-TERMCAP_LIB="-ltermcap"
+echo 'int main () { return 0; }' | gcc -ltinfo -o /dev/null -xc - > /dev/null 2>&1 && TERMCAP_LIB="-ltinfo" || TERMCAP_LIB="-lncurses"
# cannot rely on the presence of getopts
while [ $# -gt 0 ]; do
--- support/shobj-conf
+++ support/shobj-conf 2006-09-22 14:11:58.000000000 +0000
@@ -112,10 +112,11 @@ sunos5*|solaris2*)
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ SHOBJ_LDFLAGS='-shared'
- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ echo 'int main () { return 0; }' | gcc -ltinfo -o /dev/null -xc - > /dev/null 2>&1 && SHLIB_LIBS=-ltinfo || SHLIB_LIBS=-lncurses
;;
freebsd2*)
--- tests/run-intl
+++ tests/run-intl 2009-08-26 11:13:13.000000000 +0000
@@ -5,4 +5,4 @@ echo "warning: some of these tests will
echo "warning: locales installed on your system." >&2
echo "warning: please ignore any differences consisting only of white space" >&2
${THIS_SH} ./intl.tests > /tmp/xx
-diff $AFLAG /tmp/xx intl.right && rm -f /tmp/xx
+diff -w $AFLAG /tmp/xx intl.right && rm -f /tmp/xx
--- tests/run-read
+++ tests/run-read 2009-08-26 11:13:13.000000000 +0000
@@ -1,4 +1,4 @@
echo "warning: please do not consider output differing only in the amount of" >&2
echo "warning: white space to be an error." >&2
${THIS_SH} ./read.tests > /tmp/xx 2>&1
-diff /tmp/xx read.right && rm -f /tmp/xx
+diff -w /tmp/xx read.right && rm -f /tmp/xx
++++++ bash-rpmlintrc ++++++
addFilter(".*hidden-file-or-dir.*/etc/skel/\..*")
addFilter(".*zero-length.*/etc/skel/\..*")
++++++ bash42-033-bnc770795.patch ++++++
BASH PATCH REPORT
=================
Bash-Release: 4.2
Patch-ID: bash42-033
Bug-Reported-by: David Leverton
Bug-Reference-ID: <4FCCE737.1060603@googlemail.com>
Bug-Reference-URL:
Bug-Description:
Bash uses a static buffer when expanding the /dev/fd prefix for the test
and conditional commands, among other uses, when it should use a dynamic
buffer to avoid buffer overflow.
Patch (apply with `patch -p0'):
*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000 -0500
--- lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400
***************
*** 83,86 ****
--- 83,88 ----
struct stat *finfo;
{
+ static char *pbuf = 0;
+
if (*path == '\0')
{
***************
*** 107,111 ****
On most systems, with the notable exception of linux, this is
effectively a no-op. */
! char pbuf[32];
strcpy (pbuf, DEV_FD_PREFIX);
strcat (pbuf, path + 8);
--- 109,113 ----
On most systems, with the notable exception of linux, this is
effectively a no-op. */
! pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
strcpy (pbuf, DEV_FD_PREFIX);
strcat (pbuf, path + 8);
++++++ dot.bashrc ++++++
# Sample .bashrc for SuSE Linux
# Copyright (c) SuSE GmbH Nuernberg
# There are 3 different types of shells in bash: the login shell, normal shell
# and interactive shell. Login shells read ~/.profile and interactive shells
# read ~/.bashrc; in our setup, /etc/profile sources ~/.bashrc - thus all
# settings made here will also take effect in a login shell.
#
# NOTE: It is recommended to make language settings in ~/.profile rather than
# here, since multilingual X sessions would not work properly if LANG is over-
# ridden in every subshell.
# Some applications read the EDITOR variable to determine your favourite text
# editor. So uncomment the line below and enter the editor of your choice :-)
#export EDITOR=/usr/bin/vim
#export EDITOR=/usr/bin/mcedit
# For some news readers it makes sense to specify the NEWSSERVER variable here
#export NEWSSERVER=your.news.server
# If you want to use a Palm device with Linux, uncomment the two lines below.
# For some (older) Palm Pilots, you might need to set a lower baud rate
# e.g. 57600 or 38400; lowest is 9600 (very slow!)
#
#export PILOTPORT=/dev/pilot
#export PILOTRATE=115200
test -s ~/.alias && . ~/.alias || true
++++++ dot.profile ++++++
# Sample .profile for SuSE Linux
# rewritten by Christian Steinruecken
#
# This file is read each time a login shell is started.
# All other interactive shells will only read .bashrc; this is particularly
# important for language settings, see below.
test -z "$PROFILEREAD" && . /etc/profile || true
# Most applications support several languages for their output.
# To make use of this feature, simply uncomment one of the lines below or
# add your own one (see /usr/share/locale/locale.alias for more codes)
# This overwrites the system default set in /etc/sysconfig/language
# in the variable RC_LANG.
#
#export LANG=de_DE.UTF-8 # uncomment this line for German output
#export LANG=fr_FR.UTF-8 # uncomment this line for French output
#export LANG=es_ES.UTF-8 # uncomment this line for Spanish output
# Some people don't like fortune. If you uncomment the following lines,
# you will have a fortune each time you log in ;-)
#if [ -x /usr/bin/fortune ] ; then
# echo
# /usr/bin/fortune
# echo
#fi
++++++ man2html-no-timestamp.patch ++++++
Index: support/man2html.c
===================================================================
--- support/man2html.c.orig 2005-10-12 20:50:06.000000000 +0200
+++ support/man2html.c 2010-09-03 22:49:56.288632000 +0200
@@ -4061,7 +4061,7 @@ main(int argc, char **argv)
if (subs)
fputs("</DL>\n", stdout);
fputs("</DL>\n", stdout);
- print_sig();
+ /* print_sig(); */
fputs("</BODY>\n</HTML>\n", stdout);
} else
fprintf(stderr, "man2html: no output produced\n");
++++++ readline-4.3-input.dif ++++++
--- lib/readline/input.c
+++ lib/readline/input.c 2003-03-17 19:03:51.000000000 +0000
@@ -459,6 +459,8 @@ rl_read_key ()
return (c);
}
+extern int _rl_read_zero_char_from_tty;
+
int
rl_getc (stream)
FILE *stream;
@@ -482,7 +484,10 @@ rl_getc (stream)
/* If zero characters are returned, then the file that we are
reading from is empty! Return EOF in that case. */
if (result == 0)
- return (EOF);
+ {
+ _rl_read_zero_char_from_tty = 1;
+ return (EOF);
+ }
#if defined (__BEOS__)
if (errno == EINTR)
--- lib/readline/readline.c
+++ lib/readline/readline.c 2003-03-17 19:02:52.000000000 +0000
@@ -469,6 +469,9 @@ _rl_internal_char_cleanup ()
_rl_erase_entire_line ();
}
+/* Catch EOF from tty, do not return command line */
+int _rl_read_zero_char_from_tty = 0;
+
STATIC_CALLBACK int
#if defined (READLINE_CALLBACKS)
readline_internal_char ()
@@ -513,6 +516,10 @@ readline_internal_charloop ()
c = rl_read_key ();
RL_UNSETSTATE(RL_STATE_READCMD);
+ /* Return here if terminal is closed */
+ if (c == EOF && _rl_read_zero_char_from_tty)
+ return (rl_done = 1);
+
/* look at input.c:rl_getc() for the circumstances under which this will
be returned; punt immediately on read error without converting it to
a newline. */
++++++ readline-5.2-conf.patch ++++++
--- lib/readline/bind.c
+++ lib/readline/bind.c 2006-11-13 16:20:23.000000000 +0000
@@ -751,6 +751,9 @@ rl_function_of_keyseq (keyseq, map, type
/* The last key bindings file read. */
static char *last_readline_init_file = (char *)NULL;
+/* Flag to read system init file */
+static int read_system_init_file = 0;
+
/* The file we're currently reading key bindings from. */
static const char *current_readline_init_file;
static int current_readline_init_include_level;
@@ -816,11 +819,14 @@ rl_re_read_init_file (count, ignore)
return r;
}
+/* Forward declarations */
+static int sv_bell_style PARAMS((const char *));
+
/* Do key bindings from a file. If FILENAME is NULL it defaults
to the first non-null filename from this list:
1. the filename used for the previous call
2. the value of the shell variable `INPUTRC'
- 3. ~/.inputrc
+ 3. /etc/inputrc and ~/.inputrc
4. /etc/inputrc
If the file existed and could be opened and read, 0 is returned,
otherwise errno is returned. */
@@ -832,16 +838,37 @@ rl_read_init_file (filename)
if (filename == 0)
filename = last_readline_init_file;
if (filename == 0)
- filename = sh_get_env_value ("INPUTRC");
+ {
+ filename = sh_get_env_value ("INPUTRC");
+ if (filename && !strncmp(SYS_INPUTRC, filename, strlen(SYS_INPUTRC)))
+ {
+ struct stat st;
+ char *default_inputrc = tilde_expand(DEFAULT_INPUTRC);
+
+ if ((stat(default_inputrc, &st) == 0))
+ {
+ filename = DEFAULT_INPUTRC;
+ read_system_init_file = 1;
+ }
+ else
+ read_system_init_file = 0;
+
+ free(default_inputrc);
+ }
+ else
+ read_system_init_file = 1;
+ }
if (filename == 0 || *filename == 0)
{
filename = DEFAULT_INPUTRC;
- /* Try to read DEFAULT_INPUTRC; fall back to SYS_INPUTRC on failure */
- if (_rl_read_init_file (filename, 0) == 0)
- return 0;
- filename = SYS_INPUTRC;
+ read_system_init_file = 1;
}
+ sv_bell_style(sh_get_env_value("DEFAULT_BELL_STYLE"));
+
+ if (read_system_init_file)
+ _rl_read_init_file (SYS_INPUTRC, 1);
+
#if defined (__MSDOS__)
if (_rl_read_init_file (filename, 0) == 0)
return 0;
@@ -1352,7 +1379,14 @@ rl_parse_and_bind (string)
rl_macro_bind (seq, &funname[1], _rl_keymap);
}
else
- rl_bind_keyseq (seq, rl_named_function (funname));
+ {
+#if defined (PREFIX_META_HACK)
+ if (_rl_stricmp (funname, "prefix-meta") == 0)
+ rl_generic_bind (ISKMAP, seq, (char *)emacs_meta_keymap, _rl_keymap);
+ else
+#endif
+ rl_bind_keyseq (seq, rl_named_function (funname));
+ }
xfree (seq);
return 0;
@@ -1490,7 +1524,6 @@ typedef int _rl_sv_func_t PARAMS((const
#define V_INT 2
/* Forward declarations */
-static int sv_bell_style PARAMS((const char *));
static int sv_combegin PARAMS((const char *));
static int sv_dispprefix PARAMS((const char *));
static int sv_compquery PARAMS((const char *));
--- lib/readline/rlconf.h
+++ lib/readline/rlconf.h 2006-11-13 16:21:26.000000000 +0000
@@ -33,7 +33,7 @@
#define HANDLE_SIGNALS
/* Ugly but working hack for binding prefix meta. */
-#define PREFIX_META_HACK
+#undef PREFIX_META_HACK
/* The next-to-last-ditch effort file name for a user-specific init file. */
#define DEFAULT_INPUTRC "~/.inputrc"
--- lib/readline/doc/rluser.texi
+++ lib/readline/doc/rluser.texi 2006-11-13 16:23:56.000000000 +0000
@@ -347,7 +347,8 @@ file is taken from the value of the envi
@end ifclear
that variable is unset, the default is @file{~/.inputrc}. If that
file does not exist or cannot be read, the ultimate default is
-@file{/etc/inputrc}.
+@file{/etc/inputrc}. If both @file{~/.inputrc} and @file{/etc/inputrc}
+exist Readline will read first @file{/etc/inputrc} and then @file{~/.inputrc}.
When a program which uses the Readline library starts up, the
init file is read, and the key bindings are set.
++++++ readline-6.1-wrap.patch ++++++
--- lib/readline/display.c
+++ lib/readline/display.c 2006-11-13 15:55:24.000000000 +0000
@@ -714,7 +714,10 @@ rl_redisplay ()
inv_lbreaks[++newlines] = temp;
#if defined (HANDLE_MULTIBYTE)
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0 && prompt_multibyte_chars > 0)
- lpos -= _rl_col_width (local_prompt, n0, num, 1);
+ {
+ if (local_prompt_len > 0)
+ lpos -= _rl_col_width (local_prompt, n0, num, 1);
+ }
else
#endif
lpos -= _rl_screenwidth;
++++++ readline-6.2-destdir.patch ++++++
--- shlib/Makefile.in
+++ shlib/Makefile.in 2010-02-15 16:02:33.000000000 +0000
@@ -59,6 +59,7 @@ bindir = @bindir@
libdir = @libdir@
datadir = @datadir@
localedir = @localedir@
+linkagedir = $(libdir)
# Support an alternate destination root directory for package building
DESTDIR =
@@ -184,13 +185,13 @@ installdirs: $(topdir)/support/mkdirs
-$(SHELL) $(topdir)/support/mkdirs $(DESTDIR)$(bindir)
install: installdirs $(SHLIB_STATUS)
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY)
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE)
+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -i "$(INSTALL_DATA)" $(SHARED_HISTORY)
+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -i "$(INSTALL_DATA)" $(SHARED_READLINE)
@echo install: you may need to run ldconfig
uninstall:
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_HISTORY)
- $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -d $(DESTDIR)$(libdir) -b $(DESTDIR)$(bindir) -U $(SHARED_READLINE)
+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -U $(SHARED_HISTORY)
+ $(SHELL) $(topdir)/support/shlib-install -O $(host_os) -V $(host_vendor) -dd $(DESTDIR) -d $(libdir) -l $(linkagedir) -b $(bindir) -U $(SHARED_READLINE)
@echo uninstall: you may need to run ldconfig
clean mostlyclean: force
--- support/shlib-install
+++ support/shlib-install 2010-02-15 15:59:38.000000000 +0000
@@ -3,7 +3,7 @@
# shlib-install - install a shared library and do any necessary host-specific
# post-installation configuration (like ldconfig)
#
-# usage: shlib-install [-D] -O host_os [-V host_vendor] -d installation-dir [-b bin-dir] -i install-prog [-U] library
+# usage: shlib-install [-D] -O host_os [-V host_vendor] -d installation-dir [-l linkage-dir] [-b bin-dir] -i install-prog [-U] library
#
# Chet Ramey
# chet@po.cwru.edu
@@ -12,10 +12,12 @@
# defaults
#
INSTALLDIR=/usr/local/lib
+LINKAGEDIR=
LDCONFIG=ldconfig
+DESTDIR=
PROGNAME=`basename $0`
-USAGE="$PROGNAME [-D] -O host_os [-V host_vendor] -d installation-dir [-b bin-dir] -i install-prog [-U] library"
+USAGE="$PROGNAME [-D] -O host_os [-V host_vendor] [-l linkage-dir] -d installation-dir [-b bin-dir] -i install-prog [-U] library"
# process options
@@ -24,14 +26,19 @@ while [ $# -gt 0 ]; do
-O) shift; host_os="$1"; shift ;;
-V) shift; host_vendor="$1"; shift ;;
-d) shift; INSTALLDIR="$1"; shift ;;
+ -dd) shift; DESTDIR=$1; shift ;;
-b) shift; BINDIR="$1" ; shift ;;
-i) shift; INSTALLPROG="$1" ; shift ;;
+ -l) shift; LINKAGEDIR="$1" ; shift ;;
-D) echo=echo ; shift ;;
-U) uninstall=true ; shift ;;
-*) echo "$USAGE" >&2 ; exit 2;;
*) break ;;
esac
done
+if [ -z "$LINKAGEDIR" ]; then
+ LINKAGEDIR="$INSTALLDIR"
+fi
# set install target name
LIBNAME="$1"
@@ -49,18 +56,18 @@ LN="ln -s"
# pre-install
if [ -z "$uninstall" ]; then
- ${echo} $RM ${INSTALLDIR}/${LIBNAME}.${OLDSUFF}
- if [ -f "$INSTALLDIR/$LIBNAME" ]; then
- ${echo} $MV $INSTALLDIR/$LIBNAME ${INSTALLDIR}/${LIBNAME}.${OLDSUFF}
+ ${echo} $RM ${DESTDIR}${INSTALLDIR}/${LIBNAME}.${OLDSUFF}
+ if [ -f "${DESTDIR}$INSTALLDIR/$LIBNAME" ]; then
+ ${echo} $MV ${DESTDIR}$INSTALLDIR/$LIBNAME ${DESTDIR}${INSTALLDIR}/${LIBNAME}.${OLDSUFF}
fi
fi
# install/uninstall
if [ -z "$uninstall" ] ; then
- ${echo} eval ${INSTALLPROG} $LIBNAME ${INSTALLDIR}/${LIBNAME}
+ ${echo} eval ${INSTALLPROG} $LIBNAME ${DESTDIR}${INSTALLDIR}/${LIBNAME}
else
- ${echo} ${RM} ${INSTALLDIR}/${LIBNAME}
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/${LIBNAME}
fi
# post-install/uninstall
@@ -72,7 +79,7 @@ fi
case "$host_os" in
hpux*|darwin*|macosx*|linux*)
if [ -z "$uninstall" ]; then
- chmod 555 ${INSTALLDIR}/${LIBNAME}
+ chmod 555 ${DESTDIR}${INSTALLDIR}/${LIBNAME}
fi ;;
cygwin*|mingw*)
IMPLIBNAME=`echo ${LIBNAME} \
@@ -110,8 +117,8 @@ case "$LIBNAME" in
LINK1=`echo $LIBNAME | sed 's:\(.*\)\.[0-9]\.[0-9]:\1:'` # libname.dylib
esac
-INSTALL_LINK1='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK1'
-INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2'
+INSTALL_LINK1='${echo} cd ${DESTDIR}$INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK1'
+INSTALL_LINK2='${echo} cd ${DESTDIR}$INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2'
#
# Create symlinks to the installed library. This section is incomplete.
@@ -119,27 +126,27 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR &&
case "$host_os-$host_vendor" in
*linux*|freebsd*-gentoo)
# libname.so.M -> libname.so.M.N
- ${echo} ${RM} ${INSTALLDIR}/$LINK2
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2
if [ -z "$uninstall" ]; then
eval $INSTALL_LINK2
fi
# libname.so -> libname.so.M
- ${echo} ${RM} ${INSTALLDIR}/$LINK1
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1
if [ -z "$uninstall" ]; then
- ${echo} cd $INSTALLDIR && ${echo} ${LN} $LINK2 $LINK1
+ ${echo} cd ${DESTDIR}$INSTALLDIR && ${echo} ${LN} $LINK2 $LINK1
fi
;;
bsdi4*|*gnu*|darwin*|macosx*|netbsd*)
# libname.so.M -> libname.so.M.N
- ${echo} ${RM} ${INSTALLDIR}/$LINK2
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2
if [ -z "$uninstall" ]; then
eval $INSTALL_LINK2
fi
# libname.so -> libname.so.M.N
- ${echo} ${RM} ${INSTALLDIR}/$LINK1
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1
if [ -z "$uninstall" ]; then
eval $INSTALL_LINK1
fi
@@ -147,7 +154,7 @@ bsdi4*|*gnu*|darwin*|macosx*|netbsd*)
solaris2*|aix4.[2-9]*|aix[5-9]*|osf*|irix[56]*|sysv[45]*|dgux*|interix*)
# libname.so -> libname.so.M
- ${echo} ${RM} ${INSTALLDIR}/$LINK1
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1
if [ -z "$uninstall" ]; then
eval $INSTALL_LINK1
fi
@@ -158,19 +165,19 @@ solaris2*|aix4.[2-9]*|aix[5-9]*|osf*|iri
freebsd3*|freebsdaout*)
if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
# libname.so -> libname.so.M
- ${echo} ${RM} ${INSTALLDIR}/$LINK1
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1
if [ -z "$uninstall" ]; then
eval $INSTALL_LINK1
fi
else
# libname.so.M -> libname.so.M.N
- ${echo} ${RM} ${INSTALLDIR}/$LINK2
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK2
if [ -z "$uninstall" ]; then
eval $INSTALL_LINK2
fi
# libname.so -> libname.so.M.N
- ${echo} ${RM} ${INSTALLDIR}/$LINK1
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1
if [ -z "$uninstall" ]; then
eval $INSTALL_LINK1
fi
@@ -187,7 +194,7 @@ freebsd[4-9]*|freebsdelf*|dragonfly*)
hpux1*)
# libname.sl -> libname.M
- ${echo} ${RM} ${INSTALLDIR}/$LINK1.sl
+ ${echo} ${RM} ${DESTDIR}${INSTALLDIR}/$LINK1.sl
if [ -z "$uninstall" ]; then
eval $INSTALL_LINK1
fi
++++++ readline-6.2-endpw.dif ++++++
--- lib/readline/complete.c
+++ lib/readline/complete.c 2011-11-21 12:51:35.695646715 +0000
@@ -83,6 +83,7 @@ typedef int QSFUNC ();
defined. */
#if defined (HAVE_GETPWENT) && (!defined (HAVE_GETPW_DECLS) || defined (_POSIX_SOURCE))
extern struct passwd *getpwent PARAMS((void));
+extern void endpwent ();
#endif /* HAVE_GETPWENT && (!HAVE_GETPW_DECLS || _POSIX_SOURCE) */
/* If non-zero, then this is the address of a function to call when
@@ -2068,6 +2069,9 @@ rl_username_completion_function (text, s
if (first_char == '~')
rl_filename_completion_desired = 1;
+#if defined (HAVE_GETPWENT)
+ /* endpwent (); */
+#endif
return (value);
}
#endif /* !__WIN32__ && !__OPENNT */
--- lib/readline/shell.c
+++ lib/readline/shell.c 2011-11-21 13:08:46.343647023 +0000
@@ -61,9 +61,18 @@
#include "rlshell.h"
#include "xmalloc.h"
-#if defined (HAVE_GETPWUID) && !defined (HAVE_GETPW_DECLS)
+#if !defined (HAVE_GETPW_DECLS)
+# if defined (HAVE_GETPWUID)
extern struct passwd *getpwuid PARAMS((uid_t));
-#endif /* HAVE_GETPWUID && !HAVE_GETPW_DECLS */
+# endif
+# if defined (HAVE_GETPWENT)
+extern void endpwent ();
+# endif
+#endif /* !HAVE_GETPW_DECLS */
+
+#if !defined (savestring)
+# define savestring(x) strcpy ((char *)xmalloc (1 + strlen (x)), (x))
+#endif /* !savestring */
#ifndef NULL
# define NULL 0
@@ -159,15 +168,20 @@ sh_get_env_value (varname)
char *
sh_get_home_dir ()
{
- char *home_dir;
+ static char *home_dir;
struct passwd *entry;
- home_dir = (char *)NULL;
+ if (home_dir)
+ goto out;
#if defined (HAVE_GETPWUID)
entry = getpwuid (getuid ());
if (entry)
- home_dir = entry->pw_dir;
+ home_dir = savestring(entry->pw_dir);
#endif
+#if defined (HAVE_GETPWENT)
+ endpwent ();
+#endif
+out:
return (home_dir);
}
--- lib/readline/tilde.c
+++ lib/readline/tilde.c 2011-11-11 13:09:49.000000000 +0000
@@ -61,6 +61,7 @@ extern struct passwd *getpwuid PARAMS((u
# endif
# if defined (HAVE_GETPWNAM)
extern struct passwd *getpwnam PARAMS((const char *));
+extern void endpwent ();
# endif
#endif /* !HAVE_GETPW_DECLS */
++++++ readline-6.2-metamode.patch ++++++
# See bug bnc#541379
--- lib/readline/bind.c
+++ lib/readline/bind.c 2011-03-04 15:00:17.332426313 +0000
@@ -1485,6 +1485,7 @@ static const struct {
#if defined (VISIBLE_STATS)
{ "visible-stats", &rl_visible_stats, 0 },
#endif /* VISIBLE_STATS */
+ { "meta-mode", &_rl_enable_meta, 0 },
{ (char *)NULL, (int *)NULL, 0 }
};
++++++ readline-6.2.dif ++++++
--- Makefile.in
+++ Makefile.in 2009-02-27 17:25:01.076001005 +0100
@@ -222,10 +222,8 @@ uninstall-headers:
maybe-uninstall-headers: uninstall-headers
install-static: installdirs $(STATIC_LIBS) install-headers install-doc install-examples
- -$(MV) $(DESTDIR)$(libdir)/libreadline.a $(DESTDIR)$(libdir)/libreadline.old
$(INSTALL_DATA) libreadline.a $(DESTDIR)$(libdir)/libreadline.a
-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libreadline.a
- -$(MV) $(DESTDIR)$(libdir)/libhistory.a $(DESTDIR)$(libdir)/libhistory.old
$(INSTALL_DATA) libhistory.a $(DESTDIR)$(libdir)/libhistory.a
-test -n "$(RANLIB)" && $(RANLIB) $(DESTDIR)$(libdir)/libhistory.a
@@ -254,7 +252,7 @@ uninstall-examples: maybe-uninstall-head
install-doc: installdirs
-( if test -d doc ; then \
cd doc && \
- ${MAKE} ${MFLAGS} infodir=$(infodir) DESTDIR=${DESTDIR} install; \
+ ${MAKE} infodir=$(infodir) DESTDIR=${DESTDIR} install; \
fi )
uninstall-doc:
--- complete.c
+++ complete.c 2009-02-27 17:25:26.616935393 +0100
@@ -942,7 +942,7 @@ _rl_find_completion_word (fp, dp)
/* We didn't find an unclosed quoted substring upon which to do
completion, so use the word break characters to find the
substring on which to complete. */
- while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))
+ while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)))
{
scan = rl_line_buffer[rl_point];
@@ -1884,7 +1884,7 @@ rl_completion_matches (text, entry_funct
match_list[1] = (char *)NULL;
_rl_interrupt_immediately++;
- while (string = (*entry_function) (text, matches))
+ while ((string = (*entry_function) (text, matches)))
{
if (matches + 1 == match_list_size)
match_list = (char **)xrealloc
@@ -1936,7 +1936,7 @@ rl_username_completion_function (text, s
}
#if defined (HAVE_GETPWENT)
- while (entry = getpwent ())
+ while ((entry = getpwent ()))
{
/* Null usernames should result in all users as possible completions. */
if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
--- readline.c
+++ readline.c 2005-12-09 17:09:26.000000000 +0100
@@ -767,7 +767,11 @@ _rl_dispatch_subseq (key, map, got_subse
{
/* Special case rl_do_lowercase_version (). */
if (func == rl_do_lowercase_version)
- return (_rl_dispatch (_rl_to_lower (key), map));
+ {
+ if (key == ANYOTHERKEY)
+ return -1;
+ return (_rl_dispatch (_rl_to_lower (key), map));
+ }
rl_executing_keymap = map;
--- readline.h
+++ readline.h 2005-12-09 17:09:26.000000000 +0100
@@ -448,7 +448,7 @@ extern char *rl_filename_completion_func
extern int rl_completion_mode PARAMS((rl_command_func_t *));
-#if 0
+#ifdef OLD_READLINE
/* Backwards compatibility (compat.c). These will go away sometime. */
extern void free_undo_list PARAMS((void));
extern int maybe_save_line PARAMS((void));
--- doc/Makefile.in
+++ doc/Makefile.in 2009-02-27 17:27:31.104001597 +0100
@@ -98,7 +98,7 @@ DIST_DOCS = $(DVIOBJ) $(PSOBJ) $(HTMLOBJ
$(RM) $@
-${DVIPDF} $<
-all: info dvi html ps text pdf
+all: info html
nodvi: info html text
xdist: $(DIST_DOCS)
--- doc/readline.3
+++ doc/readline.3 2006-11-13 17:33:27.000000000 +0100
@@ -118,6 +118,14 @@ environment variable. If that variable
.IR ~/.inputrc .
If that file does not exist or cannot be read, the ultimate default is
.IR /etc/inputrc .
+If both files
+.I ~/.inputrc
+and
+.I /etc/inputrc
+exist readline will read first
+.I /etc/inputrc
+and then
+.IR ~/.inputrc .
When a program which uses the readline library starts up, the
init file is read, and the key bindings and variables are set.
There are only a few basic constructs allowed in the
@@ -1286,6 +1294,9 @@ VI Command Mode functions
.TP
.FN ~/.inputrc
Individual \fBreadline\fP initialization file
+.TP
+.FN /etc/inputrc
+System \fBreadline\fP initialization file
.PD
.SH AUTHORS
Brian Fox, Free Software Foundation
--- support/shobj-conf
+++ support/shobj-conf 2006-09-22 16:17:48.000000000 +0200
@@ -112,10 +112,11 @@ sunos5*|solaris2*)
linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
SHOBJ_CFLAGS=-fPIC
SHOBJ_LD='${CC}'
- SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ SHOBJ_LDFLAGS='-shared'
- SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ SHLIB_XLDFLAGS='-Wl,-rpath-link,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ echo 'int main () { return 0; }' | gcc -ltinfo -o /dev/null -xc - > /dev/null 2>&1 && SHLIB_LIBS=-ltinfo || SHLIB_LIBS=-lncurses
;;
freebsd2*)
++++++ run-tests ++++++
#! /bin/sh
PATH=.:$PATH # just to get recho/zecho/printenv if not run via `make tests'
export PATH
# unset BASH_ENV only if it is set
[ "${BASH_ENV+set}" = "set" ] && unset BASH_ENV
# ditto for SHELLOPTS
#[ "${SHELLOPTS+set}" = "set" ] && unset SHELLOPTS
: ${THIS_SH:=../bash}
export THIS_SH
${THIS_SH} ./version
rm -f /tmp/xx
echo Any output from any test, unless otherwise noted, indicates a possible anomaly
for x in run-*
do
case $x in
$0|run-all|run-minimal|run-gprof|run-jobs|run-ifs-posix) ;;
*.orig|*~) ;;
*) echo $x ; sh $x ;;
esac
done
trap 'rm -f $tmp' EXIT TERM INT QUIT
tmp=$(mktemp /tmp/hello.XXXXXXXX) || exit 1
echo '#!/bin/sh' > $tmp
echo exit >> $tmp
chmod 755 $tmp
${THIS_SH} -c $tmp
typeset -i count=500
echo '#########################'
echo 'fork + /bin/sh -c runtime'
time while ((count-- > 0)) ; do
${THIS_SH} -c $tmp
done
echo '#########################'
exit 0
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
