diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-07-04 12:30:07 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-03 12:34:23 +0000 |
commit | 07f304f4e28dc596b1420ae1cb6607d7706108e4 (patch) | |
tree | d2c4898e743e03374cc741b1418ca0a0b20ea1c7 | |
parent | db915496d3e513f8d29dd5961764137b26ae8a71 (diff) | |
download | poky-07f304f4e28dc596b1420ae1cb6607d7706108e4.tar.gz |
grub,guile,cpio,tar,wget: Fix gnulib for absense of gets in eglibc
eglibc 2.16 does not export gets anymore
(From OE-Core rev: 043d67c6677fa87496c4c441e9d366e2003ab9aa)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Resolved merge conflicts with denzil branch and backported guile
patch.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-bsp/grub/grub-1.99/remove-gets.patch | 20 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub_1.99.bb | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/guile/files/remove-gets.patch | 25 | ||||
-rw-r--r-- | meta/recipes-devtools/guile/guile_2.0.3.bb | 3 | ||||
-rw-r--r-- | meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch | 20 | ||||
-rw-r--r-- | meta/recipes-extended/cpio/cpio_2.11.bb | 5 | ||||
-rw-r--r-- | meta/recipes-extended/tar/tar-1.26/remove-gets.patch | 20 | ||||
-rw-r--r-- | meta/recipes-extended/tar/tar_1.26.bb | 5 | ||||
-rw-r--r-- | meta/recipes-extended/wget/wget-1.13.4/remove-gets.patch | 23 | ||||
-rw-r--r-- | meta/recipes-extended/wget/wget_1.13.4.bb | 3 |
10 files changed, 122 insertions, 5 deletions
diff --git a/meta/recipes-bsp/grub/grub-1.99/remove-gets.patch b/meta/recipes-bsp/grub/grub-1.99/remove-gets.patch new file mode 100644 index 0000000000..463f7847ad --- /dev/null +++ b/meta/recipes-bsp/grub/grub-1.99/remove-gets.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Index: grub-1.99/grub-core/gnulib/stdio.in.h | ||
7 | =================================================================== | ||
8 | --- grub-1.99.orig/grub-core/gnulib/stdio.in.h 2010-12-01 06:45:43.000000000 -0800 | ||
9 | +++ grub-1.99/grub-core/gnulib/stdio.in.h 2012-07-04 12:25:02.057099107 -0700 | ||
10 | @@ -140,8 +140,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-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb index 882f21d5b5..97475257d6 100644 --- a/meta/recipes-bsp/grub/grub_1.99.bb +++ b/meta/recipes-bsp/grub/grub_1.99.bb | |||
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | |||
13 | 13 | ||
14 | DEPENDS = "autogen-native" | 14 | DEPENDS = "autogen-native" |
15 | RDEPENDS_${PN} = "diffutils freetype" | 15 | RDEPENDS_${PN} = "diffutils freetype" |
16 | PR = "r7" | 16 | PR = "r8" |
17 | 17 | ||
18 | SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ | 18 | SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ |
19 | file://grub-install.in.patch \ | 19 | file://grub-install.in.patch \ |
@@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ | |||
23 | file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \ | 23 | file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \ |
24 | file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \ | 24 | file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \ |
25 | file://grub-1.99-fix-enable_execute_stack-check.patch \ | 25 | file://grub-1.99-fix-enable_execute_stack-check.patch \ |
26 | file://remove-gets.patch \ | ||
26 | file://40_custom" | 27 | file://40_custom" |
27 | 28 | ||
28 | SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" | 29 | SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" |
diff --git a/meta/recipes-devtools/guile/files/remove-gets.patch b/meta/recipes-devtools/guile/files/remove-gets.patch new file mode 100644 index 0000000000..1b4ca62594 --- /dev/null +++ b/meta/recipes-devtools/guile/files/remove-gets.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Backported to guile 2.0.3 by Scott Garman <scott.a.garman@intel.com> | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | diff -urN guile-2.0.3.orig/lib/stdio.in.h guile-2.0.3/lib/stdio.in.h | ||
10 | --- guile-2.0.3.orig/lib/stdio.in.h 2011-10-22 07:19:35.000000000 -0700 | ||
11 | +++ guile-2.0.3/lib/stdio.in.h 2012-12-12 20:47:06.397265942 -0800 | ||
12 | @@ -711,11 +711,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 | |||
diff --git a/meta/recipes-devtools/guile/guile_2.0.3.bb b/meta/recipes-devtools/guile/guile_2.0.3.bb index 164ab8c647..5201f6b45c 100644 --- a/meta/recipes-devtools/guile/guile_2.0.3.bb +++ b/meta/recipes-devtools/guile/guile_2.0.3.bb | |||
@@ -19,12 +19,13 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \ | |||
19 | file://debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch \ | 19 | file://debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch \ |
20 | file://opensuse/guile-64bit.patch \ | 20 | file://opensuse/guile-64bit.patch \ |
21 | file://opensuse/guile-turn-off-gc-test.patch \ | 21 | file://opensuse/guile-turn-off-gc-test.patch \ |
22 | file://remove-gets.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8" | 25 | SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8" |
25 | SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08" | 26 | SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08" |
26 | 27 | ||
27 | PR = "r5" | 28 | PR = "r6" |
28 | 29 | ||
29 | inherit autotools gettext | 30 | inherit autotools gettext |
30 | BBCLASSEXTEND = "native" | 31 | BBCLASSEXTEND = "native" |
diff --git a/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch b/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch new file mode 100644 index 0000000000..b4d113d3a5 --- /dev/null +++ b/meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Index: cpio-2.11/gnu/stdio.in.h | ||
7 | =================================================================== | ||
8 | --- cpio-2.11.orig/gnu/stdio.in.h 2012-07-04 12:13:43.133066247 -0700 | ||
9 | +++ cpio-2.11/gnu/stdio.in.h 2012-07-04 12:14:10.189067564 -0700 | ||
10 | @@ -138,8 +138,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/cpio/cpio_2.11.bb b/meta/recipes-extended/cpio/cpio_2.11.bb index 78da20e3d4..75fa2b1928 100644 --- a/meta/recipes-extended/cpio/cpio_2.11.bb +++ b/meta/recipes-extended/cpio/cpio_2.11.bb | |||
@@ -3,7 +3,10 @@ include cpio_v2.inc | |||
3 | LICENSE = "GPLv3" | 3 | LICENSE = "GPLv3" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" |
5 | 5 | ||
6 | PR = "r1" | 6 | PR = "r2" |
7 | |||
8 | SRC_URI += "file://remove-gets.patch \ | ||
9 | " | ||
7 | 10 | ||
8 | SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c" | 11 | SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c" |
9 | SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978" | 12 | SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978" |
diff --git a/meta/recipes-extended/tar/tar-1.26/remove-gets.patch b/meta/recipes-extended/tar/tar-1.26/remove-gets.patch new file mode 100644 index 0000000000..2429d429ae --- /dev/null +++ b/meta/recipes-extended/tar/tar-1.26/remove-gets.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Index: tar-1.26/gnu/stdio.in.h | ||
7 | =================================================================== | ||
8 | --- tar-1.26.orig/gnu/stdio.in.h 2011-03-12 01:14:33.000000000 -0800 | ||
9 | +++ tar-1.26/gnu/stdio.in.h 2012-07-04 12:18:58.997081535 -0700 | ||
10 | @@ -163,8 +163,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/tar/tar_1.26.bb b/meta/recipes-extended/tar/tar_1.26.bb index e679ccbf00..dfe63b1315 100644 --- a/meta/recipes-extended/tar/tar_1.26.bb +++ b/meta/recipes-extended/tar/tar_1.26.bb | |||
@@ -3,7 +3,10 @@ require tar.inc | |||
3 | LICENSE = "GPLv3" | 3 | LICENSE = "GPLv3" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
5 | 5 | ||
6 | PR = "r1" | 6 | PR = "r2" |
7 | |||
8 | SRC_URI += "file://remove-gets.patch \ | ||
9 | " | ||
7 | 10 | ||
8 | SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519" | 11 | SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519" |
9 | SRC_URI[sha256sum] = "5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41" | 12 | SRC_URI[sha256sum] = "5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41" |
diff --git a/meta/recipes-extended/wget/wget-1.13.4/remove-gets.patch b/meta/recipes-extended/wget/wget-1.13.4/remove-gets.patch new file mode 100644 index 0000000000..ed1d019383 --- /dev/null +++ b/meta/recipes-extended/wget/wget-1.13.4/remove-gets.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it | ||
2 | |||
3 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | Index: wget-1.13.4/lib/stdio.in.h | ||
7 | =================================================================== | ||
8 | --- wget-1.13.4.orig/lib/stdio.in.h 2011-09-13 01:15:14.000000000 -0700 | ||
9 | +++ wget-1.13.4/lib/stdio.in.h 2012-07-04 12:22:45.749092515 -0700 | ||
10 | @@ -693,11 +693,13 @@ | ||
11 | _GL_CXXALIAS_SYS (gets, char *, (char *s)); | ||
12 | # undef gets | ||
13 | # endif | ||
14 | +# if defined gets | ||
15 | _GL_CXXALIASWARN (gets); | ||
16 | /* It is very rare that the developer ever has full control of stdin, | ||
17 | so any use of gets warrants an unconditional warning. Assume it is | ||
18 | always declared, since it is required by C89. */ | ||
19 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
20 | +# endif | ||
21 | #endif | ||
22 | |||
23 | |||
diff --git a/meta/recipes-extended/wget/wget_1.13.4.bb b/meta/recipes-extended/wget/wget_1.13.4.bb index e20ff48a75..9a9441eafc 100644 --- a/meta/recipes-extended/wget/wget_1.13.4.bb +++ b/meta/recipes-extended/wget/wget_1.13.4.bb | |||
@@ -1,7 +1,8 @@ | |||
1 | PR = "${INC_PR}.2" | 1 | PR = "${INC_PR}.3" |
2 | 2 | ||
3 | SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ | 3 | SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ |
4 | file://fix_makefile.patch \ | 4 | file://fix_makefile.patch \ |
5 | file://remove-gets.patch \ | ||
5 | " | 6 | " |
6 | SRC_URI[md5sum] = "1df489976a118b9cbe1b03502adbfc27" | 7 | SRC_URI[md5sum] = "1df489976a118b9cbe1b03502adbfc27" |
7 | SRC_URI[sha256sum] = "24c7710bc9f220ce23d8a9e0f5673b0efc1cace62db6de0239b5863ecc934dcd" | 8 | SRC_URI[sha256sum] = "24c7710bc9f220ce23d8a9e0f5673b0efc1cace62db6de0239b5863ecc934dcd" |