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

34 files changed, 36 insertions, 5 deletions

diff --git a/openssl/test/Makefile b/openssl/test/Makefile
index 4c9eabcc2..005f2e8d6 100644
--- a/openssl/test/Makefile
+++ b/openssl/test/Makefile
@@ -63,6 +63,7 @@ IGETEST=	igetest
 JPAKETEST=	jpaketest
 SRPTEST=	srptest
 ASN1TEST=	asn1test
+HEARTBEATTEST= heartbeat_test
 
 TESTS=		alltests
 
@@ -74,7 +75,7 @@ EXE=	$(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT)  $(ECDSATEST)$(EXE_EXT) $(ECDHTEST)
 	$(RANDTEST)$(EXE_EXT) $(DHTEST)$(EXE_EXT) $(ENGINETEST)$(EXE_EXT) \
 	$(BFTEST)$(EXE_EXT) $(CASTTEST)$(EXE_EXT) $(SSLTEST)$(EXE_EXT) $(EXPTEST)$(EXE_EXT) $(DSATEST)$(EXE_EXT) $(RSATEST)$(EXE_EXT) \
 	$(EVPTEST)$(EXE_EXT) $(IGETEST)$(EXE_EXT) $(JPAKETEST)$(EXE_EXT) $(SRPTEST)$(EXE_EXT) \
-	$(ASN1TEST)$(EXE_EXT)
+	$(ASN1TEST)$(EXE_EXT) $(HEARTBEATTEST)$(EXE_EXT)
 
 # $(METHTEST)$(EXE_EXT)
 
