Version in base suite: 1.42.4-7~deb10u1 Base version: pango1.0_1.42.4-7~deb10u1 Target version: pango1.0_1.42.4-8~deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/p/pango1.0/pango1.0_1.42.4-7~deb10u1.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/p/pango1.0/pango1.0_1.42.4-8~deb10u1.dsc changelog | 25 ++++++ control | 2 control.in | 2 patches/Fix-crash-in-pango_fc_font_key_get_variations-when-key-is.patch | 36 ++++++++++ patches/series | 1 tests/build | 20 ++++- tests/control | 1 7 files changed, 81 insertions(+), 6 deletions(-) diff -Nru pango1.0-1.42.4/debian/changelog pango1.0-1.42.4/debian/changelog --- pango1.0-1.42.4/debian/changelog 2019-08-10 10:15:40.000000000 +0000 +++ pango1.0-1.42.4/debian/changelog 2020-04-29 20:06:53.000000000 +0000 @@ -1,3 +1,28 @@ +pango1.0 (1.42.4-8~deb10u1) buster; urgency=medium + + * Team upload + * Merge changes from 1.42.4-8 into buster + - d/gbp.conf, d/control: Set packaging branch to debian/buster + + -- Simon McVittie Wed, 29 Apr 2020 21:06:53 +0100 + +pango1.0 (1.42.4-8) unstable; urgency=medium + + * Team upload + * d/p/Fix-crash-in-pango_fc_font_key_get_variations-when-key-is.patch: + Backport crash fix from 1.44.x (Closes: #898960) + * d/tests/build: Use correct compiler for proposed autopkgtest + cross-architecture testing support, based on a patch for clutter-1.0 + by Steve Langasek + * d/tests/build: Fix shellcheck warnings + * d/tests/build: Remove trailing whitespace + * d/tests/build: Fail if using an undefined variable ("unofficial strict + mode") + * d/tests/build: Mark as superficial + * d/gbp.conf, d/control: Use debian/unstable, upstream/1.42.x branches + + -- Simon McVittie Thu, 26 Dec 2019 20:19:17 +0000 + pango1.0 (1.42.4-7~deb10u1) buster-security; urgency=medium * Team upload diff -Nru pango1.0-1.42.4/debian/control pango1.0-1.42.4/debian/control --- pango1.0-1.42.4/debian/control 2019-08-10 10:15:40.000000000 +0000 +++ pango1.0-1.42.4/debian/control 2020-04-29 20:06:53.000000000 +0000 @@ -31,7 +31,7 @@ Build-Depends-Indep: libglib2.0-doc Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/gnome-team/pango -Vcs-Git: https://salsa.debian.org/gnome-team/pango.git +Vcs-Git: https://salsa.debian.org/gnome-team/pango.git -b debian/buster Homepage: http://www.pango.org/ Package: libpango1.0-0 diff -Nru pango1.0-1.42.4/debian/control.in pango1.0-1.42.4/debian/control.in --- pango1.0-1.42.4/debian/control.in 2019-08-10 10:15:40.000000000 +0000 +++ pango1.0-1.42.4/debian/control.in 2020-04-29 20:06:53.000000000 +0000 @@ -27,7 +27,7 @@ Build-Depends-Indep: libglib2.0-doc Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/gnome-team/pango -Vcs-Git: https://salsa.debian.org/gnome-team/pango.git +Vcs-Git: https://salsa.debian.org/gnome-team/pango.git -b debian/buster Homepage: http://www.pango.org/ Package: libpango1.0-0 diff -Nru pango1.0-1.42.4/debian/patches/Fix-crash-in-pango_fc_font_key_get_variations-when-key-is.patch pango1.0-1.42.4/debian/patches/Fix-crash-in-pango_fc_font_key_get_variations-when-key-is.patch --- pango1.0-1.42.4/debian/patches/Fix-crash-in-pango_fc_font_key_get_variations-when-key-is.patch 1970-01-01 00:00:00.000000000 +0000 +++ pango1.0-1.42.4/debian/patches/Fix-crash-in-pango_fc_font_key_get_variations-when-key-is.patch 2020-04-29 20:06:53.000000000 +0000 @@ -0,0 +1,36 @@ +From: Carsten Pfeiffer +Date: Fri, 10 Aug 2018 16:06:20 +0200 +Subject: Fix crash in pango_fc_font_key_get_variations() when key is null + +Bug: https://gitlab.gnome.org/GNOME/pango/merge_requests/12 +Bug-Debian: https://bugs.debian.org/898960 +Applied-upstream: 1.43.0, commit:ad92e199f221499c19f22dce7a16e7d770ad3ae7 +--- + pango/pangofc-shape.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c +index a59ca67..53269d7 100644 +--- a/pango/pangofc-shape.c ++++ b/pango/pangofc-shape.c +@@ -380,8 +380,10 @@ _pango_fc_shape (PangoFont *font, + fc_font->is_hinted ? ft_face->size->metrics.x_ppem : 0, + fc_font->is_hinted ? ft_face->size->metrics.y_ppem : 0); + +- variations = pango_fc_font_key_get_variations (key); +- if (variations) ++ if (key) ++ { ++ variations = pango_fc_font_key_get_variations (key); ++ if (variations) + { + guint n_variations; + hb_variation_t *hb_variations; +@@ -391,6 +393,7 @@ _pango_fc_shape (PangoFont *font, + + g_free (hb_variations); + } ++ } + + hb_buffer = acquire_buffer (&free_buffer); + diff -Nru pango1.0-1.42.4/debian/patches/series pango1.0-1.42.4/debian/patches/series --- pango1.0-1.42.4/debian/patches/series 2019-08-10 10:15:40.000000000 +0000 +++ pango1.0-1.42.4/debian/patches/series 2020-04-29 20:06:53.000000000 +0000 @@ -8,3 +8,4 @@ Update-Word-Boundary-to-Unicode-11.patch Update-Line-Break-to-Unicode-11.patch bidi-Be-safer-against-bad-input.patch +Fix-crash-in-pango_fc_font_key_get_variations-when-key-is.patch diff -Nru pango1.0-1.42.4/debian/tests/build pango1.0-1.42.4/debian/tests/build --- pango1.0-1.42.4/debian/tests/build 2019-08-10 10:15:40.000000000 +0000 +++ pango1.0-1.42.4/debian/tests/build 2020-04-29 20:06:53.000000000 +0000 @@ -4,10 +4,21 @@ # Author: Rafał Cieślak set -e +set -u WORKDIR=$(mktemp -d) -trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM -cd $WORKDIR +cleanup () { + rm -fr "$WORKDIR" +} +trap cleanup 0 INT QUIT ABRT PIPE TERM +cd "$WORKDIR" + +if [ -n "${DEB_HOST_GNU_TYPE:-}" ]; then + CROSS_COMPILE="$DEB_HOST_GNU_TYPE-" +else + CROSS_COMPILE= +fi + cat < build_test.c #include @@ -20,9 +31,10 @@ } EOF -gcc -o build_test build_test.c `pkg-config --cflags --libs pango` +# Deliberately word-splitting, that's how pkg-config works: +# shellcheck disable=SC2046 +"${CROSS_COMPILE}gcc" -o build_test build_test.c $("${CROSS_COMPILE}pkg-config" --cflags --libs pango) echo "build: OK" [ -x build_test ] ./build_test echo "run: OK" - diff -Nru pango1.0-1.42.4/debian/tests/control pango1.0-1.42.4/debian/tests/control --- pango1.0-1.42.4/debian/tests/control 2019-08-10 10:15:40.000000000 +0000 +++ pango1.0-1.42.4/debian/tests/control 2020-04-29 20:06:53.000000000 +0000 @@ -1,5 +1,6 @@ Tests: build Depends: build-essential, libpango1.0-dev, pkg-config +Restrictions: superficial Tests: installed-tests Depends: pango1.0-tests, dbus (>= 1.8), xauth, xvfb, gnome-desktop-testing