rpms/busybox/devel busybox-1.7.2-sed.patch, NONE, 1.1 busybox.spec, 1.65, 1.66

Ivana Varekova (varekova) fedora-extras-commits at redhat.com
Mon Oct 29 14:06:59 UTC 2007


Author: varekova

Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv304

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.7.2-sed.patch 
Log Message:
- fix sed problem (#356111)


busybox-1.7.2-sed.patch:

--- NEW FILE busybox-1.7.2-sed.patch ---
diff -up busybox-1.7.2/editors/sed.c.pom busybox-1.7.2/editors/sed.c
--- busybox-1.7.2/editors/sed.c.pom	2007-09-03 13:48:55.000000000 +0200
+++ busybox-1.7.2/editors/sed.c	2007-10-29 14:41:44.000000000 +0100
@@ -1339,8 +1339,10 @@ int sed_main(int argc, char **argv)
 			free(G.outname);
 			G.outname = 0;
 		}
-		if (G.input_file_count > G.current_input_file)
+		if (G.input_file_count > G.current_input_file) {
 			process_files();
+			fflush(G.nonstdout);
+		}
 	}
 
 	return status;


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- busybox.spec	22 Oct 2007 12:21:31 -0000	1.65
+++ busybox.spec	29 Oct 2007 14:06:26 -0000	1.66
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -16,6 +16,7 @@
 Patch13: busybox-1.5.1-clean.patch
 Patch14: busybox-1.5.1-msh.patch
 Patch15: busybox-1.6.1-st_err.patch
+Patch16: busybox-1.7.2-sed.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -60,6 +61,7 @@
 %patch12 -b .ls -p1
 %patch14 -b .msh -p1
 %patch15 -b .st_err -p1
+%patch16 -b .sed -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -112,6 +114,9 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Mon Oct 29 2007 Ivana Varekova <varekova at redhat.com> - 1:1.7.2-2
+- fix sed problem with output (#356111)
+
 * Mon Oct 22 2007 Ivana Varekova <varekova at redhat.com> - 1:1.7.2-1
 - update to 1.7.2
  




More information about the fedora-extras-commits mailing list