diff options
| author | Marko Lindqvist <cazfi74@gmail.com> | 2012-12-28 01:19:05 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-10 23:43:07 +0000 |
| commit | 024405ca01d09b80e9a7147df973c02d3a0f0da9 (patch) | |
| tree | 4af0cdff9ce0abee75e3782a2510f8e7c16b2b80 | |
| parent | 7a5ed19c4104d14bf42cf9c6c2173d070fbc0b72 (diff) | |
| download | poky-024405ca01d09b80e9a7147df973c02d3a0f0da9.tar.gz | |
gettext: update to upstream version 0.18.2
remove_gets.patch dropped as upstream now contains
fix for the problem.
(From OE-Core rev: 9e936c390006602c27df4c42ea2d9055881db098)
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch | 58 | ||||
| -rw-r--r-- | meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch (renamed from meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/gettext/gettext-0.18.2/parallel.patch (renamed from meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch (renamed from meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/gettext/gettext_0.18.2.bb (renamed from meta/recipes-core/gettext/gettext_0.18.1.1.bb) | 7 |
5 files changed, 3 insertions, 62 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch b/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch deleted file mode 100644 index 3d3c400e0d..0000000000 --- a/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch +++ /dev/null | |||
| @@ -1,58 +0,0 @@ | |||
| 1 | eglibc 2.16 has removed gets so we need to check for it | ||
| 2 | being there before using it. | ||
| 3 | |||
| 4 | |||
| 5 | From glibc stdio.h | ||
| 6 | |||
| 7 | The function has been officially removed in ISO C11. This opportunity | ||
| 8 | is used to also remove it from the GNU feature list. It is now only | ||
| 9 | available when explicitly using an old ISO C, Unix, or POSIX standard. | ||
| 10 | |||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | |||
| 13 | Upstream-Status: Pending | ||
| 14 | Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h | ||
| 15 | =================================================================== | ||
| 16 | --- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h 2010-05-17 12:56:12.000000000 -0700 | ||
| 17 | +++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-07-02 22:42:21.292223316 -0700 | ||
| 18 | @@ -140,8 +140,10 @@ | ||
| 19 | /* It is very rare that the developer ever has full control of stdin, | ||
| 20 | so any use of gets warrants an unconditional warning. Assume it is | ||
| 21 | always declared, since it is required by C89. */ | ||
| 22 | +#if defined gets | ||
| 23 | #undef gets | ||
| 24 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
| 25 | +#endif | ||
| 26 | |||
| 27 | #if @GNULIB_FOPEN@ | ||
| 28 | # if @REPLACE_FOPEN@ | ||
| 29 | Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h | ||
| 30 | =================================================================== | ||
| 31 | --- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h 2010-05-24 02:42:46.000000000 -0700 | ||
| 32 | +++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h 2012-07-02 23:02:33.476281979 -0700 | ||
| 33 | @@ -140,8 +140,10 @@ | ||
| 34 | /* It is very rare that the developer ever has full control of stdin, | ||
| 35 | so any use of gets warrants an unconditional warning. Assume it is | ||
| 36 | always declared, since it is required by C89. */ | ||
| 37 | +#if defined gets | ||
| 38 | #undef gets | ||
| 39 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
| 40 | +#endif | ||
| 41 | |||
| 42 | #if @GNULIB_FOPEN@ | ||
| 43 | # if @REPLACE_FOPEN@ | ||
| 44 | Index: gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h | ||
| 45 | =================================================================== | ||
| 46 | --- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h 2010-05-17 12:58:03.000000000 -0700 | ||
| 47 | +++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h 2012-07-02 23:01:57.440280253 -0700 | ||
| 48 | @@ -140,8 +140,10 @@ | ||
| 49 | /* It is very rare that the developer ever has full control of stdin, | ||
| 50 | so any use of gets warrants an unconditional warning. Assume it is | ||
| 51 | always declared, since it is required by C89. */ | ||
| 52 | +#if defined gets | ||
| 53 | #undef gets | ||
| 54 | _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); | ||
| 55 | +#endif | ||
| 56 | |||
| 57 | #if @GNULIB_FOPEN@ | ||
| 58 | # if @REPLACE_FOPEN@ | ||
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch b/meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch index d8d10db2ab..d8d10db2ab 100644 --- a/meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch +++ b/meta/recipes-core/gettext/gettext-0.18.2/gnulib-uclibc-sched_param-def.patch | |||
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.18.2/parallel.patch index f2c567d188..f2c567d188 100644 --- a/meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch +++ b/meta/recipes-core/gettext/gettext-0.18.2/parallel.patch | |||
diff --git a/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch b/meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch index 34e3f1a34a..34e3f1a34a 100644 --- a/meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch +++ b/meta/recipes-core/gettext/gettext-0.18.2/wchar-uclibc.patch | |||
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.2.bb index 4639481a54..3e930896a5 100644 --- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb +++ b/meta/recipes-core/gettext/gettext_0.18.2.bb | |||
| @@ -5,7 +5,7 @@ SECTION = "libs" | |||
| 5 | LICENSE = "GPLv3+ & LGPL-2.1+" | 5 | LICENSE = "GPLv3+ & LGPL-2.1+" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 7 | 7 | ||
| 8 | PR = "r19" | 8 | PR = "r0" |
| 9 | DEPENDS = "gettext-native virtual/libiconv ncurses expat" | 9 | DEPENDS = "gettext-native virtual/libiconv ncurses expat" |
| 10 | DEPENDS_class-native = "gettext-minimal-native" | 10 | DEPENDS_class-native = "gettext-minimal-native" |
| 11 | PROVIDES = "virtual/libintl virtual/gettext" | 11 | PROVIDES = "virtual/libintl virtual/gettext" |
| @@ -13,7 +13,6 @@ PROVIDES_class-native = "virtual/gettext-native" | |||
| 13 | RCONFLICTS_${PN} = "proxy-libintl" | 13 | RCONFLICTS_${PN} = "proxy-libintl" |
| 14 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ | 14 | SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ |
| 15 | file://parallel.patch \ | 15 | file://parallel.patch \ |
| 16 | file://remove_gets.patch \ | ||
| 17 | " | 16 | " |
| 18 | 17 | ||
| 19 | SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ | 18 | SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ |
| @@ -21,8 +20,8 @@ SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ | |||
| 21 | " | 20 | " |
| 22 | LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " | 21 | LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " |
| 23 | 22 | ||
| 24 | SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89" | 23 | SRC_URI[md5sum] = "0c86e5af70c195ab8bd651d17d783928" |
| 25 | SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9" | 24 | SRC_URI[sha256sum] = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c" |
| 26 | 25 | ||
| 27 | inherit autotools | 26 | inherit autotools |
| 28 | 27 | ||
