rpms/busybox/devel busybox-1.7.2-grep.patch, NONE, 1.1 busybox.spec, 1.67, 1.68
Ivana Varekova (varekova)
fedora-extras-commits at redhat.com
Thu Nov 1 12:10:52 UTC 2007
Author: varekova
Update of /cvs/pkgs/rpms/busybox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15795
Modified Files:
busybox.spec
Added Files:
busybox-1.7.2-grep.patch
Log Message:
- fix 359371 - problem with grep output
busybox-1.7.2-grep.patch:
--- NEW FILE busybox-1.7.2-grep.patch ---
diff -up busybox-1.7.2/findutils/grep.c.pom busybox-1.7.2/findutils/grep.c
--- busybox-1.7.2/findutils/grep.c.pom 2007-09-03 13:48:54.000000000 +0200
+++ busybox-1.7.2/findutils/grep.c 2007-11-01 09:39:59.000000000 +0100
@@ -504,7 +504,9 @@ int grep_main(int argc, char **argv)
}
}
matched += grep_file(file);
+ fflush(stdout);
fclose_if_not_stdin(file);
+
grep_done: ;
}
Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/devel/busybox.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- busybox.spec 31 Oct 2007 13:51:04 -0000 1.67
+++ busybox.spec 1 Nov 2007 12:10:16 -0000 1.68
@@ -1,7 +1,7 @@
Summary: Statically linked binary providing simplified versions of system commands
Name: busybox
Version: 1.7.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2
Group: System Environment/Shells
@@ -17,6 +17,7 @@
Patch14: busybox-1.5.1-msh.patch
Patch15: busybox-1.6.1-st_err.patch
Patch16: busybox-1.7.2-sed.patch
+Patch17: busybox-1.7.2-grep.patch
URL: http://www.busybox.net
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libselinux-devel >= 1.27.7-2
@@ -61,7 +62,8 @@
%patch12 -b .ls -p1
%patch14 -b .msh -p1
%patch15 -b .st_err -p1
-%patch16 -b .sed -p1
+%patch16 -b .ffl -p1
+%patch17 -b .ffl -p1
%build
# create static busybox - the executable is kept as busybox-static
@@ -114,6 +116,9 @@
/sbin/busybox.petitboot
%changelog
+* Thu Nov 1 2007 Ivana Varekova <varekova at redhat.com> - 1:1.7.2-4
+- fix 359371 - problem with grep output
+
* Wed Oct 31 2007 Ivana Varekova <varekova at redhat.com> - 1:1.7.2-3
- fix another sed problem (forgotten fflush - #356111)
More information about the scm-commits
mailing list