On Fri, 09 Aug 2019 at 17:29:58 +0200, Salvatore Bonaccorso wrote:
> Do you have free cycles to prepare the update for buster-security?
>
> I think we can simply go with a 1.42.4-7~deb10u1 as "rebuild for
> buster-security".
Preparing one for testing now, changes since buster attached.
smcv
diff --git a/debian/changelog b/debian/changelog
index 5ff4a63f..b4c3bf86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+pango1.0 (1.42.4-7~deb10u1) buster-security; urgency=medium
+
+ * Team upload
+ * Rebuild for buster-security
+ * d/gbp.conf: Set upstream branch to upstream/1.42.x
+ * d/gbp.conf: Set packaging branch to debian/buster
+
+ -- Simon McVittie <s...@debian.org> Sat, 10 Aug 2019 11:15:40 +0100
+
+pango1.0 (1.42.4-7) unstable; urgency=medium
+
+ * Team upload
+ * d/p/bidi-Be-safer-against-bad-input.patch:
+ Fix heap overflow when acting on malformed UTF-8.
+ (Closes: #933860; CVE-2019-1010238)
+
+ -- Simon McVittie <s...@debian.org> Sun, 04 Aug 2019 17:20:47 +0100
+
pango1.0 (1.42.4-6) unstable; urgency=medium
* Restore -Wl,-O1 to our LDFLAGS
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7eebcaf2..6498210d 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,7 +1,7 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = debian/buster
+upstream-branch = upstream/1.42.x
upstream-vcs-tag = %(version)s
[buildpackage]
diff --git a/debian/patches/bidi-Be-safer-against-bad-input.patch b/debian/patches/bidi-Be-safer-against-bad-input.patch
new file mode 100644
index 00000000..55f758de
--- /dev/null
+++ b/debian/patches/bidi-Be-safer-against-bad-input.patch
@@ -0,0 +1,33 @@
+From: Matthias Clasen <mcla...@redhat.com>
+Date: Wed, 10 Jul 2019 20:26:23 -0400
+Subject: bidi: Be safer against bad input
+
+Don't run off the end of an array that we
+allocated to certain length.
+
+Bug: https://gitlab.gnome.org/GNOME/pango/issues/342
+Origin: upstream, 1.44, commit:490f8979a260c16b1df055eab386345da18a2d54)
+CVE: CVE-2019-1010238
+Bug-Debian: https://bugs.debian.org/933860
+---
+ pango/pango-bidi-type.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/pango/pango-bidi-type.c b/pango/pango-bidi-type.c
+index a49e06d..d169525 100644
+--- a/pango/pango-bidi-type.c
++++ b/pango/pango-bidi-type.c
+@@ -179,8 +179,11 @@ pango_log2vis_get_embedding_levels (const gchar *text,
+ for (i = 0, p = text; p < text + length; p = g_utf8_next_char(p), i++)
+ {
+ gunichar ch = g_utf8_get_char (p);
+- FriBidiCharType char_type;
+- char_type = fribidi_get_bidi_type (ch);
++ FriBidiCharType char_type = fribidi_get_bidi_type (ch);
++
++ if (i == n_chars)
++ break;
++
+ bidi_types[i] = char_type;
+ ored_types |= char_type;
+ if (FRIBIDI_IS_STRONG (char_type))
diff --git a/debian/patches/series b/debian/patches/series
index f6c10734..ef8fe1a0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ Update-GraphemeBreakTest.txt-to-Unicode-11.patch
Update-Grapheme-Boundary-to-Unicode-11.patch
Update-Word-Boundary-to-Unicode-11.patch
Update-Line-Break-to-Unicode-11.patch
+bidi-Be-safer-against-bad-input.patch
