[packages/gettext] - updated to 0.18.3.2 - removed obsolete format-security patch

qboosh qboosh at pld-linux.org
Tue Jan 7 21:32:23 CET 2014


commit 9f9ee3c797cec2d892beb7ccaae60e6d12997d09
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jan 7 21:33:05 2014 +0100

    - updated to 0.18.3.2
    - removed obsolete format-security patch

 format-security.patch | 31 -------------------------------
 gettext.spec          | 11 +++--------
 2 files changed, 3 insertions(+), 39 deletions(-)
---
diff --git a/gettext.spec b/gettext.spec
index c3c4d2e..34d4696 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -39,17 +39,16 @@ Summary(ru.UTF-8):	Библиотеки и утилиты для поддерж
 Summary(tr.UTF-8):	Desteği için kitaplık ve araçlar
 Summary(uk.UTF-8):	Бібліотеки та утиліти для підтримки національних мов
 Name:		gettext
-Version:	0.18.3.1
+Version:	0.18.3.2
 Release:	1
 License:	LGPL v2+ (libintl), GPL v3+ (tools)
 Group:		Development/Tools
 Source0:	http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
-# Source0-md5:	3fc808f7d25487fc72b5759df7419e02
+# Source0-md5:	241aba309d07aa428252c74b40a818ef
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-killkillkill.patch
 Patch2:		%{name}-pl.po-fixes.patch
 Patch3:		%{name}-libintl_by_gcj.patch
-Patch4:		format-security.patch
 URL:		http://www.gnu.org/software/gettext/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf >= 2.62
@@ -359,13 +358,8 @@ GNU gettext dla C#.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#for d in gettext-runtime gettext-tools gettext-tools/examples ; do
-#	iconv -f iso-8859-2 -t utf-8 ${d}/po/pl.po > ${d}/po/pl.po.utf-8
-#	mv -f ${d}/po/pl.po.utf-8 ${d}/po/pl.po
-#done
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -482,6 +476,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gettext/urlget
 %attr(755,root,root) %{_libdir}/gettext/user-email
 %{_aclocaldir}/codeset.m4
+%{_aclocaldir}/extern-inline.m4
 %{_aclocaldir}/fcntl-o.m4
 %{_aclocaldir}/gettext.m4
 %{_aclocaldir}/glibc2.m4
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index 27d7205..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- gettext-0.18.1.1/gettext-tools/libgrep/m-regex.c~	2010-06-06 14:49:57.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/libgrep/m-regex.c	2012-12-12 13:19:17.540818961 +0100
-@@ -106,7 +106,7 @@
- 
-         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;
---- gettext-0.18.1.1/gettext-tools/libgrep/m-fgrep.c~	2010-06-06 14:49:57.000000000 +0200
-+++ gettext-0.18.1.1/gettext-tools/libgrep/m-fgrep.c	2012-12-12 13:19:46.297484613 +0100
-@@ -106,7 +106,7 @@
-       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 @@
-   while (beg < pattern + pattern_size);
- 
-   if ((err = kwsprep (ckwset->kwset)) != NULL)
--    error (exit_failure, 0, err);
-+    error (exit_failure, 0, "%s", err);
-   return ckwset;
- }
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gettext.git/commitdiff/9f9ee3c797cec2d892beb7ccaae60e6d12997d09



More information about the pld-cvs-commit mailing list