From 2c0f37d2da3e662dd81b62b911e8135cc7e4b98f Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 22 May 2019 21:18:47 +0300 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/m4/m4-1.4.18.inc | 1 - meta/recipes-devtools/m4/m4/remove-gets.patch | 24 -------------------- meta/recipes-extended/tar/tar/remove-gets.patch | 29 ------------------------- meta/recipes-extended/tar/tar_1.32.bb | 1 - 4 files changed, 55 deletions(-) delete mode 100644 meta/recipes-devtools/m4/m4/remove-gets.patch delete mode 100644 meta/recipes-extended/tar/tar/remove-gets.patch 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 SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \ file://ac_config_links.patch \ - file://remove-gets.patch \ file://m4-1.4.18-glibc-change-work-around.patch \ " SRC_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 @@ -eglibc has remove gets starting 2.16 -therefore check for its being there before -undefining it. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index 5727452..f04a691 100644 ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -742,10 +742,12 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning; besides, C11 - removed it. */ -+#if defined gets - #undef gets - #if HAVE_RAW_DECL_GETS && !defined __cplusplus - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif -+#endif - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ - 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 @@ -ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it - -Signed-off-by: Khem Raj - -Upstream-Status: Pending ---- - gnu/stdio.in.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gnu/stdio.in.h b/gnu/stdio.in.h -index ec43874..502e3ae 100644 ---- a/gnu/stdio.in.h -+++ b/gnu/stdio.in.h -@@ -722,10 +722,12 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning; besides, C11 - removed it. */ -+#if defined gets - #undef gets - #if HAVE_RAW_DECL_GETS && !defined __cplusplus - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif -+#endif - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ - struct obstack; --- -2.8.3 - 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" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ - file://remove-gets.patch \ file://musl_dirent.patch \ " -- cgit v1.2.3-54-g00ecf