Changeset 026bb5d for patches/coreutils-8.22-uname-1.patch

Timestamp:

Dec 18, 2013, 1:04:00 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

f975b3a

Parents:

1c9985f (diff), 8abef998 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Updated simp branch to match main book

File:

• patches/coreutils-8.22-uname-1.patch (moved) (moved from patches/coreutils-8.12-uname-1.patch ) (4 diffs)

patches/coreutils-8.22-uname-1.patch

@@ -10 +10 @@
 Rediffed for 8.4 by Joe Ciccone
 Rediffed for 8.9 by Joe Ciccone
+Rediffed for 8.16 by Jonathan Norman - 2012-06-10
+Rediffed for 8.19 by William Harrington - 2012-08-27
+Renamed for 8.20 by William Harrington - 2012-11-01
+Rediffed for 8.21 by William Harrington 2013-05-31
+Renamed for 8.22 by William Harrington - 2013-12-14
 
---- coreutils-8.9.orig/src/uname.c      2010-01-01 08:06:47.000000000 -0500
-+++ coreutils-8.9/src/uname.c   2010-07-26 20:44:24.389842706 -0400
-@@ -50,6 +50,11 @@
+diff -Naur coreutils-8.21.orig/src/uname.c coreutils-8.21/src/uname.c
+--- coreutils-8.21.orig/src/uname.c     2013-01-31 00:46:24.000000000 +0000
++++ coreutils-8.21/src/uname.c  2013-05-31 13:41:32.683326834 +0000
+@@ -49,6 +49,11 @@
  # include <mach-o/arch.h>
  #endif
@@ -25 +31 @@
  #include "error.h"
  #include "quote.h"
-@@ -155,6 +160,117 @@
+@@ -153,6 +158,117 @@
    exit (status);
  }
@@ -143 +149 @@
     printed.  */
  
-@@ -302,10 +418,14 @@
+@@ -300,10 +416,14 @@
    if (toprint & PRINT_PROCESSOR)
      {
@@ -159 +165 @@
        }
  #endif
-@@ -358,9 +478,13 @@
+@@ -356,9 +476,13 @@
        if (element == unknown)
          {