mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
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>
This commit is contained in:
@@ -0,0 +1,20 @@
|
|||||||
|
ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Index: grub-1.99/grub-core/gnulib/stdio.in.h
|
||||||
|
===================================================================
|
||||||
|
--- grub-1.99.orig/grub-core/gnulib/stdio.in.h 2010-12-01 06:45:43.000000000 -0800
|
||||||
|
+++ grub-1.99/grub-core/gnulib/stdio.in.h 2012-07-04 12:25:02.057099107 -0700
|
||||||
|
@@ -140,8 +140,10 @@
|
||||||
|
/* It is very rare that the developer ever has full control of stdin,
|
||||||
|
so any use of gets warrants an unconditional warning. Assume it is
|
||||||
|
always declared, since it is required by C89. */
|
||||||
|
+#if defined gets
|
||||||
|
#undef gets
|
||||||
|
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if @GNULIB_FOPEN@
|
||||||
|
# if @REPLACE_FOPEN@
|
||||||
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
|||||||
|
|
||||||
DEPENDS = "autogen-native"
|
DEPENDS = "autogen-native"
|
||||||
RDEPENDS_${PN} = "diffutils freetype"
|
RDEPENDS_${PN} = "diffutils freetype"
|
||||||
PR = "r7"
|
PR = "r8"
|
||||||
|
|
||||||
SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
|
SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
|
||||||
file://grub-install.in.patch \
|
file://grub-install.in.patch \
|
||||||
@@ -23,6 +23,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
|
|||||||
file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \
|
file://grub-1.99-gcc-4.7.0-uninitialized-var-errors.patch \
|
||||||
file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \
|
file://grub-1.99-gcc-4.7.0-strict-aliasing-errors.patch \
|
||||||
file://grub-1.99-fix-enable_execute_stack-check.patch \
|
file://grub-1.99-fix-enable_execute_stack-check.patch \
|
||||||
|
file://remove-gets.patch \
|
||||||
file://40_custom"
|
file://40_custom"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5"
|
SRC_URI[md5sum] = "ca9f2a2d571b57fc5c53212d1d22e2b5"
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
Backported to guile 2.0.3 by Scott Garman <scott.a.garman@intel.com>
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
diff -urN guile-2.0.3.orig/lib/stdio.in.h guile-2.0.3/lib/stdio.in.h
|
||||||
|
--- guile-2.0.3.orig/lib/stdio.in.h 2011-10-22 07:19:35.000000000 -0700
|
||||||
|
+++ guile-2.0.3/lib/stdio.in.h 2012-12-12 20:47:06.397265942 -0800
|
||||||
|
@@ -711,11 +711,13 @@
|
||||||
|
_GL_CXXALIAS_SYS (gets, char *, (char *s));
|
||||||
|
# undef gets
|
||||||
|
# endif
|
||||||
|
+# if defined gets
|
||||||
|
_GL_CXXALIASWARN (gets);
|
||||||
|
/* It is very rare that the developer ever has full control of stdin,
|
||||||
|
so any use of gets warrants an unconditional warning. Assume it is
|
||||||
|
always declared, since it is required by C89. */
|
||||||
|
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||||
|
+# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@@ -19,12 +19,13 @@ SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
|
|||||||
file://debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch \
|
file://debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch \
|
||||||
file://opensuse/guile-64bit.patch \
|
file://opensuse/guile-64bit.patch \
|
||||||
file://opensuse/guile-turn-off-gc-test.patch \
|
file://opensuse/guile-turn-off-gc-test.patch \
|
||||||
|
file://remove-gets.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8"
|
SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8"
|
||||||
SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08"
|
SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08"
|
||||||
|
|
||||||
PR = "r5"
|
PR = "r6"
|
||||||
|
|
||||||
inherit autotools gettext
|
inherit autotools gettext
|
||||||
BBCLASSEXTEND = "native"
|
BBCLASSEXTEND = "native"
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Index: cpio-2.11/gnu/stdio.in.h
|
||||||
|
===================================================================
|
||||||
|
--- cpio-2.11.orig/gnu/stdio.in.h 2012-07-04 12:13:43.133066247 -0700
|
||||||
|
+++ cpio-2.11/gnu/stdio.in.h 2012-07-04 12:14:10.189067564 -0700
|
||||||
|
@@ -138,8 +138,10 @@
|
||||||
|
/* It is very rare that the developer ever has full control of stdin,
|
||||||
|
so any use of gets warrants an unconditional warning. Assume it is
|
||||||
|
always declared, since it is required by C89. */
|
||||||
|
+#if defined gets
|
||||||
|
#undef gets
|
||||||
|
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if @GNULIB_FOPEN@
|
||||||
|
# if @REPLACE_FOPEN@
|
||||||
@@ -3,7 +3,10 @@ include cpio_v2.inc
|
|||||||
LICENSE = "GPLv3"
|
LICENSE = "GPLv3"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
|
SRC_URI += "file://remove-gets.patch \
|
||||||
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"
|
SRC_URI[md5sum] = "1112bb6c45863468b5496ba128792f6c"
|
||||||
SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978"
|
SRC_URI[sha256sum] = "601b1d774cd6e4cd39416203c91ec59dbd65dd27d79d75e1a9b89497ea643978"
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Index: tar-1.26/gnu/stdio.in.h
|
||||||
|
===================================================================
|
||||||
|
--- tar-1.26.orig/gnu/stdio.in.h 2011-03-12 01:14:33.000000000 -0800
|
||||||
|
+++ tar-1.26/gnu/stdio.in.h 2012-07-04 12:18:58.997081535 -0700
|
||||||
|
@@ -163,8 +163,10 @@
|
||||||
|
/* It is very rare that the developer ever has full control of stdin,
|
||||||
|
so any use of gets warrants an unconditional warning. Assume it is
|
||||||
|
always declared, since it is required by C89. */
|
||||||
|
+#if defined gets
|
||||||
|
#undef gets
|
||||||
|
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if @GNULIB_FOPEN@
|
||||||
|
# if @REPLACE_FOPEN@
|
||||||
@@ -3,7 +3,10 @@ require tar.inc
|
|||||||
LICENSE = "GPLv3"
|
LICENSE = "GPLv3"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
|
SRC_URI += "file://remove-gets.patch \
|
||||||
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519"
|
SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519"
|
||||||
SRC_URI[sha256sum] = "5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41"
|
SRC_URI[sha256sum] = "5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41"
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
ISO C11 removes the specification of gets() from the C language, eglibc 2.16+ removed it
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
|
||||||
|
Upstream-Status: Pending
|
||||||
|
Index: wget-1.13.4/lib/stdio.in.h
|
||||||
|
===================================================================
|
||||||
|
--- wget-1.13.4.orig/lib/stdio.in.h 2011-09-13 01:15:14.000000000 -0700
|
||||||
|
+++ wget-1.13.4/lib/stdio.in.h 2012-07-04 12:22:45.749092515 -0700
|
||||||
|
@@ -693,11 +693,13 @@
|
||||||
|
_GL_CXXALIAS_SYS (gets, char *, (char *s));
|
||||||
|
# undef gets
|
||||||
|
# endif
|
||||||
|
+# if defined gets
|
||||||
|
_GL_CXXALIASWARN (gets);
|
||||||
|
/* It is very rare that the developer ever has full control of stdin,
|
||||||
|
so any use of gets warrants an unconditional warning. Assume it is
|
||||||
|
always declared, since it is required by C89. */
|
||||||
|
_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
|
||||||
|
+# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
@@ -1,7 +1,8 @@
|
|||||||
PR = "${INC_PR}.2"
|
PR = "${INC_PR}.3"
|
||||||
|
|
||||||
SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
|
SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
|
||||||
file://fix_makefile.patch \
|
file://fix_makefile.patch \
|
||||||
|
file://remove-gets.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "1df489976a118b9cbe1b03502adbfc27"
|
SRC_URI[md5sum] = "1df489976a118b9cbe1b03502adbfc27"
|
||||||
SRC_URI[sha256sum] = "24c7710bc9f220ce23d8a9e0f5673b0efc1cace62db6de0239b5863ecc934dcd"
|
SRC_URI[sha256sum] = "24c7710bc9f220ce23d8a9e0f5673b0efc1cace62db6de0239b5863ecc934dcd"
|
||||||
|
|||||||
Reference in New Issue
Block a user