File project.diff of Package coreutils

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package coreutils (Revision f25cb2796623667fbe6b75a583b7ecd0)

Currently displaying revision f25cb2796623667fbe6b75a583b7ecd0 , Show latest

--- coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff.orig
+++ coreutils-8.6-make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
@@ -16,7 +16,7 @@ Index: src/su.c
  }
  
 +/* Add or clear /sbin and /usr/sbin for the su command
-+   used without `-'.  */
++   used without '-'.  */
 +
 +/* Set if /sbin is found in path.  */
 +#define SBIN_MASK	0x01
--- coreutils-acl-nofollow.patch.orig
+++ coreutils-acl-nofollow.patch
@@ -32,7 +32,7 @@ Index: lib/file-has-acl.c
 --- lib/file-has-acl.c.orig	2012-03-09 08:31:00.000000000 +0100
 +++ lib/file-has-acl.c	2012-04-16 13:17:12.471016513 +0200
 @@ -492,12 +492,20 @@ file_has_acl (char const *name, struct s
-       /* Linux, FreeBSD, MacOS X, IRIX, Tru64 */
+       /* Linux, FreeBSD, Mac OS X, IRIX, Tru64 */
        int ret;
  
 -      if (HAVE_ACL_EXTENDED_FILE) /* Linux */
@@ -51,7 +51,7 @@ Index: lib/file-has-acl.c
            ret = acl_extended_file (name);
 +#  endif
          }
-       else /* FreeBSD, MacOS X, IRIX, Tru64 */
+       else /* FreeBSD, Mac OS X, IRIX, Tru64 */
          {
 Index: m4/acl.m4
 ===================================================================
--- coreutils-bnc#697897-setsid.patch.orig
+++ coreutils-bnc#697897-setsid.patch
@@ -1,31 +1,33 @@
-Index: doc/coreutils.info
+Index: doc/coreutils.texi
 ===================================================================
---- doc/coreutils.info.orig	2012-03-26 14:08:30.000000000 +0200
-+++ doc/coreutils.info	2012-04-18 11:17:09.917545246 +0200
-@@ -12788,6 +12788,10 @@ and optionally successful, `su' attempts
- `syslog'.)  However, GNU `su' does not check if the user is a member of
- the `wheel' group; see below.
+--- doc/coreutils.texi.orig	2012-03-26 14:08:30.000000000 +0200
++++ doc/coreutils.texi	2012-04-18 11:17:09.917545246 +0200
+@@ -15864,6 +15864,10 @@ failed, and optionally successful, @command{su} attempts.  (If the system
+ authentication.  You can edit @file{/etc/pam.d/su} resp @file{/etc/pam.d/su-l}
+ to customize its behaviour.
  
-+   If the environment variable SU_COMMAND_SAME_SESSION is set, su will
-+not open a new session for running a command thus making -c behaves just
-+like -C.
++If the environment variable @env{SU_COMMAND_SAME_SESSION} is set,
++@command{su} will not open a new session for running a command thus
++making @option{-c} behaves just like @option{-C}.
 +
-    The program accepts the following options.  Also see *note Common
- options::.
+ The program accepts the following options.  Also see @ref{Common options}.
  
-@@ -12796,6 +12800,12 @@ options::.
-      Pass COMMAND, a single command line to run, to the shell with a
-      `-c' option instead of starting an interactive shell.
+ @table @samp
+@@ -15874,6 +15878,14 @@ The program accepts the following options.  Also see @ref{Common options}.
+ Pass @var{command}, a single command line to run, to the shell with
+ a @option{-c} option instead of starting an interactive shell.
  
-+`-C COMMAND'
-+`--session-command=COMMAND'
-+     Pass COMMAND, a single command line to run, to the shell with a
-+     `-c' option instead of starting an interactive and do not create
-+     a new session for it.
++@item -C @var{COMMAND}
++@itemx --session-command=@var{COMMAND}
++@opindex -C
++@opindex --session-command
++Pass @var{COMMAND}, a single command line to run, to the shell with a
++@option{-c} option instead of starting an interactive and do not
++create a new session for it.
 +
- `-f'
- `--fast'
-      Pass the `-f' option to the shell.  This probably only makes sense
+ @item -f
+ @itemx --fast
+ @opindex -f
 Index: src/su.c
 ===================================================================
 --- src/su.c.orig	2012-04-18 11:17:09.856546407 +0200
--- coreutils-gl_printf_safe.patch.orig
+++ coreutils-gl_printf_safe.patch
@@ -2,11 +2,11 @@ Index: m4/gnulib-comp.m4
 ===================================================================
 --- m4/gnulib-comp.m4.orig	2012-03-20 23:34:39.000000000 +0100
 +++ m4/gnulib-comp.m4	2012-04-16 12:57:23.373219154 +0200
-@@ -1584,7 +1584,6 @@ gl_POSIXTM
- gl_POSIXVER
- gl_FUNC_PRINTF_FREXP
- gl_FUNC_PRINTF_FREXPL
--m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes])
- gl_PRIV_SET
- AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
- AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
+@@ -1417,7 +1417,6 @@ gl_POSIXTM
+   gl_POSIXVER
+   gl_FUNC_PRINTF_FREXP
+   gl_FUNC_PRINTF_FREXPL
+-  m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes])
+   gl_PRIV_SET
+   AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
+   AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
--- coreutils-i18n.patch.orig
+++ coreutils-i18n.patch
@@ -347,7 +347,7 @@ Index: src/cut.c
 +    wc = WEOF;
 +
 +  /* To support the semantics of the -s flag, we may have to buffer
-+     all of the first field to determine whether it is `delimited.'
++     all of the first field to determine whether it is 'delimited.'
 +     But that is unnecessary if all non-delimited lines must be printed
 +     and the first field has been selected, or if non-delimited lines
 +     must be suppressed and the first field has *not* been selected.
@@ -689,7 +689,7 @@ Index: src/expand.c
 +  wchar_t wc;			/* A gotten wide character. */
 +  size_t mblength;		/* The byte size of a multibyte character
 +				   which shows as same character as WC. */
