Merge remote-tracking branch 'origin/released'

* origin/released:
  Opdated to openssl-1.0.1h xkeyboard-config fontconfig libX11 libxcb xcb-proto mesa xserver git update 26 June 2014

Conflicts:
	openssl/Makefile

75 files changed, 0 insertions, 0 deletions

diff --git a/openssl/include/openssl/aes.h b/openssl/include/openssl/aes.h
index f555c13ed..f555c13ed 100644..120000
--- a/openssl/include/openssl/aes.h
+++ b/openssl/include/openssl/aes.h
diff --git a/openssl/include/openssl/asn1.h b/openssl/include/openssl/asn1.h
index dd514954a..dd514954a 100644..120000
--- a/openssl/include/openssl/asn1.h
+++ b/openssl/include/openssl/asn1.h
diff --git a/openssl/include/openssl/asn1_mac.h b/openssl/include/openssl/asn1_mac.h
index 97781d993..97781d993 100644..120000
--- a/openssl/include/openssl/asn1_mac.h
+++ b/openssl/include/openssl/asn1_mac.h
diff --git a/openssl/include/openssl/asn1t.h b/openssl/include/openssl/asn1t.h
index 31c87c388..31c87c388 100644..120000
--- a/openssl/include/openssl/asn1t.h
+++ b/openssl/include/openssl/asn1t.h
diff --git a/openssl/include/openssl/bio.h b/openssl/include/openssl/bio.h
index c598b6f73..c598b6f73 100644..120000
--- a/openssl/include/openssl/bio.h
+++ b/openssl/include/openssl/bio.h
diff --git a/openssl/include/openssl/blowfish.h b/openssl/include/openssl/blowfish.h
index 88bf92234..88bf92234 100644..120000
--- a/openssl/include/openssl/blowfish.h
+++ b/openssl/include/openssl/blowfish.h
diff --git a/openssl/include/openssl/bn.h b/openssl/include/openssl/bn.h
index 5c251c135..5c251c135 100644..120000
--- a/openssl/include/openssl/bn.h
+++ b/openssl/include/openssl/bn.h
diff --git a/openssl/include/openssl/buffer.h b/openssl/include/openssl/buffer.h
index 76ea7114a..76ea7114a 100644..120000
--- a/openssl/include/openssl/buffer.h
+++ b/openssl/include/openssl/buffer.h
diff --git a/openssl/include/openssl/camellia.h b/openssl/include/openssl/camellia.h
index ad10f9792..ad10f9792 100644..120000
--- a/openssl/include/openssl/camellia.h
+++ b/openssl/include/openssl/camellia.h
diff --git a/openssl/include/openssl/cast.h b/openssl/include/openssl/cast.h
index b775ab04b..b775ab04b 100644..120000
--- a/openssl/include/openssl/cast.h
+++ b/openssl/include/openssl/cast.h
diff --git a/openssl/include/openssl/cmac.h b/openssl/include/openssl/cmac.h
index bfb70c468..bfb70c468 100644..120000
--- a/openssl/include/openssl/cmac.h
+++ b/openssl/include/openssl/cmac.h
diff --git a/openssl/include/openssl/cms.h b/openssl/include/openssl/cms.h
index 0f651adde..0f651adde 100644..120000
--- a/openssl/include/openssl/cms.h
+++ b/openssl/include/openssl/cms.h
diff --git a/openssl/include/openssl/comp.h b/openssl/include/openssl/comp.h
index 712c9d4ae..712c9d4ae 100644..120000
--- a/openssl/include/openssl/comp.h
+++ b/openssl/include/openssl/comp.h
diff --git a/openssl/include/openssl/conf.h b/openssl/include/openssl/conf.h
index 44156b189..44156b189 100644..120000
--- a/openssl/include/openssl/conf.h
+++ b/openssl/include/openssl/conf.h
diff --git a/openssl/include/openssl/conf_api.h b/openssl/include/openssl/conf_api.h
index 26b42198a..26b42198a 100644..120000
--- a/openssl/include/openssl/conf_api.h
+++ b/openssl/include/openssl/conf_api.h
diff --git a/openssl/include/openssl/crypto.h b/openssl/include/openssl/crypto.h
index 2f3f63cb0..2f3f63cb0 100644..120000
--- a/openssl/include/openssl/crypto.h
+++ b/openssl/include/openssl/crypto.h
diff --git a/openssl/include/openssl/des.h b/openssl/include/openssl/des.h
index 5eb7c88b3..5eb7c88b3 100644..120000
--- a/openssl/include/openssl/des.h
+++ b/openssl/include/openssl/des.h
diff --git a/openssl/include/openssl/des_old.h b/openssl/include/openssl/des_old.h
index 970989880..970989880 100644..120000
--- a/openssl/include/openssl/des_old.h
+++ b/openssl/include/openssl/des_old.h
diff --git a/openssl/include/openssl/dh.h b/openssl/include/openssl/dh.h
index c0eacb5eb..c0eacb5eb 100644..120000
--- a/openssl/include/openssl/dh.h
+++ b/openssl/include/openssl/dh.h
diff --git a/openssl/include/openssl/dsa.h b/openssl/include/openssl/dsa.h
index ad4695f9b..ad4695f9b 100644..120000
--- a/openssl/include/openssl/dsa.h
+++ b/openssl/include/openssl/dsa.h
diff --git a/openssl/include/openssl/dso.h b/openssl/include/openssl/dso.h
index b1f215daf..b1f215daf 100644..120000
--- a/openssl/include/openssl/dso.h
+++ b/openssl/include/openssl/dso.h
diff --git a/openssl/include/openssl/dtls1.h b/openssl/include/openssl/dtls1.h
index 95aef9913..95aef9913 100644..120000
--- a/openssl/include/openssl/dtls1.h
+++ b/openssl/include/openssl/dtls1.h
diff --git a/openssl/include/openssl/e_os2.h b/openssl/include/openssl/e_os2.h
index 0e8c03992..0e8c03992 100644..120000
--- a/openssl/include/openssl/e_os2.h
+++ b/openssl/include/openssl/e_os2.h
diff --git a/openssl/include/openssl/ebcdic.h b/openssl/include/openssl/ebcdic.h
index a7ee60e0a..a7ee60e0a 100644..120000
--- a/openssl/include/openssl/ebcdic.h
+++ b/openssl/include/openssl/ebcdic.h
diff --git a/openssl/include/openssl/ec.h b/openssl/include/openssl/ec.h
index 245497eda..245497eda 100644..120000
--- a/openssl/include/openssl/ec.h
+++ b/openssl/include/openssl/ec.h
diff --git a/openssl/include/openssl/ecdh.h b/openssl/include/openssl/ecdh.h
index 3fd1c3ba3..3fd1c3ba3 100644..120000
--- a/openssl/include/openssl/ecdh.h
+++ b/openssl/include/openssl/ecdh.h
diff --git a/openssl/include/openssl/ecdsa.h b/openssl/include/openssl/ecdsa.h
index e48acc669..e48acc669 100644..120000
--- a/openssl/include/openssl/ecdsa.h
+++ b/openssl/include/openssl/ecdsa.h
diff --git a/openssl/include/openssl/engine.h b/openssl/include/openssl/engine.h
index a02073e32..a02073e32 100644..120000
--- a/openssl/include/openssl/engine.h
+++ b/openssl/include/openssl/engine.h
diff --git a/openssl/include/openssl/err.h b/openssl/include/openssl/err.h
index 20f65bd9c..20f65bd9c 100644..120000
--- a/openssl/include/openssl/err.h
+++ b/openssl/include/openssl/err.h
diff --git a/openssl/include/openssl/evp.h b/openssl/include/openssl/evp.h
index 7e3a904ae..7e3a904ae 100644..120000
--- a/openssl/include/openssl/evp.h
+++ b/openssl/include/openssl/evp.h
diff --git a/openssl/include/openssl/hmac.h b/openssl/include/openssl/hmac.h
index de19ba7ed..de19ba7ed 100644..120000
--- a/openssl/include/openssl/hmac.h
+++ b/openssl/include/openssl/hmac.h
diff --git a/openssl/include/openssl/idea.h b/openssl/include/openssl/idea.h
index 724fa3458..724fa3458 100644..120000
--- a/openssl/include/openssl/idea.h
+++ b/openssl/include/openssl/idea.h
diff --git a/openssl/include/openssl/krb5_asn.h b/openssl/include/openssl/krb5_asn.h
index 1172e522e..1172e522e 100644..120000
--- a/openssl/include/openssl/krb5_asn.h
+++ b/openssl/include/openssl/krb5_asn.h
diff --git a/openssl/include/openssl/kssl.h b/openssl/include/openssl/kssl.h
index 2e5c2cd4d..2e5c2cd4d 100644..120000
--- a/openssl/include/openssl/kssl.h
+++ b/openssl/include/openssl/kssl.h
diff --git a/openssl/include/openssl/lhash.h b/openssl/include/openssl/lhash.h
index 56eb09918..56eb09918 100644..120000
--- a/openssl/include/openssl/lhash.h
+++ b/openssl/include/openssl/lhash.h
diff --git a/openssl/include/openssl/md4.h b/openssl/include/openssl/md4.h
index 4ff863e7f..4ff863e7f 100644..120000
--- a/openssl/include/openssl/md4.h
+++ b/openssl/include/openssl/md4.h
diff --git a/openssl/include/openssl/md5.h b/openssl/include/openssl/md5.h
index 26fa47eb5..26fa47eb5 100644..120000
--- a/openssl/include/openssl/md5.h
+++ b/openssl/include/openssl/md5.h
diff --git a/openssl/include/openssl/mdc2.h b/openssl/include/openssl/mdc2.h
index 0bc32f121..0bc32f121 100644..120000
--- a/openssl/include/openssl/mdc2.h
+++ b/openssl/include/openssl/mdc2.h
diff --git a/openssl/include/openssl/modes.h b/openssl/include/openssl/modes.h
index ccc172827..ccc172827 100644..120000
--- a/openssl/include/openssl/modes.h
+++ b/openssl/include/openssl/modes.h
diff --git a/openssl/include/openssl/obj_mac.h b/openssl/include/openssl/obj_mac.h
index 0f443c828..0f443c828 100644..120000
--- a/openssl/include/openssl/obj_mac.h
+++ b/openssl/include/openssl/obj_mac.h
diff --git a/openssl/include/openssl/objects.h b/openssl/include/openssl/objects.h
index 7bd145ca0..7bd145ca0 100644..120000
--- a/openssl/include/openssl/objects.h
+++ b/openssl/include/openssl/objects.h
diff --git a/openssl/include/openssl/ocsp.h b/openssl/include/openssl/ocsp.h
index 08288c84a..08288c84a 100644..120000
--- a/openssl/include/openssl/ocsp.h
+++ b/openssl/include/openssl/ocsp.h
diff --git a/openssl/include/openssl/opensslconf.h b/openssl/include/openssl/opensslconf.h
index 25d2bea96..25d2bea96 100644..120000
--- a/openssl/include/openssl/opensslconf.h
+++ b/openssl/include/openssl/opensslconf.h
diff --git a/openssl/include/openssl/opensslv.h b/openssl/include/openssl/opensslv.h
index f314f5fc7..f314f5fc7 100644..120000
--- a/openssl/include/openssl/opensslv.h
+++ b/openssl/include/openssl/opensslv.h
diff --git a/openssl/include/openssl/ossl_typ.h b/openssl/include/openssl/ossl_typ.h
index e8f42456e..e8f42456e 100644..120000
--- a/openssl/include/openssl/ossl_typ.h
+++ b/openssl/include/openssl/ossl_typ.h
diff --git a/openssl/include/openssl/pem.h b/openssl/include/openssl/pem.h
index ca371423e..ca371423e 100644..120000
--- a/openssl/include/openssl/pem.h
+++ b/openssl/include/openssl/pem.h
diff --git a/openssl/include/openssl/pem2.h b/openssl/include/openssl/pem2.h
index c734dbdc3..c734dbdc3 100644..120000
--- a/openssl/include/openssl/pem2.h
+++ b/openssl/include/openssl/pem2.h
diff --git a/openssl/include/openssl/pkcs12.h b/openssl/include/openssl/pkcs12.h
index eebba7778..eebba7778 100644..120000
--- a/openssl/include/openssl/pkcs12.h
+++ b/openssl/include/openssl/pkcs12.h
diff --git a/openssl/include/openssl/pkcs7.h b/openssl/include/openssl/pkcs7.h
index 73e1b23f7..73e1b23f7 100644..120000
--- a/openssl/include/openssl/pkcs7.h
+++ b/openssl/include/openssl/pkcs7.h
diff --git a/openssl/include/openssl/pqueue.h b/openssl/include/openssl/pqueue.h
index 93817c2df..93817c2df 100644..120000
--- a/openssl/include/openssl/pqueue.h
+++ b/openssl/include/openssl/pqueue.h
diff --git a/openssl/include/openssl/rand.h b/openssl/include/openssl/rand.h
index 11231f852..11231f852 100644..120000
--- a/openssl/include/openssl/rand.h
+++ b/openssl/include/openssl/rand.h
diff --git a/openssl/include/openssl/rc2.h b/openssl/include/openssl/rc2.h
index bb5a05c5d..bb5a05c5d 100644..120000
--- a/openssl/include/openssl/rc2.h
+++ b/openssl/include/openssl/rc2.h
diff --git a/openssl/include/openssl/rc4.h b/openssl/include/openssl/rc4.h
index ef7deeb7d..ef7deeb7d 100644..120000
--- a/openssl/include/openssl/rc4.h
+++ b/openssl/include/openssl/rc4.h
diff --git a/openssl/include/openssl/ripemd.h b/openssl/include/openssl/ripemd.h
index 200f562fa..200f562fa 100644..120000
--- a/openssl/include/openssl/ripemd.h
+++ b/openssl/include/openssl/ripemd.h
diff --git a/openssl/include/openssl/rsa.h b/openssl/include/openssl/rsa.h
index 3e5a65475..3e5a65475 100644..120000
--- a/openssl/include/openssl/rsa.h
+++ b/openssl/include/openssl/rsa.h
diff --git a/openssl/include/openssl/safestack.h b/openssl/include/openssl/safestack.h
index 8ca5b4cc7..8ca5b4cc7 100644..120000
--- a/openssl/include/openssl/safestack.h
+++ b/openssl/include/openssl/safestack.h
diff --git a/openssl/include/openssl/seed.h b/openssl/include/openssl/seed.h
index 05d04a50b..05d04a50b 100644..120000
--- a/openssl/include/openssl/seed.h
+++ b/openssl/include/openssl/seed.h
diff --git a/openssl/include/openssl/sha.h b/openssl/include/openssl/sha.h
index 3025cd5d7..3025cd5d7 100644..120000
--- a/openssl/include/openssl/sha.h
+++ b/openssl/include/openssl/sha.h
diff --git a/openssl/include/openssl/srp.h b/openssl/include/openssl/srp.h
index 16b73ebd3..16b73ebd3 100644..120000
--- a/openssl/include/openssl/srp.h
+++ b/openssl/include/openssl/srp.h
diff --git a/openssl/include/openssl/srtp.h b/openssl/include/openssl/srtp.h
index 9800e4ee4..9800e4ee4 100644..120000
--- a/openssl/include/openssl/srtp.h
+++ b/openssl/include/openssl/srtp.h
diff --git a/openssl/include/openssl/ssl.h b/openssl/include/openssl/ssl.h
index e87d9be8f..e87d9be8f 100644..120000
--- a/openssl/include/openssl/ssl.h
+++ b/openssl/include/openssl/ssl.h
diff --git a/openssl/include/openssl/ssl2.h b/openssl/include/openssl/ssl2.h
index 72876883c..72876883c 100644..120000
--- a/openssl/include/openssl/ssl2.h
+++ b/openssl/include/openssl/ssl2.h
diff --git a/openssl/include/openssl/ssl23.h b/openssl/include/openssl/ssl23.h
index 5605052d7..5605052d7 100644..120000
--- a/openssl/include/openssl/ssl23.h
+++ b/openssl/include/openssl/ssl23.h
diff --git a/openssl/include/openssl/ssl3.h b/openssl/include/openssl/ssl3.h
index 5ae2507f2..5ae2507f2 100644..120000
--- a/openssl/include/openssl/ssl3.h
+++ b/openssl/include/openssl/ssl3.h
diff --git a/openssl/include/openssl/stack.h b/openssl/include/openssl/stack.h
index 61d342fcd..61d342fcd 100644..120000
--- a/openssl/include/openssl/stack.h
+++ b/openssl/include/openssl/stack.h
diff --git a/openssl/include/openssl/symhacks.h b/openssl/include/openssl/symhacks.h
index 4a1a6913c..4a1a6913c 100644..120000
--- a/openssl/include/openssl/symhacks.h
+++ b/openssl/include/openssl/symhacks.h
diff --git a/openssl/include/openssl/tls1.h b/openssl/include/openssl/tls1.h
index 53d998fbd..53d998fbd 100644..120000
--- a/openssl/include/openssl/tls1.h
+++ b/openssl/include/openssl/tls1.h
diff --git a/openssl/include/openssl/ts.h b/openssl/include/openssl/ts.h
index a75d99db1..a75d99db1 100644..120000
--- a/openssl/include/openssl/ts.h
+++ b/openssl/include/openssl/ts.h
diff --git a/openssl/include/openssl/txt_db.h b/openssl/include/openssl/txt_db.h
index f672e3552..f672e3552 100644..120000
--- a/openssl/include/openssl/txt_db.h
+++ b/openssl/include/openssl/txt_db.h
diff --git a/openssl/include/openssl/ui.h b/openssl/include/openssl/ui.h
index b07defad7..b07defad7 100644..120000
--- a/openssl/include/openssl/ui.h
+++ b/openssl/include/openssl/ui.h
diff --git a/openssl/include/openssl/ui_compat.h b/openssl/include/openssl/ui_compat.h
index d8c74b7c5..d8c74b7c5 100644..120000
--- a/openssl/include/openssl/ui_compat.h
+++ b/openssl/include/openssl/ui_compat.h
diff --git a/openssl/include/openssl/whrlpool.h b/openssl/include/openssl/whrlpool.h
index 125a0816f..125a0816f 100644..120000
--- a/openssl/include/openssl/whrlpool.h
+++ b/openssl/include/openssl/whrlpool.h
diff --git a/openssl/include/openssl/x509.h b/openssl/include/openssl/x509.h
index b2b85c524..b2b85c524 100644..120000
--- a/openssl/include/openssl/x509.h
+++ b/openssl/include/openssl/x509.h
diff --git a/openssl/include/openssl/x509_vfy.h b/openssl/include/openssl/x509_vfy.h
index bb99ad498..bb99ad498 100644..120000
--- a/openssl/include/openssl/x509_vfy.h
+++ b/openssl/include/openssl/x509_vfy.h
diff --git a/openssl/include/openssl/x509v3.h b/openssl/include/openssl/x509v3.h
index 63d12f9dc..63d12f9dc 100644..120000
--- a/openssl/include/openssl/x509v3.h
+++ b/openssl/include/openssl/x509v3.h