rpms/bash
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use better nomenclature for --rpm-requires bash option (#557134)

Browse Source
This commit is contained in:
Roman Rakus 2010-08-02 18:20:29 +02:00
parent 58c1729f33
commit 5ab66f48b3
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
bash-requires.patch
View File

@ -1,6 +1,6 @@
diff -up bash-4.1/builtins.h.requires bash-4.1/builtins.h 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.requires 2009-01-04 20:32:23.000000000 +0100
+++ bash-4.1/builtins.h 2010-03-30 10:50:38.000000000 +0200 +++ bash-4.1/builtins.h 2010-08-02 17:42:41.000000000 +0200
@@ -41,6 +41,8 @@ @@ -41,6 +41,8 @@
#define SPECIAL_BUILTIN 0x08 /* This is a Posix `special' builtin. */ #define SPECIAL_BUILTIN 0x08 /* This is a Posix `special' builtin. */
#define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */ #define ASSIGNMENT_BUILTIN 0x10 /* This builtin takes assignment statements. */
@ -12,7 +12,7 @@ diff -up bash-4.1/builtins.h.requires bash-4.1/builtins.h
diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c 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.requires 2009-01-04 20:32:23.000000000 +0100
+++ bash-4.1/builtins/mkbuiltins.c 2010-03-30 10:50:38.000000000 +0200 +++ bash-4.1/builtins/mkbuiltins.c 2010-08-02 17:42:41.000000000 +0200
@@ -69,9 +69,15 @@ extern char *strcpy (); @@ -69,9 +69,15 @@ extern char *strcpy ();
#define whitespace(c) (((c) == ' ') || ((c) == '\t')) #define whitespace(c) (((c) == ' ') || ((c) == '\t'))
@ -87,9 +87,9 @@ diff -up bash-4.1/builtins/mkbuiltins.c.requires bash-4.1/builtins/mkbuiltins.c
static int static int
rename (from, to) rename (from, to)
diff -up bash-4.1/doc/bash.1.requires bash-4.1/doc/bash.1 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.requires 2010-08-02 17:42:41.000000000 +0200
+++ bash-4.1/doc/bash.1 2010-03-30 10:50:38.000000000 +0200 +++ bash-4.1/doc/bash.1 2010-08-02 18:09:27.000000000 +0200
@@ -231,6 +231,13 @@ The shell becomes restricted (see @@ -231,6 +231,14 @@ The shell becomes restricted (see
.B "RESTRICTED SHELL" .B "RESTRICTED SHELL"
below). below).
.TP .TP
@ -97,15 +97,16 @@ diff -up bash-4.1/doc/bash.1.requires bash-4.1/doc/bash.1
+Produce the list of files that are required for the +Produce the list of files that are required for the
+shell script to run. This implies '-n' and is subject +shell script to run. This implies '-n' and is subject
+to the same limitations as compile time error checking checking; +to the same limitations as compile time error checking checking;
+Backticks, [] tests, and evals are not parsed so some +Command substitutions, Conditional expressions and
+dependencies may be missed. +.BR eval
+builtin are not parsed so some dependencies may be missed.
+.TP +.TP
.B \-\-verbose .B \-\-verbose
Equivalent to \fB\-v\fP. Equivalent to \fB\-v\fP.
.TP .TP
diff -up bash-4.1/doc/bashref.texi.requires bash-4.1/doc/bashref.texi 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.requires 2010-08-02 17:42:41.000000000 +0200
+++ bash-4.1/doc/bashref.texi 2010-03-30 10:50:38.000000000 +0200 +++ bash-4.1/doc/bashref.texi 2010-08-02 18:11:58.000000000 +0200
@@ -5343,6 +5343,13 @@ standard. @xref{Bash POSIX Mode}, for a @@ -5343,6 +5343,13 @@ standard. @xref{Bash POSIX Mode}, for a
@item --restricted @item --restricted
Make the shell a restricted shell (@pxref{The Restricted Shell}). Make the shell a restricted shell (@pxref{The Restricted Shell}).
@ -114,15 +115,15 @@ diff -up bash-4.1/doc/bashref.texi.requires bash-4.1/doc/bashref.texi
+Produce the list of files that are required for the +Produce the list of files that are required for the
+shell script to run. This implies '-n' and is subject +shell script to run. This implies '-n' and is subject
+to the same limitations as compile time error checking checking; +to the same limitations as compile time error checking checking;
+Backticks, [] tests, and evals are not parsed so some +Command substitutions, Conditional expressions and @command{eval}
+dependencies may be missed. +are not parsed so some dependencies may be missed.
+ +
@item --verbose @item --verbose
Equivalent to @option{-v}. Print shell input lines as they're read. Equivalent to @option{-v}. Print shell input lines as they're read.
diff -up bash-4.1/eval.c.requires bash-4.1/eval.c 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.requires 2009-01-04 20:32:26.000000000 +0100
+++ bash-4.1/eval.c 2010-03-30 10:50:38.000000000 +0200 +++ bash-4.1/eval.c 2010-08-02 17:42:41.000000000 +0200
@@ -53,6 +53,7 @@ extern int last_command_exit_value, stdi @@ -53,6 +53,7 @@ extern int last_command_exit_value, stdi
extern int need_here_doc; extern int need_here_doc;
extern int current_command_number, current_command_line_count, line_number; extern int current_command_number, current_command_line_count, line_number;
@ -141,8 +142,8 @@ diff -up bash-4.1/eval.c.requires bash-4.1/eval.c
last_command_exit_value = EXECUTION_SUCCESS; last_command_exit_value = EXECUTION_SUCCESS;
dispose_command (global_command); dispose_command (global_command);
diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c 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.requires 2010-08-02 17:42:41.000000000 +0200
+++ bash-4.1/execute_cmd.c 2010-03-30 10:52:03.000000000 +0200 +++ bash-4.1/execute_cmd.c 2010-08-02 17:42:41.000000000 +0200
@@ -503,6 +503,8 @@ async_redirect_stdin () @@ -503,6 +503,8 @@ async_redirect_stdin ()
#define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0) #define DESCRIBE_PID(pid) do { if (interactive) describe_pid (pid); } while (0)
@ -178,7 +179,7 @@ diff -up bash-4.1/execute_cmd.c.requires bash-4.1/execute_cmd.c
jump_to_top_level (ERREXIT); jump_to_top_level (ERREXIT);
diff -up bash-4.1/execute_cmd.h.requires bash-4.1/execute_cmd.h 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.requires 2009-01-16 22:20:15.000000000 +0100
+++ bash-4.1/execute_cmd.h 2010-03-30 10:50:38.000000000 +0200 +++ bash-4.1/execute_cmd.h 2010-08-02 17:42:41.000000000 +0200
@@ -22,6 +22,8 @@ @@ -22,6 +22,8 @@
#define _EXECUTE_CMD_H_ #define _EXECUTE_CMD_H_
@ -190,7 +191,7 @@ diff -up bash-4.1/execute_cmd.h.requires bash-4.1/execute_cmd.h
extern void dispose_fd_bitmap __P((struct fd_bitmap *)); extern void dispose_fd_bitmap __P((struct fd_bitmap *));
diff -up bash-4.1/make_cmd.c.requires bash-4.1/make_cmd.c 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.requires 2009-09-11 23:26:12.000000000 +0200
+++ bash-4.1/make_cmd.c 2010-03-30 10:50:38.000000000 +0200 +++ bash-4.1/make_cmd.c 2010-08-02 17:42:41.000000000 +0200
@@ -42,11 +42,15 @@ @@ -42,11 +42,15 @@
#include "flags.h" #include "flags.h"
#include "make_cmd.h" #include "make_cmd.h"
@ -275,8 +276,8 @@ diff -up bash-4.1/make_cmd.c.requires bash-4.1/make_cmd.c
return (command); return (command);
} }
diff -up bash-4.1/shell.c.requires bash-4.1/shell.c 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.requires 2010-08-02 17:42:41.000000000 +0200
+++ bash-4.1/shell.c 2010-03-30 10:50:38.000000000 +0200 +++ bash-4.1/shell.c 2010-08-02 17:42:41.000000000 +0200
@@ -193,6 +193,9 @@ int have_devfd = 0; @@ -193,6 +193,9 @@ int have_devfd = 0;
/* The name of the .(shell)rc file. */ /* The name of the .(shell)rc file. */
static char *bashrc_file = "~/.bashrc"; static char *bashrc_file = "~/.bashrc";

5
bash.spec
View File

@ -5,7 +5,7 @@
Version: %{baseversion}%{patchleveltag} Version: %{baseversion}%{patchleveltag}
Name: bash Name: bash
Summary: The GNU Bourne Again shell Summary: The GNU Bourne Again shell
Release: 3%{?dist} Release: 4%{?dist}
Group: System Environment/Shells Group: System Environment/Shells
License: GPLv3+ License: GPLv3+
Url: http://www.gnu.org/software/bash Url: http://www.gnu.org/software/bash
@ -274,6 +274,9 @@ fi
#%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
%changelog %changelog
* Mon Aug 02 2010 Roman Rakus <rrakus@redhat.com> - 4.1.7-4
- Use better nomenclature for --rpm-requires bash option (#557134)
* Tue Jun 22 2010 Roman Rakus <rrakus@redhat.com> - 4.1.7-3 * Tue Jun 22 2010 Roman Rakus <rrakus@redhat.com> - 4.1.7-3
- Added missing patch - Added missing patch