Revision: 6418
http://ipcop.svn.sourceforge.net/ipcop/?rev=6418&view=rev
Author: gespinasse
Date: 2012-02-26 12:31:07 +0000 (Sun, 26 Feb 2012)
Log Message:
-----------
Fix format string issue in gettext
Configure with --disable-nls, as :
- not used on toolchain and reducing space
- not fonctional actually as using install-exec doesn't install translations
Modified Paths:
--------------
ipcop/trunk/lfs/gettext
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
Added Paths:
-----------
ipcop/trunk/src/patches/gettext-0.18.1.1_format-string.patch
Modified: ipcop/trunk/lfs/gettext
===================================================================
--- ipcop/trunk/lfs/gettext 2012-02-25 17:49:58 UTC (rev 6417)
+++ ipcop/trunk/lfs/gettext 2012-02-26 12:31:07 UTC (rev 6418)
@@ -82,10 +82,12 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ # Upstream know :
http://lists.gnu.org/archive/html/bug-gnu-utils/2011-01/msg00041.html
+ # libcroco part is in libcroco-0.64, unsure if libgrep part will be
applied
+ cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_format-string.patch
ifeq "$(STAGE)" "toolchain"
- cd $(DIR_APP)/gettext-tools && ./configure --prefix=/$(TOOLS_DIR)
\
- --disable-shared
+ cd $(DIR_APP)/gettext-tools && ./configure --prefix=/$(TOOLS_DIR)
--disable-shared --disable-nls
cd $(DIR_APP)/gettext-tools && make -j $(PARALLELISM) -C gnulib-lib
cd $(DIR_APP)/gettext-tools && make -j $(PARALLELISM) -C src msgfmt
cd $(DIR_APP)/gettext-tools && cp -v src/msgfmt /$(TOOLS_DIR)/bin
@@ -98,6 +100,7 @@
--disable-java \
--disable-native-java \
--disable-libasprintf \
+ --disable-nls \
--disable-openmp \
--without-emacs \
--without-included-gettext
@@ -115,5 +118,5 @@
rm -rf /usr/share/doc/gettext/examples
endif
- @rm -rf $(DIR_APP)
+ #@rm -rf $(DIR_APP)
@$(POSTBUILD)
Added: ipcop/trunk/src/patches/gettext-0.18.1.1_format-string.patch
===================================================================
--- ipcop/trunk/src/patches/gettext-0.18.1.1_format-string.patch
(rev 0)
+++ ipcop/trunk/src/patches/gettext-0.18.1.1_format-string.patch
2012-02-26 12:31:07 UTC (rev 6418)
@@ -0,0 +1,99 @@
+This fix format-string warning that the maintainer know
+http://lists.gnu.org/archive/html/bug-gnu-utils/2011-01/msg00041.html
+but was reluctant to include the patches
+- libcroco issue may be fixed as libcroco-0.64 contain the fix
+- libgrep part may remain
+
+diff --git a/gettext-tools/libgrep/m-fgrep.c b/gettext-tools/libgrep/m-fgrep.c
+index 7bb3715..e2d3ad8 100644
+--- a/gettext-tools/libgrep/m-fgrep.c
++++ b/gettext-tools/libgrep/m-fgrep.c
+@@ -80,7 +80,7 @@ kwsinit (struct compiled_kwset *ckwset,
+ ckwset->kwset = kwsalloc (NULL);
+ }
+ if (ckwset->kwset == NULL)
+- error (exit_failure, 0, _("memory exhausted"));
++ error (exit_failure, 0, "%s", _("memory exhausted"));
+ ckwset->match_words = match_words;
+ ckwset->match_lines = match_lines;
+ ckwset->eolbyte = eolbyte;
+@@ -106,7 +106,7 @@ Fcompile (const char *pattern, size_t pattern_size,
+ for (lim = beg; lim < pattern + pattern_size && *lim != '\n'; ++lim)
+ ;
+ if ((err = kwsincr (ckwset->kwset, beg, lim - beg)) != NULL)
+- error (exit_failure, 0, err);
++ error (exit_failure, 0, "%s", err);
+ if (lim < pattern + pattern_size)
+ ++lim;
+ beg = lim;
+@@ -114,7 +114,7 @@ Fcompile (const char *pattern, size_t pattern_size,
+ while (beg < pattern + pattern_size);
+
+ if ((err = kwsprep (ckwset->kwset)) != NULL)
+- error (exit_failure, 0, err);
++ error (exit_failure, 0, "%s", err);
+ return ckwset;
+ }
+
+diff --git a/gettext-tools/libgrep/m-regex.c b/gettext-tools/libgrep/m-regex.c
+index d5d3dd1..5444978 100644
+--- a/gettext-tools/libgrep/m-regex.c
++++ b/gettext-tools/libgrep/m-regex.c
+@@ -106,7 +106,7 @@ compile (const char *pattern, size_t pattern_size,
+
+ if ((err = re_compile_pattern (motif, len,
+
&cregex->patterns[cregex->pcount].regexbuf)) != NULL)
+- error (exit_failure, 0, err);
++ error (exit_failure, 0, "%s", err);
+ cregex->pcount++;
+
+ motif = sep;
+diff --git a/gnulib-local/lib/libcroco/cr-statement.c
b/gnulib-local/lib/libcroco/cr-statement.c
+index 346795d..5afa7e3 100644
+--- a/gnulib-local/lib/libcroco/cr-statement.c
++++ b/gnulib-local/lib/libcroco/cr-statement.c
+@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE *
a_fp, glong a_indent)
+ g_return_if_fail (a_fp && a_this);
+ str = cr_statement_ruleset_to_string (a_this, a_indent);
+ if (str) {
+- fprintf (a_fp, str);
++ fprintf (a_fp, "%s", str);
+ g_free (str);
+ str = NULL;
+ }
+@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE *
a_fp, gulong a_indent)
+ str = cr_statement_charset_to_string (a_this,
+ a_indent) ;
+ if (str) {
+- fprintf (a_fp, str) ;
++ fprintf (a_fp, "%s", str) ;
+ g_free (str) ;
+ str = NULL ;
+ }
+@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE *
a_fp, gulong a_indent)
+
+ str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
+ if (str) {
+- fprintf (a_fp, str);
++ fprintf (a_fp, "%s", str);
+ g_free (str) ;
+ str = NULL ;
+ }
+@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this,
+
+ str = cr_statement_media_rule_to_string (a_this, a_indent) ;
+ if (str) {
+- fprintf (a_fp, str) ;
++ fprintf (a_fp, "%s", str) ;
+ g_free (str) ;
+ str = NULL ;
+ }
+@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this,
FILE * a_fp,
+
+ str = cr_statement_import_rule_to_string (a_this, a_indent) ;
+ if (str) {
+- fprintf (a_fp, str) ;
++ fprintf (a_fp, "%s", str) ;
+ g_free (str) ;
+ str = NULL ;
+ }
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-02-25 17:49:58 UTC
(rev 6417)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-02-26 12:31:07 UTC
(rev 6418)
@@ -78,6 +78,9 @@
## ethtool-3.2
/usr/sbin/ethtool
##
+## gettext-0.18.1.1 patched
+/usr/bin/gettext
+##
## gmp-5.0.4
/usr/lib/libgmp.so.10
/usr/lib/libgmp.so.10.0.4
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-02-25 17:49:58 UTC (rev
6417)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-02-26 12:31:07 UTC (rev
6418)
@@ -3,7 +3,7 @@
<version>2.1.0</version>
<releasedate>2012-04-dd</releasedate>
<size>0</size>
- <description>bash patch<br />
+ <description>bash and gettext patch<br />
Add URL filter.<br />
Language updates.<br />
Upgrade e2fsprogs to 1.42.1, ethtool to 3.2, gmp to 5.0.4, kernel
to 3.0.22, krb5 to 1.9.3,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
