diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch | 58 | ||||
-rw-r--r-- | meta/recipes-core/gettext/gettext_0.18.1.1.bb | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4-1.4.16.inc | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/m4/m4/remove-gets.patch | 21 | ||||
-rw-r--r-- | meta/recipes-extended/augeas/augeas/remove-gets.patch | 20 | ||||
-rw-r--r-- | meta/recipes-extended/augeas/augeas_0.10.0.bb | 4 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/gnutls/remove-gets.patch | 42 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/gnutls_2.12.17.bb | 3 |
8 files changed, 152 insertions, 5 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch new file mode 100644 index 0000000000..3d3c400e0d --- /dev/null +++ b/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch | |||
@@ -0,0 +1,58 @@ | |||
1 | eglibc 2.16 has removed gets so we need to check for it | ||
2 | being there before using it. | ||
3 | |||
4 | |||
5 | From glibc stdio.h | ||
6 | |||
7 | The function has been officially removed in ISO C11. This opportunity | ||
8 | is used to also remove it from the GNU feature list. It is now only | ||
9 | available when explicitly using an old ISO C, Unix, or POSIX standard. | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h | ||
15 | =================================================================== | ||
16 | --- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h 2010-05-17 12:56:12.000000000 -0700 | ||
17 | +++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-07-02 22:42:21.292223316 -0700 | ||
18 | @@ -140,8 +140,10 @@ | ||
19 | /* It is very rare that the developer ever has full control of stdin, | ||
20 | so any use of gets warrants an unconditional warning. Assume it is | ||
21 | always declared, since it is required by C89. */ | ||
22 | +#if defined gets | ||
23 | #undef gets | ||
24 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
25 | +#endif | ||
26 | |||
27 | #if @GNULIB_FOPEN@ | ||
28 | # if @REPLACE_FOPEN@ | ||
29 | Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h | ||
30 | =================================================================== | ||
31 | --- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h 2010-05-24 02:42:46.000000000 -0700 | ||
32 | +++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h 2012-07-02 23:02:33.476281979 -0700 | ||
33 | @@ -140,8 +140,10 @@ | ||
34 | /* It is very rare that the developer ever has full control of stdin, | ||
35 | so any use of gets warrants an unconditional warning. Assume it is | ||
36 | always declared, since it is required by C89. */ | ||
37 | +#if defined gets | ||
38 | #undef gets | ||
39 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
40 | +#endif | ||
41 | |||
42 | #if @GNULIB_FOPEN@ | ||
43 | # if @REPLACE_FOPEN@ | ||
44 | Index: gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h | ||
45 | =================================================================== | ||
46 | --- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h 2010-05-17 12:58:03.000000000 -0700 | ||
47 | +++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h 2012-07-02 23:01:57.440280253 -0700 | ||
48 | @@ -140,8 +140,10 @@ | ||
49 | /* It is very rare that the developer ever has full control of stdin, | ||
50 | so any use of gets warrants an unconditional warning. Assume it is | ||
51 | always declared, since it is required by C89. */ | ||
52 | +#if defined gets | ||
53 | #undef gets | ||
54 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
55 | +#endif | ||
56 | |||
57 | #if @GNULIB_FOPEN@ | ||
58 | # if @REPLACE_FOPEN@ | ||
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb index 1e67afb57c..16ea010f25 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb | |||
@@ -5,7 +5,7 @@ SECTION = "libs" | |||
5 | LICENSE = "GPLv3+ & LGPL-2.1+" | 5 | LICENSE = "GPLv3+ & LGPL-2.1+" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
7 | 7 | ||
8 | PR = "r12" | 8 | PR = "r13" |
9 | DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" | 9 | DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" |
10 | DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" | 10 | DEPENDS_virtclass-native = "libxml2-native gettext-minimal-native" |
11 | PROVIDES = "virtual/libintl virtual/gettext" | 11 | PROVIDES = "virtual/libintl virtual/gettext" |
@@ -13,6 +13,7 @@ PROVIDES_virtclass-native = "virtual/gettext-native" | |||
13 | CONFLICTS_${PN} = "proxy-libintl" | 13 | CONFLICTS_${PN} = "proxy-libintl" |
14 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ | 14 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ |
15 | file://parallel.patch \ | 15 | file://parallel.patch \ |
16 | file://remove_gets.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ | 19 | SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ |
diff --git a/meta/recipes-devtools/m4/m4-1.4.16.inc b/meta/recipes-devtools/m4/m4-1.4.16.inc index 139193c958..bb82a3bde0 100644 --- a/meta/recipes-devtools/m4/m4-1.4.16.inc +++ b/meta/recipes-devtools/m4/m4-1.4.16.inc | |||
@@ -5,8 +5,10 @@ LICENSE = "GPLv3" | |||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\ |
6 | file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d" | 6 | file://examples/COPYING;md5=fbc986d45b3dae6725c29870dd6b669d" |
7 | 7 | ||
8 | PR = "r2" | 8 | PR = "r3" |
9 | SRC_URI += "file://ac_config_links.patch" | 9 | SRC_URI += "file://ac_config_links.patch \ |
10 | file://remove-gets.patch \ | ||
11 | " | ||
10 | 12 | ||
11 | SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280" | 13 | SRC_URI[md5sum] = "a5dfb4f2b7370e9d34293d23fd09b280" |
12 | SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da" | 14 | SRC_URI[sha256sum] = "e9176a35bb13a1b08482359aa554ee8072794f58f00e4827bf0e06b570c827da" |
diff --git a/meta/recipes-devtools/m4/m4/remove-gets.patch b/meta/recipes-devtools/m4/m4/remove-gets.patch new file mode 100644 index 0000000000..9c396d94f0 --- /dev/null +++ b/meta/recipes-devtools/m4/m4/remove-gets.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | eglibc has remove gets starting 2.16 | ||
2 | therefore check for its being there before | ||
3 | undefining it. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | Index: m4-1.4.16/lib/stdio.in.h | ||
8 | =================================================================== | ||
9 | --- m4-1.4.16.orig/lib/stdio.in.h 2011-03-01 08:39:29.000000000 -0800 | ||
10 | +++ m4-1.4.16/lib/stdio.in.h 2012-07-03 08:32:08.145935928 -0700 | ||
11 | @@ -161,8 +161,10 @@ | ||
12 | /* It is very rare that the developer ever has full control of stdin, | ||
13 | so any use of gets warrants an unconditional warning. Assume it is | ||
14 | always declared, since it is required by C89. */ | ||
15 | +#if defined gets | ||
16 | #undef gets | ||
17 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
18 | +#endif | ||
19 | |||
20 | #if @GNULIB_FOPEN@ | ||
21 | # if @REPLACE_FOPEN@ | ||
diff --git a/meta/recipes-extended/augeas/augeas/remove-gets.patch b/meta/recipes-extended/augeas/augeas/remove-gets.patch new file mode 100644 index 0000000000..bd6e92cc66 --- /dev/null +++ b/meta/recipes-extended/augeas/augeas/remove-gets.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | eglibc 2.16 has remove gets so check for it to be there before using it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Index: augeas-0.10.0/gnulib/lib/stdio.in.h | ||
7 | =================================================================== | ||
8 | --- augeas-0.10.0.orig/gnulib/lib/stdio.in.h 2011-03-03 17:07:59.000000000 -0800 | ||
9 | +++ augeas-0.10.0/gnulib/lib/stdio.in.h 2012-07-03 19:46:42.871894833 -0700 | ||
10 | @@ -161,8 +161,10 @@ | ||
11 | /* It is very rare that the developer ever has full control of stdin, | ||
12 | so any use of gets warrants an unconditional warning. Assume it is | ||
13 | always declared, since it is required by C89. */ | ||
14 | +#if defined gets | ||
15 | #undef gets | ||
16 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
17 | +#endif | ||
18 | |||
19 | #if @GNULIB_FOPEN@ | ||
20 | # if @REPLACE_FOPEN@ | ||
diff --git a/meta/recipes-extended/augeas/augeas_0.10.0.bb b/meta/recipes-extended/augeas/augeas_0.10.0.bb index 00921aa854..06ef4944fa 100644 --- a/meta/recipes-extended/augeas/augeas_0.10.0.bb +++ b/meta/recipes-extended/augeas/augeas_0.10.0.bb | |||
@@ -1,6 +1,8 @@ | |||
1 | require augeas.inc | 1 | require augeas.inc |
2 | 2 | ||
3 | PR = "r1" | 3 | PR = "r2" |
4 | SRC_URI += "file://remove-gets.patch \ | ||
5 | " | ||
4 | 6 | ||
5 | SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352" | 7 | SRC_URI[md5sum] = "fe1834e90a066c3208ac0214622c7352" |
6 | SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca" | 8 | SRC_URI[sha256sum] = "ec111af06186216930176ebe5ecccdf7bf528528aee9acde1d5d70088484afca" |
diff --git a/meta/recipes-support/gnutls/gnutls/remove-gets.patch b/meta/recipes-support/gnutls/gnutls/remove-gets.patch new file mode 100644 index 0000000000..d694a3d95c --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/remove-gets.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | eglibc 2.16 has removed gets completely | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Backported to gnutls 2.12.17 by Scott Garman <scott.a.garman@intel.com> | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | diff -urN gnutls-2.12.17.orig/gl/stdio.in.h gnutls-2.12.17/gl/stdio.in.h | ||
10 | --- gnutls-2.12.17.orig/gl/stdio.in.h 2012-03-01 07:47:48.000000000 -0800 | ||
11 | +++ gnutls-2.12.17/gl/stdio.in.h 2012-12-12 20:27:54.833297791 -0800 | ||
12 | @@ -710,11 +710,13 @@ | ||
13 | _GL_CXXALIAS_SYS (gets, char *, (char *s)); | ||
14 | # undef gets | ||
15 | # endif | ||
16 | +# if defined gets | ||
17 | _GL_CXXALIASWARN (gets); | ||
18 | /* It is very rare that the developer ever has full control of stdin, | ||
19 | so any use of gets warrants an unconditional warning. Assume it is | ||
20 | always declared, since it is required by C89. */ | ||
21 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
22 | +# endif | ||
23 | #endif | ||
24 | |||
25 | |||
26 | diff -urN gnutls-2.12.17.orig/lib/gl/stdio.in.h gnutls-2.12.17/lib/gl/stdio.in.h | ||
27 | --- gnutls-2.12.17.orig/lib/gl/stdio.in.h 2012-03-01 07:53:13.000000000 -0800 | ||
28 | +++ gnutls-2.12.17/lib/gl/stdio.in.h 2012-12-12 20:29:09.669295717 -0800 | ||
29 | @@ -710,11 +710,13 @@ | ||
30 | _GL_CXXALIAS_SYS (gets, char *, (char *s)); | ||
31 | # undef gets | ||
32 | # endif | ||
33 | +# if defined gets | ||
34 | _GL_CXXALIASWARN (gets); | ||
35 | /* It is very rare that the developer ever has full control of stdin, | ||
36 | so any use of gets warrants an unconditional warning. Assume it is | ||
37 | always declared, since it is required by C89. */ | ||
38 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
39 | +# endif | ||
40 | #endif | ||
41 | |||
42 | |||
diff --git a/meta/recipes-support/gnutls/gnutls_2.12.17.bb b/meta/recipes-support/gnutls/gnutls_2.12.17.bb index 7a33ec2cf0..ebcbea3c60 100644 --- a/meta/recipes-support/gnutls/gnutls_2.12.17.bb +++ b/meta/recipes-support/gnutls/gnutls_2.12.17.bb | |||
@@ -1,10 +1,11 @@ | |||
1 | require gnutls.inc | 1 | require gnutls.inc |
2 | 2 | ||
3 | PR = "${INC_PR}.0" | 3 | PR = "${INC_PR}.2" |
4 | 4 | ||
5 | SRC_URI += "file://gnutls-openssl.patch \ | 5 | SRC_URI += "file://gnutls-openssl.patch \ |
6 | file://correct_rpl_gettimeofday_signature.patch \ | 6 | file://correct_rpl_gettimeofday_signature.patch \ |
7 | file://configure-fix.patch \ | 7 | file://configure-fix.patch \ |
8 | file://remove-gets.patch \ | ||
8 | " | 9 | " |
9 | 10 | ||
10 | SRC_URI[md5sum] = "f08990f1afa4e1d0ee13e64e537c7854" | 11 | SRC_URI[md5sum] = "f08990f1afa4e1d0ee13e64e537c7854" |