rpms/bash/devel bash-requires.patch,1.5,1.6 bash.spec,1.200,1.201
Roman Rakus
rrakus at fedoraproject.org
Tue Mar 30 11:46:15 UTC 2010
Author: rrakus
Update of /cvs/pkgs/rpms/bash/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20795
Modified Files:
bash-requires.patch bash.spec
Log Message:
Corrected requires patch (#563301)
bash-requires.patch:
builtins.h | 2 ++
builtins/mkbuiltins.c | 27 ++++++++++++++++++++++++++-
doc/bash.1 | 7 +++++++
doc/bashref.texi | 7 +++++++
eval.c | 3 ++-
execute_cmd.c | 12 ++++++++++--
execute_cmd.h | 2 ++
make_cmd.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
shell.c | 10 ++++++++++
9 files changed, 116 insertions(+), 4 deletions(-)
Index: bash-requires.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash-requires.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- bash-requires.patch 27 Dec 2009 11:22:37 -0000 1.5
+++ bash-requires.patch 30 Mar 2010 11:46:15 -0000 1.6
@@ -1,6 +1,6 @@
-diff -up bash-4.1-rc1/builtins.h.requires bash-4.1-rc1/builtins.h
---- bash-4.1-rc1/builtins.h.requires 2009-01-04 20:32:23.000000000 +0100
-+++ bash-4.1-rc1/builtins.h 2009-12-26 22:55:02.000000000 +0100
+diff -up bash-4.1/builtins.h.requires bash-4.1/builtins.h
+--- bash-4.1/builtins.h.requires 2009-01-04 20:32:23.000000000 +0100
++++ bash-4.1/builtins.h 2010-03-30 10:50:38.000000000 +0200
@@ -41,6 +41,8 @@
#define SPECIAL_BUILTIN 0x08 /* This is a Posix `special' builtin. */
#define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */
@@ -10,9 +10,9 @@ diff -up bash-4.1-rc1/builtins.h.require
#define BASE_INDENT 4
-diff -up bash-4.1-rc1/builtins/mkbuiltins.c.requires bash-4.1-rc1/builtins/mkbuiltins.c
---- bash-4.1-rc1/builtins/mkbuiltins.c.requires 2009-01-04 20:32:23.000000000 +0100
-+++ bash-4.1-rc1/builtins/mkbuiltins.c 2009-12-26 22:55:02.000000000 +0100
+diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
+--- bash-4.1/builtins/mkbuiltins.c.requires 2009-01-04 20:32:23.000000000 +0100
++++ bash-4.1/builtins/mkbuiltins.c 2010-03-30 10:50:38.000000000 +0200
@@ -69,9 +69,15 @@ extern char *strcpy ();
#define whitespace(c) (((c) == ' ') || ((c) == '\t'))
@@ -86,9 +86,9 @@ diff -up bash-4.1-rc1/builtins/mkbuiltin
#if !defined (HAVE_RENAME)
static int
rename (from, to)
-diff -up bash-4.1-rc1/doc/bash.1.requires bash-4.1-rc1/doc/bash.1
---- bash-4.1-rc1/doc/bash.1.requires 2009-12-26 22:55:02.000000000 +0100
-+++ bash-4.1-rc1/doc/bash.1 2009-12-26 22:55:02.000000000 +0100
+diff -up bash-4.1/doc/bash.1.requires bash-4.1/doc/bash.1
+--- bash-4.1/doc/bash.1.requires 2010-03-30 10:50:38.000000000 +0200
++++ bash-4.1/doc/bash.1 2010-03-30 10:50:38.000000000 +0200
@@ -231,6 +231,13 @@ The shell becomes restricted (see
.B "RESTRICTED SHELL"
below).
@@ -103,10 +103,10 @@ diff -up bash-4.1-rc1/doc/bash.1.require
.B \-\-verbose
Equivalent to \fB\-v\fP.
.TP
-diff -up bash-4.1-rc1/doc/bashref.texi.requires bash-4.1-rc1/doc/bashref.texi
---- bash-4.1-rc1/doc/bashref.texi.requires 2009-12-26 22:55:02.000000000 +0100
-+++ bash-4.1-rc1/doc/bashref.texi 2009-12-26 22:55:02.000000000 +0100
-@@ -5337,6 +5337,13 @@ standard. @xref{Bash POSIX Mode}, for a
+diff -up bash-4.1/doc/bashref.texi.requires bash-4.1/doc/bashref.texi
+--- bash-4.1/doc/bashref.texi.requires 2010-03-30 10:50:38.000000000 +0200
++++ bash-4.1/doc/bashref.texi 2010-03-30 10:50:38.000000000 +0200
+@@ -5343,6 +5343,13 @@ standard. @xref{Bash POSIX Mode}, for a
@item --restricted
Make the shell a restricted shell (@pxref{The Restricted Shell}).
@@ -120,9 +120,9 @@ diff -up bash-4.1-rc1/doc/bashref.texi.r
@item --verbose
Equivalent to @option{-v}. Print shell input lines as they're read.
-diff -up bash-4.1-rc1/eval.c.requires bash-4.1-rc1/eval.c
---- bash-4.1-rc1/eval.c.requires 2009-01-04 20:32:26.000000000 +0100
-+++ bash-4.1-rc1/eval.c 2009-12-26 22:55:02.000000000 +0100
+diff -up bash-4.1/eval.c.requires bash-4.1/eval.c
+--- bash-4.1/eval.c.requires 2009-01-04 20:32:26.000000000 +0100
++++ bash-4.1/eval.c 2010-03-30 10:50:38.000000000 +0200
@@ -53,6 +53,7 @@ extern int last_command_exit_value, stdi
extern int need_here_doc;
extern int current_command_number, current_command_line_count, line_number;
@@ -140,10 +140,10 @@ diff -up bash-4.1-rc1/eval.c.requires ba
{
last_command_exit_value = EXECUTION_SUCCESS;
dispose_command (global_command);
-diff -up bash-4.1-rc1/execute_cmd.c.requires bash-4.1-rc1/execute_cmd.c
---- bash-4.1-rc1/execute_cmd.c.requires 2009-12-26 22:55:02.000000000 +0100
-+++ bash-4.1-rc1/execute_cmd.c 2009-12-26 22:55:02.000000000 +0100
-@@ -501,6 +501,8 @@ async_redirect_stdin ()
+diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
+--- bash-4.1/execute_cmd.c.requires 2010-03-30 10:50:37.000000000 +0200
++++ bash-4.1/execute_cmd.c 2010-03-30 10:52:03.000000000 +0200
+@@ -503,6 +503,8 @@ async_redirect_stdin ()
#define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
@@ -152,22 +152,22 @@ diff -up bash-4.1-rc1/execute_cmd.c.requ
/* Execute the command passed in COMMAND, perhaps doing it asynchrounously.
COMMAND is exactly what read_command () places into GLOBAL_COMMAND.
ASYNCHROUNOUS, if non-zero, says to do this command in the background.
-@@ -532,8 +534,13 @@ execute_command_internal (command, async
+@@ -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)
+ if (command == 0 || (read_but_dont_execute && !rpm_requires))
- return (EXECUTION_SUCCESS);
++ return (EXECUTION_SUCCESS);
+ if (rpm_requires && command->type == cm_function_def)
+ return last_command_exit_value =
+ execute_intern_function (command->value.Function_def->name,
+ command->value.Function_def->command);
-+
++ if (read_but_dont_execute)
+ return (EXECUTION_SUCCESS);
#endif
- QUIT;
-@@ -5061,7 +5068,7 @@ execute_intern_function (name, function)
+@@ -5066,7 +5074,7 @@ execute_intern_function (name, function)
if (check_identifier (name, posixly_correct) == 0)
{
@@ -176,9 +176,9 @@ diff -up bash-4.1-rc1/execute_cmd.c.requ
{
last_command_exit_value = EX_BADUSAGE;
jump_to_top_level (ERREXIT);
-diff -up bash-4.1-rc1/execute_cmd.h.requires bash-4.1-rc1/execute_cmd.h
---- bash-4.1-rc1/execute_cmd.h.requires 2009-01-16 22:20:15.000000000 +0100
-+++ bash-4.1-rc1/execute_cmd.h 2009-12-26 22:55:02.000000000 +0100
+diff -up bash-4.1/execute_cmd.h.requires bash-4.1/execute_cmd.h
+--- bash-4.1/execute_cmd.h.requires 2009-01-16 22:20:15.000000000 +0100
++++ bash-4.1/execute_cmd.h 2010-03-30 10:50:38.000000000 +0200
@@ -22,6 +22,8 @@
#define _EXECUTE_CMD_H_
@@ -188,9 +188,9 @@ diff -up bash-4.1-rc1/execute_cmd.h.requ
extern struct fd_bitmap *new_fd_bitmap __P((int));
extern void dispose_fd_bitmap __P((struct fd_bitmap *));
-diff -up bash-4.1-rc1/make_cmd.c.requires bash-4.1-rc1/make_cmd.c
---- bash-4.1-rc1/make_cmd.c.requires 2009-09-11 23:26:12.000000000 +0200
-+++ bash-4.1-rc1/make_cmd.c 2009-12-26 22:57:46.000000000 +0100
+diff -up bash-4.1/make_cmd.c.requires bash-4.1/make_cmd.c
+--- bash-4.1/make_cmd.c.requires 2009-09-11 23:26:12.000000000 +0200
++++ bash-4.1/make_cmd.c 2010-03-30 10:50:38.000000000 +0200
@@ -42,11 +42,15 @@
#include "flags.h"
#include "make_cmd.h"
@@ -274,9 +274,9 @@ diff -up bash-4.1-rc1/make_cmd.c.require
parser_state &= ~PST_REDIRLIST;
return (command);
}
-diff -up bash-4.1-rc1/shell.c.requires bash-4.1-rc1/shell.c
---- bash-4.1-rc1/shell.c.requires 2009-12-26 22:55:02.000000000 +0100
-+++ bash-4.1-rc1/shell.c 2009-12-26 22:55:02.000000000 +0100
+diff -up bash-4.1/shell.c.requires bash-4.1/shell.c
+--- bash-4.1/shell.c.requires 2010-03-30 10:50:38.000000000 +0200
++++ bash-4.1/shell.c 2010-03-30 10:50:38.000000000 +0200
@@ -193,6 +193,9 @@ int have_devfd = 0;
/* The name of the .(shell)rc file. */
static char *bashrc_file = "~/.bashrc";
Index: bash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash/devel/bash.spec,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -p -r1.200 -r1.201
--- bash.spec 22 Jan 2010 13:13:39 -0000 1.200
+++ bash.spec 30 Mar 2010 11:46:15 -0000 1.201
@@ -5,7 +5,7 @@
Version: %{baseversion}%{patchleveltag}
Name: bash
Summary: The GNU Bourne Again shell
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Shells
License: GPLv3+
Url: http://www.gnu.org/software/bash
@@ -262,6 +262,9 @@ fi
#%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
%changelog
+* Tue Mar 30 2010 Roman Rakus <rrakus at redhat.com> - 4.1.2-4
+- Corrected requires patch (#563301)
+
* Fri Jan 22 2010 rrakus at redhat.com 4.1.2-3
- Don't use cond-rmatch patch
- Use manso patch
More information about the scm-commits
mailing list