rpms/bash/devel bash-3.2-patch035.patch, NONE, 1.1 bash-2.03-profile.patch, 1.1, 1.2 bash-requires.patch, 1.1, 1.2 bash.spec, 1.159, 1.160 bash32-035, 1.1, 1.2
Roman Rakus (rrakus)
fedora-extras-commits at redhat.com
Thu Jul 17 12:15:34 UTC 2008
Author: rrakus
Update of /cvs/extras/rpms/bash/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26283
Modified Files:
bash-2.03-profile.patch bash-requires.patch bash.spec
bash32-035
Added Files:
bash-3.2-patch035.patch
Log Message:
Changed patches to satisfy fuzz=0
bash-3.2-patch035.patch:
--- NEW FILE bash-3.2-patch035.patch ---
--- ../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
***************
bash-2.03-profile.patch:
Index: bash-2.03-profile.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-2.03-profile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-2.03-profile.patch 9 Sep 2004 03:25:09 -0000 1.1
+++ bash-2.03-profile.patch 17 Jul 2008 12:14:50 -0000 1.2
@@ -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
bash-requires.patch:
Index: bash-requires.patch
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash-requires.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash-requires.patch 15 Jun 2006 15:21:10 -0000 1.1
+++ bash-requires.patch 17 Jul 2008 12:14:50 -0000 1.2
@@ -162,7 +162,7 @@
+ 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)
Index: bash.spec
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- bash.spec 17 Jul 2008 08:45:32 -0000 1.159
+++ bash.spec 17 Jul 2008 12:14:50 -0000 1.160
@@ -73,6 +73,7 @@
Patch138: bash-3.2-comp_wordbreaks.patch
Patch139: bash-3.2-manpage.patch
Patch140: bash-3.2-man-page-suspend.patch
+Patch141: bash-3.2-patch035.patch
Requires: mktemp
Requires(post): ncurses
@@ -91,7 +92,11 @@
compliance over previous versions.
%prep
+
%setup -q -a 2
+# patching official upstream patches
+%patch141 -p0 -b .patch035
+
# Official upstream patches
%patch1 -p0 -b .001
%patch2 -p0 -b .002
@@ -156,7 +161,6 @@
%patch139 -p1 -b .manpage
%patch140 -p1 -b .man-page-suspend
-
echo %{version} > _distribution
echo %{release} > _patchlevel
@@ -299,6 +303,7 @@
%changelog
* Thu Jul 17 2008 Roman Rakus <rrakus at redhat.com> - 3.2-27
- Changes in man page - #442018, #445692, #446625, #453409
+- Changed patches to satisfy fuzz=0
* Thu Jun 5 2008 Roman Rakus <rrakus at redhat.com> - 3.2-26
- Patchlevel 39
Index: bash32-035
===================================================================
RCS file: /cvs/extras/rpms/bash/devel/bash32-035,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bash32-035 5 Jun 2008 15:43:36 -0000 1.1
+++ bash32-035 17 Jul 2008 12:14:50 -0000 1.2
@@ -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
***************
More information about the fedora-extras-commits
mailing list