Browse code
Applied patch for CVE-2018-18751
Change-Id: I338adfac87c8f3cc08bfb91d2490fe5568f0bc88
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6879
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>
smaliakkal authored on 2019/03/15 07:43:32Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,50 @@ |
| 0 |
+diff -ru a/gettext-tools/src/po-gram-gen.y b/gettext-tools/src/po-gram-gen.y |
|
| 1 |
+--- a/gettext-tools/src/po-gram-gen.y 2019-03-14 21:17:26.557259243 +0000 |
|
| 2 |
+@@ -221,15 +221,12 @@ |
|
| 3 |
+ check_obsolete ($1, $3); |
|
| 4 |
+ check_obsolete ($1, $4); |
|
| 5 |
+ if (!$1.obsolete || pass_obsolete_entries) |
|
| 6 |
+- {
|
|
| 7 |
+- do_callback_message ($1.ctxt, string2, &$1.pos, $3.string, |
|
| 8 |
+- $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos, |
|
| 9 |
+- $1.prev_ctxt, |
|
| 10 |
+- $1.prev_id, $1.prev_id_plural, |
|
| 11 |
+- $1.obsolete); |
|
| 12 |
+- free ($3.string); |
|
| 13 |
+- } |
|
| 14 |
+- else |
|
| 15 |
++ do_callback_message ($1.ctxt, string2, &$1.pos, $3.string, |
|
| 16 |
++ $4.rhs.msgstr, $4.rhs.msgstr_len, &$4.pos, |
|
| 17 |
++ $1.prev_ctxt, |
|
| 18 |
++ $1.prev_id, $1.prev_id_plural, |
|
| 19 |
++ $1.obsolete); |
|
| 20 |
++ else |
|
| 21 |
+ {
|
|
| 22 |
+ free_message_intro ($1); |
|
| 23 |
+ free (string2); |
|
| 24 |
+diff -ru a/gettext-tools/src/read-catalog.c b/gettext-tools/src/read-catalog.c |
|
| 25 |
+--- a/gettext-tools/src/read-catalog.c 2019-03-14 21:17:26.561259208 +0000 |
|
| 26 |
+@@ -397,6 +397,8 @@ |
|
| 27 |
+ appropriate. */ |
|
| 28 |
+ mp = message_alloc (msgctxt, msgid, msgid_plural, msgstr, msgstr_len, |
|
| 29 |
+ msgstr_pos); |
|
| 30 |
++ if (msgid_plural != NULL) |
|
| 31 |
++ free (msgid_plural); |
|
| 32 |
+ mp->prev_msgctxt = prev_msgctxt; |
|
| 33 |
+ mp->prev_msgid = prev_msgid; |
|
| 34 |
+ mp->prev_msgid_plural = prev_msgid_plural; |
|
| 35 |
+diff -ru a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am |
|
| 36 |
+--- a/gettext-tools/tests/Makefile.am 2019-03-14 21:17:26.609258796 +0000 |
|
| 37 |
+@@ -94,7 +94,7 @@ |
|
| 38 |
+ xgettext-perl-1 xgettext-perl-2 xgettext-perl-3 xgettext-perl-4 \ |
|
| 39 |
+ xgettext-perl-5 xgettext-perl-6 xgettext-perl-7 xgettext-perl-8 \ |
|
| 40 |
+ xgettext-php-1 xgettext-php-2 xgettext-php-3 xgettext-php-4 \ |
|
| 41 |
+- xgettext-po-1 \ |
|
| 42 |
++ xgettext-po-1 xgettext-po-2 \ |
|
| 43 |
+ xgettext-properties-1 \ |
|
| 44 |
+ xgettext-python-1 xgettext-python-2 xgettext-python-3 \ |
|
| 45 |
+ xgettext-python-4 \ |
|
| 46 |
+Only in b/gettext-tools/tests: xgettext-po-2 |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Utilities for internationalization and localization |
| 2 | 2 |
Name: gettext |
| 3 | 3 |
Version: 0.19.5.1 |
| 4 |
-Release: 3%{?dist}
|
|
| 4 |
+Release: 4%{?dist}
|
|
| 5 | 5 |
License: GPLv3 |
| 6 | 6 |
URL: http://www.gnu.org/software/gettext |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -11,6 +11,7 @@ Source0: http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.xz
|
| 11 | 11 |
%define sha1 gettext=668562227972d2645ac6c5930448ba74df65a53f |
| 12 | 12 |
Source1: libxml2-2.9.8.tar.gz |
| 13 | 13 |
%define sha1 libxml2=66bcefd98a6b7573427cf66f9d3841b59eb5b8c3 |
| 14 |
+Patch0: gettext-CVE-2018-18751.patch |
|
| 14 | 15 |
|
| 15 | 16 |
%description |
| 16 | 17 |
These allow programs to be compiled with NLS |
| ... | ... |
@@ -19,6 +20,8 @@ messages in the user's native language. |
| 19 | 19 |
%prep |
| 20 | 20 |
%setup -q |
| 21 | 21 |
%setup -D -a 1 |
| 22 |
+%patch0 -p1 |
|
| 23 |
+ |
|
| 22 | 24 |
rm -rf gnulib-local/lib/libxml |
| 23 | 25 |
mv libxml2-2.9.8 gnulib-local/lib/libxml |
| 24 | 26 |
|
| ... | ... |
@@ -52,6 +55,8 @@ make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
|
| 52 | 52 |
%{_datarootdir}/%{name}/*
|
| 53 | 53 |
%{_mandir}/*/*
|
| 54 | 54 |
%changelog |
| 55 |
+* Thu Mar 14 2019 Siju Maliakkal <smaliakkal@vmware.com> 0.19.5.1-4 |
|
| 56 |
+- Fix CVE-2018-18751 |
|
| 55 | 57 |
* Wed May 23 2018 Xiaolin Li <xiaolinl@vmware.com> 0.19.5.1-3 |
| 56 | 58 |
- Rebuild gettext with libxml2-2.9.8 |
| 57 | 59 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 0.19.5.1-2 |