[coreutils/f13/master] cumulative update from rawhide
Ondrej Vasik
ovasik at fedoraproject.org
Fri Oct 1 11:40:09 UTC 2010
commit d0389630a2e388a3120f2f4bcca2a1d6c8c1606b
Author: Ondřej Vašík <ovasik at redhat.com>
Date: Fri Oct 1 13:40:27 2010 +0200
cumulative update from rawhide
coreutils-DIR_COLORS | 3 +++
coreutils-DIR_COLORS.256color | 3 +++
coreutils-DIR_COLORS.lightbgcolor | 3 +++
coreutils-i18n.patch | 5 +++--
coreutils.spec | 22 +++++++++++++++++++++-
5 files changed, 33 insertions(+), 3 deletions(-)
---
diff --git a/coreutils-DIR_COLORS b/coreutils-DIR_COLORS
index a045303..4befd4c 100644
--- a/coreutils-DIR_COLORS
+++ b/coreutils-DIR_COLORS
@@ -134,6 +134,9 @@ EXEC 01;32
.deb 01;31
.rpm 01;31
.jar 01;31
+.war 01;31
+.ear 01;31
+.sar 01;31
.rar 01;31
.ace 01;31
.zoo 01;31
diff --git a/coreutils-DIR_COLORS.256color b/coreutils-DIR_COLORS.256color
index b682ea2..1b2d628 100644
--- a/coreutils-DIR_COLORS.256color
+++ b/coreutils-DIR_COLORS.256color
@@ -109,6 +109,9 @@ EXEC 38;5;34
.deb 38;5;9
.rpm 38;5;9
.jar 38;5;9
+.war 38;5;9
+.ear 38;5;9
+.sar 38;5;9
.rar 38;5;9
.ace 38;5;9
.zoo 38;5;9
diff --git a/coreutils-DIR_COLORS.lightbgcolor b/coreutils-DIR_COLORS.lightbgcolor
index 2400e1e..a843bff 100644
--- a/coreutils-DIR_COLORS.lightbgcolor
+++ b/coreutils-DIR_COLORS.lightbgcolor
@@ -113,6 +113,9 @@ EXEC 00;32
.deb 00;31
.rpm 00;31
.jar 00;31
+.war 00;31
+.ear 00;31
+.sar 00;31
.rar 00;31
.ace 00;31
.zoo 00;31
diff --git a/coreutils-i18n.patch b/coreutils-i18n.patch
index a8faefe..a2960a8 100644
--- a/coreutils-i18n.patch
+++ b/coreutils-i18n.patch
@@ -2928,7 +2928,7 @@ diff -urNp coreutils-8.0-orig/src/sort.c coreutils-8.0/src/sort.c
{
size_t lo = 0;
size_t hi = MONTHS_PER_YEAR;
-@@ -1996,11 +2324,79 @@ compare_version (char *restrict texta, s
+@@ -1996,11 +2324,80 @@ compare_version (char *restrict texta, s
return diff;
}
@@ -2965,7 +2965,8 @@ diff -urNp coreutils-8.0-orig/src/sort.c coreutils-8.0/src/sort.c
+ memset (&state, '\0', sizeof(mbstate_t));
+
+ wclength = mbsrtowcs (month_wcs, pp, len + 1, &state);
-+ assert (wclength != (size_t)-1 && *pp == NULL);
++ if (wclength == (size_t)-1 || *pp != NULL)
++ error (SORT_FAILURE, 0, _("Invalid multibyte input %s."), quote(s));
+
+ for (i = 0; i < wclength; i++)
+ {
diff --git a/coreutils.spec b/coreutils.spec
index d572462..640630a 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.4
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@@ -24,6 +24,10 @@ Source203: coreutils-runuser-l.pamd
Patch1: coreutils-8.4-who-msgstatus.patch
#fix detection of xattr support in configure
Patch2: coreutils-8.4-xattrmodule.patch
+#fix double free error in tac (reported in debian bug #594666)
+Patch3: coreutils-8.5-tac-doublefree.patch
+#fix various case conversion issues in tr(#611274)
+Patch4: coreutils-8.5-trcaseconversion.patch
# Our patches
#general patch to workaround koji build system issues
@@ -62,6 +66,8 @@ Patch912: coreutils-overflow.patch
Patch915: coreutils-split-pam.patch
#prevent koji build failure with wrong getfacl exit code
Patch916: coreutils-getfacl-exit-code.patch
+#compile su with pie flag and RELRO protection
+Patch917: coreutils-8.4-su-pie.patch
#SELINUX Patch - implements Redhat changes
#(upstream did some SELinux implementation unlike with RedHat patch)
@@ -123,6 +129,8 @@ Libraries for coreutils package.
# From upstream
%patch1 -p1 -b .whomsg
%patch2 -p1 -b .xattr
+%patch3 -p1 -b .doublefree
+%patch4 -p1 -b .caseconvert
# Our patches
%patch100 -p1 -b .configure
@@ -145,12 +153,14 @@ Libraries for coreutils package.
%patch912 -p1 -b .overflow
%patch915 -p1 -b .splitl
%patch916 -p1 -b .getfacl-exit-code
+%patch917 -p1 -b .pie
#SELinux
%patch950 -p1 -b .selinux
%patch951 -p1 -b .selinuxman
chmod a+x tests/misc/sort-mb-tests
+chmod a+x tests/misc/tr-case-class
#fix bad encoding in danish translations(#615945)
cp -a %{SOURCE1} po/da.po
@@ -346,6 +356,16 @@ fi
%{_libdir}/coreutils
%changelog
+* Fri Oct 01 2010 Ondrej Vasik <ovasik at redhat.com> - 8.4-9
+- various fixes for case conversion in tr(#611274)
+- change assertion failure for invalid multibyte input
+ in sort to less confusing error message(#591352)
+- add RELRO protection to su as well (#630017)
+- compile su with pie again (#630017)
+- fix double free abort in tac (#628213)
+- Add .ear, .war, .sar , for Java jar-like archives to
+ dircolors (#616497)
+
* Tue Jul 20 2010 Ondrej Vasik <ovasik at redhat.com> - 8.4-8
- fix danish translation file encoding(#615945)
More information about the scm-commits
mailing list