rpms/busybox/F-7 busybox-1.2.2-ed.patch, NONE, 1.1 busybox.spec, 1.59, 1.60

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/busybox/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4429

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.2.2-ed.patch 
Log Message:
- Resolves: #423011
  busybox cut command suppresses redirected output


busybox-1.2.2-ed.patch:

--- NEW FILE busybox-1.2.2-ed.patch ---
--- busybox-1.2.2/editors/ed.c.pom	2006-07-01 00:42:13.000000000 +0200
+++ busybox-1.2.2/editors/ed.c	2007-12-21 09:44:29.000000000 +0100
@@ -1172,6 +1172,12 @@
 	lastNum++;
 	dirty = TRUE;
 
+	/* It is necessary to shift the enumeration
+	   if the line is added to the first position */
+	   
+        if ((num==1) && (lastNum>1))
+    	        curNum=2;
+
 	return setCurNum(num);
 }
 


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/F-7/busybox.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- busybox.spec	13 Dec 2007 14:57:24 -0000	1.59
+++ busybox.spec	21 Dec 2007 09:36:21 -0000	1.60
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.2.2
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPL
 Group: System Environment/Shells
@@ -18,6 +18,7 @@
 Patch11: busybox-1.2.2-iptunnel.patch
 Patch12: busybox-1.2.2-ls.patch
 Patch13: busybox-1.2.2-gc-section.patch
+Patch14: busybox-1.2.2-ed.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -68,6 +69,7 @@
 %patch11 -b .iptunnel -p1
 %patch12 -b .ls -p1
 %patch13 -b .sect -p1
+%patch14 -b .pom -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -124,8 +126,13 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Fri Dec 21 2007 Ivana Varekova <varekova at redhat.com> - 1:1.2.2-10
+- Resolves: #423781 
+  busybox's ed has a bug in the insert command
+
 * Thu Dec 13 2007 Ivana Varekova <varekova at redhat.com> - 1:1.2.2-9
-- fix #423011- busybox cut command suppresses redirected output
+- Resolves: #423011
+  busybox cut command suppresses redirected output
 
 * Sat Apr  7 2007 David Woodhouse <dwmw2 at redhat.com> - 1:1.2.2-8
 - Add busybox-petitboot subpackage