diff --git a/cloexec.patch b/cloexec.patch deleted file mode 100644 index ad044bd..0000000 --- a/cloexec.patch +++ /dev/null @@ -1,66 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -59,7 +59,9 @@ dnl ==================================== - AC_CONFIG_HEADERS(config.h) - AC_CONFIG_MACRO_DIR([m4]) - --AC_PROG_CC -+AC_PROG_CC_STDC -+AC_USE_SYSTEM_EXTENSIONS -+AC_SYS_LARGEFILE - AC_PROG_INSTALL - AC_PROG_LN_S - AC_LIBTOOL_WIN32_DLL -@@ -136,7 +138,7 @@ AC_TYPE_PID_T - # Checks for library functions. - AC_FUNC_VPRINTF - AC_FUNC_MMAP --AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs]) -+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48 random_r rand_r regcomp regerror regexec regfree fstatvfs fstatfs]) - - dnl AC_CHECK_FUNCS doesn't check for header files. - dnl posix_fadvise() may be not available in older libc. -Index: src/fcatomic.c -=================================================================== ---- src/fcatomic.c.orig -+++ src/fcatomic.c -@@ -109,10 +109,14 @@ FcAtomicLock (FcAtomic *atomic) - - strcpy ((char *) atomic->tmp, (char *) atomic->file); - strcat ((char *) atomic->tmp, TMP_NAME); -+#ifdef HAVE_MKOSTEMP -+ fd = mkostemp ((char *) atomic->tmp, O_CLOEXEC); -+#else - fd = mkstemp ((char *) atomic->tmp); -+#endif - if (fd < 0) - return FcFalse; -- f = fdopen (fd, "w"); -+ f = fdopen (fd, "we"); - if (!f) - { - close (fd); -Index: src/fccache.c -=================================================================== ---- src/fccache.c.orig -+++ src/fccache.c -@@ -150,7 +150,7 @@ FcDirCacheOpenFile (const FcChar8 *cache - if (FcStat (cache_file, file_stat) < 0) - return -1; - #endif -- fd = open((char *) cache_file, O_RDONLY | O_BINARY); -+ fd = open((char *) cache_file, O_RDONLY | O_BINARY | O_CLOEXEC); - if (fd < 0) - return fd; - #ifndef _WIN32 -@@ -904,7 +904,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi - if (!FcAtomicLock (atomic)) - goto bail3; - -- fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY, 0666); -+ fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY | O_CLOEXEC, 0666); - if (fd == -1) - goto bail4; - diff --git a/fontconfig-2.10.2.tar.bz2 b/fontconfig-2.10.2.tar.bz2 deleted file mode 100644 index 2985873..0000000 --- a/fontconfig-2.10.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952 -size 1412488 diff --git a/fontconfig-2.10.91.tar.bz2 b/fontconfig-2.10.91.tar.bz2 new file mode 100644 index 0000000..d6fd467 --- /dev/null +++ b/fontconfig-2.10.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4727954e950c0b8ae71580e2328bf54457d835ff3023ae4bd7221f9073e63ee +size 1507887 diff --git a/fontconfig-doc-2.10.2.tar.bz2 b/fontconfig-doc-2.10.2.tar.bz2 deleted file mode 100644 index 56fee93..0000000 --- a/fontconfig-doc-2.10.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:392766d3bb86e4d0186fc833bf2515f9b68970e0c82f2e66d0db21dd0557446a -size 97655 diff --git a/fontconfig-doc-2.10.91.tar.bz2 b/fontconfig-doc-2.10.91.tar.bz2 new file mode 100644 index 0000000..cbd7046 --- /dev/null +++ b/fontconfig-doc-2.10.91.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e958f930ac0819e33bd3fc02a7e9ec8fc8dcb51f526095306848f073fe020f1 +size 97861 diff --git a/fontconfig.changes b/fontconfig.changes index 3769e3e..9be58e8 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 4 10:40:31 UTC 2013 - dimstar@opensuse.org + +- Update to version 2.10.91:a + + Fix memory corruptions. + + Fix linker calls. + + Make the library thread-safe. + + Bugs fixed: fdo#29312, fdo#47705 +- Drop cloexec.patch: fixed upstream (slighlty different). + ------------------------------------------------------------------- Mon Mar 4 09:40:31 UTC 2013 - pgajdos@suse.com diff --git a/fontconfig.spec b/fontconfig.spec index 5dedb55..d6ddb31 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -48,7 +48,7 @@ Url: http://fontconfig.org/ Obsoletes: fontconfig-64bit %endif Requires: bash -Version: 2.10.2 +Version: 2.10.91 Release: 0 Summary: Library for Font Configuration License: MIT @@ -72,10 +72,8 @@ Source58: 58-suse-post-user.conf # suse specific because freetype2-bitmap-foundry.patch # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47704 Patch0: make-check.patch -# suse specific +# suse specific Patch1: usr-share-doc-packages.patch -# https://www.libreoffice.org/bugzilla/show_bug.cgi?id=47705 -Patch2: cloexec.patch # to be upstreamed https://bugs.freedesktop.org/show_bug.cgi?id=47721 Patch3: metric-croscore.patch # to be upstreamed https://bugs.freedesktop.org/show_bug.cgi?id=60783 @@ -124,7 +122,6 @@ accepts font patterns and returns the nearest matching font. %endif %patch0 -p1 %patch1 -p1 -%patch2 %patch3 %patch4