pool/fribidi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 825419 from M17N

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/825419
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fribidi?expand=0&rev=30
This commit is contained in:
Dominique Leuenberger 2020-08-14 07:30:09 +00:00 committed by Git OBS Bridge
commit 291827929f
6 changed files with 38 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.diff
View File

@ -1,28 +0,0 @@
From: Dov Grobgeld <dov.grobgeld@gmail.com>
Date: Thu, 24 Oct 2019 09:37:29 +0300
Subject: Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL
Origin: https://github.com/fribidi/fribidi/commit/034c6e9a1d296286305f4cfd1e0072b879f52568
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-18397
---
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 6c843922685c..d38487852fe7 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))
--
2.24.0

3
fribidi-1.0.10.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f1c687c7831499bcacae5e8675945a39bacbad16ecaa945e9454a32df653c01
size 1147588

3
fribidi-1.0.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a64f2a687f5c4f203a46fa659f43dd43d1f8b845df8d723107e8a7e6158e4ce
size 2082617

32
fribidi.changes
View File

@ -1,3 +1,35 @@
-------------------------------------------------------------------
Sun Aug 9 20:02:12 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
- Update to version 1.0.10:
* Fixed various compilation problems and symbol exports necessary for
proper compilation under windows.
- Changes from version 1.0.9:
* A bug fix in the fribidi unicode algorithm where isolate sequences were
not really isolated.
* Restored mistakenly removed deprecated function
fribidi_log2vis_get_embedding_levels()
* autotools now generates xz archives instead of bzip2 archives
- Changes from version 1.0.8:
* A bug fix in the fribidi unicode algorithm for multiple isolate
sequences.
* Fixed a potential buffer overflow for a long sequence of isolate
overrides characters
- Changes from version 1.0.7:
* This is a minor bugfix that removes symlinks and updates the meson
version.
- Changes from version 1.0.6:
* This is a minor bugfix release that fixes a list of minor issues that
have turned up during the last year.
* Various compilation and cross compilation issues.
* Various minor header cleanups.
* Removed libc's bsearch for performance and portability reasons
- Run spec-cleaner
* Remove package groups
- Drop patches fixed upstream
* Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.diff
* no-config-h.diff
-------------------------------------------------------------------
Fri May 22 14:43:34 UTC 2020 - Carsten Ziepke <kieltux@gmail.com>

15
fribidi.spec
View File

@ -18,18 +18,13 @@
%define lname libfribidi0
Name: fribidi
Version: 1.0.5
Version: 1.0.10
Release: 0
Summary: An implementation of the Unicode BiDi algorithm
License: LGPL-2.1-only
Group: Development/Libraries/C and C++
URL: https://github.com/fribidi/fribidi
Source: https://github.com/fribidi/fribidi/releases/download/v%{version}/%{name}-%{version}.tar.bz2
Source: https://github.com/fribidi/fribidi/releases/download/v%{version}/%{name}-%{version}.tar.xz
Source2: baselibs.conf
# PATCH-FIX-UPSTREAM no-config-h.diff - copied from Debian
Patch1: no-config-h.diff
# PATCH-FIX-UPSTREAM Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.diff - copied from Debian
Patch2: Truncate-isolate_level-to-FRIBIDI_BIDI_MAX_EXPLICIT_.diff
BuildRequires: pkgconfig
#
Provides: locale(ar;he)
@ -44,7 +39,6 @@ Standard Annex #9, the Bidirectional Algorithm".
%package -n %{lname}
Summary: An implementation of the Unicode BiDi algorithm
Group: System/Libraries
%description -n %{lname}
This library implements the algorithm as described in "Unicode
@ -59,16 +53,13 @@ adding BiDi support to Mozilla.
%package devel
Summary: Development Files for FriBiDi
Group: Development/Libraries/C and C++
Requires: %{lname} = %{version}
%description devel
This package provides headers and manual files for FriBiDi.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%autosetup -p1
%build
%configure --disable-static

211
no-config-h.diff
View File

