rpms/busybox/F-12 busybox-1.15.1-uname.patch, NONE, 1.1 busybox.spec, 1.105, 1.106

[Denys Vlasenko]

Author: vda

Update of /cvs/extras/rpms/busybox/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25928

Modified Files:
	busybox.spec 
Added Files:
	busybox-1.15.1-uname.patch 
Log Message:
- enable Fedora-specific uname -p behavior (#534081)



busybox-1.15.1-uname.patch:
 uname.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE busybox-1.15.1-uname.patch ---
diff -urpN busybox-1.15.1/coreutils/uname.c busybox-1.15.1/coreutils/uname.c
--- busybox-1.15.1/coreutils/uname.c	2009-09-12 17:55:58.000000000 +0200
+++ busybox-1.15.1/coreutils/uname.c	2010-01-26 23:04:02.922149002 +0100
@@ -123,7 +123,7 @@ int uname_main(int argc UNUSED_PARAM, ch
 	strcpy(uname_info.processor, unknown_str);
 	strcpy(uname_info.platform, unknown_str);
 	strcpy(uname_info.os, "GNU/Linux");
-#if 0
+#if 1
 	/* Fedora does something like this */
 	strcpy(uname_info.processor, uname_info.name.machine);
 	strcpy(uname_info.platform, uname_info.name.machine);


Index: busybox.spec
===================================================================
RCS file: /cvs/extras/rpms/busybox/F-12/busybox.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -p -r1.105 -r1.106
--- busybox.spec	26 Nov 2009 13:14:48 -0000	1.105
+++ busybox.spec	11 Feb 2010 15:16:10 -0000	1.106
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.15.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -15,6 +15,7 @@ Patch16: busybox-1.10.1-hwclock.patch
 Patch22: uClibc-0.9.30.1-getline.patch
 Patch23: busybox-1.15.1-man.patch
 Patch24: uClibc-0.9.30.1-utmp.patch
+Patch25: busybox-1.15.1-uname.patch
 Obsoletes: busybox-anaconda
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@ cat %{SOURCE4} >uClibc-0.9.30.1/.config1
 %patch22 -b .getline -p1
 %patch23 -b .man -p1
 %patch24 -b .utmp -p1
+%patch25 -b .uname -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -129,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/busybox.petitboot.1.gz
 
 %changelog
+* Wed Jan 27 2010 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-5
+- enable Fedora-specific uname -p behavior (#534081)
+
 * Fri Nov 26 2009 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-4
 - make uclibc use 32-bit compat struct utmp (#541587)