From b99ec86db0c25a110dee8ca1e4fd85982ca203bc6844e7a252e006cd7e0b9775 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Mon, 2 Jan 2012 00:33:32 +0000 Subject: [PATCH] Accepting request 98503 from home:elvigia:branches:M17N - The O_CLOEXEC patch missed one case, in particular the loading of configuration files, this has been fixed. OBS-URL: https://build.opensuse.org/request/show/98503 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=50 --- fontconfig-visibility.patch | 11 +++++++++++ fontconfig.changes | 6 ++++++ fontconfig.spec | 3 ++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/fontconfig-visibility.patch b/fontconfig-visibility.patch index 10e121a..1401ff9 100644 --- a/fontconfig-visibility.patch +++ b/fontconfig-visibility.patch @@ -119,3 +119,14 @@ DOCSRC=@DOCSRC@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \ fc-cache fc-cat fc-list fc-match fc-query fc-scan conf.d $(DOCSRC) test +--- src/fcxml.c.orig ++++ src/fcxml.c +@@ -2485,7 +2485,7 @@ FcConfigParseAndLoad (FcConfig *conf + if (FcDebug () & FC_DBG_CONFIG) + printf ("\tLoading config file %s\n", filename); + +- fd = open ((char *) filename, O_RDONLY); ++ fd = open ((char *) filename, O_RDONLY|O_CLOEXEC); + if (fd == -1) { + FcStrFree (filename); + goto bail0; diff --git a/fontconfig.changes b/fontconfig.changes index 3c788f2..e109ef0 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 1 23:42:27 UTC 2012 - crrodriguez@opensuse.org + +- The O_CLOEXEC patch missed one case, in particular the + loading of configuration files, this has been fixed. + ------------------------------------------------------------------- Thu Dec 15 09:20:44 UTC 2011 - cfarrell@suse.com diff --git a/fontconfig.spec b/fontconfig.spec index f6c3a84..8fa5d8d 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -1,7 +1,7 @@ # # spec file for package fontconfig # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # + Name: fontconfig %define build_docs 0 BuildRequires: automake