Changed patches to satisfy fuzz=0
This commit is contained in:
parent
39b6ea3bda
commit
064f2912f8
@ -1,11 +1,12 @@
|
||||
--- bash-2.03/config-top.h.profile Mon Feb 22 14:37:17 1999
|
||||
+++ bash-2.03/config-top.h Mon Feb 22 14:37:29 1999
|
||||
@@ -3,6 +3,8 @@
|
||||
/* This contains various user-settable options not under the control of
|
||||
autoconf. */
|
||||
diff -up bash-3.2/config-top.h.profile bash-3.2/config-top.h
|
||||
--- bash-3.2/config-top.h.profile 2008-07-17 13:35:39.000000000 +0200
|
||||
+++ bash-3.2/config-top.h 2008-07-17 13:42:18.000000000 +0200
|
||||
@@ -26,6 +26,8 @@
|
||||
what POSIX.2 specifies. */
|
||||
#define CONTINUE_AFTER_KILL_ERROR
|
||||
|
||||
+#define NON_INTERACTIVE_LOGIN_SHELLS
|
||||
+
|
||||
/* Define CONTINUE_AFTER_KILL_ERROR if you want the kill command to
|
||||
continue processing arguments after one of them fails. This is
|
||||
what POSIX.2 specifies. */
|
||||
/* Define BREAK_COMPLAINS if you want the non-standard, but useful
|
||||
error messages about `break' and `continue' out of context. */
|
||||
#define BREAK_COMPLAINS
|
||||
|
30
bash-3.2-patch035.patch
Normal file
30
bash-3.2-patch035.patch
Normal file
@ -0,0 +1,30 @@
|
||||
--- ../bash32-035.patchpatch 2008-07-17 13:26:12.000000000 +0200
|
||||
+++ ../bash32-035 2008-07-17 13:28:18.000000000 +0200
|
||||
@@ -18,16 +18,15 @@
|
||||
*** ../bash-3.2-patched/subst.c 2007-12-13 22:31:21.000000000 -0500
|
||||
--- subst.c 2008-01-17 22:48:15.000000000 -0500
|
||||
***************
|
||||
-*** 4621,4627 ****
|
||||
-
|
||||
+*** 4622,4628 ****
|
||||
#if defined (JOB_CONTROL)
|
||||
set_sigchld_handler ();
|
||||
stop_making_children ();
|
||||
! pipeline_pgrp = old_pipeline_pgrp;
|
||||
#else
|
||||
stop_making_children ();
|
||||
---- 4721,4728 ----
|
||||
-
|
||||
+ #endif /* JOB_CONTROL */
|
||||
+--- 4622,4629 ----
|
||||
#if defined (JOB_CONTROL)
|
||||
set_sigchld_handler ();
|
||||
stop_making_children ();
|
||||
@@ -35,6 +34,7 @@
|
||||
! pipeline_pgrp = old_pipeline_pgrp;
|
||||
#else
|
||||
stop_making_children ();
|
||||
+ #endif /* JOB_CONTROL */
|
||||
*** ../bash-3.2-patched/jobs.c 2007-08-25 13:46:59.000000000 -0400
|
||||
--- jobs.c 2007-12-08 16:47:43.000000000 -0500
|
||||
***************
|
@ -162,7 +162,7 @@ diff -upk.orig bash-3.1.orig/execute_cmd.c bash-3.1/execute_cmd.c
|
||||
+ if (read_but_dont_execute)
|
||||
return (EXECUTION_SUCCESS);
|
||||
|
||||
run_pending_traps ();
|
||||
QUIT;
|
||||
@@ -3984,7 +3994,7 @@ execute_intern_function (name, function)
|
||||
|
||||
if (check_identifier (name, posixly_correct) == 0)
|
||||
|
@ -95,7 +95,7 @@ compliance over previous versions.
|
||||
|
||||
%setup -q -a 2
|
||||
# patching official upstream patches
|
||||
%patch141 -p0 -b .patch035
|
||||
#%patch141 -p0 -b .patch035
|
||||
|
||||
# Official upstream patches
|
||||
%patch1 -p0 -b .001
|
||||
|
@ -18,16 +18,15 @@ Patch:
|
||||
*** ../bash-3.2-patched/subst.c 2007-12-13 22:31:21.000000000 -0500
|
||||
--- subst.c 2008-01-17 22:48:15.000000000 -0500
|
||||
***************
|
||||
*** 4621,4627 ****
|
||||
|
||||
*** 4622,4628 ****
|
||||
#if defined (JOB_CONTROL)
|
||||
set_sigchld_handler ();
|
||||
stop_making_children ();
|
||||
! pipeline_pgrp = old_pipeline_pgrp;
|
||||
#else
|
||||
stop_making_children ();
|
||||
--- 4721,4728 ----
|
||||
|
||||
#endif /* JOB_CONTROL */
|
||||
--- 4622,4629 ----
|
||||
#if defined (JOB_CONTROL)
|
||||
set_sigchld_handler ();
|
||||
stop_making_children ();
|
||||
@ -35,6 +34,7 @@ Patch:
|
||||
! pipeline_pgrp = old_pipeline_pgrp;
|
||||
#else
|
||||
stop_making_children ();
|
||||
#endif /* JOB_CONTROL */
|
||||
*** ../bash-3.2-patched/jobs.c 2007-08-25 13:46:59.000000000 -0400
|
||||
--- jobs.c 2007-12-08 16:47:43.000000000 -0500
|
||||
***************
|
||||
|
Loading…
Reference in New Issue
Block a user