@ -1,211 +0,0 @@
Description: Removed HAVE_CONFIG_H from public API
Origin: commit:b534ab2642f694c3106d5bc8d0a8beae60bf60d3
Author: Dov Grobgeld <dov.grobgeld@gmail.com>
Date: Sat Aug 18 20:37:22 2018 +0300
diff --git a/bin/fribidi-benchmark.c b/bin/fribidi-benchmark.c
index e5fc9c0..07ac336 100644
--- a/bin/fribidi-benchmark.c
+++ b/bin/fribidi-benchmark.c
@@ -33,6 +33,11 @@
#include <fribidi-deprecated.h>
#include <stdio.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c
index cd359a9..33e1630 100644
--- a/bin/fribidi-main.c
+++ b/bin/fribidi-main.c
@@ -33,6 +33,11 @@
#include <fribidi-deprecated.h>
#include <stdio.h>
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
diff --git a/gen.tab/gen-arabic-shaping-tab.c b/gen.tab/gen-arabic-shaping-tab.c
index e613768..369501c 100644
--- a/gen.tab/gen-arabic-shaping-tab.c
+++ b/gen.tab/gen-arabic-shaping-tab.c
@@ -30,6 +30,10 @@
#include <fribidi-unicode.h>
#include <stdio.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
diff --git a/gen.tab/gen-bidi-type-tab.c b/gen.tab/gen-bidi-type-tab.c
index a0a61ef..05b1d16 100644
--- a/gen.tab/gen-bidi-type-tab.c
+++ b/gen.tab/gen-bidi-type-tab.c
@@ -30,6 +30,10 @@
#include <fribidi-unicode.h>
#include <stdio.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
diff --git a/gen.tab/gen-brackets-tab.c b/gen.tab/gen-brackets-tab.c
index 8c1f1df..cd99e01 100644
--- a/gen.tab/gen-brackets-tab.c
+++ b/gen.tab/gen-brackets-tab.c
@@ -32,6 +32,10 @@
#include <fribidi-unicode.h>
#include <stdio.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
diff --git a/gen.tab/gen-brackets-type-tab.c b/gen.tab/gen-brackets-type-tab.c
index 221db07..9ec60cc 100644
--- a/gen.tab/gen-brackets-type-tab.c
+++ b/gen.tab/gen-brackets-type-tab.c
@@ -32,6 +32,10 @@
#include <fribidi-unicode.h>
#include <stdio.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
diff --git a/gen.tab/gen-joining-type-tab.c b/gen.tab/gen-joining-type-tab.c
index 07c0953..29ab3ed 100644
--- a/gen.tab/gen-joining-type-tab.c
+++ b/gen.tab/gen-joining-type-tab.c
@@ -30,6 +30,10 @@
#include <fribidi-unicode.h>
#include <stdio.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
diff --git a/gen.tab/gen-mirroring-tab.c b/gen.tab/gen-mirroring-tab.c
index 21d33cf..e19be91 100644
--- a/gen.tab/gen-mirroring-tab.c
+++ b/gen.tab/gen-mirroring-tab.c
@@ -30,6 +30,10 @@
#include <fribidi-unicode.h>
#include <stdio.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
diff --git a/gen.tab/gen-unicode-version.c b/gen.tab/gen-unicode-version.c
index 4291551..35306ca 100644
--- a/gen.tab/gen-unicode-version.c
+++ b/gen.tab/gen-unicode-version.c
@@ -28,6 +28,10 @@
#include <common.h>
#include <stdio.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
diff --git a/lib/bidi-types.h b/lib/bidi-types.h
index 385ef05..86f3d02 100644
--- a/lib/bidi-types.h
+++ b/lib/bidi-types.h
@@ -27,7 +27,7 @@
#ifndef _BIDI_TYPES_H
#define _BIDI_TYPES_H
-#include "common.h"
+#include "fribidi-common.h"
#include <fribidi-types.h>
#include <fribidi-bidi-types.h>
diff --git a/lib/fribidi-arabic.c b/lib/fribidi-arabic.c
index dbfdc09..e12074c 100644
--- a/lib/fribidi-arabic.c
+++ b/lib/fribidi-arabic.c
@@ -27,6 +27,10 @@
#include "common.h"
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
#endif
diff --git a/lib/fribidi-types.h b/lib/fribidi-types.h
index 9f1746f..90238b4 100644
--- a/lib/fribidi-types.h
+++ b/lib/fribidi-types.h
@@ -27,10 +27,6 @@
#ifndef _FRIBIDI_TYPES_H
#define _FRIBIDI_TYPES_H
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include "fribidi-common.h"
#include "fribidi-begindecls.h"
diff --git a/lib/joining-types.h b/lib/joining-types.h
index 94b9fe3..6e11fa1 100644
--- a/lib/joining-types.h
+++ b/lib/joining-types.h
@@ -27,7 +27,7 @@
#ifndef _JOINING_TYPES_H
#define _JOINING_TYPES_H
-#include "common.h"
+#include "fribidi-common.h"
#include <fribidi-types.h>
#include <fribidi-joining-types.h>
diff --git a/lib/run.h b/lib/run.h
index 8c4e259..44ddfec 100644
--- a/lib/run.h
+++ b/lib/run.h
@@ -29,7 +29,7 @@
#ifndef _RUN_H
#define _RUN_H
-#include "common.h"
+#include "fribidi-common.h"
#include <fribidi-common.h>