Bug#938997: stretch-pu: package gettext/0.19.8.1-2+deb9u1

[Santiago Vila <sanvila@unex.es>]

Package: release.debian.org
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu

Dear Release Managers:

I'd like to have this bug fixed in stretch, as it has practical
implications for some people (as opposed to other crashes which
may only happen with specially crafted files).

I was requested to do this here:

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=891347#30

and the request makes sense to me.

The debdiff is below and the changelog is self-explanatoty.

Thanks.

diff -Nru gettext-0.19.8.1/debian/changelog gettext-0.19.8.1/debian/changelog
--- gettext-0.19.8.1/debian/changelog	2017-01-23 23:11:50.000000000 +0100
+++ gettext-0.19.8.1/debian/changelog	2019-08-31 01:30:22.000000000 +0200
@@ -1,3 +1,12 @@
+gettext (0.19.8.1-2+deb9u1) stretch; urgency=medium
+
+  * Stop xgettext() from crashing when run with --its=FILE option.
+    Patch taken from Debian 10, which in turn was extracted from
+    upstream git. Should help the inkscape project. Closes: #891347.
+    See https://gitlab.com/inkscape/inkscape/issues/271 for details.
+
+ -- Santiago Vila <sanvila@debian.org>  Sat, 31 Aug 2019 01:30:22 +0200
+
 gettext (0.19.8.1-2) unstable; urgency=medium
 
   * Use debhelper more.
diff -Nru gettext-0.19.8.1/debian/patches/05-fix-crash-xgettext-with-its.patch gettext-0.19.8.1/debian/patches/05-fix-crash-xgettext-with-its.patch
--- gettext-0.19.8.1/debian/patches/05-fix-crash-xgettext-with-its.patch	1970-01-01 01:00:00.000000000 +0100
+++ gettext-0.19.8.1/debian/patches/05-fix-crash-xgettext-with-its.patch	2019-08-31 00:02:00.000000000 +0200
@@ -0,0 +1,33 @@
+From: Bruno Haible <bruno@clisp.org>
+Subject: Fix crash of xgettext with --its option.
+Origin: https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff_plain;h=a0cab23332a254e3500cac2a3a984472d02180e5
+Bug-Debian: https://bugs.debian.org/891347
+X-Debian-version: 0.19.8.1-5
+
+--- a/gettext-tools/src/xgettext.c
++++ b/gettext-tools/src/xgettext.c
+@@ -330,7 +330,7 @@
+   bool sort_by_msgid = false;
+   bool sort_by_filepos = false;
+   char **dirs;
+-  char **its_dirs;
++  char **its_dirs = NULL;
+   char *explicit_its_filename = NULL;
+   const char *file_name;
+   const char *files_from = NULL;
+@@ -1016,9 +1016,12 @@
+   if (its_locating_rules)
+     locating_rule_list_free (its_locating_rules);
+ 
+-  for (i = 0; its_dirs[i] != NULL; i++)
+-    free (its_dirs[i]);
+-  free (its_dirs);
++  if (its_dirs != NULL)
++    {
++      for (i = 0; its_dirs[i] != NULL; i++)
++        free (its_dirs[i]);
++      free (its_dirs);
++    }
+ 
+   exit (EXIT_SUCCESS);
+ }
diff -Nru gettext-0.19.8.1/debian/patches/series gettext-0.19.8.1/debian/patches/series
--- gettext-0.19.8.1/debian/patches/series	2017-01-23 22:00:00.000000000 +0100
+++ gettext-0.19.8.1/debian/patches/series	2019-08-31 00:00:00.000000000 +0200
@@ -1 +1,2 @@
 01-do-not-use-java-in-urlget
+05-fix-crash-xgettext-with-its.patch