xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014

Update to openssl1.0.1f

xserver          commit 83e38eb73fd8c852513aac2da2975b4c01070ec2
libxcb           commit d7eb0bdf3b5b11ee9f40ee5e73df8fc0bdfa59f3
xkeyboard-config commit 7596672b96315465df8d8d691e3a567a52f70743
libX11           commit aacf95dacc7c598e7297894580d4d655593813b2
xkbcomp          commit 31b90ee4ffc774e0da540277907fc5540c0b012c
libxtrans        commit 3f0de269abe59353acbd7a5587d68ce0da91db67
fontconfig       commit e310d2fac2d874d5aa76c609df70cc7b871c0b6d
mesa             commit dd2229d4c68ed78a50104637aef904f8ab6d7dd3

3 files changed, 29 insertions, 13 deletions

diff --git a/fontconfig/src/fccompat.c b/fontconfig/src/fccompat.c
index 1c2ba8bed..f4f3f5fdc 100644
--- a/fontconfig/src/fccompat.c
+++ b/fontconfig/src/fccompat.c
@@ -170,14 +170,27 @@ FcRandom(void)
     static struct random_data fcrandbuf;
     static char statebuf[256];
     static FcBool initialized = FcFalse;
+#ifdef _AIX
+    static char *retval;
+    long res;
+#endif
 
     if (initialized != FcTrue)
     {
-	initstate_r(time(NULL), statebuf, 256, &fcrandbuf);
+#ifdef _AIX
+	initstate_r (time (NULL), statebuf, 256, &retval, &fcrandbuf);
+#else
+	initstate_r (time (NULL), statebuf, 256, &fcrandbuf);
+#endif
 	initialized = FcTrue;
     }
 
-    random_r(&fcrandbuf, &result);
+#ifdef _AIX
+    random_r (&res, &fcrandbuf);
+    result = (int32_t)res;
+#else
+    random_r (&fcrandbuf, &result);
+#endif
 #elif HAVE_RANDOM
     static char statebuf[256];
     char *state;
@@ -185,30 +198,30 @@ FcRandom(void)
 
     if (initialized != FcTrue)
     {
-	state = initstate(time(NULL), statebuf, 256);
+	state = initstate (time (NULL), statebuf, 256);
 	initialized = FcTrue;
     }
     else
-	state = setstate(statebuf);
+	state = setstate (statebuf);
 
-    result = random();
+    result = random ();
 
-    setstate(state);
+    setstate (state);
 #elif HAVE_LRAND48
-    result = lrand48();
+    result = lrand48 ();
 #elif HAVE_RAND_R
-    static unsigned int seed = time(NULL);
+    static unsigned int seed = time (NULL);
 
-    result = rand_r(&seed);
+    result = rand_r (&seed);
 #elif HAVE_RAND
     static FcBool initialized = FcFalse;
 
     if (initialized != FcTrue)
     {
-	srand(time(NULL));
+	srand (time (NULL));
 	initialized = FcTrue;
     }
-    result = rand();
+    result = rand ();
 #else
 # error no random number generator function available.
 #endif
diff --git a/fontconfig/src/fcfreetype.c b/fontconfig/src/fcfreetype.c
index e39430762..d271d69e2 100644
--- a/fontconfig/src/fcfreetype.c
+++ b/fontconfig/src/fcfreetype.c
@@ -1586,7 +1586,7 @@ FcFreeTypeQueryFace (const FT_Face  face,
 	}
 	if (width == -1 &&
 	    FT_Get_BDF_Property (face, "SETWIDTH_NAME", &prop) == 0 &&
-	    prop.type == BDF_PROPERTY_TYPE_ATOM)
+	    prop.type == BDF_PROPERTY_TYPE_ATOM && prop.u.atom != NULL)
 	{
 	    width = FcIsWidth ((FcChar8 *) prop.u.atom);
 	    if (FcDebug () & FC_DBG_SCANV)
@@ -1716,7 +1716,7 @@ bail3:
     /* For PCF fonts, override the computed spacing with the one from
        the property */
     if(FT_Get_BDF_Property(face, "SPACING", &prop) == 0 &&
-       prop.type == BDF_PROPERTY_TYPE_ATOM) {
+       prop.type == BDF_PROPERTY_TYPE_ATOM && prop.u.atom != NULL) {
         if(!strcmp(prop.u.atom, "c") || !strcmp(prop.u.atom, "C"))
             spacing = FC_CHARCELL;
         else if(!strcmp(prop.u.atom, "m") || !strcmp(prop.u.atom, "M"))
diff --git a/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c
index ff8e88455..f384767cc 100644
--- a/fontconfig/src/fcstat.c
+++ b/fontconfig/src/fcstat.c
@@ -30,6 +30,9 @@
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
 #endif
+#ifdef HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#endif
 #ifdef HAVE_SYS_STATFS_H
 #include <sys/statfs.h>
 #endif