rpms/coreutils/devel coreutils-4.5.3-sysinfo.patch, 1.4, 1.5 coreutils.spec, 1.139, 1.140

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/coreutils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19567

Modified Files:
	coreutils-4.5.3-sysinfo.patch coreutils.spec 
Log Message:
5.97-9

coreutils-4.5.3-sysinfo.patch:
 uname.c |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

Index: coreutils-4.5.3-sysinfo.patch
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils-4.5.3-sysinfo.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- coreutils-4.5.3-sysinfo.patch	24 Aug 2006 15:59:31 -0000	1.4
+++ coreutils-4.5.3-sysinfo.patch	24 Aug 2006 16:25:39 -0000	1.5
@@ -1,15 +1,23 @@
---- coreutils-4.5.3/src/uname.c.sysinfo	2002-08-31 09:52:11.000000000 +0100
-+++ coreutils-4.5.3/src/uname.c	2002-11-28 18:29:15.000000000 +0000
-@@ -232,7 +232,7 @@
-       if (toprint & PRINT_KERNEL_RELEASE)
- 	print_element (name.release);
-       if (toprint & PRINT_KERNEL_VERSION)
--	print_element (name.version);
-+	print_element (name.version);
-       if (toprint & PRINT_MACHINE)
- 	print_element (name.machine);
-     }
-@@ -246,6 +246,28 @@
+--- coreutils-5.97/src/uname.c.sysinfo	2005-09-15 20:57:04.000000000 +0100
++++ coreutils-5.97/src/uname.c	2006-08-24 17:15:56.000000000 +0100
+@@ -155,7 +155,7 @@
+ main (int argc, char **argv)
+ {
+   int c;
+-  static char const unknown[] = "unknown";
++  static char unknown[] = "unknown";
+ 
+   /* Mask indicating which elements to print. */
+   unsigned int toprint = 0;
+@@ -249,13 +249,35 @@
+ 
+   if (toprint & PRINT_PROCESSOR)
+     {
+-      char const *element = unknown;
++      char *element = unknown;
+ #if HAVE_SYSINFO && defined SI_ARCHITECTURE
+       {
+ 	static char processor[257];
  	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
  	  element = processor;
        }
@@ -38,7 +46,16 @@
  #endif
  #ifdef UNAME_PROCESSOR
        if (element == unknown)
-@@ -270,6 +292,14 @@
+@@ -293,7 +315,7 @@
+ 
+   if (toprint & PRINT_HARDWARE_PLATFORM)
+     {
+-      char const *element = unknown;
++      char *element = unknown;
+ #if HAVE_SYSINFO && defined SI_PLATFORM
+       {
+ 	static char hardware_platform[257];
+@@ -301,6 +323,14 @@
  			  hardware_platform, sizeof hardware_platform))
  	  element = hardware_platform;
        }


Index: coreutils.spec
===================================================================
RCS file: /cvs/dist/rpms/coreutils/devel/coreutils.spec,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- coreutils.spec	24 Aug 2006 16:05:51 -0000	1.139
+++ coreutils.spec	24 Aug 2006 16:25:40 -0000	1.140
@@ -1,7 +1,7 @@
 Summary: The GNU core utilities: a set of tools commonly used in shell scripts
 Name:    coreutils
 Version: 5.97
-Release: 8
+Release: 9
 License: GPL
 Group:   System Environment/Base
 Url:     http://www.gnu.org/software/coreutils/
@@ -280,12 +280,8 @@
 /sbin/runuser
 
 %changelog
-* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com>
-- Fixed warnings in pam patch (bug #203166).
-- Fixed warnings in i18n patch (bug #203166).
-- Fixed warnings in sysinfo patch (bug #203166).
-- Fixed warnings in selinux patch (bug #203166).
-- Fixed warnings in acl patch (bug #203166).
+* Thu Aug 24 2006 Tim Waugh <twaugh at redhat.com> 5.97-9
+- Fixed warnings in pam, i18n, sysinfo, selinux and acl patches (bug #203166).
 
 * Wed Aug 23 2006 Tim Waugh <twaugh at redhat.com> 5.97-8
 - Don't chdir until after PAM bits in su (bug #197659).