summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2012-07-04 12:30:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-17 10:54:00 +0100
commit06f6b54e14298a86fb3ae87e943df4001cfd02a7 (patch)
tree66b2c5d6500638fb402da1f092470e3693ed3436 /meta
parent674e951d088e64834b156f32d592c4bf76ea1b2f (diff)
downloadpoky-06f6b54e14298a86fb3ae87e943df4001cfd02a7.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: 497d8d82b8e7e04a457a7fdd689c657903218c0d) 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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-bsp/grub/grub-1.99/remove-gets.patch20
-rw-r--r--meta/recipes-bsp/grub/grub_1.99.bb3
-rw-r--r--meta/recipes-devtools/guile/files/remove-gets.patch23
-rw-r--r--meta/recipes-devtools/guile/guile_2.0.5.bb3
-rw-r--r--meta/recipes-extended/cpio/cpio-2.11/remove-gets.patch20
-rw-r--r--meta/recipes-extended/cpio/cpio_2.11.bb5
-rw-r--r--meta/recipes-extended/tar/tar-1.26/remove-gets.patch20
-rw-r--r--meta/recipes-extended/tar/tar_1.26.bb5
-rw-r--r--meta/recipes-extended/wget/wget-1.13.4/remove-gets.patch23
-rw-r--r--meta/recipes-extended/wget/wget_1.13.4.bb3
10 files changed, 120 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 @@
1ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: 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 0d49f23591..775c6aad88 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
14DEPENDS = "autogen-native" 14DEPENDS = "autogen-native"
15RDEPENDS_${PN} = "diffutils freetype" 15RDEPENDS_${PN} = "diffutils freetype"
16PR = "r8" 16PR = "r9"
17 17
18SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ 18SRC_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
28SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5" 29SRC_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..6d3605f106
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/remove-gets.patch
@@ -0,0 +1,23 @@
1ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: guile-2.0.5/lib/stdio.in.h
7===================================================================
8--- guile-2.0.5.orig/lib/stdio.in.h 2012-01-24 03:06:06.000000000 -0800
9+++ guile-2.0.5/lib/stdio.in.h 2012-07-04 12:28:15.617108481 -0700
10@@ -711,11 +711,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-devtools/guile/guile_2.0.5.bb b/meta/recipes-devtools/guile/guile_2.0.5.bb
index cf222a6f47..fc94a412a1 100644
--- a/meta/recipes-devtools/guile/guile_2.0.5.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.5.bb
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
20 file://guile_2.0.5_fix_sed_error.patch \ 20 file://guile_2.0.5_fix_sed_error.patch \
21 file://guile_2.0.5_disable_goops_optimizations.patch \ 21 file://guile_2.0.5_disable_goops_optimizations.patch \
22 file://guile_2.0.5_fix_cross_compilation.patch \ 22 file://guile_2.0.5_fix_cross_compilation.patch \
23 file://remove-gets.patch \
23 " 24 "
24 25
25# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch 26# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
@@ -28,7 +29,7 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
28SRC_URI[md5sum] = "bcf70d54b44c99cb9acd3f63c5486b4b" 29SRC_URI[md5sum] = "bcf70d54b44c99cb9acd3f63c5486b4b"
29SRC_URI[sha256sum] = "2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956" 30SRC_URI[sha256sum] = "2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956"
30 31
31PR = "r1" 32PR = "r2"
32 33
33inherit autotools gettext 34inherit autotools gettext
34BBCLASSEXTEND = "native" 35BBCLASSEXTEND = "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 @@
1ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: 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 73a3444b57..9b37dcdeba 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
3LICENSE = "GPLv3" 3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" 4LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
5 5
6PR = "r2" 6PR = "r3"
7
8SRC_URI += "file://remove-gets.patch \
9 "
7 10
8SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c" 11SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"
9SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978" 12SRC_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 @@
1ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: 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 9c06d7e065..4c8ab2c4f5 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
3LICENSE = "GPLv3" 3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
5 5
6PR = "r2" 6PR = "r3"
7
8SRC_URI += "file://remove-gets.patch \
9 "
7 10
8SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519" 11SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519"
9SRC_URI[sha256sum] = "5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41" 12SRC_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 @@
1ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5Upstream-Status: Pending
6Index: 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 @@
1PR = "${INC_PR}.2" 1PR = "${INC_PR}.3"
2 2
3SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \ 3SRC_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 "
6SRC_URI[md5sum] = "1df489976a118b9cbe1b03502adbfc27" 7SRC_URI[md5sum] = "1df489976a118b9cbe1b03502adbfc27"
7SRC_URI[sha256sum] = "24c7710bc9f220ce23d8a9e0f5673b0efc1cace62db6de0239b5863ecc934dcd" 8SRC_URI[sha256sum] = "24c7710bc9f220ce23d8a9e0f5673b0efc1cace62db6de0239b5863ecc934dcd"