From 607ae01f9d0876aa2c1058228c6b58864c88164d4f3287c215c15b712629cac4 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 19 Sep 2018 08:26:18 +0000 Subject: [PATCH] Add patch msgfmt-reset-msg-length-after-remove.patch for boo#1106843 OBS-URL: https://build.opensuse.org/package/show/Base:System/gettext-runtime?expand=0&rev=144 --- gettext-runtime-mini.spec | 3 +++ gettext-runtime.changes | 7 +++++++ gettext-runtime.spec | 3 +++ msgfmt-reset-msg-length-after-remove.patch | 20 ++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 msgfmt-reset-msg-length-after-remove.patch diff --git a/gettext-runtime-mini.spec b/gettext-runtime-mini.spec index a510c8f..5f04062 100644 --- a/gettext-runtime-mini.spec +++ b/gettext-runtime-mini.spec @@ -75,6 +75,8 @@ Patch9: gettext-needlessly_init_vars.patch Patch10: msgfmt-remove-pot-creation-date.patch # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com Patch11: boo941629-unnessary-rpath-on-standard-path.patch +# PATCH-FIX-SUSE Bug boo#1106843 +Patch12: msgfmt-reset-msg-length-after-remove.patch %description This package contains the intl library as well as tools that ease the @@ -139,6 +141,7 @@ as well as project examples. %patch9 %patch10 -p1 %patch11 -p1 +%patch12 -p0 %build # expect a couple "You should update your `aclocal.m4' by running aclocal." diff --git a/gettext-runtime.changes b/gettext-runtime.changes index e8b8c78..a553da4 100644 --- a/gettext-runtime.changes +++ b/gettext-runtime.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 19 08:24:19 UTC 2018 - Dr. Werner Fink + +- Add patch msgfmt-reset-msg-length-after-remove.patch + which does reset the length of message string after a line + has been removed (boo#1106843) + ------------------------------------------------------------------- Thu May 24 10:45:49 CEST 2018 - kukuk@suse.de diff --git a/gettext-runtime.spec b/gettext-runtime.spec index 4a254c9..6d24267 100644 --- a/gettext-runtime.spec +++ b/gettext-runtime.spec @@ -75,6 +75,8 @@ Patch9: gettext-needlessly_init_vars.patch Patch10: msgfmt-remove-pot-creation-date.patch # PATCH-FIX-UPSTREAM boo#941629 -- pth@suse.com Patch11: boo941629-unnessary-rpath-on-standard-path.patch +# PATCH-FIX-SUSE Bug boo#1106843 +Patch12: msgfmt-reset-msg-length-after-remove.patch %description This package contains the intl library as well as tools that ease the @@ -139,6 +141,7 @@ as well as project examples. %patch9 %patch10 -p1 %patch11 -p1 +%patch12 -p0 %build # expect a couple "You should update your `aclocal.m4' by running aclocal." diff --git a/msgfmt-reset-msg-length-after-remove.patch b/msgfmt-reset-msg-length-after-remove.patch new file mode 100644 index 0000000..100e617 --- /dev/null +++ b/msgfmt-reset-msg-length-after-remove.patch @@ -0,0 +1,20 @@ +Bug 1106843 -- msgfmt crashes when writing java source code and the .po file has a POT-Creation-Date header + +Due d13f165b83701dffc14f7151419e0c00c00c0d1b there will be the +line with the POT-Creation-Date: tag removed but the lenght of +the changed message string does also change with this. + +--- + gettext-tools/src/msgl-header.c | 1 + + 1 file changed, 1 insertion(+) + +--- gettext-tools/src/msgl-header.c ++++ gettext-tools/src/msgl-header.c 2018-09-19 08:05:54.340122157 +0000 +@@ -217,6 +217,7 @@ message_list_delete_header_field (messag + *p = '\0'; + + mp->msgstr = new_header; ++ mp->msgstr_len = strlen (new_header) + 1; + } + } + }