[bash] Update to bash-4.3
Ondrej Oprala
ooprala at fedoraproject.org
Fri Feb 28 00:26:29 UTC 2014
commit ac881ba83f94a4b96aadb41ac38a50f7e331b178
Author: Ondrej Oprala <ooprala at redhat.com>
Date: Thu Feb 27 15:09:51 2014 +0100
Update to bash-4.3
.gitignore | 1 +
bash-2.03-paths.patch | 21 +--
bash-2.05a-interpreter.patch | 11 +-
bash-2.05b-readline-oom.patch | 6 +-
bash-3.2-audit.patch | 14 +-
bash-4.1-defer-sigchld-trap.patch | 21 +--
bash-4.2-format-security.patch | 12 -
bash-4.2-manpage_trap.patch | 2 +-
bash-4.2-missing_closes.patch | 39 ---
bash-4.2-signal.patch | 36 ---
bash-bashbug.patch | 2 +-
bash-requires.patch | 14 +-
bash.spec | 135 ++---------
bash42-001 | 78 ------
bash42-002 | 60 -----
bash42-003 | 318 ----------------------
bash42-004 | 53 ----
bash42-005 | 131 ---------
bash42-006 | 46 ----
bash42-007 | 46 ----
bash42-008 | 74 ------
bash42-009 | 82 ------
bash42-010 | 61 -----
bash42-011 | 46 ----
bash42-012 | 151 -----------
bash42-013 | 52 ----
bash42-014 | 47 ----
bash42-015 | 81 ------
bash42-016 | 46 ----
bash42-017 | 47 ----
bash42-018 | 74 ------
bash42-019 | 47 ----
bash42-020 | 60 -----
bash42-021 | 61 -----
bash42-022 | 61 -----
bash42-023 | 62 -----
bash42-024 | 45 ----
bash42-025 | 143 ----------
bash42-026 | 58 ----
bash42-027 | 47 ----
bash42-028 | 52 ----
bash42-029 | 524 -------------------------------------
bash42-030 | 178 -------------
bash42-031 | 80 ------
bash42-032 | 75 ------
bash42-033 | 57 ----
bash42-034 | 46 ----
bash42-035 | 66 -----
bash42-036 | 92 -------
bash42-037 | 112 --------
bash42-038 | 47 ----
bash42-039 | 58 ----
bash42-040 | 56 ----
bash42-041 | 47 ----
bash42-042 | 57 ----
bash42-043 | 65 -----
bash42-044 | 70 -----
bash42-045 | 53 ----
sources | 2 +-
59 files changed, 40 insertions(+), 4088 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 40bdc48..8cc6f04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
bash-4.1.tar.gz
/bash-4.2-rc2.tar.gz
/bash-4.2.tar.gz
+/bash-4.3.tar.gz
diff --git a/bash-2.03-paths.patch b/bash-2.03-paths.patch
index 735a381..24ec5cc 100644
--- a/bash-2.03-paths.patch
+++ b/bash-2.03-paths.patch
@@ -1,25 +1,6 @@
---- bash-3.0/config.h.in.paths 2004-07-21 21:08:31.000000000 +0100
-+++ bash-3.0/config.h.in 2004-07-28 09:16:27.257884999 +0100
-@@ -197,7 +197,7 @@
-
- /* System paths */
-
--#define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
-+#define DEFAULT_MAIL_DIRECTORY "/var/spool/mail"
-
- /* Characteristics of the system's header files and libraries that affect
- the compilation environment. */
--- bash-3.0/config-top.h.paths 2003-08-05 15:36:12.000000000 +0100
+++ bash-3.0/config-top.h 2004-07-28 09:36:27.117205637 +0100
-@@ -52,14 +52,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"
- #endif
-
- /* The value for PATH when invoking `command -p'. This is only used when
+@@ -66,7 +66,7 @@
the Posix.2 confstr () function, or CS_PATH define are not present. */
#ifndef STANDARD_UTILS_PATH
#define STANDARD_UTILS_PATH \
diff --git a/bash-2.05a-interpreter.patch b/bash-2.05a-interpreter.patch
index 6957eec..b9f0da2 100644
--- a/bash-2.05a-interpreter.patch
+++ b/bash-2.05a-interpreter.patch
@@ -23,13 +23,13 @@ diff -up bash-4.2-rc2/config.h.in.interpreter bash-4.2-rc2/config.h.in
diff -up bash-4.2-rc2/configure.in.interpreter bash-4.2-rc2/configure.in
--- bash-4.2-rc2/configure.in.interpreter 2011-01-16 21:31:12.000000000 +0100
-+++ bash-4.2-rc2/configure.in 2011-02-09 08:02:27.000000000 +0100
++++ bash-4.2-rc2/configure.ac 2011-02-09 08:02:27.000000000 +0100
@@ -659,7 +659,7 @@ BASH_HEADER_INTTYPES
AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \
memory.h locale.h termcap.h termio.h termios.h dlfcn.h \
- stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h \
-- syslog.h ulimit.h)
-+ syslog.h ulimit.h elf.h)
+ stdbool.h stddef.h stdint.h netdb.h pwd.h grp.h strings.h \
+- regex.h syslog.h ulimit.h)
++ regex.h syslog.h ulimit.h elf.h)
AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \
sys/resource.h sys/param.h sys/socket.h sys/stat.h \
sys/time.h sys/times.h sys/types.h sys/wait.h)
@@ -56,7 +56,7 @@ diff -up bash-4.2-rc2/execute_cmd.c.interpreter bash-4.2-rc2/execute_cmd.c
#include "posixtime.h"
#if defined (HAVE_SYS_RESOURCE_H) && !defined (RLIMTYPE)
-@@ -4975,13 +4979,21 @@ shell_execve (command, args, env)
+@@ -4975,14 +4979,22 @@ shell_execve (command, args, env)
{
/* The file has the execute bits set, but the kernel refuses to
run it for some reason. See why. */
@@ -70,6 +70,7 @@ diff -up bash-4.2-rc2/execute_cmd.c.interpreter bash-4.2-rc2/execute_cmd.c
+#endif
#if defined (HAVE_HASH_BANG_EXEC)
- READ_SAMPLE_BUF (command, sample, sample_len);
+ sample[sample_len - 1] = '\0';
if (sample_len > 2 && sample[0] == '#' && sample[1] == '!')
{
char *interp;
diff --git a/bash-2.05b-readline-oom.patch b/bash-2.05b-readline-oom.patch
index 8c1f231..f25d780 100644
--- a/bash-2.05b-readline-oom.patch
+++ b/bash-2.05b-readline-oom.patch
@@ -1,11 +1,11 @@
--- bash-2.05b/lib/readline/readline.c.oom 2002-03-13 23:10:46.000000000 +0100
+++ bash-2.05b/lib/readline/readline.c 2002-08-07 12:02:04.000000000 +0200
-@@ -567,7 +567,7 @@
- {
+@@ -817,7 +817,7 @@
/* Special case rl_do_lowercase_version (). */
if (func == rl_do_lowercase_version)
+ /* Should we do anything special if key == ANYOTHERKEY? */
- return (_rl_dispatch (_rl_to_lower (key), map));
+ return (_rl_dispatch (_rl_to_lower ((unsigned char)key), map));
rl_executing_keymap = map;
-
+ rl_executing_key = key;
diff --git a/bash-3.2-audit.patch b/bash-3.2-audit.patch
index 80eccfe..48a1751 100644
--- a/bash-3.2-audit.patch
+++ b/bash-3.2-audit.patch
@@ -18,7 +18,7 @@ diff -up bash-4.2/config.h.in.audit bash-4.2/config.h.in
#endif /* _CONFIG_H_ */
diff -up bash-4.2/configure.in.audit bash-4.2/configure.in
--- bash-4.2/configure.in.audit 2013-01-31 16:26:16.858699005 +0100
-+++ bash-4.2/configure.in 2013-01-31 16:26:16.877699269 +0100
++++ bash-4.2/configure.ac 2013-01-31 16:26:16.877699269 +0100
@@ -888,6 +888,8 @@ BASH_FUNC_DUP2_CLOEXEC_CHECK
BASH_SYS_PGRP_SYNC
BASH_SYS_SIGNAL_VINTAGE
@@ -94,15 +94,3 @@ diff -up bash-4.2/lib/readline/readline.c.audit bash-4.2/lib/readline/readline.c
/* Read a line of input. Prompt with PROMPT. An empty PROMPT means
none. A return value of NULL means that EOF was encountered. */
char *
-@@ -352,6 +399,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);
- }
-
diff --git a/bash-4.1-defer-sigchld-trap.patch b/bash-4.1-defer-sigchld-trap.patch
index 8ff26af..e00adec 100644
--- a/bash-4.1-defer-sigchld-trap.patch
+++ b/bash-4.1-defer-sigchld-trap.patch
@@ -2,29 +2,10 @@ diff -pruN bash-4.1/jobs.c bash-4.1.patched/jobs.c
--- bash-4.1/jobs.c 2009-11-30 03:42:05.000000000 +0530
+++ bash-4.1.patched/jobs.c 2012-03-06 16:44:15.706595703 +0530
@@ -3037,6 +3037,7 @@ waitchld (wpid, block)
- PROCESS *child;
pid_t pid;
+
int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
+ int called_from_sighand = sigchld;
static int wcontinued = WCONTINUED; /* run-time fix for glibc problem */
call_set_current = children_exited = 0;
-@@ -3161,7 +3162,17 @@ waitchld (wpid, block)
- longjmp (wait_intr_buf, 1);
- }
-
-- run_sigchld_trap (children_exited);
-+ /* Queue up the trap handler if we're called directly from within the
-+ signal handler. */
-+ if (called_from_sighand)
-+ {
-+ int i = children_exited;
-+ interrupt_immediately = 0;
-+ while (i--)
-+ trap_handler (SIGCHLD);
-+ }
-+ else
-+ run_sigchld_trap (children_exited);
- }
-
- /* We have successfully recorded the useful information about this process
diff --git a/bash-4.2-manpage_trap.patch b/bash-4.2-manpage_trap.patch
index 6923d25..e81882f 100644
--- a/bash-4.2-manpage_trap.patch
+++ b/bash-4.2-manpage_trap.patch
@@ -2,7 +2,7 @@ diff -up bash-4.1/doc/bash.1.manpage_trap bash-4.1/doc/bash.1
--- bash-4.1/doc/bash.1.manpage_trap 2012-08-28 10:06:00.561999092 +0200
+++ bash-4.1/doc/bash.1 2012-08-28 10:06:24.225304505 +0200
@@ -9251,7 +9251,7 @@ being inverted via
- These are the same conditions obeyed by the \fBerrexit\fP option.
+ These are the same conditions obeyed by the \fBerrexit\fP (\fB\-e\fP) option.
.if t .sp 0.5
.if n .sp 1
-Signals ignored upon entry to the shell cannot be trapped or reset.
diff --git a/bash-bashbug.patch b/bash-bashbug.patch
index 656e3b4..7ed60d2 100644
--- a/bash-bashbug.patch
+++ b/bash-bashbug.patch
@@ -41,7 +41,7 @@ diff -up bash-4.2-rc2/doc/bashref.texi.bashbug bash-4.2-rc2/doc/bashref.texi
-the template it provides for filing a bug report.
-
Please send all reports concerning this manual to
- @email{chet.ramey@@case.edu}.
+ @email{bug-bash@@gnu.org}.
diff -up bash-4.2-rc2/shell.c.bashbug bash-4.2-rc2/shell.c
--- bash-4.2-rc2/shell.c.bashbug 2011-01-02 22:04:51.000000000 +0100
diff --git a/bash-requires.patch b/bash-requires.patch
index 63ef4d7..5d82ac6 100644
--- a/bash-requires.patch
+++ b/bash-requires.patch
@@ -71,7 +71,7 @@ diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
+ (builtin->flags & BUILTIN_FLAG_REQUIRES) ? " | REQUIRES_BUILTIN" : "",
document_name (builtin));
- fprintf
+ if (inhibit_functions)
@@ -1581,6 +1599,13 @@ is_posix_builtin (name)
return (_find_in_table (name, posix_builtins));
}
@@ -130,8 +130,8 @@ diff -up bash-4.1/eval.c.requires bash-4.1/eval.c
extern int expand_aliases;
+extern int rpm_requires;
- static void send_pwd_to_eterm __P((void));
- static sighandler alrm_catcher __P((int));
+ #if defined (HAVE_POSIX_SIGNALS)
+ extern sigset_t top_level_mask;
@@ -136,7 +137,7 @@ reader_loop ()
if (read_command () == 0)
@@ -150,11 +150,11 @@ diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
+extern int rpm_requires;
+
- /* Execute the command passed in COMMAND, perhaps doing it asynchrounously.
+ /* Execute the command passed in COMMAND, perhaps doing it asynchronously.
COMMAND is exactly what read_command () places into GLOBAL_COMMAND.
ASYNCHROUNOUS, if non-zero, says to do this command in the background.
@@ -534,7 +536,13 @@ execute_command_internal (command, async
- #else
+
if (breaking || continuing)
return (last_command_exit_value);
- if (command == 0 || read_but_dont_execute)
@@ -166,8 +166,8 @@ diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
+ command->value.Function_def->command);
+ if (read_but_dont_execute)
return (EXECUTION_SUCCESS);
- #endif
+ QUIT;
@@ -5066,7 +5074,7 @@ execute_intern_function (name, function)
if (check_identifier (name, posixly_correct) == 0)
@@ -289,8 +289,8 @@ diff -up bash-4.1/shell.c.requires bash-4.1/shell.c
static int act_like_sh;
@@ -251,6 +254,7 @@ static const struct {
- { "posix", Int, &posixly_correct, (char **)0x0 },
{ "protected", Int, &protected_mode, (char **)0x0 },
+ #endif
{ "rcfile", Charp, (int *)0x0, &bashrc_file },
+ { "rpm-requires", Int, &rpm_requires, (char **)0x0 },
#if defined (RESTRICTED_SHELL)
diff --git a/bash.spec b/bash.spec
index e7cd503..0ec2cec 100644
--- a/bash.spec
+++ b/bash.spec
@@ -1,13 +1,13 @@
#% define beta_tag rc2
-%define patchleveltag .45
-%define baseversion 4.2
+%define patchleveltag .0
+%define baseversion 4.3
%bcond_without tests
%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
Version: %{baseversion}%{patchleveltag}
Name: bash
Summary: The GNU Bourne Again shell
-Release: 6%{?dist}
+Release: 1%{?dist}
Group: System Environment/Shells
License: GPLv3+
Url: http://www.gnu.org/software/bash
@@ -20,53 +20,6 @@ Source1: dot-bashrc
Source2: dot-bash_profile
Source3: dot-bash_logout
-# Official upstream patches
-Patch001: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-001
-Patch002: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-002
-Patch003: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-003
-Patch004: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-004
-Patch005: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-005
-Patch006: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-006
-Patch007: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-007
-Patch008: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-008
-Patch009: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-009
-Patch010: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-010
-Patch011: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-011
-Patch012: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-012
-Patch013: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-013
-Patch014: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-014
-Patch015: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-015
-Patch016: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-016
-Patch017: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-017
-Patch018: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-018
-Patch019: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-019
-Patch020: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-020
-Patch021: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-021
-Patch022: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-022
-Patch023: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-023
-Patch024: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-024
-Patch025: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-025
-Patch026: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-026
-Patch027: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-027
-Patch028: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-028
-Patch029: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-029
-Patch030: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-030
-Patch031: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-031
-Patch032: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-032
-Patch033: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-033
-Patch034: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-034
-Patch035: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-035
-Patch036: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-036
-Patch037: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-037
-Patch038: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-038
-Patch039: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-039
-Patch040: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-040
-Patch041: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-041
-Patch042: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-042
-Patch043: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-043
-Patch044: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-044
-Patch045: ftp://ftp.gnu.org/pub/gnu/bash/bash-4.2-patches/bash42-045
-
# Other patches
Patch101: bash-2.02-security.patch
Patch102: bash-2.03-paths.patch
@@ -107,21 +60,12 @@ Patch122: bash-4.1-defer-sigchld-trap.patch
# 799958, updated info about trap
Patch123: bash-4.2-manpage_trap.patch
-# 695656, block the signal and unblock it after the new handler is installed
-Patch124: bash-4.2-signal.patch
-
# https://www.securecoding.cert.org/confluence/display/seccode/INT32-C.+Ensure+that+operations+on+signed+integers+do+not+result+in+overflow
Patch125: bash-4.2-size_type.patch
-# 903833, Fix missing close(), fixes fd leaks
-Patch126: bash-4.2-missing_closes.patch
-
# fix deadlock in trap, backported from devel branch
Patch127: bash-4.2-trap.patch
-# 1036998, bash FTBFS if -Werror=format-string is used
-Patch128: bash-4.2-format-security.patch
-
BuildRequires: texinfo bison
BuildRequires: ncurses-devel
BuildRequires: autoconf, gettext
@@ -147,53 +91,6 @@ This package contains documentation files for %{name}.
#%setup -q -a 2
%setup -q -n %{name}-%{baseversion}
-# Official upstream patches
-%patch001 -p0 -b .001
-%patch002 -p0 -b .002
-%patch003 -p0 -b .003
-%patch004 -p0 -b .004
-%patch005 -p0 -b .005
-%patch006 -p0 -b .006
-%patch007 -p0 -b .007
-%patch008 -p0 -b .008
-%patch009 -p0 -b .009
-%patch010 -p0 -b .010
-%patch011 -p0 -b .011
-%patch012 -p0 -b .012
-%patch013 -p0 -b .013
-%patch014 -p0 -b .014
-%patch015 -p0 -b .015
-%patch016 -p0 -b .016
-%patch017 -p0 -b .017
-%patch018 -p0 -b .018
-%patch019 -p0 -b .019
-%patch020 -p0 -b .020
-%patch021 -p0 -b .021
-%patch022 -p0 -b .022
-%patch023 -p0 -b .023
-%patch024 -p0 -b .024
-%patch025 -p0 -b .025
-%patch026 -p0 -b .026
-%patch027 -p0 -b .027
-%patch028 -p0 -b .028
-%patch029 -p0 -b .029
-%patch030 -p0 -b .030
-%patch031 -p0 -b .031
-%patch032 -p0 -b .032
-%patch033 -p0 -b .033
-%patch034 -p0 -b .034
-%patch035 -p0 -b .035
-%patch036 -p0 -b .036
-%patch037 -p0 -b .037
-%patch038 -p0 -b .038
-%patch039 -p0 -b .039
-%patch040 -p0 -b .040
-%patch041 -p0 -b .041
-%patch042 -p0 -b .042
-%patch043 -p0 -b .043
-%patch044 -p0 -b .044
-%patch045 -p0 -b .045
-
# Other patches
%patch101 -p1 -b .security
%patch102 -p1 -b .paths
@@ -218,10 +115,7 @@ This package contains documentation files for %{name}.
%patch121 -p1 -b .coverity
%patch122 -p1 -b .defer_sigchld_trap
%patch123 -p1
-%patch124 -p1 -b .signal
%patch125 -p1 -b .size_type
-%patch126 -p1 -b .missing_closes
-%patch128 -p1 -b .format-security
echo %{version} > _distribution
echo %{release} > _patchlevel
@@ -297,10 +191,11 @@ ln -s bashbug.1 $RPM_BUILD_ROOT/%{_mandir}/man1/bashbug-"$LONG_BIT".1
# Fix missing sh-bangs in example scripts (bug #225609).
for script in \
- examples/scripts/krand.bash \
- examples/scripts/bcsh.sh \
- examples/scripts/precedence \
examples/scripts/shprompt
+# I don't know why these are gone in 4.3
+ #examples/scripts/krand.bash \
+ #examples/scripts/bcsh.sh \
+ #examples/scripts/precedence \
do
cp "$script" "$script"-orig
echo '#!/bin/bash' > "$script"
@@ -326,8 +221,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_pkgdocdir}/doc
cp -p COPYING $RPM_BUILD_ROOT/%{_pkgdocdir}
# loadables aren't buildable
rm -rf examples/loadables
-for file in CHANGES COMPAT NEWS NOTES POSIX examples\
- doc/{FAQ,INTRO,rose94.pdf,article.{pdf,txt},bashref.{html,pdf}}
+for file in CHANGES COMPAT NEWS NOTES POSIX RBASH README examples
do
cp -rp "$file" $RPM_BUILD_ROOT/%{_pkgdocdir}/"$file"
echo "%%doc %{_pkgdocdir}/$file" >> %{name}-doc.files
@@ -335,6 +229,7 @@ done
echo "%%doc %{_pkgdocdir}/doc" >> %{name}-doc.files
+
%if %{with tests}
%check
make check
@@ -402,18 +297,22 @@ end
%{_bindir}/wait
%dir %{_pkgdocdir}/
%doc %{_pkgdocdir}/COPYING
-%attr(0755,root,root) %{_bindir}/bashbug*
+%attr(0755,root,root) %{_bindir}/bashbug[-.]*
+%{_bindir}/bashbug
%{_infodir}/bash.info*
%{_mandir}/*/*
%{_mandir}/*/..1*
+%doc RBASH README
+%doc doc/{FAQ,INTRO,README,bash{,ref}.html}
%files doc -f %{name}-doc.files
%defattr(-, root, root)
-
-# For now there isn't any doc
-#%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
+%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
%changelog
+* Thu Feb 27 2014 Ondrej Oprala <ooprala at redhat.com> 4.3.0-1
+- Update to bash-4.3
+
* Wed Dec 04 2013 Ondrej Oprala <ooprala at redhat.com> 4.2.45-6
- Change the paths for format-security patch
diff --git a/sources b/sources
index 42b0157..6e00bea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3fb927c7c33022f1c327f14a81c0d4b0 bash-4.2.tar.gz
+81348932d5da294953e15d4814c74dd1 bash-4.3.tar.gz
More information about the scm-commits
mailing list