This commit is contained in:
Tim Waugh 2006-08-24 16:25:40 +00:00
parent ee719b5558
commit 12a60070d7
2 changed files with 33 additions and 20 deletions

View File

@ -1,15 +1,23 @@
--- coreutils-4.5.3/src/uname.c.sysinfo 2002-08-31 09:52:11.000000000 +0100 --- coreutils-5.97/src/uname.c.sysinfo 2005-09-15 20:57:04.000000000 +0100
+++ coreutils-4.5.3/src/uname.c 2002-11-28 18:29:15.000000000 +0000 +++ coreutils-5.97/src/uname.c 2006-08-24 17:15:56.000000000 +0100
@@ -232,7 +232,7 @@ @@ -155,7 +155,7 @@
if (toprint & PRINT_KERNEL_RELEASE) main (int argc, char **argv)
print_element (name.release); {
if (toprint & PRINT_KERNEL_VERSION) int c;
- print_element (name.version); - static char const unknown[] = "unknown";
+ print_element (name.version); + static char unknown[] = "unknown";
if (toprint & PRINT_MACHINE)
print_element (name.machine); /* Mask indicating which elements to print. */
} unsigned int toprint = 0;
@@ -246,6 +246,28 @@ @@ -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)) if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
element = processor; element = processor;
} }
@ -38,7 +46,16 @@
#endif #endif
#ifdef UNAME_PROCESSOR #ifdef UNAME_PROCESSOR
if (element == unknown) 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)) hardware_platform, sizeof hardware_platform))
element = hardware_platform; element = hardware_platform;
} }

View File

@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 5.97 Version: 5.97
Release: 8 Release: 9
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -280,12 +280,8 @@ fi
/sbin/runuser /sbin/runuser
%changelog %changelog
* Thu Aug 24 2006 Tim Waugh <twaugh@redhat.com> * Thu Aug 24 2006 Tim Waugh <twaugh@redhat.com> 5.97-9
- Fixed warnings in pam patch (bug #203166). - Fixed warnings in pam, i18n, sysinfo, selinux and acl patches (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).
* Wed Aug 23 2006 Tim Waugh <twaugh@redhat.com> 5.97-8 * Wed Aug 23 2006 Tim Waugh <twaugh@redhat.com> 5.97-8
- Don't chdir until after PAM bits in su (bug #197659). - Don't chdir until after PAM bits in su (bug #197659).