FreeBSD Bugzilla – Attachment 150003 Details for
Bug 195511
lang/python33: Fix build with LibreSSL
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Single patch for this PR for the source tree
patch-pr195511 (text/plain), 5.48 KB, created by
Bernard Spil
on 2014-11-29 22:14:33 UTC
(
hide
)
Description:
Single patch for this PR for the source tree
Filename:
MIME Type:
Creator:
Bernard Spil
Created:
2014-11-29 22:14:33 UTC
Size:
5.48 KB
patch
obsolete
>--- configure.ac.orig 2014-11-29 22:32:54.691247309 +0100 >+++ configure.ac 2014-11-29 22:37:50.663356194 +0100 >@@ -2185,6 +2185,13 @@ > AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV > AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX > >+### Fix build with LibreSSL (does not have RAND_egd) >+### PR195511, http://bugs.python.org/issue21356 >+AC_CHECK_LIB(crypto, RAND_egd, >+ AC_DEFINE(HAVE_RAND_EGD, 1, >+ [Define if the libcrypto has RAND_egd])) >+### PR195511 >+ > # only check for sem_init if thread support is requested > if test "$with_threads" = "yes" -o -z "$with_threads"; then > AC_SEARCH_LIBS(sem_init, pthread rt posix4) # 'Real Time' functions on Solaris >--- configure.orig 2014-11-29 22:33:01.712152689 +0100 >+++ configure 2014-11-29 22:38:00.520934671 +0100 >@@ -8827,6 +8827,52 @@ > fi > # Dynamic linking for HP-UX > >+### Fix build with LibreSSL (does not have RAND_egd) >+### PR195511, http://bugs.python.org/issue21356 >+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RAND_egd in -lcrypto" >&5 >+$as_echo_n "checking for RAND_egd in -lcrypto... " >&6; } >+if ${ac_cv_lib_crypto_RAND_egd+:} false; then : >+ $as_echo_n "(cached) " >&6 >+else >+ ac_check_lib_save_LIBS=$LIBS >+LIBS="-lcrypto $LIBS" >+cat confdefs.h - <<_ACEOF >conftest.$ac_ext >+/* end confdefs.h. */ >+ >+/* Override any GCC internal prototype to avoid an error. >+ Use char because int might match the return type of a GCC >+ builtin and then its argument prototype would still apply. */ >+#ifdef __cplusplus >+extern "C" >+#endif >+char RAND_egd (); >+int >+main () >+{ >+return RAND_egd (); >+ ; >+ return 0; >+} >+_ACEOF >+if ac_fn_c_try_link "$LINENO"; then : >+ ac_cv_lib_crypto_RAND_egd=yes >+else >+ ac_cv_lib_crypto_RAND_egd=no >+fi >+rm -f core conftest.err conftest.$ac_objext \ >+ conftest$ac_exeext conftest.$ac_ext >+LIBS=$ac_check_lib_save_LIBS >+fi >+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_RAND_egd" >&5 >+$as_echo "$ac_cv_lib_crypto_RAND_egd" >&6; } >+if test "x$ac_cv_lib_crypto_RAND_egd" = xyes; then : >+ >+$as_echo "#define HAVE_RAND_EGD 1" >>confdefs.h >+ >+fi >+ >+### PR195511 >+ > # only check for sem_init if thread support is requested > if test "$with_threads" = "yes" -o -z "$with_threads"; then > { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing sem_init" >&5 >--- Lib/ssl.py.orig 2014-03-09 09:40:13.000000000 +0100 >+++ Lib/ssl.py 2014-11-29 22:42:24.820894513 +0100 >@@ -78,7 +78,15 @@ > from _ssl import OP_SINGLE_ECDH_USE > except ImportError: > pass >-from _ssl import RAND_status, RAND_egd, RAND_add, RAND_bytes, RAND_pseudo_bytes >+### Fix build with LibreSSL (does not have RAND_egd) >+### PR195511, http://bugs.python.org/issue21356 >+from _ssl import RAND_status, RAND_add, RAND_bytes, RAND_pseudo_bytes >+try: >+ from _ssl import RAND_egd >+except ImportError: >+ # LibreSSL does not provide RAND_egd >+ pass >+### End PR195511 > from _ssl import ( > SSL_ERROR_ZERO_RETURN, > SSL_ERROR_WANT_READ, >--- Lib/test/test_ssl.py.orig 2014-03-09 09:40:19.000000000 +0100 >+++ Lib/test/test_ssl.py 2014-11-29 22:44:07.630157771 +0100 >@@ -130,8 +130,12 @@ > self.assertRaises(ValueError, ssl.RAND_bytes, -5) > self.assertRaises(ValueError, ssl.RAND_pseudo_bytes, -5) > >- self.assertRaises(TypeError, ssl.RAND_egd, 1) >- self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1) >+### Fix build with LibreSSL (does not have RAND_egd) >+### PR195511, http://bugs.python.org/issue21356 >+ if hasattr(ssl, 'RAND_egd'): >+ self.assertRaises(TypeError, ssl.RAND_egd, 1) >+ self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1) >+### End PR195511 > ssl.RAND_add("this is a random string", 75.0) > > @unittest.skipUnless(os.name == 'posix', 'requires posix') >--- pyconfig.h.in.orig 2014-03-09 09:40:34.000000000 +0100 >+++ pyconfig.h.in 2014-11-29 22:46:09.503928390 +0100 >@@ -660,6 +660,12 @@ > /* Define to 1 if you have the `pwrite' function. */ > #undef HAVE_PWRITE > >+/* ### Fix build with LibreSSL (does not have RAND_egd) >+ ### PR195511, http://bugs.python.org/issue21356 */ >+/* Define if the libcrypto has RAND_egd */ >+#undef HAVE_RAND_EGD >+/* ### PR195511 */ >+ > /* Define to 1 if you have the `readlink' function. */ > #undef HAVE_READLINK > >--- Modules/_ssl.c.orig 2014-03-09 09:40:26.000000000 +0100 >+++ Modules/_ssl.c 2014-11-29 23:04:07.340262966 +0100 >@@ -2559,6 +2559,9 @@ > It is necessary to seed the PRNG with RAND_add() on some platforms before\n\ > using the ssl() function."); > >+/* ### Fix build with LibreSSL (does not have RAND_egd) >+ ### PR195511, http://bugs.python.org/issue21356 */ >+#ifdef HAVE_RAND_EGD > static PyObject * > PySSL_RAND_egd(PyObject *self, PyObject *args) > { >@@ -2586,6 +2589,8 @@ > Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\ > Returns number of bytes read. Raises SSLError if connection to EGD\n\ > fails or if it does not provide enough data to seed PRNG."); >+#endif /* HAVE_RAND_EGD */ >+/* ### End PR195511 */ > > #endif /* HAVE_OPENSSL_RAND */ > >@@ -2604,8 +2609,13 @@ > PySSL_RAND_bytes_doc}, > {"RAND_pseudo_bytes", PySSL_RAND_pseudo_bytes, METH_VARARGS, > PySSL_RAND_pseudo_bytes_doc}, >+/* ### Fix build with LibreSSL (does not have RAND_egd) >+ ### PR195511, http://bugs.python.org/issue21356 */ >+#ifdef HAVE_RAND_EGD > {"RAND_egd", PySSL_RAND_egd, METH_VARARGS, > PySSL_RAND_egd_doc}, >+#endif /* HAVE_RAND_EGD */ >+/* ### End PR195511 */ > {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS, > PySSL_RAND_status_doc}, > #endif
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 195511
:
150002
| 150003 |
150004
|
150005