diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-08 16:47:37 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-08 21:56:03 +0100 |
| commit | b9f71df3773c8cbe799cec1362aa5fb8314f7e13 (patch) | |
| tree | 6ac14db00bd7ce3cf3a088320df487e2a376dfde /gnu/packages | |
| parent | 343139dabbe858c9e34544ba21fab34fbc6df20d (diff) | |
| download | guix-b9f71df3773c8cbe799cec1362aa5fb8314f7e13.tar.gz guix-b9f71df3773c8cbe799cec1362aa5fb8314f7e13.zip | |
gnu: fribidi: Update to 1.0.8.
* gnu/packages/patches/fribidi-CVE-2019-18397.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/fribidi.scm (fribidi): Update to 1.0.8.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/fribidi.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/fribidi-CVE-2019-18397.patch | 26 |
2 files changed, 2 insertions, 29 deletions
diff --git a/gnu/packages/fribidi.scm b/gnu/packages/fribidi.scm index b6cabdc4b0..8fa0e6d980 100644 --- a/gnu/packages/fribidi.scm +++ b/gnu/packages/fribidi.scm @@ -28,7 +28,7 @@ (define-public fribidi (package (name "fribidi") - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) @@ -37,8 +37,7 @@ "/download/v" version "/fribidi-" version ".tar.bz2")) (sha256 - (base32 "0pckda4fcn0aw32lpycwdp25r2m7vca8zspq815ppi9gkwgg5das")) - (patches (search-patches "fribidi-CVE-2019-18397.patch")))) + (base32 "0v0ybhck9vz4yayihydknmikslh3xfxygzywnh9rcamdhs6vdiwl")))) (build-system gnu-build-system) (synopsis "Implementation of the Unicode bidirectional algorithm") (description diff --git a/gnu/packages/patches/fribidi-CVE-2019-18397.patch b/gnu/packages/patches/fribidi-CVE-2019-18397.patch deleted file mode 100644 index aff1a669b2..0000000000 --- a/gnu/packages/patches/fribidi-CVE-2019-18397.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568.patch - -From 034c6e9a1d296286305f4cfd1e0072b879f52568 Mon Sep 17 00:00:00 2001 -From: Dov Grobgeld <dov.grobgeld@gmail.com> -Date: Thu, 24 Oct 2019 09:37:29 +0300 -Subject: [PATCH] Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL - ---- - lib/fribidi-bidi.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c -index 6c84392..d384878 100644 ---- a/lib/fribidi-bidi.c -+++ b/lib/fribidi-bidi.c -@@ -747,7 +747,9 @@ fribidi_get_par_embedding_levels_ex ( - } - - RL_LEVEL (pp) = level; -- RL_ISOLATE_LEVEL (pp) = isolate_level++; -+ RL_ISOLATE_LEVEL (pp) = isolate_level; -+ if (isolate_level < FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL-1) -+ isolate_level++; - base_level_per_iso_level[isolate_level] = new_level; - - if (!FRIBIDI_IS_NEUTRAL (override)) |