From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 13 Jan 2012 18:30:25 +0000 (+0100)
Subject: coreutils: Update to 8.15.
X-Git-Url: http://git.ipfire.org/?p=people%2Famarx%2Fipfire-3.x.git;a=commitdiff_plain;h=fa4603be1b996748d3c6624863f5a35ea88cb2c6

coreutils: Update to 8.15.

Fixes #314
---

diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm
index abdfcbb12..6b6535326 100644
--- a/coreutils/coreutils.nm
+++ b/coreutils/coreutils.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = coreutils
-version    = 8.14
-release    = 3
+version    = 8.15
+release    = 1
 
 groups     = System/Base
 url        = http://www.gnu.org/software/coreutils/
@@ -31,7 +31,7 @@ build
 		libcap-devel
 		libselinux-devel
 		ncurses-devel
-		pam-devel
+		pam-devel>=1.1.5
 	end
 
 	CFLAGS += \
diff --git a/coreutils/patches/coreutils-i18n.patch b/coreutils/patches/coreutils-i18n.patch
index 9ba6bb489..e2f9f21ed 100644
--- a/coreutils/patches/coreutils-i18n.patch
+++ b/coreutils/patches/coreutils-i18n.patch
@@ -10,7 +10,7 @@ diff -urNp coreutils-8.13-orig/lib/linebuffer.h coreutils-8.13/lib/linebuffer.h
 +#  include <wchar.h>
 +# endif
 +
- /* A `struct linebuffer' holds a line of text. */
+ /* A 'struct linebuffer' holds a line of text. */
  
  struct linebuffer
 @@ -28,6 +33,9 @@ struct linebuffer
@@ -1784,8 +1784,8 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c
  static void getoptarg (char *arg, char switch_char, char *character,
 +                       int *character_length, int *character_width,
                         int *number);
- void usage (int status);
  static void print_files (int number_of_files, char **av);
+ static void init_parameters (int number_of_files);
 @@ -439,7 +491,6 @@ static void store_char (char c);
  static void pad_down (int lines);
  static void read_rest_of_line (COLUMN *p);
@@ -2271,7 +2271,7 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c
      {
        width = TAB_WIDTH (chars_per_c, input_position);
  
-@@ -2741,6 +2942,154 @@ char_to_clump (char c)
+@@ -2741,6 +2942,155 @@ char_to_clump (char c)
    return chars;
  }
  
@@ -2279,6 +2279,7 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c
 +static int
 +char_to_clump_multi (char c)
 +{
++  unsigned char uc = c;
 +  static size_t mbc_pos = 0;
 +  static char mbc[MB_LEN_MAX] = {'\0'};
 +  static mbstate_t state = {'\0'};
@@ -2365,7 +2366,7 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c
 +                      width += 4;
 +                      chars += 4;
 +                      *s++ = '\\';
-+                      sprintf (esc_buff, "%03o", c);
++                      sprintf (esc_buff, "%03o", uc);
 +                      for (j = 0; j <= 2; ++j)
 +                        *s++ = (int) esc_buff[j];
 +                    }
@@ -2386,7 +2387,7 @@ diff -urNp coreutils-8.13-orig/src/pr.c coreutils-8.13/src/pr.c
 +                          width += 4;
 +                          chars += 4;
 +                          *s++ = '\\';
-+                          sprintf (esc_buff, "%03o", c);
++                          sprintf (esc_buff, "%03o", uc);
 +                          for (j = 0; j <= 2; ++j)
 +                            *s++ = (int) esc_buff[j];
 +                        }
@@ -2970,9 +2971,9 @@ diff -urNp coreutils-8.13-orig/src/sort.c coreutils-8.13/src/sort.c
 +}
 +#endif /* HAV_EMBRTOWC */
 +
- static int
- general_numcompare (char const *sa, char const *sb)
- {
+ /* Work around a problem whereby the long double value returned by glibc's
+    strtold ("NaN", ...) contains uninitialized bits: clear all bytes of
+    A and B before calling strtold.  FIXME: remove this function once
 @@ -1942,7 +2305,7 @@ general_numcompare (char const *sa, char
     Return 0 if the name in S is not recognized.  */
  
diff --git a/coreutils/patches/coreutils-selinux.patch b/coreutils/patches/coreutils-selinux.patch
index 7ebce30d0..3e5c143df 100644
--- a/coreutils/patches/coreutils-selinux.patch
+++ b/coreutils/patches/coreutils-selinux.patch
@@ -45,7 +45,7 @@ diff -urNp coreutils-8.13-orig/src/chcon.c coreutils-8.13/src/chcon.c
 +Change the SELinux security context of each FILE to CONTEXT.\n\
  With --reference, change the security context of each FILE to that of RFILE.\n\
  \n\
-   -h, --no-dereference   affect symbolic links instead of any referenced file\n\
+ "), stdout);
 diff -urNp coreutils-8.13-orig/src/copy.c coreutils-8.13/src/copy.c
 --- coreutils-8.13-orig/src/copy.c	2011-07-28 12:38:27.000000000 +0200
 +++ coreutils-8.13/src/copy.c	2011-09-09 10:30:39.564562214 +0200
@@ -243,10 +243,10 @@ diff -urNp coreutils-8.13-orig/src/ls.c coreutils-8.13/src/ls.c
    };
  
  /* Display letters and indicators for each filetype.
-@@ -283,6 +284,7 @@ static void queue_directory (char const 
+@@ -282,6 +283,7 @@
+                              bool command_line_arg);
  static void sort_files (void);
  static void parse_ls_color (void);
- void usage (int status);
 +static void print_scontext_format (const struct fileinfo *f);
  
  /* Initial size of hash table.
@@ -382,19 +382,6 @@ diff -urNp coreutils-8.13-orig/src/ls.c coreutils-8.13/src/ls.c
          default:
            usage (LS_FAILURE);
          }
-@@ -2714,8 +2738,10 @@ clear_files (void)
-       struct fileinfo *f = sorted_file[i];
-       free (f->name);
-       free (f->linkname);
--      if (f->scontext != UNKNOWN_SECURITY_CONTEXT)
--        freecon (f->scontext);
-+      if (f->scontext != UNKNOWN_SECURITY_CONTEXT) {
-+               freecon (f->scontext);
-+        f->scontext = NULL;
-+      }
-     }
- 
-   cwd_n_used = 0;
 @@ -2757,6 +2783,7 @@ gobble_file (char const *name, enum file
    memset (f, '\0', sizeof *f);
    f->stat.st_ino = inode;