diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-extended/grep/grep-2.5.1a | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-extended/grep/grep-2.5.1a')
7 files changed, 213 insertions, 0 deletions
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/Makevars b/meta/recipes-extended/grep/grep-2.5.1a/Makevars new file mode 100644 index 0000000000..8b09f53b0f --- /dev/null +++ b/meta/recipes-extended/grep/grep-2.5.1a/Makevars | |||
@@ -0,0 +1,25 @@ | |||
1 | # Makefile variables for PO directory in any package using GNU gettext. | ||
2 | |||
3 | # Usually the message domain is the same as the package name. | ||
4 | DOMAIN = $(PACKAGE) | ||
5 | |||
6 | # These two variables depend on the location of this directory. | ||
7 | subdir = po | ||
8 | top_builddir = .. | ||
9 | |||
10 | # These options get passed to xgettext. | ||
11 | XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ | ||
12 | |||
13 | # This is the copyright holder that gets inserted into the header of the | ||
14 | # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding | ||
15 | # package. (Note that the msgstr strings, extracted from the package's | ||
16 | # sources, belong to the copyright holder of the package.) Translators are | ||
17 | # expected to transfer the copyright for their translations to this person | ||
18 | # or entity, or to disclaim their copyright. The empty string stands for | ||
19 | # the public domain; in this case the translators are expected to disclaim | ||
20 | # their copyright. | ||
21 | COPYRIGHT_HOLDER = Free Software Foundation, Inc. | ||
22 | |||
23 | # This is the list of locale categories, beyond LC_MESSAGES, for which the | ||
24 | # message catalogs shall be used. It is usually empty. | ||
25 | EXTRA_LOCALE_CATEGORIES = | ||
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch b/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch new file mode 100644 index 0000000000..5a4149cfc0 --- /dev/null +++ b/meta/recipes-extended/grep/grep-2.5.1a/fix-for-texinfo-5.1.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Upstream-Status: Inappropriate [Poky Specific this is gplv2 version] | ||
2 | |||
3 | Signed-off-by Saul Wold <sgw@linux.intel.com> | ||
4 | |||
5 | Index: grep-2.5.1a/doc/grep.texi | ||
6 | =================================================================== | ||
7 | --- grep-2.5.1a.orig/doc/grep.texi | ||
8 | +++ grep-2.5.1a/doc/grep.texi | ||
9 | @@ -288,7 +288,7 @@ This version number should be included i | ||
10 | Print a usage message briefly summarizing these command-line options | ||
11 | and the bug-reporting address, then exit. | ||
12 | |||
13 | -@itemx --binary-files=@var{type} | ||
14 | +@item --binary-files=@var{type} | ||
15 | @opindex --binary-files | ||
16 | @cindex binary files | ||
17 | If the first few bytes of a file indicate that the file contains binary | ||
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch b/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch new file mode 100644 index 0000000000..3b91520fb2 --- /dev/null +++ b/meta/recipes-extended/grep/grep-2.5.1a/fix64-int-to-pointer.patch | |||
@@ -0,0 +1,17 @@ | |||
1 | Always use locale.h as HAVE_LOCALE_H is no longer handled by ./configure | ||
2 | Upstream-Status: Inappropriate [ old version that will not be maintained ] | ||
3 | Signed-off-by: Alex DAMIAN <alexandru.damian@intel.com> | ||
4 | |||
5 | diff --recursive --unified grep-2.5.1a-orig/lib/hard-locale.c grep-2.5.1a/lib/hard-locale.c | ||
6 | --- grep-2.5.1a-orig/lib/hard-locale.c 2001-03-04 07:33:12.000000000 +0200 | ||
7 | +++ grep-2.5.1a/lib/hard-locale.c 2013-03-11 17:05:52.086444891 +0200 | ||
8 | @@ -38,9 +38,7 @@ | ||
9 | # endif | ||
10 | #endif | ||
11 | |||
12 | -#if HAVE_LOCALE_H | ||
13 | # include <locale.h> | ||
14 | -#endif | ||
15 | |||
16 | #if HAVE_STRING_H | ||
17 | # include <string.h> | ||
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch b/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch new file mode 100644 index 0000000000..57463355a7 --- /dev/null +++ b/meta/recipes-extended/grep/grep-2.5.1a/gettext.patch | |||
@@ -0,0 +1,15 @@ | |||
1 | Enable operation with later versions of gettext. | ||
2 | |||
3 | Upstream-Status: Inappropriate | ||
4 | RP 2012/10/19 | ||
5 | |||
6 | Index: grep-2.5.1a/configure.in | ||
7 | =================================================================== | ||
8 | --- grep-2.5.1a.orig/configure.in 2012-10-19 12:57:51.646970204 +0000 | ||
9 | +++ grep-2.5.1a/configure.in 2012-10-19 12:59:49.946968803 +0000 | ||
10 | @@ -140,4 +140,4 @@ | ||
11 | AC_CHECK_LIB(pcre, pcre_exec) | ||
12 | fi | ||
13 | |||
14 | -AC_OUTPUT(Makefile lib/Makefile lib/posix/Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile vms/Makefile bootstrap/Makefile, [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile; echo timestamp > stamp-h]) | ||
15 | +AC_OUTPUT(Makefile lib/Makefile lib/posix/Makefile src/Makefile tests/Makefile po/Makefile.in intl/Makefile doc/Makefile m4/Makefile vms/Makefile bootstrap/Makefile, [echo timestamp > stamp-h]) | ||
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/grep-CVE-2012-5667.patch b/meta/recipes-extended/grep/grep-2.5.1a/grep-CVE-2012-5667.patch new file mode 100644 index 0000000000..059d0687b3 --- /dev/null +++ b/meta/recipes-extended/grep/grep-2.5.1a/grep-CVE-2012-5667.patch | |||
@@ -0,0 +1,32 @@ | |||
1 | The patch to fix CVE-2012-5667 | ||
2 | Reference: https://bugzilla.redhat.com/attachment.cgi?id=686605&action=diff | ||
3 | |||
4 | Multiple integer overflows in GNU Grep before 2.11 might allow | ||
5 | context-dependent attackers to execute arbitrary code via vectors | ||
6 | involving a long input line that triggers a heap-based buffer overflow. | ||
7 | |||
8 | http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-5667 | ||
9 | |||
10 | Upstream-Status: Inappropriate [other] | ||
11 | This version of GNU Grep has been abandoned upstream and they are no longer | ||
12 | accepting patches. This is not a backport. | ||
13 | |||
14 | Signed-off-by Ming Liu <ming.liu@windriver.com> | ||
15 | --- | ||
16 | grep.c | 7 +++---- | ||
17 | 1 file changed, 3 insertions(+), 4 deletions(-) | ||
18 | |||
19 | --- a/src/grep.c 2013-05-15 13:39:33.359191769 +0800 | ||
20 | +++ a/src/grep.c 2013-05-15 13:50:22.609191882 +0800 | ||
21 | @@ -306,6 +306,11 @@ fillbuf (size_t save, struct stats const | ||
22 | int cc = 1; | ||
23 | char *readbuf; | ||
24 | size_t readsize; | ||
25 | + const size_t max_save = INT_MAX / 2; | ||
26 | + | ||
27 | + /* Limit the amount of saved data to INT_MAX to fix CVE-2012-5667 */ | ||
28 | + if (save > max_save) | ||
29 | + error (2, 0, _("line too long")); | ||
30 | |||
31 | /* Offset from start of buffer to start of old stuff | ||
32 | that we want to save. */ | ||
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/grep_fix_for_automake-1.12.patch b/meta/recipes-extended/grep/grep-2.5.1a/grep_fix_for_automake-1.12.patch new file mode 100644 index 0000000000..3ccce5fc36 --- /dev/null +++ b/meta/recipes-extended/grep/grep-2.5.1a/grep_fix_for_automake-1.12.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | automake 1.12 has depricated automatic de-ANSI-fication support | ||
4 | |||
5 | this patch avoids these kinds of errors: | ||
6 | |||
7 | | configure.in:33: error: automatic de-ANSI-fication support has been removed | ||
8 | | /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12/protos.m4:12: AM_C_PROTOTYPES is expanded from... | ||
9 | | configure.in:33: the top level | ||
10 | | autom4te: m4 failed with exit status: 1 | ||
11 | ... | ||
12 | | lib/Makefile.am:2: error: automatic de-ANSI-fication support has been removed | ||
13 | | src/Makefile.am:2: error: automatic de-ANSI-fication support has been removed | ||
14 | | autoreconf: automake failed with exit status: 1 | ||
15 | |||
16 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> | ||
17 | 2012/05/04 | ||
18 | |||
19 | Index: grep-2.5.1a/configure.in | ||
20 | =================================================================== | ||
21 | --- grep-2.5.1a.orig/configure.in | ||
22 | +++ grep-2.5.1a/configure.in | ||
23 | @@ -30,7 +30,6 @@ AC_PROG_RANLIB | ||
24 | |||
25 | dnl Checks for typedefs, structures, and compiler characteristics. | ||
26 | AC_SYS_LARGEFILE | ||
27 | -AM_C_PROTOTYPES | ||
28 | AC_TYPE_SIZE_T | ||
29 | AC_CHECK_TYPE(ssize_t, int) | ||
30 | AC_C_CONST | ||
31 | Index: grep-2.5.1a/lib/Makefile.am | ||
32 | =================================================================== | ||
33 | --- grep-2.5.1a.orig/lib/Makefile.am | ||
34 | +++ grep-2.5.1a/lib/Makefile.am | ||
35 | @@ -1,5 +1,5 @@ | ||
36 | # | ||
37 | -AUTOMAKE_OPTIONS = ../src/ansi2knr | ||
38 | +AUTOMAKE_OPTIONS = | ||
39 | |||
40 | SUBDIRS = posix | ||
41 | |||
42 | Index: grep-2.5.1a/src/Makefile.am | ||
43 | =================================================================== | ||
44 | --- grep-2.5.1a.orig/src/Makefile.am | ||
45 | +++ grep-2.5.1a/src/Makefile.am | ||
46 | @@ -1,5 +1,5 @@ | ||
47 | ## Process this file with automake to create Makefile.in | ||
48 | -AUTOMAKE_OPTIONS = ansi2knr no-dependencies | ||
49 | +AUTOMAKE_OPTIONS = no-dependencies | ||
50 | |||
51 | LN = ln | ||
52 | |||
diff --git a/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch b/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch new file mode 100644 index 0000000000..de054fc755 --- /dev/null +++ b/meta/recipes-extended/grep/grep-2.5.1a/uclibc-fix.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | Upstream-Status: Inappropriate [licensing] | ||
2 | |||
3 | # Fix to use mempcpy instead of __mempcpy. This is needed for uclibc which | ||
4 | # doesn't define __mempcpy, only mempcpy. Since both uclibc and glibc have | ||
5 | # mempcpy, we'll just use that instead. | ||
6 | # Patch source: OpenEmbedded | ||
7 | |||
8 | Index: grep-2.5.1/intl/localealias.c | ||
9 | =================================================================== | ||
10 | --- grep-2.5.1.orig/intl/localealias.c 2002-03-14 00:39:06.000000000 +1100 | ||
11 | +++ grep-2.5.1/intl/localealias.c 2007-05-17 13:53:58.000000000 +1000 | ||
12 | @@ -65,7 +65,7 @@ | ||
13 | # define strcasecmp __strcasecmp | ||
14 | |||
15 | # ifndef mempcpy | ||
16 | -# define mempcpy __mempcpy | ||
17 | +# error "mempcpy not detected" | ||
18 | # endif | ||
19 | # define HAVE_MEMPCPY 1 | ||
20 | # define HAVE___FSETLOCKING 1 | ||
21 | Index: grep-2.5.1/lib/getopt.c | ||
22 | =================================================================== | ||
23 | --- grep-2.5.1.orig/lib/getopt.c 2001-03-04 16:33:12.000000000 +1100 | ||
24 | +++ grep-2.5.1/lib/getopt.c 2007-05-17 13:51:44.000000000 +1000 | ||
25 | @@ -326,7 +326,7 @@ | ||
26 | nonoption_flags_len = nonoption_flags_max_len = 0; | ||
27 | else | ||
28 | { | ||
29 | - memset (__mempcpy (new_str, __getopt_nonoption_flags, | ||
30 | + memset (mempcpy (new_str, __getopt_nonoption_flags, | ||
31 | nonoption_flags_max_len), | ||
32 | '\0', top + 1 - nonoption_flags_max_len); | ||
33 | nonoption_flags_max_len = top + 1; | ||
34 | @@ -437,7 +437,7 @@ | ||
35 | if (__getopt_nonoption_flags == NULL) | ||
36 | nonoption_flags_max_len = -1; | ||
37 | else | ||
38 | - memset (__mempcpy (__getopt_nonoption_flags, orig_str, len), | ||
39 | + memset (mempcpy (__getopt_nonoption_flags, orig_str, len), | ||
40 | '\0', nonoption_flags_max_len - len); | ||
41 | } | ||
42 | } | ||
43 | Index: grep-2.5.1/lib/regex.c | ||
44 | =================================================================== | ||
45 | --- grep-2.5.1.orig/lib/regex.c 2001-04-03 04:04:45.000000000 +1000 | ||
46 | +++ grep-2.5.1/lib/regex.c 2007-05-17 13:51:48.000000000 +1000 | ||
47 | @@ -7842,7 +7842,7 @@ | ||
48 | if (msg_size > errbuf_size) | ||
49 | { | ||
50 | #if defined HAVE_MEMPCPY || defined _LIBC | ||
51 | - *((char *) __mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; | ||
52 | + *((char *) mempcpy (errbuf, msg, errbuf_size - 1)) = '\0'; | ||
53 | #else | ||
54 | memcpy (errbuf, msg, errbuf_size - 1); | ||
55 | errbuf[errbuf_size - 1] = 0; | ||