summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-22 21:18:47 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-27 17:06:34 +0100
commit2c0f37d2da3e662dd81b62b911e8135cc7e4b98f (patch)
treebdcea5de61d997439a7121307890b9dae34a4cdc
parent03c92bdf9cd53fe0451146e2a18466c3b6e6afa3 (diff)
downloadpoky-2c0f37d2da3e662dd81b62b911e8135cc7e4b98f.tar.gz
m4/tar: Remove remove-gets.patch
When the original problem was fixed in gnulib the patches were rebased on top of the upstream fix... (From OE-Core rev: d93ad85d94ea99e3fad7e4c2f6be999088e2f9f9) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/m4/m4-1.4.18.inc1
-rw-r--r--meta/recipes-devtools/m4/m4/remove-gets.patch24
-rw-r--r--meta/recipes-extended/tar/tar/remove-gets.patch29
-rw-r--r--meta/recipes-extended/tar/tar_1.32.bb1
4 files changed, 0 insertions, 55 deletions
diff --git a/meta/recipes-devtools/m4/m4-1.4.18.inc b/meta/recipes-devtools/m4/m4-1.4.18.inc
index 81ed65edd9..a9b63c1bf6 100644
--- a/meta/recipes-devtools/m4/m4-1.4.18.inc
+++ b/meta/recipes-devtools/m4/m4-1.4.18.inc
@@ -8,7 +8,6 @@ inherit autotools texinfo ptest
8 8
9SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ 9SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
10 file://ac_config_links.patch \ 10 file://ac_config_links.patch \
11 file://remove-gets.patch \
12 file://m4-1.4.18-glibc-change-work-around.patch \ 11 file://m4-1.4.18-glibc-change-work-around.patch \
13 " 12 "
14SRC_URI_append_class-target = " file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 13SRC_URI_append_class-target = " file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
diff --git a/meta/recipes-devtools/m4/m4/remove-gets.patch b/meta/recipes-devtools/m4/m4/remove-gets.patch
deleted file mode 100644
index abe82f3b2d..0000000000
--- a/meta/recipes-devtools/m4/m4/remove-gets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1eglibc has remove gets starting 2.16
2therefore check for its being there before
3undefining it.
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8diff --git a/lib/stdio.in.h b/lib/stdio.in.h
9index 5727452..f04a691 100644
10--- a/lib/stdio.in.h
11+++ b/lib/stdio.in.h
12@@ -742,10 +742,12 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
13 /* It is very rare that the developer ever has full control of stdin,
14 so any use of gets warrants an unconditional warning; besides, C11
15 removed it. */
16+#if defined gets
17 #undef gets
18 #if HAVE_RAW_DECL_GETS && !defined __cplusplus
19 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
20 #endif
21+#endif
22
23 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
24 struct obstack;
diff --git a/meta/recipes-extended/tar/tar/remove-gets.patch b/meta/recipes-extended/tar/tar/remove-gets.patch
deleted file mode 100644
index f24de926a3..0000000000
--- a/meta/recipes-extended/tar/tar/remove-gets.patch
+++ /dev/null
@@ -1,29 +0,0 @@
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
6---
7 gnu/stdio.in.h | 2 ++
8 1 file changed, 2 insertions(+)
9
10diff --git a/gnu/stdio.in.h b/gnu/stdio.in.h
11index ec43874..502e3ae 100644
12--- a/gnu/stdio.in.h
13+++ b/gnu/stdio.in.h
14@@ -722,10 +722,12 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
15 /* It is very rare that the developer ever has full control of stdin,
16 so any use of gets warrants an unconditional warning; besides, C11
17 removed it. */
18+#if defined gets
19 #undef gets
20 #if HAVE_RAW_DECL_GETS && !defined __cplusplus
21 _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
22 #endif
23+#endif
24
25 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
26 struct obstack;
27--
282.8.3
29
diff --git a/meta/recipes-extended/tar/tar_1.32.bb b/meta/recipes-extended/tar/tar_1.32.bb
index 7240fdb7e1..18f09b5711 100644
--- a/meta/recipes-extended/tar/tar_1.32.bb
+++ b/meta/recipes-extended/tar/tar_1.32.bb
@@ -7,7 +7,6 @@ LICENSE = "GPLv3"
7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
8 8
9SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ 9SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \
10 file://remove-gets.patch \
11 file://musl_dirent.patch \ 10 file://musl_dirent.patch \
12" 11"
13 12