[packages/coreutils] - rediffed
hawk
hawk at pld-linux.org
Sun Mar 21 00:33:39 CET 2021
commit ee6a228faa0271aac380e7b216a66b0a9258788a
Author: Marcin Krol <hawk at tld-linux.org>
Date: Sun Mar 21 00:33:02 2021 +0100
- rediffed
coreutils-getgid.patch | 64 +++++++++++++++++++++----------------------
coreutils-uname-cpuinfo.patch | 16 +++++------
2 files changed, 40 insertions(+), 40 deletions(-)
---
diff --git a/coreutils-getgid.patch b/coreutils-getgid.patch
index c27cb8f..79c21d5 100644
--- a/coreutils-getgid.patch
+++ b/coreutils-getgid.patch
@@ -1,6 +1,6 @@
-diff -ruN coreutils-8.27.orig/README coreutils-8.27/README
---- coreutils-8.27.orig/README 2017-01-21 15:53:43.000000000 +0100
-+++ coreutils-8.27/README 2017-06-10 20:34:17.945208906 +0200
+diff -urNp -x '*.orig' coreutils-8.32.org/README coreutils-8.32/README
+--- coreutils-8.32.org/README 2020-01-01 15:13:12.000000000 +0100
++++ coreutils-8.32/README 2021-03-21 00:28:40.313899186 +0100
@@ -9,7 +9,7 @@ The programs that can be built with this
[ arch b2sum base32 base64 basename basenc cat chcon chgrp chmod chown
@@ -10,10 +10,10 @@ diff -ruN coreutils-8.27.orig/README coreutils-8.27/README
id install join kill link ln logname ls md5sum mkdir mkfifo mknod mktemp
mv nice nl nohup nproc numfmt od paste pathchk pinky pr printenv printf ptx
pwd readlink realpath rm rmdir runcon seq sha1sum sha224sum sha256sum
-diff -ruN coreutils-8.27.orig/build-aux/gen-lists-of-programs.sh coreutils-8.27/build-aux/gen-lists-of-programs.sh
---- coreutils-8.27.orig/build-aux/gen-lists-of-programs.sh 2017-02-10 06:53:47.000000000 +0100
-+++ coreutils-8.27/build-aux/gen-lists-of-programs.sh 2017-06-10 20:32:44.126465035 +0200
-@@ -70,6 +70,7 @@
+diff -urNp -x '*.orig' coreutils-8.32.org/build-aux/gen-lists-of-programs.sh coreutils-8.32/build-aux/gen-lists-of-programs.sh
+--- coreutils-8.32.org/build-aux/gen-lists-of-programs.sh 2018-12-31 13:19:23.000000000 +0100
++++ coreutils-8.32/build-aux/gen-lists-of-programs.sh 2021-03-21 00:28:40.314899186 +0100
+@@ -71,6 +71,7 @@ normal_progs='
false
fmt
fold
@@ -21,9 +21,9 @@ diff -ruN coreutils-8.27.orig/build-aux/gen-lists-of-programs.sh coreutils-8.27/
ginstall
groups
head
-diff -ruN coreutils-8.27.orig/man/getgid.1 coreutils-8.27/man/getgid.1
---- coreutils-8.27.orig/man/getgid.1 1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-8.27/man/getgid.1 2017-06-10 20:32:44.116465062 +0200
+diff -urNp -x '*.orig' coreutils-8.32.org/man/getgid.1 coreutils-8.32/man/getgid.1
+--- coreutils-8.32.org/man/getgid.1 1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.32/man/getgid.1 2021-03-21 00:28:40.314899186 +0100
@@ -0,0 +1,22 @@
+.TH GETGID "1" "October 2002" "getgid (coreutils) 4.5.3" "User Commands"
+.SH NAME
@@ -47,17 +47,17 @@ diff -ruN coreutils-8.27.orig/man/getgid.1 coreutils-8.27/man/getgid.1
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH "SEE ALSO"
+.BR id (1)
-diff -ruN coreutils-8.27.orig/man/getgid.x coreutils-8.27/man/getgid.x
---- coreutils-8.27.orig/man/getgid.x 1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-8.27/man/getgid.x 2017-06-10 20:32:44.116465062 +0200
+diff -urNp -x '*.orig' coreutils-8.32.org/man/getgid.x coreutils-8.32/man/getgid.x
+--- coreutils-8.32.org/man/getgid.x 1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.32/man/getgid.x 2021-03-21 00:28:40.314899186 +0100
@@ -0,0 +1,4 @@
+[NAME]
+getgid \- print ID of given group
+[DESCRIPTION]
+.\" Add any additional description here
-diff -ruN coreutils-8.27.orig/man/pl/getgid.1 coreutils-8.27/man/pl/getgid.1
---- coreutils-8.27.orig/man/pl/getgid.1 1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-8.27/man/pl/getgid.1 2017-06-10 20:32:44.117465059 +0200
+diff -urNp -x '*.orig' coreutils-8.32.org/man/pl/getgid.1 coreutils-8.32/man/pl/getgid.1
+--- coreutils-8.32.org/man/pl/getgid.1 1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.32/man/pl/getgid.1 2021-03-21 00:28:40.314899186 +0100
@@ -0,0 +1,22 @@
+.TH GETGID "1" "Pa?dziernik 2002" "getgid (coreutils) 4.5.3" "Polecenia u?ytkownika"
+.SH NAZWA
@@ -81,10 +81,10 @@ diff -ruN coreutils-8.27.orig/man/pl/getgid.1 coreutils-8.27/man/pl/getgid.1
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+.SH ZOBACZ TAK?E
+.BR id (1)
-diff -ruN coreutils-8.27.orig/po/POTFILES.in coreutils-8.27/po/POTFILES.in
---- coreutils-8.27.orig/po/POTFILES.in 2017-02-18 04:37:23.000000000 +0100
-+++ coreutils-8.27/po/POTFILES.in 2017-06-10 20:32:44.118465057 +0200
-@@ -65,6 +65,7 @@
+diff -urNp -x '*.orig' coreutils-8.32.org/po/POTFILES.in coreutils-8.32/po/POTFILES.in
+--- coreutils-8.32.org/po/POTFILES.in 2020-01-01 15:13:12.000000000 +0100
++++ coreutils-8.32/po/POTFILES.in 2021-03-21 00:28:40.314899186 +0100
+@@ -66,6 +66,7 @@ src/false.c
src/find-mount-point.c
src/fmt.c
src/fold.c
@@ -92,10 +92,10 @@ diff -ruN coreutils-8.27.orig/po/POTFILES.in coreutils-8.27/po/POTFILES.in
src/getlimits.c
src/group-list.c
src/groups.c
-diff -ruN coreutils-8.27.orig/po/pl.po coreutils-8.27/po/pl.po
---- coreutils-8.27.orig/po/pl.po 2017-03-09 06:02:56.000000000 +0100
-+++ coreutils-8.27/po/pl.po 2017-06-10 20:32:44.124465040 +0200
-@@ -4128,6 +4128,15 @@
+diff -urNp -x '*.orig' coreutils-8.32.org/po/pl.po coreutils-8.32/po/pl.po
+--- coreutils-8.32.org/po/pl.po 2021-03-21 00:28:39.617899186 +0100
++++ coreutils-8.32/po/pl.po 2021-03-21 00:28:40.316899186 +0100
+@@ -4199,6 +4199,15 @@ msgstr "przy czytaniu nazw na wejściu p
msgid "invalid zero-length file name"
msgstr "błędna nazwa pliku o zerowej długości"
@@ -109,11 +109,11 @@ diff -ruN coreutils-8.27.orig/po/pl.po coreutils-8.27/po/pl.po
+"\t%s nazwa-grupy\n"
+
#. This is a proper name. See the gettext manual, section Names.
- #: src/echo.c:26
+ #: src/echo.c:27
msgid "Brian Fox"
-diff -ruN coreutils-8.27.orig/src/getgid.c coreutils-8.27/src/getgid.c
---- coreutils-8.27.orig/src/getgid.c 1970-01-01 01:00:00.000000000 +0100
-+++ coreutils-8.27/src/getgid.c 2017-06-10 20:32:44.125465038 +0200
+diff -urNp -x '*.orig' coreutils-8.32.org/src/getgid.c coreutils-8.32/src/getgid.c
+--- coreutils-8.32.org/src/getgid.c 1970-01-01 01:00:00.000000000 +0100
++++ coreutils-8.32/src/getgid.c 2021-03-21 00:28:40.317899186 +0100
@@ -0,0 +1,88 @@
+/* getgid - print GID of given group
+ Copyright (C) 1999 Artur Frysiak <wiget at pld-linux.org>
@@ -203,10 +203,10 @@ diff -ruN coreutils-8.27.orig/src/getgid.c coreutils-8.27/src/getgid.c
+ printf("%lu\n", (unsigned long int) gr->gr_gid);
+ exit(EXIT_SUCCESS);
+}
-diff -ruN coreutils-8.27.orig/src/local.mk coreutils-8.27/src/local.mk
---- coreutils-8.27.orig/src/local.mk 2017-03-08 06:34:11.000000000 +0100
-+++ coreutils-8.27/src/local.mk 2017-06-10 20:32:44.124465040 +0200
-@@ -128,6 +128,7 @@
+diff -urNp -x '*.orig' coreutils-8.32.org/src/local.mk coreutils-8.32/src/local.mk
+--- coreutils-8.32.org/src/local.mk 2020-02-25 13:54:28.000000000 +0100
++++ coreutils-8.32/src/local.mk 2021-03-21 00:28:40.317899186 +0100
+@@ -130,6 +130,7 @@ src_factor_LDADD = $(LDADD)
src_false_LDADD = $(LDADD)
src_fmt_LDADD = $(LDADD)
src_fold_LDADD = $(LDADD)
diff --git a/coreutils-uname-cpuinfo.patch b/coreutils-uname-cpuinfo.patch
index 853be2b..b6b83c0 100644
--- a/coreutils-uname-cpuinfo.patch
+++ b/coreutils-uname-cpuinfo.patch
@@ -1,7 +1,7 @@
-diff -urN coreutils-5.2.1-orig/src/uname.c coreutils-5.2.1/src/uname.c
---- coreutils-5.2.1-orig/src/uname.c 2005-01-15 19:15:36.193346304 +0100
-+++ coreutils-5.2.1/src/uname.c 2005-01-15 19:19:06.918311240 +0100
-@@ -77,6 +77,8 @@
+diff -urNp -x '*.orig' coreutils-8.32.org/src/uname.c coreutils-8.32/src/uname.c
+--- coreutils-8.32.org/src/uname.c 2020-02-04 20:27:08.000000000 +0100
++++ coreutils-8.32/src/uname.c 2021-03-21 00:28:54.006899186 +0100
+@@ -86,6 +86,8 @@
/* Operating system. */
#define PRINT_OPERATING_SYSTEM 128
@@ -10,7 +10,7 @@ diff -urN coreutils-5.2.1-orig/src/uname.c coreutils-5.2.1/src/uname.c
static struct option const uname_long_options[] =
{
{"all", no_argument, NULL, 'a'},
-@@ -243,13 +245,9 @@
+@@ -301,13 +303,9 @@ main (int argc, char **argv)
if (toprint & PRINT_PROCESSOR)
{
char const *element = unknown;
@@ -26,10 +26,10 @@ diff -urN coreutils-5.2.1-orig/src/uname.c coreutils-5.2.1/src/uname.c
+ element = processor;
#ifdef UNAME_PROCESSOR
if (element == unknown)
- {
-@@ -294,3 +292,38 @@
+ {
+@@ -374,3 +372,38 @@ main (int argc, char **argv)
- exit (EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/coreutils.git/commitdiff/ee6a228faa0271aac380e7b216a66b0a9258788a
More information about the pld-cvs-commit
mailing list