1
0

Accepting request 316512 from home:AndreasStieger:branches:Base:System

gettext 0.19.5

The slightly unclean diff in gettext-runtime-mini.changes is due to the previous updater not running pre-checkin.sh

OBS-URL: https://build.opensuse.org/request/show/316512
OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=108
This commit is contained in:
Marcus Meissner 2015-07-16 09:52:43 +00:00 committed by Git OBS Bridge
parent 632fef5eda
commit 1cc780146f
14 changed files with 70 additions and 113 deletions

View File

@ -1,4 +1,3 @@
gettext-runtime
obsoletes "gettext-<targettype> <= <version>"
provides "gettext-<targettype> = <version>"
gettext-tools

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:719adadb8bf3e36bac52c243a01c0add18d23506a3a40437e6f5899ceab18d20
size 6656168

View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJUmnCtAAoJENYFhI7X5phxi+UP/jVqeTPMduQeuohjPp1n7F5L
eo04tvkHEuAeq7281hMDlzF4pKQOIR7xpq0FXoQEtMp5uok7bD7RGblTDJTsibRE
ZSPR5benz07QGyULK/JFj8IIaTcMrjyC98OZwWrVGR9L6ybUG1BJIrdlsZo7X8t7
og4MwWuDcoB5YS4j4J0Fqy9I/fGdC9FcGe1KkEybg8yxuIKepDYgOo2mu6SUiDmO
DzLA/X+RLt7IpilYkXYV4/J8XnVj1MPlxwEk4TTGODzC4qQlDKJaF2meo3X7TBTe
iBYE9TstgbvYdUuFQLHVmOlQr1yG8HryC5jcvg2qD25TX0Ja3dJbYiewgj8zVgT+
c14vXDSsPt2j0vuHCjdc3lKq1ePH+h/g2zSk6Ynv8Fi9zoFWfpTmQKESEPspLS8v
NRMXLcMfuCyUeaB9XG9mxwH06iXu64AwsrFB3ch3Bsnmk0qwGjcHC8oACV+DApt8
yVO2tvrNp1288kAqlxlSlvp+XjE5JxaN7jvxjqTSJG001W0TgWLbh6jMKrBkt2/S
f50ngOT/Dz5o4ORxatIiGIx8h5xfmC3DmCD+2IakiZ6IUKc9iMvmGWDbnWSYmrwE
bsnX9Nh6BiH8Q+YINZeQbQ7TGWGEliHNrlKpPuh2tLWoSc4LrqvE7hjG49IyTdK1
hAvrjlDt7QpatVfJRNi7
=edCp
-----END PGP SIGNATURE-----

3
gettext-0.19.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3410a61c5c05d0392533c92133e135de828973fee27477a6d6dd3d3e36f2a2dd
size 6874376

17
gettext-0.19.5.tar.xz.sig Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJVn29CAAoJENYFhI7X5phxaUkP/3Erp5oSxlUTVlisEe0OctIa
COZDb2Q/uLdYtQtxOe/VgwJzOLLaxiaep2gRoVrYOHxT7Wcsq/oxEGyJzpBLBaWD
LRt839Wh4cdgaprKtj/9C90hklE6ovojln0aXdx4EiM+hUrQg7MjwlRbL4ylN3WB
BCeCuEf9wq/zMlvM7bv3znvJOTVVpKows/8gwThzIW4vpiZi4HkkYJEUTI+lYKQI
QpH0lglM9+8glKomn5ABp+hU1Ej9OW5Lzd/GwbenOw4zqHUw+2xoOlwbv2l9RKg0
88Be7rNjJ2wwsUd5/3cNwJU6tHw/lhU6084BkOsu+B1dOXpRR9BenVzLAxjIaiFR
OBOcBTOhVlteDf9zaTvfj3nxIsoIOToVT1i3T8Rr6nvQYZFG/b+par7i6nflSTW6
bTBuhdYFm78qwnSnVafUhbt7JFot8Cpke2s0J0hcVp84uiFmnSKcnpVrfjS24rzz
Gyjp+dwIxikX8IpUX9pRDqQJjy3HCkVCP1U7MaZewgOw875Xe4cZUnk8At/P1jCU
Z7f0JjDUUt57n2IHXzk8a4k7zSJWr0I2SKs047irm9f+Xfg6/B0EragAzbs7m8iK
JTuJ7KAhwyxuTt+GZkIdYHBdNHpPsLKQTpm+OiA1RoCjIRoKUJMRDu0d3+P3YnMO
R1HuZ42BHwCIv3bk0/vK
=CGfR
-----END PGP SIGNATURE-----

View File

