| 1 |
commit: 2e23da62f35f8c716af5e6342ac9cdbb96898c14 |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Tue Sep 18 23:41:07 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 19 08:06:12 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e23da62 |
| 7 |
|
| 8 |
media-libs/fontconfig: Revert part of upstream commit which causes sandbox violations for fonts cache. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/666418 |
| 11 |
|
| 12 |
...1-revert_delete_.uuid_for_empty_directory.patch | 43 ++++++++++++++++++++++ |
| 13 |
....13.1-r1.ebuild => fontconfig-2.13.1-r2.ebuild} | 1 + |
| 14 |
2 files changed, 44 insertions(+) |
| 15 |
|
| 16 |
diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..cd66082eedd |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch |
| 21 |
@@ -0,0 +1,43 @@ |
| 22 |
+https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107 |
| 23 |
+ |
| 24 |
+Reversion of part of: |
| 25 |
+https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/f5dd8512bdf9fd8e01c30ae36f593758b29385cf |
| 26 |
+ |
| 27 |
+--- /src/fcdir.c |
| 28 |
++++ /src/fcdir.c |
| 29 |
+@@ -421,13 +421,6 @@ |
| 30 |
+ /* Not using existing cache file, construct new cache */ |
| 31 |
+ if (!cache) |
| 32 |
+ cache = FcDirCacheScan (dir, config); |
| 33 |
+- if (cache) |
| 34 |
+- { |
| 35 |
+- FcFontSet *fs = FcCacheSet (cache); |
| 36 |
+- |
| 37 |
+- if (cache->dirs_count == 0 && (!fs || fs->nfont == 0)) |
| 38 |
+- FcDirCacheDeleteUUID (dir, config); |
| 39 |
+- } |
| 40 |
+ |
| 41 |
+ return cache; |
| 42 |
+ } |
| 43 |
+--- /test/run-test.sh |
| 44 |
++++ /test/run-test.sh |
| 45 |
+@@ -239,19 +239,4 @@ |
| 46 |
+ |
| 47 |
+ rm -rf $MyPWD/sysroot |
| 48 |
+ |
| 49 |
+-dotest "deleting .uuid file on empty dir" |
| 50 |
+-prep |
| 51 |
+-cp $FONT1 $FONT2 $FONTDIR |
| 52 |
+-$FCCACHE $FONTDIR |
| 53 |
+-sleep 1 |
| 54 |
+-rm -f $FONTDIR/*pcf |
| 55 |
+-$FCCACHE $FONTDIR |
| 56 |
+-rmdir $FONTDIR > /dev/null 2>&1 |
| 57 |
+-if [ $? != 0 ]; then |
| 58 |
+- echo "*** Test failed: $TEST" |
| 59 |
+- echo "$FONTDIR isn't empty" |
| 60 |
+- ls -al $FONTDIR |
| 61 |
+- exit 1 |
| 62 |
+-fi |
| 63 |
+- |
| 64 |
+ rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out |
| 65 |
|
| 66 |
diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild |
| 67 |
similarity index 98% |
| 68 |
rename from media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild |
| 69 |
rename to media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild |
| 70 |
index fdc25117f94..0ba7f651fab 100644 |
| 71 |
--- a/media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild |
| 72 |
+++ b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild |
| 73 |
@@ -36,6 +36,7 @@ PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig ) |
| 74 |
PATCHES=( |
| 75 |
"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157 |
| 76 |
"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default |
| 77 |
+ "${FILESDIR}"/${P}-revert_delete_.uuid_for_empty_directory.patch # 666418 |
| 78 |
|
| 79 |
# Patches from upstream (can usually be removed with next version bump) |
| 80 |
"${FILESDIR}"/${P}-static_build.patch |
Archives