From 7a6797db09d2736264ebd25fd77263edfbd37934 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Tue, 2 Jun 2015 05:30:41 -0400
Subject: [PATCH 1/2] Test with PyPy 2.6.0

---
 .travis/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 7c3e9de2908e..9db2743794b4 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -35,8 +35,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then
             ;;
         pypy)
             brew outdated pyenv || brew upgrade pyenv
-            pyenv install pypy-2.5.1
-            pyenv global pypy-2.5.1
+            pyenv install pypy-2.6.0
+            pyenv global pypy-2.6.0
             ;;
         pypy3)
             brew outdated pyenv || brew upgrade pyenv

From 8184147c769c71d271fd7b0a303c72535d769e18 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Tue, 2 Jun 2015 09:30:31 -0400
Subject: [PATCH 2/2] fix?

---
 src/cryptography/hazmat/bindings/commoncrypto/cf.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/cryptography/hazmat/bindings/commoncrypto/cf.py b/src/cryptography/hazmat/bindings/commoncrypto/cf.py
index 77d2d7cc20fc..3bd44f65a8ea 100644
--- a/src/cryptography/hazmat/bindings/commoncrypto/cf.py
+++ b/src/cryptography/hazmat/bindings/commoncrypto/cf.py
@@ -62,8 +62,10 @@
 };
 typedef int CFNumberType;
 
-const CFDictionaryKeyCallBacks kCFTypeDictionaryKeyCallBacks;
-const CFDictionaryValueCallBacks kCFTypeDictionaryValueCallBacks;
+/* TODO: these should both be "const", which can be added back once we switch
+   to cffi 1.0's set_source */
+CFDictionaryKeyCallBacks kCFTypeDictionaryKeyCallBacks;
+CFDictionaryValueCallBacks kCFTypeDictionaryValueCallBacks;
 
 const CFBooleanRef kCFBooleanTrue;
 const CFBooleanRef kCFBooleanFalse;