-+  int tab_index = 0;		/* Index in `tab_list' of next tabstop. */
++  int tab_index = 0;		/* Index in 'tab_list' of next tabstop. */
 +  int column = 0;		/* Column on screen of the next char. */
 +  int next_tab_column;		/* Column the next tab stop is on. */
 +  int convert = 1;		/* If nonzero, perform translations. */
@@ -1005,7 +1005,7 @@ Index: src/fold.c
 +  int convfail;                /* 1, when conversion is failed. Otherwise 0. */
 +
 +  static char *line_out = NULL;
-+  size_t offset_out = 0;        /* Index in `line_out' for next char. */
++  size_t offset_out = 0;        /* Index in 'line_out' for next char. */
 +  static size_t allocated_out = 0;
 +
 +  int increment;
@@ -2001,13 +2001,13 @@ Index: src/pr.c
          }
        /* It's rather pointless to define a TAB separator with column
 @@ -1279,11 +1405,11 @@ init_parameters (int number_of_files)
-              TAB_WIDTH (chars_per_input_tab, chars_per_number);   */
+              + TAB_WIDTH (chars_per_input_tab, chars_per_number);   */
  
        /* Estimate chars_per_text without any margin and keep it constant. */
 -      if (number_separator == '\t')
 +      if (number_separator[0] == '\t')
-         number_width = chars_per_number +
-           TAB_WIDTH (chars_per_default_tab, chars_per_number);
+         number_width = (chars_per_number
+                         + TAB_WIDTH (chars_per_default_tab, chars_per_number));
        else
 -        number_width = chars_per_number + 1;
 +        number_width = chars_per_number + number_separator_width;
@@ -2017,9 +2017,9 @@ Index: src/pr.c
 @@ -1298,7 +1424,7 @@ init_parameters (int number_of_files)
      }
  
-   chars_per_column = (chars_per_line - chars_used_by_number -
--                     (columns - 1) * col_sep_length) / columns;
-+                     (columns - 1) * col_sep_width) / columns;
+   chars_per_column = (chars_per_line - chars_used_by_number
+-                      - (columns - 1) * col_sep_length) / columns;
++                      - (columns - 1) * col_sep_width) / columns;
  
    if (chars_per_column < 1)
      error (EXIT_FAILURE, 0, _("page width too narrow"));
