Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bash: Refresh patches

Browse source 
Signed-off-by: Marcel Denia <naoir@gmx.net>
This commit is contained in:
Marcel Denia 2014-08-08 19:53:11 +02:00
parent dddc01bbbe
commit f73ee0d75d
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/bash/patches/001-compile-fix.patch
View file

@ -1,6 +1,6 @@
--- a/execute_cmd.c --- a/execute_cmd.c
+++ b/execute_cmd.c +++ b/execute_cmd.c
@@ -2202,7 +2202,11 @@ execute_pipeline (command, asynchronous, @@ -2369,7 +2369,11 @@ execute_pipeline (command, asynchronous,
/* If the `lastpipe' option is set with shopt, and job control is not /* If the `lastpipe' option is set with shopt, and job control is not
enabled, execute the last element of non-async pipelines in the enabled, execute the last element of non-async pipelines in the
current shell environment. */ current shell environment. */
@ -11,5 +11,5 @@
+#endif +#endif
+ asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
{ {
lstdin = move_to_high_fd (0, 0, 255); lstdin = move_to_high_fd (0, 1, -1);
if (lstdin > 0) if (lstdin > 0)

8
utils/bash/patches/002-force-internal-readline.patch
View file

@ -1,6 +1,6 @@
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -5748,8 +5748,7 @@ _ACEOF @@ -5430,8 +5430,7 @@ if test $opt_readline = yes; then
# static version specified as -llibname to override the # static version specified as -llibname to override the
# dynamic version # dynamic version
case "${host_os}" in case "${host_os}" in
@ -10,9 +10,9 @@
esac esac
fi fi
else else
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -540,8 +540,7 @@ if test $opt_readline = yes; then @@ -578,8 +578,7 @@ if test $opt_readline = yes; then
# static version specified as -llibname to override the # static version specified as -llibname to override the
# dynamic version # dynamic version
case "${host_os}" in case "${host_os}" in

7
utils/bash/patches/129-no_doc.patch
View file

@ -1,7 +1,6 @@
diff -urN bash-4.2/Makefile.in bash-4.2.new/Makefile.in --- a/Makefile.in
--- bash-4.2/Makefile.in 2010-12-01 01:22:42.000000000 +0100 +++ b/Makefile.in
+++ bash-4.2.new/Makefile.in 2012-07-30 16:24:01.325057998 +0200 @@ -741,10 +741,8 @@ reconfig: force
@@ -724,10 +724,8 @@
# $(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir) # $(MAKE) -f $(srcdir)/Makefile $(MFLAGS) srcdir=$(srcdir)
doc documentation: force doc documentation: force