From 883185514495b925bc76f6a9e096def4e72b28b5 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Wed, 18 Apr 2012 09:58:57 +0000 Subject: [PATCH] - updated for coreutils 8.16 --- coreutils-fmt-wchars.patch | 8 ++++---- coreutils-pam.patch | 2 +- coreutils-runuser.patch | 2 +- coreutils-split-pam.patch | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coreutils-fmt-wchars.patch b/coreutils-fmt-wchars.patch index 2bd4559..83e5a23 100644 --- a/coreutils-fmt-wchars.patch +++ b/coreutils-fmt-wchars.patch @@ -83,11 +83,11 @@ diff -ur coreutils-7.6.org/src/fmt.c coreutils-7.6/src/fmt.c + /* Extra ctype(3)-style macros. */ --#define isopen(c) (strchr ("([`'\"", c) != NULL) +-#define isopen(c) (strchr ("(['`\"", c) != NULL) -#define isclose(c) (strchr (")]'\"", c) != NULL) -#define isperiod(c) (strchr (".?!", c) != NULL) +#define isopen(c) \ -+ (wcschr (L"([`'\"\u2018\u201A\u201B\u201C\u201E\u201F", c) != NULL) ++ (wcschr (L"(['`\"\u2018\u201A\u201B\u201C\u201E\u201F", c) != NULL) +#define isclose(c) (wcschr (L")]'\"\u2018\u2019\u201C\u201D", c) != NULL) +#define isperiod(c) (wcschr (L".?!", c) != NULL) @@ -589,10 +589,10 @@ diff -ur coreutils-7.6.org/src/fmt.c coreutils-7.6/src/fmt.c + start->line_width = wid; } -- /* This is a kludge to keep us from computing `len' as the +- /* This is a kludge to keep us from computing 'len' as the - sum of the sentinel length and some non-zero number. - Since the sentinel w->length may be INT_MAX, adding -+ /* This is a kludge to keep us from computing `wid' as the ++ /* This is a kludge to keep us from computing 'wid' as the + sum of the sentinel width and some non-zero number. + Since the sentinel w->width may be INT_MAX, adding to that would give a negative result. */ diff --git a/coreutils-pam.patch b/coreutils-pam.patch index 3f0cf31..6eb3e5d 100644 --- a/coreutils-pam.patch +++ b/coreutils-pam.patch @@ -474,7 +474,7 @@ +msgid " killed.\n" +msgstr " zabito.\n" + - #: src/su.c:373 + #: src/su.c:372 msgid "" "Change the effective user id and group id to that of USER.\n" diff -Nur coreutils-5.2.1.orig/man/es/su.1 coreutils-5.2.1/man/es/su.1 diff --git a/coreutils-runuser.patch b/coreutils-runuser.patch index 978bb07..033a058 100644 --- a/coreutils-runuser.patch +++ b/coreutils-runuser.patch @@ -45,7 +45,7 @@ diff -urNp coreutils-8.7-orig/man/help2man coreutils-8.7/man/help2man @@ -109,9 +109,15 @@ #include "error.h" - /* The official name of this program (e.g., no `g' prefix). */ + /* The official name of this program (e.g., no 'g' prefix). */ +#ifndef RUNUSER #define PROGRAM_NAME "su" +#else diff --git a/coreutils-split-pam.patch b/coreutils-split-pam.patch index 4d36447..5f6f72e 100644 --- a/coreutils-split-pam.patch +++ b/coreutils-split-pam.patch @@ -5,8 +5,8 @@ diff -uNrp -x '*~' coreutils-5.97-orig/src/su.c coreutils-5.97/src/su.c #include "error.h" --/* The official name of this program (e.g., no `g' prefix). */ -+/* The official name of this program (e.g., no `g' prefix). +-/* The official name of this program (e.g., no 'g' prefix). */ ++/* The official name of this program (e.g., no 'g' prefix). + * - Add a "-l" to the name passed to PAM if this is a login simulation + */ #ifndef RUNUSER -- 2.46.0