rpms/busybox/F-8 busybox-1.6.1-ed.patch, NONE, 1.1 busybox.spec, 1.65, 1.66

[Ivana Varekova (varekova)]

Author: varekova

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

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


busybox-1.6.1-ed.patch:

--- NEW FILE busybox-1.6.1-ed.patch ---
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);
 }
 


Index: busybox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/busybox/F-8/busybox.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- busybox.spec	17 Dec 2007 09:16:19 -0000	1.65
+++ busybox.spec	21 Dec 2007 09:57:09 -0000	1.66
@@ -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 @@
 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 @@
 %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 @@
 /sbin/busybox.petitboot
 
 %changelog
+* Fri Dec 21 2007 Ivana Varekova <varekova at 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 at redhat.com> - 1:1.6.1-3
 - fix #423011 - busybox cut command suppresses redirected output