@@ -86,7 +87,8 @@ OBJ=	$(BNTEST).o $(ECTEST).o  $(ECDSATEST).o $(ECDHTEST).o $(IDEATEST).o \
 	$(MDC2TEST).o $(RMDTEST).o \
 	$(RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \
 	$(BFTEST).o  $(SSLTEST).o  $(DSATEST).o  $(EXPTEST).o $(RSATEST).o \
-	$(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o
+	$(EVPTEST).o $(IGETEST).o $(JPAKETEST).o $(ASN1TEST).o $(HEARTBEATTEST).o
+
 SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
 	$(MD2TEST).c  $(MD4TEST).c $(MD5TEST).c \
 	$(HMACTEST).c $(WPTEST).c \
@@ -94,7 +96,8 @@ SRC=	$(BNTEST).c $(ECTEST).c  $(ECDSATEST).c $(ECDHTEST).c $(IDEATEST).c \
 	$(DESTEST).c $(SHATEST).c $(SHA1TEST).c $(MDC2TEST).c $(RMDTEST).c \
 	$(RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \
 	$(BFTEST).c  $(SSLTEST).c $(DSATEST).c   $(EXPTEST).c $(RSATEST).c \
-	$(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c
+	$(EVPTEST).c $(IGETEST).c $(JPAKETEST).c $(SRPTEST).c $(ASN1TEST).c \
+	$(HEARTBEATTEST).c
 
 EXHEADER= 
 HEADER=	$(EXHEADER)
@@ -137,7 +140,7 @@ alltests: \
 	test_enc test_x509 test_rsa test_crl test_sid \
 	test_gen test_req test_pkcs7 test_verify test_dh test_dsa \
 	test_ss test_ca test_engine test_evp test_ssl test_tsa test_ige \
-	test_jpake test_srp test_cms
+	test_jpake test_srp test_cms test_heartbeat
 
 test_evp:
 	../util/shlib_wrap.sh ./$(EVPTEST) evptests.txt
@@ -227,7 +230,7 @@ test_bn:
 	@../util/shlib_wrap.sh ./$(BNTEST) >tmp.bntest
 	@echo quit >>tmp.bntest
 	@echo "running bc"
-	@<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
+	@<tmp.bntest sh -c "`sh ./bctest ignore`" | $(PERL) -e '$$i=0; while (<STDIN>) {if (/^test (.*)/) {print STDERR "\nverify $$1";} elsif (!/^0\r?$$/) {die "\nFailed! bc: $$_";} else {print STDERR "."; $$i++;}} print STDERR "\n$$i tests passed\n"'
 	@echo 'test a^b%c implementations'
 	../util/shlib_wrap.sh ./$(EXPTEST)
 
@@ -318,6 +321,9 @@ test_srp: $(SRPTEST)$(EXE_EXT)
 	@echo "Test SRP"
 	../util/shlib_wrap.sh ./srptest
 
+test_heartbeat: $(HEARTBEATTEST)$(EXE_EXT)
+	../util/shlib_wrap.sh ./$(HEARTBEATTEST)
+
 lint:
 	lint -DLINT $(INCLUDES) $(SRC)>fluff
 
@@ -469,6 +475,9 @@ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
 $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
 	@target=$(SRPTEST); $(BUILD_CMD)
 
+$(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
+	@target=$(HEARTBEATTEST); $(BUILD_CMD)
+
 #$(AESTEST).o: $(AESTEST).c
 #	$(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
 
@@ -604,6 +613,27 @@ exptest.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 exptest.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
 exptest.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 exptest.o: ../include/openssl/symhacks.h exptest.c
+heartbeat_test.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
+heartbeat_test.o: ../include/openssl/buffer.h ../include/openssl/comp.h
+heartbeat_test.o: ../include/openssl/crypto.h ../include/openssl/dsa.h
+heartbeat_test.o: ../include/openssl/dtls1.h ../include/openssl/e_os2.h
+heartbeat_test.o: ../include/openssl/ec.h ../include/openssl/ecdh.h
+heartbeat_test.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
+heartbeat_test.o: ../include/openssl/evp.h ../include/openssl/hmac.h
+heartbeat_test.o: ../include/openssl/kssl.h ../include/openssl/lhash.h
+heartbeat_test.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+heartbeat_test.o: ../include/openssl/opensslconf.h
+heartbeat_test.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+heartbeat_test.o: ../include/openssl/pem.h ../include/openssl/pem2.h
+heartbeat_test.o: ../include/openssl/pkcs7.h ../include/openssl/pqueue.h
+heartbeat_test.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+heartbeat_test.o: ../include/openssl/sha.h ../include/openssl/srtp.h
+heartbeat_test.o: ../include/openssl/ssl.h ../include/openssl/ssl2.h
+heartbeat_test.o: ../include/openssl/ssl23.h ../include/openssl/ssl3.h
+heartbeat_test.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+heartbeat_test.o: ../include/openssl/tls1.h ../include/openssl/x509.h
+heartbeat_test.o: ../include/openssl/x509_vfy.h ../ssl/ssl_locl.h
+heartbeat_test.o: heartbeat_test.c
 hmactest.o: ../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
 hmactest.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 hmactest.o: ../include/openssl/evp.h ../include/openssl/hmac.h
diff --git a/openssl/test/bftest.c b/openssl/test/bftest.c
index 78b1749a4..78b1749a4 100644..120000
--- a/openssl/test/bftest.c
+++ b/openssl/test/bftest.c
diff --git a/openssl/test/bntest.c b/openssl/test/bntest.c
index 03f54a238..03f54a238 100644..120000
--- a/openssl/test/bntest.c
+++ b/openssl/test/bntest.c
diff --git a/openssl/test/casttest.c b/openssl/test/casttest.c
index ac7ede8d7..ac7ede8d7 100644..120000
--- a/openssl/test/casttest.c
+++ b/openssl/test/casttest.c
diff --git a/openssl/test/destest.c b/openssl/test/destest.c
index 5988c7303..5988c7303 100644..120000
--- a/openssl/test/destest.c
+++ b/openssl/test/destest.c
diff --git a/openssl/test/dhtest.c b/openssl/test/dhtest.c
index 9a67f9162..9a67f9162 100644..120000
--- a/openssl/test/dhtest.c
+++ b/openssl/test/dhtest.c
diff --git a/openssl/test/dsatest.c b/openssl/test/dsatest.c
index 16a1b5a34..16a1b5a34 100644..120000
--- a/openssl/test/dsatest.c
+++ b/openssl/test/dsatest.c
diff --git a/openssl/test/ecdhtest.c b/openssl/test/ecdhtest.c
index 206d98686..206d98686 100644..120000
--- a/openssl/test/ecdhtest.c
+++ b/openssl/test/ecdhtest.c
diff --git a/openssl/test/ecdsatest.c b/openssl/test/ecdsatest.c
index 441082ba2..441082ba2 100644..120000
--- a/openssl/test/ecdsatest.c
+++ b/openssl/test/ecdsatest.c
diff --git a/openssl/test/ectest.c b/openssl/test/ectest.c
index df1831f81..df1831f81 100644..120000
--- a/openssl/test/ectest.c
+++ b/openssl/test/ectest.c
diff --git a/openssl/test/enginetest.c b/openssl/test/enginetest.c
index 5c74a6f41..5c74a6f41 100644..120000
--- a/openssl/test/enginetest.c
+++ b/openssl/test/enginetest.c
diff --git a/openssl/test/evp_test.c b/openssl/test/evp_test.c
index 074162812..074162812 100644..120000
--- a/openssl/test/evp_test.c
+++ b/openssl/test/evp_test.c
diff --git a/openssl/test/exptest.c b/openssl/test/exptest.c
index 50ccf71cb..50ccf71cb 100644..120000
--- a/openssl/test/exptest.c
+++ b/openssl/test/exptest.c
diff --git a/openssl/test/heartbeat_test.c b/openssl/test/heartbeat_test.c
new file mode 120000
index 000000000..79576fd5a
--- /dev/null
+++ b/openssl/test/heartbeat_test.c
@@ -0,0 +1 @@
+../ssl/heartbeat_test.c
\ No newline at end of file
diff --git a/openssl/test/hmactest.c b/openssl/test/hmactest.c
index 353ee2c7f..353ee2c7f 100644..120000
--- a/openssl/test/hmactest.c
+++ b/openssl/test/hmactest.c
diff --git a/openssl/test/ideatest.c b/openssl/test/ideatest.c
index a9bfb3d48..a9bfb3d48 100644..120000
--- a/openssl/test/ideatest.c
+++ b/openssl/test/ideatest.c
diff --git a/openssl/test/jpaketest.c b/openssl/test/jpaketest.c
index 49f44f8b6..49f44f8b6 100644..120000
--- a/openssl/test/jpaketest.c
+++ b/openssl/test/jpaketest.c
diff --git a/openssl/test/md2test.c b/openssl/test/md2test.c
index 49f44f8b6..49f44f8b6 100644..120000
--- a/openssl/test/md2test.c
+++ b/openssl/test/md2test.c
diff --git a/openssl/test/md4test.c b/openssl/test/md4test.c
index 1509be911..1509be911 100644..120000
--- a/openssl/test/md4test.c
+++ b/openssl/test/md4test.c
diff --git a/openssl/test/md5test.c b/openssl/test/md5test.c
index 20f4aaf0a..20f4aaf0a 100644..120000
--- a/openssl/test/md5test.c
+++ b/openssl/test/md5test.c
diff --git a/openssl/test/mdc2test.c b/openssl/test/mdc2test.c
index c4ffe4835..c4ffe4835 100644..120000
--- a/openssl/test/mdc2test.c
+++ b/openssl/test/mdc2test.c
diff --git a/openssl/test/randtest.c b/openssl/test/randtest.c
index a2b107a2b..a2b107a2b 100644..120000
--- a/openssl/test/randtest.c
+++ b/openssl/test/randtest.c
diff --git a/openssl/test/rc2test.c b/openssl/test/rc2test.c
index 5c53ad984..5c53ad984 100644..120000
--- a/openssl/test/rc2test.c
+++ b/openssl/test/rc2test.c
diff --git a/openssl/test/rc4test.c b/openssl/test/rc4test.c
index 061ac3773..061ac3773 100644..120000
--- a/openssl/test/rc4test.c
+++ b/openssl/test/rc4test.c
diff --git a/openssl/test/rc5test.c b/openssl/test/rc5test.c
index 49f44f8b6..49f44f8b6 100644..120000
--- a/openssl/test/rc5test.c
+++ b/openssl/test/rc5test.c
diff --git a/openssl/test/rmdtest.c b/openssl/test/rmdtest.c
index ce6646065..ce6646065 100644..120000
--- a/openssl/test/rmdtest.c
+++ b/openssl/test/rmdtest.c
diff --git a/openssl/test/rsa_test.c b/openssl/test/rsa_test.c
index aaea20d98..aaea20d98 100644..120000
--- a/openssl/test/rsa_test.c
+++ b/openssl/test/rsa_test.c
diff --git a/openssl/test/sha1test.c b/openssl/test/sha1test.c
index 8d66e9ee4..8d66e9ee4 100644..120000
--- a/openssl/test/sha1test.c
+++ b/openssl/test/sha1test.c
diff --git a/openssl/test/sha256t.c b/openssl/test/sha256t.c
index 952a50867..952a50867 100644..120000
--- a/openssl/test/sha256t.c
+++ b/openssl/test/sha256t.c
diff --git a/openssl/test/sha512t.c b/openssl/test/sha512t.c
index c80d152f1..c80d152f1 100644..120000
--- a/openssl/test/sha512t.c
+++ b/openssl/test/sha512t.c
diff --git a/openssl/test/shatest.c b/openssl/test/shatest.c
index 43cfda78f..43cfda78f 100644..120000
--- a/openssl/test/shatest.c
+++ b/openssl/test/shatest.c
diff --git a/openssl/test/srptest.c b/openssl/test/srptest.c
index 953486826..953486826 100644..120000
--- a/openssl/test/srptest.c
+++ b/openssl/test/srptest.c
diff --git a/openssl/test/ssltest.c b/openssl/test/ssltest.c
index 40191f0da..40191f0da 100644..120000
--- a/openssl/test/ssltest.c
+++ b/openssl/test/ssltest.c
diff --git a/openssl/test/wp_test.c b/openssl/test/wp_test.c
index 81b2021f3..81b2021f3 100644..120000
--- a/openssl/test/wp_test.c
+++ b/openssl/test/wp_test.c