From c7a2b115a6e05a960fdc4fe1a2a5daeade2498af Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Dec 21 2007 09:57:09 +0000
Subject: - Resolves: #423011 busybox cut command suppresses redirected output


---

diff --git a/busybox-1.6.1-ed.patch b/busybox-1.6.1-ed.patch
new file mode 100644
index 0000000..890b9ad
--- /dev/null
+++ b/busybox-1.6.1-ed.patch
@@ -0,0 +1,17 @@
+diff -up busybox-1.6.1/editors/ed.c.pom busybox-1.6.1/editors/ed.c
+--- busybox-1.6.1/editors/ed.c.pom	2007-06-30 17:06:47.000000000 +0200
++++ busybox-1.6.1/editors/ed.c	2007-12-21 10:44:49.000000000 +0100
+@@ -1068,6 +1068,13 @@ static int insertLine(int num, const cha
+ 
+ 	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);
+ }
+ 
diff --git a/busybox.spec b/busybox.spec
index 8006ff4..6e6b6be 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -17,6 +17,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.6.1-gc-section.patch
+Patch17: busybox-1.6.1-ed.patch
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  
 BuildRequires: libselinux-devel >= 1.27.7-2
@@ -62,6 +63,7 @@ better suited to normal use.
 %patch14 -b .msh -p1
 %patch15 -b .st_err -p1
 %patch16 -b .gc-s -p1
+%patch17 -b .ed -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -114,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/busybox.petitboot
 
 %changelog
+* Fri Dec 21 2007 Ivana Varekova <varekova@redhat.com> - 1:1.6.1-4
+- Resolves: #423781
+  busybox's ed has a bug in the insert command
+
 * Mon Dec 17 2007 Ivana Varekova <varekova@redhat.com> - 1:1.6.1-3
 - fix #423011 - busybox cut command suppresses redirected output