@@ -2440,16 +2440,10 @@ Index: src/sort.c
 ===================================================================
 --- src/sort.c.orig	2012-03-24 21:26:51.000000000 +0100
 +++ src/sort.c	2012-04-16 17:03:09.060189025 +0200
-@@ -22,11 +22,20 @@
- 
- #include <config.h>
- 
-+#include <assert.h>
- #include <getopt.h>
- #include <pthread.h>
- #include <sys/types.h>
+@@ -29,6 +29,14 @@
  #include <sys/wait.h>
  #include <signal.h>
+ #include <assert.h>
 +#if HAVE_WCHAR_H
 +# include <wchar.h>
 +#endif
@@ -3442,7 +3436,7 @@ Index: src/unexpand.c
 +  size_t mblength;		/* The byte size of a multibyte character
 +				   which shows as same character as WC. */
 +
-+  /* Index in `tab_list' of next tabstop: */
++  /* Index in 'tab_list' of next tabstop: */
 +  int tab_index = 0;		/* For calculating width of pending tabs. */
 +  int print_tab_index = 0;	/* For printing as many tabs as possible. */
 +  unsigned int column = 0;	/* Column on screen of next char. */
--- coreutils.spec.orig
+++ coreutils.spec
@@ -29,8 +29,8 @@ BuildRequires:  libselinux-devel
 BuildRequires:  pam-devel
 BuildRequires:  xz
 Url:            http://www.gnu.org/software/coreutils/
-Version:        8.16
-Release:        0
+Version:        8.19
+Release:        1
 Provides:       fileutils = %{version}
 Provides:       mktemp = %{version}
 Provides:       sh-utils = %{version}
@@ -52,7 +52,6 @@ Source:         coreutils-%{version}.tar
 Source1:        su.pamd
 Source2:        su.default
 Source3:        baselibs.conf
-Source4:        coreutils-%{version}.de.po.xz
 Patch0:         coreutils-misc.patch
 Patch1:         coreutils-remove_hostname_documentation.patch
 Patch2:         coreutils-gl_printf_safe.patch
@@ -62,6 +61,7 @@ Patch5:         coreutils-i18n-uninit.pa
 Patch6:         coreutils-i18n-infloop.patch
 Patch8:         coreutils-sysinfo.patch
 Patch16:        coreutils-invalid-ids.patch
+Patch19:        su.patch
 Patch20:        coreutils-8.6-pam-support-for-su.diff
 Patch21:        coreutils-8.6-update-man-page-for-pam.diff
 Patch22:        coreutils-8.6-log-all-su-attempts.diff
@@ -74,12 +74,7 @@ Patch31:        coreutils-getaddrinfo.pa
 Patch32:        coreutils-ptr_int_casts.patch
 Patch33:        coreutils-8.9-singlethreaded-sort.patch
 Patch34:        coreutils-acl-nofollow.patch
-Patch36:        coreutils-basename_documentation.patch
 Patch37:        coreutils-bnc#697897-setsid.patch
-#Upstream patch will be included with 8.17
-Patch38:        coreutils-id_show_real_groups.patch
-#Upstream patch, needs to be removed for 8.17
-Patch39:        coreutils-race_in_cp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # this will create a cycle, broken up randomly - coreutils is just too core to have other
 # prerequires
@@ -101,6 +96,7 @@ uname unexpand uniq unlink uptime users
 %lang_package
 %prep
 %setup -q
+%patch19 -p1
 %patch4
 %patch5
 %patch6
@@ -121,12 +117,7 @@ uname unexpand uniq unlink uptime users
 %patch32
 %patch33
 %patch34
-%patch36
 %patch37
-%patch38
-%patch39
-
-xz -dc %{S:4} >po/de.po
 
 %build
 AUTOPOINT=true autoreconf -fi

Places

File project.diff of Package coreutils (Revision f25cb2796623667fbe6b75a583b7ecd0)

Places