Revision: 6882
http://ipcop.svn.sourceforge.net/ipcop/?rev=6882&view=rev
Author: gespinasse
Date: 2013-01-01 14:25:34 +0000 (Tue, 01 Jan 2013)
Log Message:
-----------
Upgrade gettext to 0.18.2
Remove applied patches
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
Removed Paths:
-------------
ipcop/trunk/src/patches/gettext-0.18.1.1_format-string.patch
ipcop/trunk/src/patches/gettext-0.18.1.1_printf.patch
Modified: ipcop/trunk/lfs/gettext
===================================================================
--- ipcop/trunk/lfs/gettext 2013-01-01 14:17:05 UTC (rev 6881)
+++ ipcop/trunk/lfs/gettext 2013-01-01 14:25:34 UTC (rev 6882)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = gettext
-VER = 0.18.1.1
+VER = 0.18.2
HOST_ARCH = all
OTHER_SRC = yes
@@ -52,7 +52,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3dd55b952826d2b32f51308f2f91aa89
+$(DL_FILE)_MD5 = 0c86e5af70c195ab8bd651d17d783928
install : $(TARGET)
@@ -82,11 +82,6 @@
$(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
- # From upstream, fix a segv with malformed string
- cd $(DIR_APP) && patch -p1 -i $(DIR_PATCHES)/$(THISAPP)_printf.patch
ifeq "$(STAGE)" "toolchain"
cd $(DIR_APP)/gettext-tools && EMACS="no" ./configure
--prefix=/$(TOOLS_DIR) --disable-shared --disable-nls
Deleted: ipcop/trunk/src/patches/gettext-0.18.1.1_format-string.patch
===================================================================
--- ipcop/trunk/src/patches/gettext-0.18.1.1_format-string.patch
2013-01-01 14:17:05 UTC (rev 6881)
+++ ipcop/trunk/src/patches/gettext-0.18.1.1_format-string.patch
2013-01-01 14:25:34 UTC (rev 6882)
@@ -1,99 +0,0 @@
-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 ;
- }
Deleted: ipcop/trunk/src/patches/gettext-0.18.1.1_printf.patch
===================================================================
--- ipcop/trunk/src/patches/gettext-0.18.1.1_printf.patch 2013-01-01
14:17:05 UTC (rev 6881)
+++ ipcop/trunk/src/patches/gettext-0.18.1.1_printf.patch 2013-01-01
14:25:34 UTC (rev 6882)
@@ -1,34 +0,0 @@
-http://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=1a1831be04f634375c7e7c56cac7ec2f4167e863
-
- Avoid crash in *printf functions for invalid format string with dollar.
- * printf.c (libintl_vsnprintf, libintl_vswprintf): Don't crash in
- mempy if libintl_vasnprintf returned NULL.
- Reported by Jeong, Heon <bimar...@gmail.com>
- in <https://savannah.gnu.org/bugs/?34555>.
-
-2011-10-15 Bruno Haible <br...@clisp.org>
-
-
-diff --git a/gettext-runtime/intl/printf.c b/gettext-runtime/intl/printf.c
-index 157853a..0369e87 100644
---- a/gettext-runtime/intl/printf.c
-+++ b/gettext-runtime/intl/printf.c
-@@ -213,6 +213,8 @@ libintl_vsnprintf (char *resultbuf, size_t length, const
char *format, va_list a
- {
- size_t maxlength = length;
- char *result = libintl_vasnprintf (resultbuf, &length, format, args);
-+ if (result == NULL)
-+ return -1;
- if (result != resultbuf)
- {
- if (maxlength > 0)
-@@ -388,6 +390,8 @@ libintl_vswprintf (wchar_t *resultbuf, size_t length,
const wchar_t *format, va_
- {
- size_t maxlength = length;
- wchar_t *result = libintl_vasnwprintf (resultbuf, &length, format,
args);
-+ if (result == NULL)
-+ return -1;
- if (result != resultbuf)
- {
- if (maxlength > 0)
-
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-01-01 14:17:05 UTC
(rev 6881)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-01-01 14:25:34 UTC
(rev 6882)
@@ -249,7 +249,7 @@
/usr/lib/libgthread-2.0.so.0
/usr/lib/libgthread-2.0.so.0.3000.3
##
-## gettext-0.18.1.1 patched
+## gettext-0.18.2
/usr/bin/gettext
##
## gmp-5.0.5
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2013-01-01 14:17:05 UTC (rev
6881)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-01-01 14:25:34 UTC (rev
6882)
@@ -3,14 +3,14 @@
<version>2.1.0</version>
<releasedate>2012-11-dd</releasedate>
<size>0</size>
- <description>gettext, setserial, pcmciautils, perl, ppp, openvpn
radiusplugin patched<br />
+ <description>setserial, pcmciautils, perl, ppp, openvpn radiusplugin
patched<br />
cairo recompiled with -O3, isdn4k-utils with -Os
-fno-strict-aliasing<br />
Add xz-5.0.4<br />
Language updates.<br />
Upgrade acpid to 2.0.17, arping to 2.13, bash to 4.2.39, bind to
9.8.4, CnxADSL to ..PIM-2.6-2.7
conntrack-tools to 1.2.2, coreutils to 8.20, dhcpcd to 5.6.4,
dnsmasq to 2.65,
- e2fsprogs to 1.42.6, ethtool to 3.6, expat to 2.1.0, freetype to
2.4.10, fontconfig to 2.9, gawk to 4.0.2, glib to 2.30.3,
- gmp to 5.0.5, gnupg to 1.4.13, grep to 2.14, gzip to 1.5,
+ e2fsprogs to 1.42.6, ethtool to 3.6, expat to 2.1.0, freetype to
2.4.10, fontconfig to 2.9,
+ gawk to 4.0.2, gettext to 0.18.2, glib to 2.30.3, gmp to 5.0.5,
gnupg to 1.4.13, grep to 2.14, gzip to 1.5,
iproute2 to 3.7.0, iptables to 1.4.16.3, iptstate to 2.2.5,
iputils to s20121011, iw to 3.7,
hdparm to 9.39, httpd to 2.2.23, krb5 to 1.10.3,
less to 451, libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to
1.5.0, libnet to 1.1.6,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master SQL Server Development, Administration, T-SQL, SSAS, SSIS, SSRS
and more. Get SQL Server skills now (including 2012) with LearnDevNow -
200+ hours of step-by-step video tutorials by Microsoft MVPs and experts.
SALE $99.99 this month only - learn more at:
http://p.sf.net/sfu/learnmore_122512
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
