From a292e5048d8517f1a36c63dd31e056927a7b0df5 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 7 Jan 2014 18:19:01 +0900 Subject: [PATCH] Update to 0.18.3.2-1 --- .gitignore | 1 + gettext-gnulib-tests-format-security.patch | 27 ++++++++++++++++++++++ gettext.spec | 8 ++++++- sources | 2 +- 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 gettext-gnulib-tests-format-security.patch diff --git a/.gitignore b/.gitignore index 440a687..fda8dbf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ gettext-0.18.1.1.tar.gz /gettext-0.18.2.1.tar.gz /gettext-0.18.3.tar.gz /gettext-0.18.3.1.tar.gz +/gettext-0.18.3.2.tar.gz diff --git a/gettext-gnulib-tests-format-security.patch b/gettext-gnulib-tests-format-security.patch new file mode 100644 index 0000000..2f195de --- /dev/null +++ b/gettext-gnulib-tests-format-security.patch @@ -0,0 +1,27 @@ +commit 4e42bcc4f190909d49d38f1137726b3bc36b7191 +Author: Ivailo +Date: Tue Dec 3 14:20:22 2013 +0000 + + test-xvasprintf: disable some -Wformat-security diagnostics + + * tests/test-xvasprintf.c: Disable -Wformat-zero-length and + -Wformat-nonliteral checks, as these edge cases are part of the test. + +diff --git a/tests/test-xvasprintf.c b/tests/test-xvasprintf.c +index 453ca58..0987225 100644 +--- a/gettext-tools/gnulib-tests/test-xvasprintf.c ++++ b/gettext-tools/gnulib-tests/test-xvasprintf.c +@@ -16,6 +16,13 @@ + + /* Written by Bruno Haible , 2007. */ + ++/* Tell GCC not to warn about the specific edge cases tested here. */ ++#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__ ++# pragma GCC diagnostic ignored "-Wformat-zero-length" ++# pragma GCC diagnostic ignored "-Wformat-nonliteral" ++# pragma GCC diagnostic ignored "-Wformat-security" ++#endif ++ + #include + + #include "xvasprintf.h" diff --git a/gettext.spec b/gettext.spec index 17d162b..c41452e 100644 --- a/gettext.spec +++ b/gettext.spec @@ -5,7 +5,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages Name: gettext -Version: 0.18.3.1 +Version: 0.18.3.2 Release: 1%{?dist} License: GPLv3+ and LGPLv2+ Group: Development/Tools @@ -13,6 +13,7 @@ URL: http://www.gnu.org/software/gettext/ Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz Source2: msghack.py Source3: msghack.1 +Patch0: gettext-gnulib-tests-format-security.patch # removal of openmp.m4 BuildRequires: autoconf >= 2.62 BuildRequires: automake @@ -134,6 +135,7 @@ Emacs. %prep %setup -q +%patch0 -p1 -b .gnulib-tests-format-security %build @@ -329,6 +331,10 @@ fi %{_emacs_sitelispdir}/%{name}/*.el %changelog +* Tue Jan 7 2014 Daiki Ueno - 0.18.3.2-1 +- update to 0.18.3.2 release +- apply patch to suppress -Wformat-security warnings in gnulib-tests + * Sun Aug 25 2013 Daiki Ueno - 0.18.3.1-1 - update to 0.18.3.1 release diff --git a/sources b/sources index 00d30f2..232f7f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3fc808f7d25487fc72b5759df7419e02 gettext-0.18.3.1.tar.gz +241aba309d07aa428252c74b40a818ef gettext-0.18.3.2.tar.gz