| Submitter | Marko Lindqvist |
|---|---|
| Date | Dec. 27, 2012, 11:07 a.m. |
| Message ID | <1356606431-31942-1-git-send-email-cazfi74@gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/41715/ |
| State | New |
| Headers | show |
Comments
On 12/27/2012 03:07 AM, Marko Lindqvist wrote: > Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> > --- > .../gettext/gettext-0.18.1.1/remove_gets.patch | 58 -------------------- Why are we removing this patch, it's important to note this in the commit message, did the upstream take this patch or change the code?? Sau! > .../gnulib-uclibc-sched_param-def.patch | 0 > .../parallel.patch | 0 > .../wchar-uclibc.patch | 0 > .../{gettext_0.18.1.1.bb => gettext_0.18.2.bb} | 7 +-- > 5 files changed, 3 insertions(+), 62 deletions(-) > delete mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch > rename meta/recipes-core/gettext/{gettext-0.18.1.1 => gettext-0.18.2}/gnulib-uclibc-sched_param-def.patch (100%) > rename meta/recipes-core/gettext/{gettext-0.18.1.1 => gettext-0.18.2}/parallel.patch (100%) > rename meta/recipes-core/gettext/{gettext-0.18.1.1 => gettext-0.18.2}/wchar-uclibc.patch (100%) > rename meta/recipes-core/gettext/{gettext_0.18.1.1.bb => gettext_0.18.2.bb} (96%) > > 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 3d3c400..0000000 > --- a/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch > +++ /dev/null > @@ -1,58 +0,0 @@ > -eglibc 2.16 has removed gets so we need to check for it > -being there before using it. > - > - > -From glibc stdio.h > - > -The function has been officially removed in ISO C11. This opportunity > - is used to also remove it from the GNU feature list. It is now only > - available when explicitly using an old ISO C, Unix, or POSIX standard. > - > -Signed-off-by: Khem Raj <raj.khem@gmail.com> > - > -Upstream-Status: Pending > -Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h > -=================================================================== > ---- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h 2010-05-17 12:56:12.000000000 -0700 > -+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-07-02 22:42:21.292223316 -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@ > -Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h > -=================================================================== > ---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h 2010-05-24 02:42:46.000000000 -0700 > -+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h 2012-07-02 23:02:33.476281979 -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@ > -Index: gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h > -=================================================================== > ---- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h 2010-05-17 12:58:03.000000000 -0700 > -+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h 2012-07-02 23:01:57.440280253 -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@ > 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 > similarity index 100% > rename from meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch > rename to 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 > similarity index 100% > rename from meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch > rename to 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 > similarity index 100% > rename from meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch > rename to 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 > similarity index 96% > rename from meta/recipes-core/gettext/gettext_0.18.1.1.bb > rename to meta/recipes-core/gettext/gettext_0.18.2.bb > index 4639481..3e93089 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" > LICENSE = "GPLv3+ & LGPL-2.1+" > LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" > > -PR = "r19" > +PR = "r0" > DEPENDS = "gettext-native virtual/libiconv ncurses expat" > DEPENDS_class-native = "gettext-minimal-native" > PROVIDES = "virtual/libintl virtual/gettext" > @@ -13,7 +13,6 @@ PROVIDES_class-native = "virtual/gettext-native" > RCONFLICTS_${PN} = "proxy-libintl" > SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ > file://parallel.patch \ > - file://remove_gets.patch \ > " > > SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ > @@ -21,8 +20,8 @@ SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ > " > LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " > > -SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89" > -SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9" > +SRC_URI[md5sum] = "0c86e5af70c195ab8bd651d17d783928" > +SRC_URI[sha256sum] = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c" > > inherit autotools > >
On 27 December 2012 18:08, Saul Wold <sgw@linux.intel.com> wrote: > On 12/27/2012 03:07 AM, Marko Lindqvist wrote: >> >> Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> >> --- >> .../gettext/gettext-0.18.1.1/remove_gets.patch | 58 >> -------------------- > > Why are we removing this patch, it's important to note this in the commit > message, did the upstream take this patch or change the code?? Sorry, I forgot to amend commit message to mention that upstream has resolved the issue the patch was for. I'll send updated version once I've finished testing of some other patches. - ML
Patch
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 3d3c400..0000000 --- a/meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch +++ /dev/null @@ -1,58 +0,0 @@ -eglibc 2.16 has removed gets so we need to check for it -being there before using it. - - -From glibc stdio.h - -The function has been officially removed in ISO C11. This opportunity - is used to also remove it from the GNU feature list. It is now only - available when explicitly using an old ISO C, Unix, or POSIX standard. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h -=================================================================== ---- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h 2010-05-17 12:56:12.000000000 -0700 -+++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h 2012-07-02 22:42:21.292223316 -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@ -Index: gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h -=================================================================== ---- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h 2010-05-24 02:42:46.000000000 -0700 -+++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h 2012-07-02 23:02:33.476281979 -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@ -Index: gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h -=================================================================== ---- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h 2010-05-17 12:58:03.000000000 -0700 -+++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h 2012-07-02 23:01:57.440280253 -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@ 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 similarity index 100% rename from meta/recipes-core/gettext/gettext-0.18.1.1/gnulib-uclibc-sched_param-def.patch rename to 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 similarity index 100% rename from meta/recipes-core/gettext/gettext-0.18.1.1/parallel.patch rename to 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 similarity index 100% rename from meta/recipes-core/gettext/gettext-0.18.1.1/wchar-uclibc.patch rename to 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 similarity index 96% rename from meta/recipes-core/gettext/gettext_0.18.1.1.bb rename to meta/recipes-core/gettext/gettext_0.18.2.bb index 4639481..3e93089 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" LICENSE = "GPLv3+ & LGPL-2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -PR = "r19" +PR = "r0" DEPENDS = "gettext-native virtual/libiconv ncurses expat" DEPENDS_class-native = "gettext-minimal-native" PROVIDES = "virtual/libintl virtual/gettext" @@ -13,7 +13,6 @@ PROVIDES_class-native = "virtual/gettext-native" RCONFLICTS_${PN} = "proxy-libintl" SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ file://parallel.patch \ - file://remove_gets.patch \ " SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ @@ -21,8 +20,8 @@ SRC_URI_append_libc-uclibc = " file://wchar-uclibc.patch \ " LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread " -SRC_URI[md5sum] = "3dd55b952826d2b32f51308f2f91aa89" -SRC_URI[sha256sum] = "93ac71a7afa5b70c1b1032516663658c51e653087f42a3fc8044752c026443e9" +SRC_URI[md5sum] = "0c86e5af70c195ab8bd651d17d783928" +SRC_URI[sha256sum] = "516a6370b3b3f46e2fc5a5e222ff5ecd76f3089bc956a7587a6e4f89de17714c" inherit autotools
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> --- .../gettext/gettext-0.18.1.1/remove_gets.patch | 58 -------------------- .../gnulib-uclibc-sched_param-def.patch | 0 .../parallel.patch | 0 .../wchar-uclibc.patch | 0 .../{gettext_0.18.1.1.bb => gettext_0.18.2.bb} | 7 +-- 5 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 meta/recipes-core/gettext/gettext-0.18.1.1/remove_gets.patch rename meta/recipes-core/gettext/{gettext-0.18.1.1 => gettext-0.18.2}/gnulib-uclibc-sched_param-def.patch (100%) rename meta/recipes-core/gettext/{gettext-0.18.1.1 => gettext-0.18.2}/parallel.patch (100%) rename meta/recipes-core/gettext/{gettext-0.18.1.1 => gettext-0.18.2}/wchar-uclibc.patch (100%) rename meta/recipes-core/gettext/{gettext_0.18.1.1.bb => gettext_0.18.2.bb} (96%)