[coreutils] new upstream release 8.15, patches updated
Ondrej Vasik
ovasik at fedoraproject.org
Sat Jan 7 19:47:18 UTC 2012
commit 7f6231bff1e5cfcad550c3e36d59ec8af3d2b418
Author: Ondřej Vašík <ovasik at redhat.com>
Date: Sat Jan 7 20:47:10 2012 +0100
new upstream release 8.15, patches updated
.gitignore | 1 +
coreutils-8.7-runuser.patch | 20 ++++++++------------
coreutils-df-direct.patch | 2 +-
coreutils-i18n.patch | 4 ++--
coreutils-selinux.patch | 19 +++----------------
coreutils.spec | 7 +++++--
sources | 2 +-
7 files changed, 21 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 188c76f..b8a1c39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/coreutils-8.12.tar.xz
/coreutils-8.13.tar.xz
/coreutils-8.14.tar.xz
+/coreutils-8.15.tar.xz
diff --git a/coreutils-8.7-runuser.patch b/coreutils-8.7-runuser.patch
index 93cd962..c68da7c 100644
--- a/coreutils-8.7-runuser.patch
+++ b/coreutils-8.7-runuser.patch
@@ -52,20 +52,16 @@ diff -urNp coreutils-8.7-orig/man/runuser.x coreutils-8.7/man/runuser.x
diff -urNp coreutils-8.7-orig/README coreutils-8.7/README
--- coreutils-8.7-orig/README 2010-10-11 19:35:11.000000000 +0200
+++ coreutils-8.7/README 2010-11-15 10:10:43.002922253 +0100
-@@ -12,10 +12,10 @@ The programs that can be built with this
+@@ -11,8 +11,8 @@ The programs that can be built with this
factor false fmt fold groups head hostid hostname id install join kill
link ln logname ls md5sum mkdir mkfifo mknod mktemp mv nice nl nohup
- nproc od paste pathchk pinky pr printenv printf ptx pwd readlink rm rmdir
-- runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred shuf
-- sleep sort split stat stdbuf stty su sum sync tac tail tee test timeout
-- touch tr true truncate tsort tty uname unexpand uniq unlink uptime users
-- vdir wc who whoami yes
-+ runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum shred
-+ shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test
-+ timeout touch tr true truncate tsort tty uname unexpand uniq unlink uptime
-+ users vdir wc who whoami yes
-
- See the file NEWS for a list of major changes in the current release.
+ nproc od paste pathchk pinky pr printenv printf ptx pwd readlink realpath
+- rm rmdir runcon seq sha1sum sha224sum sha256sum sha384sum sha512sum shred
+- shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test
++ rm rmdir runcon runuser seq sha1sum sha224sum sha256sum sha384sum sha512sum
++ shred shuf sleep sort split stat stdbuf stty su sum sync tac tail tee test
+ timeout touch tr true truncate tsort tty uname unexpand uniq unlink
+ uptime users vdir wc who whoami yes
diff -urNp coreutils-8.7-orig/src/Makefile.am coreutils-8.7/src/Makefile.am
--- coreutils-8.7-orig/src/Makefile.am 2010-11-15 10:07:07.339171659 +0100
diff --git a/coreutils-df-direct.patch b/coreutils-df-direct.patch
index 2139809..1bc8c40 100644
--- a/coreutils-df-direct.patch
+++ b/coreutils-df-direct.patch
@@ -67,7 +67,7 @@ diff -urNp coreutils-8.11-orig/src/df.c coreutils-8.11/src/df.c
+ char *resolved = canonicalize_file_name (name);
+ if (resolved)
+ {
-+ get_dev (NULL, resolved, NULL, NULL, false, false, NULL);
++ get_dev (NULL, resolved, NULL, NULL, false, false, NULL, false);
+ free (resolved);
+ return;
+ }
diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
index 4de494f..e2f9f21 100644
--- a/coreutils-i18n.patch
+++ b/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);
diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch
index 7ebce30..3e5c143 100644
--- a/coreutils-selinux.patch
+++ b/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;
diff --git a/coreutils.spec b/coreutils.spec
index 9a076cb..1b060af 100644
--- a/coreutils.spec
+++ b/coreutils.spec
@@ -1,7 +1,7 @@
Summary: A set of basic GNU tools commonly used in shell scripts
Name: coreutils
-Version: 8.14
-Release: 6%{?dist}
+Version: 8.15
+Release: 1%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -322,6 +322,9 @@ fi
%{?!norunuser:/sbin/runuser}
%changelog
+* Sat Jan 08 2012 Ondrej Vasik <ovasik at redhat.com> - 8.15-1
+- new upstream release 8.15
+
* Thu Jan 05 2012 Ondrej Vasik <ovasik at redhat.com> - 8.14-6
- do not use shebang in sourced colorls.csh
diff --git a/sources b/sources
index 2f04ed2..db9edbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bcb135ce553493a45aba01b39eb3920a coreutils-8.14.tar.xz
+094909fafa86110140b32e4948941545 coreutils-8.15.tar.xz
More information about the scm-commits
mailing list