summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--user/pango/APKBUILD32
-rw-r--r--user/pango/CVE-2019-1010238.patch34
2 files changed, 16 insertions, 50 deletions
diff --git a/user/pango/APKBUILD b/user/pango/APKBUILD
index a9e6d5beb..049175aaf 100644
--- a/user/pango/APKBUILD
+++ b/user/pango/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=pango
-pkgver=1.42.4
-pkgrel=1
+pkgver=1.48.7
+pkgrel=0
pkgdesc="Library for laying out and rendering text"
url="https://www.pango.org/"
arch="all"
@@ -9,31 +9,31 @@ options="!check" # no tests available
license="LGPL-2.1+"
depends=""
makedepends="$depends_dev cairo-dev expat-dev fontconfig-dev freetype-dev
- fribidi-dev glib-dev gobject-introspection-dev harfbuzz-dev libxft-dev"
+ fribidi-dev glib-dev gobject-introspection-dev harfbuzz-dev libxft-dev
+ meson ninja"
install="$pkgname.pre-deinstall"
triggers="$pkgname.trigger=/usr/lib/pango/*/modules"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- CVE-2019-1010238.patch"
+subpackages="$pkgname-dev"
+source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
# secfixes:
# 1.42.4-r1:
# - CVE-2019-1010238
build () {
- ./configure \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var
- make
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=release \
+ . output
+ ninja -C output
}
package() {
mkdir -p "$pkgdir"/etc/pango
- make DESTDIR="$pkgdir" install
+ DESTDIR="$pkgdir" ninja -C output install
}
-sha512sums="993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc pango-1.42.4.tar.xz
-d11af8e56c59286f998d136d795d9ed22bea96b7dfaf4e02fe294ab0b147606ecb43ddfbd8caaa0eee1ee27b5a2f5c5a6f6f7a0b3193750649cf6b121cb6de50 CVE-2019-1010238.patch"
+sha512sums="e5680d628f531bea7633945bd74dc51a93c4c881dec58fcf9f6271043e77b82a4805e311355cb4d9f8cdfcdf52785a5a6391517a264b62416c26e82dff4aca39 pango-1.48.7.tar.xz"
diff --git a/user/pango/CVE-2019-1010238.patch b/user/pango/CVE-2019-1010238.patch
deleted file mode 100644
index cc65b3d53..000000000
--- a/user/pango/CVE-2019-1010238.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 490f8979a260c16b1df055eab386345da18a2d54 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Wed, 10 Jul 2019 20:26:23 -0400
-Subject: [PATCH] bidi: Be safer against bad input
-
-Don't run off the end of an array that we
-allocated to certain length.
-
-Closes: https://gitlab.gnome.org/GNOME/pango/issues/342
----
- 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 3e46b66c..5c02dbbb 100644
---- a/pango/pango-bidi-type.c
-+++ b/pango/pango-bidi-type.c
-@@ -181,8 +181,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))
---
-2.22.0
-