@ -1,74 +0,0 @@
From 5d3eeaa0d3b7f4f6932bd29d859925a940b69459 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@gnu.org>
Date: Wed, 11 Mar 2015 16:18:26 +0900
Subject: [PATCH] msgunfmt: Check allocated size for static segment
Reported by Max Lin in:
http://lists.gnu.org/archive/html/bug-gettext/2015-03/msg00005.html
* read-mo.c (get_sysdep_string): Check if the embedded segment
size is valid, before adding it to the string length.
---
gettext-tools/src/ChangeLog | 8 ++++++++
gettext-tools/src/read-mo.c | 11 +++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
--- a/gettext-tools/src/read-mo.c
+++ b/gettext-tools/src/read-mo.c
@@ -149,6 +149,7 @@ get_sysdep_string (const struct binary_m
nls_uint32 s_offset;
/* Compute the length. */
+ s_offset = get_uint32 (bfp, offset);
length = 0;
for (i = 4; ; i += 8)
{
@@ -158,9 +159,14 @@ get_sysdep_string (const struct binary_m
nls_uint32 ss_length;
nls_uint32 ss_offset;
size_t ss_end;
+ size_t s_end;
size_t n;
+ s_end = xsum (s_offset, segsize);
+ if (size_overflow_p (s_end) || s_end > bfp->size)
+ error (EXIT_FAILURE, 0, _("file \"%s\" is truncated"), bfp->filename);
length += segsize;
+ s_offset += segsize;
if (sysdepref == SEGMENTS_END)
break;
@@ -175,7 +181,7 @@ get_sysdep_string (const struct binary_m
ss_end = xsum (ss_offset, ss_length);
if (size_overflow_p (ss_end) || ss_end > bfp->size)
error (EXIT_FAILURE, 0, _("file \"%s\" is truncated"), bfp->filename);
- if (!(ss_length > 0 && bfp->data[ss_offset + ss_length - 1] == '\0'))
+ if (!(ss_length > 0 && bfp->data[ss_end - 1] == '\0'))
{
char location[30];
sprintf (location, "sysdep_segment[%u]", (unsigned int) sysdepref);
@@ -198,11 +204,8 @@ get_sysdep_string (const struct binary_m
nls_uint32 sysdep_segment_offset;
nls_uint32 ss_length;
nls_uint32 ss_offset;
- size_t s_end = xsum (s_offset, segsize);
size_t n;
- if (size_overflow_p (s_end) || s_end > bfp->size)
- error (EXIT_FAILURE, 0, _("file \"%s\" is truncated"), bfp->filename);
memcpy (p, bfp->data + s_offset, segsize);
p += segsize;
s_offset += segsize;
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-11 Daiki Ueno <ueno@gnu.org>
+
+ msgunfmt: Check allocated size for static segment
+ Reported by Max Lin in:
+ http://lists.gnu.org/archive/html/bug-gettext/2015-03/msg00005.html
+ * read-mo.c (get_sysdep_string): Check if the embedded segment
+ size is valid, before adding it to the string length.
+
2014-12-24 Daiki Ueno <ueno@gnu.org>
* gettext 0.19.4 released.

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jul 10 14:34:22 UTC 2015 - astieger@suse.com
- GNU gettext 0.19.5:
* drop gettext-check-allocated-size-for-static-segment.patch,
is upstream
-------------------------------------------------------------------
Tue Mar 10 07:11:29 UTC 2015 - mlin@suse.com

View File

@ -29,7 +29,7 @@ BuildRequires: tcl
BuildRequires: xz
Requires: mono
Url: http://www.gnu.org/software/gettext/
Version: 0.19.4
Version: 0.19.5
Release: 0
Summary: Native Language Support (NLS) for C#
License: LGPL-2.1+
@ -47,8 +47,6 @@ Patch2: gettext-0.12.1-gettextize.patch
Patch4: gettext-po-mode.diff
Patch5: gettext-initialize_vars.patch
Patch9: gettext-needlessly_init_vars.patch
# PATCH-FIX-UPSTREAM gettext-check-allocated-size-for-static-segment.patch -- mlin@suse.com
Patch10: gettext-check-allocated-size-for-static-segment.patch
%description
Mono with its 'resgen' program uses a design that Microsoft created and
@ -79,7 +77,6 @@ reliably than 'resgen'.
%patch4
%patch5
%patch9
%patch10 -p1
%build
export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
@ -118,6 +115,7 @@ rm -f %{buildroot}/%_libdir/gettext/hostname
rm -f %{buildroot}/%_libdir/gettext/project-id
rm -f %{buildroot}/%_libdir/gettext/urlget
rm -f %{buildroot}/%_libdir/gettext/user-email
rm -f %{buildroot}/%_libdir/gettext/cldr-plurals
rm -Rf %{buildroot}/%_includedir
rm -f %{buildroot}/%_libdir/preloadable_libintl.so

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jul 10 14:34:22 UTC 2015 - astieger@suse.com
- GNU gettext 0.19.5:
* drop gettext-check-allocated-size-for-static-segment.patch,
is upstream
-------------------------------------------------------------------
Tue Mar 10 07:10:56 UTC 2015 - mlin@suse.com

View File

@ -28,7 +28,7 @@ BuildRequires: perl-libintl-perl
BuildRequires: tcl
BuildRequires: xz
Url: http://www.gnu.org/software/gettext/
Version: 0.19.4
Version: 0.19.5
Release: 0
Summary: Java Support for Native Language Support (NLS)
License: LGPL-2.1+
@ -46,8 +46,6 @@ Patch2: gettext-0.12.1-gettextize.patch
Patch4: gettext-po-mode.diff
Patch5: gettext-initialize_vars.patch
Patch9: gettext-needlessly_init_vars.patch
# PATCH-FIX-UPSTREAM gettext-check-allocated-size-for-static-segment.patch -- mlin@suse.com
Patch10: gettext-check-allocated-size-for-static-segment.patch
%description
This package includes the tools needed to support message catalogs in
@ -61,7 +59,6 @@ java+swing.
%patch4
%patch5
%patch9
%patch10 -p1
%build
# expect a couple "You should update your `aclocal.m4' by running aclocal."
@ -123,6 +120,7 @@ rm -f %{buildroot}/%_libdir/gettext/hostname
rm -f %{buildroot}/%_libdir/gettext/project-id
rm -f %{buildroot}/%_libdir/gettext/urlget
rm -f %{buildroot}/%_libdir/gettext/user-email
rm -f %{buildroot}/%_libdir/gettext/cldr-plurals
%clean
rm -rf %{buildroot}

View File

@ -1,10 +1,24 @@
-------------------------------------------------------------------
Tue Mar 10 07:10:28 UTC 2015 - mlin@suse.com
Fri Jul 10 14:34:22 UTC 2015 - astieger@suse.com
- GNU gettext 0.19.5:
* xgettext: feature to perform syntax checks on msgid, via
--check option or "xgettext: " commentgs
* msgfilter, msgexec: new option --newline
* The base Unicode standard is now updated to 8.0.0.
* msginit is now capable of generating "Plural-Forms:" from
Unicode CLDR. Via GETTEXTCLDRDIR environment variable.
* Improved Programming languages support
* drop gettext-check-allocated-size-for-static-segment.patch,
is upstream
-------------------------------------------------------------------
Tue Mar 10 07:06:26 UTC 2015 - mlin@suse.com
- Add gettext-check-allocated-size-for-static-segment.patch from upstream
* Check if the embedded segment size is valid, before adding it to
the string length. Please see
http://lists.gnu.org/archive/html/bug-gettext/2015-03/msg00005.html
http://lists.gnu.org/archive/html/bug-gettext/2015-03/msg00005.html
-------------------------------------------------------------------
Tue Jan 27 20:24:49 UTC 2015 - andreas.stieger@gmx.de

View File

@ -20,7 +20,7 @@
%bcond_without mini
Name: gettext-runtime-mini
Version: 0.19.4
Version: 0.19.5
Release: 0
BuildRequires: gcc-c++
BuildRequires: libtool
@ -68,8 +68,6 @@ Patch5: gettext-initialize_vars.patch
# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de
Patch6: gettext-dont-test-gnulib.patch
Patch9: gettext-needlessly_init_vars.patch
# PATCH-FIX-UPSTREAM gettext-check-allocated-size-for-static-segment.patch -- mlin@suse.com
Patch10: gettext-check-allocated-size-for-static-segment.patch
%description
This package contains the intl library as well as tools that ease the
@ -127,7 +125,6 @@ as well as project examples.
%patch5
%patch6 -p1
%patch9
%patch10 -p1
%build
# expect a couple "You should update your `aclocal.m4' by running aclocal."

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Jul 10 14:34:22 UTC 2015 - astieger@suse.com
- GNU gettext 0.19.5:
* xgettext: feature to perform syntax checks on msgid, via
--check option or "xgettext: " commentgs
* msgfilter, msgexec: new option --newline
* The base Unicode standard is now updated to 8.0.0.
* msginit is now capable of generating "Plural-Forms:" from
Unicode CLDR. Via GETTEXTCLDRDIR environment variable.
* Improved Programming languages support
* drop gettext-check-allocated-size-for-static-segment.patch,
is upstream
-------------------------------------------------------------------
Tue Mar 10 07:06:26 UTC 2015 - mlin@suse.com

View File

@ -20,7 +20,7 @@
%bcond_with mini
Name: gettext-runtime
Version: 0.19.4
Version: 0.19.5
Release: 0
BuildRequires: gcc-c++
BuildRequires: libtool
@ -68,8 +68,6 @@ Patch5: gettext-initialize_vars.patch
# PATCH-FIX-OPENSUSE gettext-dont-test-gnulib.patch -- coolo@suse.de
Patch6: gettext-dont-test-gnulib.patch
Patch9: gettext-needlessly_init_vars.patch
# PATCH-FIX-UPSTREAM gettext-check-allocated-size-for-static-segment.patch -- mlin@suse.com
Patch10: gettext-check-allocated-size-for-static-segment.patch
%description
This package contains the intl library as well as tools that ease the
@ -127,7 +125,6 @@ as well as project examples.
%patch5
%patch6 -p1
%patch9
%patch10 -p1
%build
# expect a couple "You should update your `aclocal.m4' by running aclocal."