diff options
Diffstat (limited to 'meta/recipes-core/coreutils/coreutils-8.22')
5 files changed, 166 insertions, 0 deletions
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/date-tz-crash.patch b/meta/recipes-core/coreutils/coreutils-8.22/date-tz-crash.patch new file mode 100644 index 0000000000..570e4fd49c --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.22/date-tz-crash.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | This was reported in http://bugs.gnu.org/16872 | ||
2 | from the coreutils command: date -d 'TZ="""' | ||
3 | |||
4 | The infinite loop for this case was present since the | ||
5 | initial TZ="" parsing support in commit de95bdc2 29-10-2004. | ||
6 | This was changed to a crash or heap corruption depending | ||
7 | on the platform with commit 2e3e4195 18-01-2010. | ||
8 | |||
9 | * lib/parse-datetime.y (parse_datetime): Break out of the | ||
10 | TZ="" parsing loop once the second significant " is found. | ||
11 | Also skip over any subsequent whitespace to be consistent | ||
12 | with the non TZ= case. | ||
13 | |||
14 | Fixes: CVE-2014-9471 | ||
15 | |||
16 | Upstream-Status: backport | ||
17 | |||
18 | Signed-off-by: Maxin B. John <maxin.john@enea.com> | ||
19 | Signed-off-by: Pádraig Brady <P@draigBrady.com> | ||
20 | --- | ||
21 | diff -Naur coreutils-8.22-origin/lib/parse-datetime.y coreutils-8.22/lib/parse-datetime.y | ||
22 | --- coreutils-8.22-origin/lib/parse-datetime.y 2013-12-04 15:53:33.000000000 +0100 | ||
23 | +++ coreutils-8.22/lib/parse-datetime.y 2015-01-05 17:11:16.754358184 +0100 | ||
24 | @@ -1303,8 +1303,6 @@ | ||
25 | char tz1buf[TZBUFSIZE]; | ||
26 | bool large_tz = TZBUFSIZE < tzsize; | ||
27 | bool setenv_ok; | ||
28 | - /* Free tz0, in case this is the 2nd or subsequent time through. */ | ||
29 | - free (tz0); | ||
30 | tz0 = get_tz (tz0buf); | ||
31 | z = tz1 = large_tz ? xmalloc (tzsize) : tz1buf; | ||
32 | for (s = tzbase; *s != '"'; s++) | ||
33 | @@ -1317,6 +1315,10 @@ | ||
34 | goto fail; | ||
35 | tz_was_altered = true; | ||
36 | p = s + 1; | ||
37 | + while (c = *p, c_isspace (c)) | ||
38 | + p++; | ||
39 | + | ||
40 | + break; | ||
41 | } | ||
42 | } | ||
43 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch new file mode 100644 index 0000000000..4757f52aa0 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.22/dummy_help2man.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | Upstream-Status: Inappropriate [disable feature] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd coreutils-8.21/man/local.mk coreutils-8.21/man/local.mk | ||
5 | --- coreutils-8.21/man/local.mk 2013-02-05 16:01:21.000000000 +0200 | ||
6 | +++ coreutils-8.21/man/local.mk 2013-03-23 09:12:53.360470192 +0200 | ||
7 | @@ -19,11 +19,11 @@ | ||
8 | EXTRA_DIST += man/help2man man/dummy-man | ||
9 | |||
10 | ## Graceful degradation for systems lacking perl. | ||
11 | -if HAVE_PERL | ||
12 | -run_help2man = $(PERL) -- $(srcdir)/man/help2man | ||
13 | -else | ||
14 | +#if HAVE_PERL | ||
15 | +#run_help2man = $(PERL) -- $(srcdir)/man/help2man | ||
16 | +#else | ||
17 | run_help2man = $(SHELL) $(srcdir)/man/dummy-man | ||
18 | -endif | ||
19 | +#endif | ||
20 | |||
21 | man1_MANS = @man1_MANS@ | ||
22 | EXTRA_DIST += $(man1_MANS:.1=.x) | ||
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch b/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch new file mode 100644 index 0000000000..b7e82609bd --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.22/fix-for-dummy-man-usage.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | coreutils: fix for dummy-man usage | ||
4 | |||
5 | The options should be before the final argument, otherwise, the following error | ||
6 | would appear when compiling. | ||
7 | |||
8 | "dummy-man: too many non-option arguments" | ||
9 | |||
10 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
11 | --- | ||
12 | man/local.mk | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/man/local.mk b/man/local.mk | ||
16 | index 7cef5e3..dc0865f 100644 | ||
17 | --- a/man/local.mk | ||
18 | +++ b/man/local.mk | ||
19 | @@ -189,8 +189,8 @@ man/yes.1: src/yes | ||
20 | && $(run_help2man) \ | ||
21 | --source='$(PACKAGE_STRING)' \ | ||
22 | --include=$(srcdir)/man/$$name.x \ | ||
23 | - --output=$$t/$$name.1 $$t/$$name \ | ||
24 | --info-page='coreutils \(aq'$$name' invocation\(aq' \ | ||
25 | + --output=$$t/$$name.1 $$t/$$name \ | ||
26 | && sed \ | ||
27 | -e 's|$*\.td/||g' \ | ||
28 | -e '/For complete documentation/d' \ | ||
29 | -- | ||
30 | 1.7.9.5 | ||
31 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch b/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch new file mode 100644 index 0000000000..9d1ae55d47 --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.22/fix-selinux-flask.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From a1d360509fa3a4aff57eedcd528cc0347a87531d Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Tue, 16 Sep 2014 01:59:08 -0700 | ||
4 | Subject: [PATCH] gnulib-comp.m4: selinux/flask.h should respect to | ||
5 | with_selinux | ||
6 | |||
7 | Fixed when build with meta-selinux even when --without-selinux: | ||
8 | runcon.c:49:28: fatal error: selinux/flask.h: No such file or directory | ||
9 | # include <selinux/flask.h> | ||
10 | ^ | ||
11 | compilation terminated. | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
16 | --- | ||
17 | m4/gnulib-comp.m4 | 2 +- | ||
18 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
19 | |||
20 | diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 | ||
21 | index 472d3a0..5f09734 100644 | ||
22 | --- a/m4/gnulib-comp.m4 | ||
23 | +++ b/m4/gnulib-comp.m4 | ||
24 | @@ -1730,11 +1730,11 @@ AC_DEFUN([gl_INIT], | ||
25 | AC_LIBOBJ([select]) | ||
26 | fi | ||
27 | gl_SYS_SELECT_MODULE_INDICATOR([select]) | ||
28 | - AC_CHECK_HEADERS([selinux/flask.h]) | ||
29 | AC_LIBOBJ([selinux-at]) | ||
30 | gl_HEADERS_SELINUX_SELINUX_H | ||
31 | gl_HEADERS_SELINUX_CONTEXT_H | ||
32 | if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then | ||
33 | + AC_CHECK_HEADERS([selinux/flask.h]) | ||
34 | AC_LIBOBJ([getfilecon]) | ||
35 | fi | ||
36 | gl_SERVENT | ||
37 | -- | ||
38 | 1.7.9.5 | ||
39 | |||
diff --git a/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch b/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch new file mode 100644 index 0000000000..2ef8a548ac --- /dev/null +++ b/meta/recipes-core/coreutils/coreutils-8.22/remove-usr-local-lib-from-m4.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | We have problem using hardcoded directories like /usr/local here | ||
2 | which will be checked for cross builds. This is a special case which | ||
3 | is valid for AIX only. We do not have AIX as one of our supported | ||
4 | build host or target. Therefore we get rid of the hardcoded paths | ||
5 | and make life easier for cross compilation process. | ||
6 | |||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | Upstream-Status: Inappropriate [Upstream does care for AIX while we may not] | ||
10 | |||
11 | Index: coreutils-8.14/m4/getloadavg.m4 | ||
12 | =================================================================== | ||
13 | --- coreutils-8.14.orig/m4/getloadavg.m4 2011-09-19 08:09:24.000000000 -0700 | ||
14 | +++ coreutils-8.14/m4/getloadavg.m4 2011-10-19 21:42:00.385533357 -0700 | ||
15 | @@ -41,16 +41,6 @@ | ||
16 | [LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes]) | ||
17 | fi | ||
18 | |||
19 | - if test $gl_func_getloadavg_done = no; then | ||
20 | - # There is a commonly available library for RS/6000 AIX. | ||
21 | - # Since it is not a standard part of AIX, it might be installed locally. | ||
22 | - gl_getloadavg_LIBS=$LIBS | ||
23 | - LIBS="-L/usr/local/lib $LIBS" | ||
24 | - AC_CHECK_LIB([getloadavg], [getloadavg], | ||
25 | - [LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes], | ||
26 | - [LIBS=$gl_getloadavg_LIBS]) | ||
27 | - fi | ||
28 | - | ||
29 | # Set up the replacement function if necessary. | ||
30 | if test $gl_func_getloadavg_done = no; then | ||
31 | HAVE_GETLOADAVG=0 | ||