.if defined(WITH_OPENSSL_PORT)

CONFIGURE_ARGS+=	CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib

.endif

--- Doc/library/fcntl.rst.orig	2014-12-10 15:59:27 UTC

+++ Doc/library/fcntl.rst

@@ -50,7 +50,6 @@ The module defines the following functio

    operations are typically defined in the library module :mod:`termios` and the

    argument handling is even more complicated.

-   The op parameter is limited to values that can fit in 32-bits.

    Additional constants of interest for use as the *op* argument can be

    found in the :mod:`termios` module, under the same names as used in

    the relevant C header files.

# Description: A non-invasive partial backport of the Python3 distutils behaviour.

# This allows Python's scripts to be properly suffixed (similar to Python 3.x) on

# installation.

# Submitted by: mva

--- Lib/distutils/command/build_scripts.py.orig	2014-12-10 15:59:34 UTC

+++ Lib/distutils/command/build_scripts.py

@@ -126,6 +126,9 @@ class build_scripts (Command):

                                  file, oldmode, newmode)

                         os.chmod(file, newmode)

+        # XXX should we modify self.outfiles?

+        return outfiles

+

     # copy_scripts ()

 # class build_scripts

# Description: Some python extensions can't be compiled with clang 3.4

# Issue ID: http://bugs.python.org/issue20767

# Submitted by: antoine

--- Lib/distutils/unixccompiler.py.orig	2014-12-10 15:59:34 UTC

+++ Lib/distutils/unixccompiler.py

@@ -228,6 +228,8 @@ class UnixCCompiler(CCompiler):

         if sys.platform[:6] == "darwin":

             # MacOSX's linker doesn't understand the -R flag at all

             return "-L" + dir

+        elif sys.platform[:7] == "freebsd":

+            return "-Wl,-rpath=" + dir

         elif sys.platform[:5] == "hp-ux":

             if self._is_gcc(compiler):

                 return ["-Wl,+s", "-L" + dir]

# Fix build with LibreSSL (does not have RAND_egd)

# PR192511, http://bugs.python.org/issue21356

# Submitted by: spil.oss@gmail.org

--- Lib/socket.py.orig	2014-12-10 15:59:40 UTC

+++ Lib/socket.py

@@ -67,7 +67,6 @@ else:

     from _ssl import SSLError as sslerror

     from _ssl import \

          RAND_add, \

-         RAND_egd, \

          RAND_status, \

          SSL_ERROR_ZERO_RETURN, \

          SSL_ERROR_WANT_READ, \

@@ -78,6 +77,11 @@ else:

          SSL_ERROR_WANT_CONNECT, \

          SSL_ERROR_EOF, \

          SSL_ERROR_INVALID_ERROR_CODE

+    try:

+         from _ssl import RAND_egd

+         # LibreSSL does not provide RAND_egd

+    except ImportError:

+         pass

 import os, sys, warnings

# Fix build with LibreSSL (does not have RAND_egd)

# PR192511, http://bugs.python.org/issue21356

# Submitted by: spil.oss@gmail.org

--- Lib/ssl.py.orig	2014-12-10 15:59:40 UTC

+++ Lib/ssl.py

@@ -106,7 +106,11 @@ from _ssl import CERT_NONE, CERT_OPTIONA

 from _ssl import (VERIFY_DEFAULT, VERIFY_CRL_CHECK_LEAF, VERIFY_CRL_CHECK_CHAIN,

     VERIFY_X509_STRICT)

 from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj

-from _ssl import RAND_status, RAND_egd, RAND_add

+from _ssl import RAND_status, RAND_add

+try:

+    from _ssl import RAND_egd

+except ImportError:

+    pass

 def _import_symbols(prefix):

     for n in dir(_ssl):

# Fix build with LibreSSL (does not have RAND_egd)

# PR192511, http://bugs.python.org/issue21356

# Submitted by: spil.oss@gmail.org

--- Lib/test/test_ssl.py.orig	2014-12-10 15:59:47 UTC

+++ Lib/test/test_ssl.py

@@ -169,8 +169,9 @@ class BasicSocketTests(unittest.TestCase

             sys.stdout.write("\n RAND_status is %d (%s)\n"

                              % (v, (v and "sufficient randomness") or

                                 "insufficient randomness"))

-        self.assertRaises(TypeError, ssl.RAND_egd, 1)

-        self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)

+        if hasattr(ssl, 'RAND_egd'):

+            self.assertRaises(TypeError, ssl.RAND_egd, 1)

+            self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)

         ssl.RAND_add("this is a random string", 75.0)

     def test_parse_cert(self):

--- Modules/_ctypes/libffi/configure.orig	2014-12-10 15:59:51 UTC

+++ Modules/_ctypes/libffi/configure

@@ -7526,7 +7526,7 @@ mips64*-*linux*)

   rm -rf conftest*

   ;;

-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \

+amd64-*-freebsd*|x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \

 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)

   # Find out what ABI is being produced by ac_compile, and set linker

   # options accordingly.  Note that the listed cases only cover the

# Description: Fix _ctypes abort on import for FreeBSD/ARM. This is an issue

# for anything !apple that is using the libcompiler_rt provided by clang on arm

# PR: ports/149167 ports/184517

# Patch by: cognet@ (to be upstreamed @ LLVM)

--- Modules/_ctypes/libffi/src/arm/ffi.c.orig	2014-12-10 15:59:52 UTC

+++ Modules/_ctypes/libffi/src/arm/ffi.c

@@ -33,6 +33,11 @@

 #include <stdlib.h>

+#if defined(__FreeBSD__) && defined(__arm__)

+#include <sys/types.h>

+#include <machine/sysarch.h>

+#endif

+

 /* Forward declares. */

 static int vfp_type_p (ffi_type *);

 static void layout_vfp_args (ffi_cif *);

@@ -751,6 +756,16 @@ ffi_closure_free (void *ptr)

 #else

+#if defined(__FreeBSD__) && defined(__arm__)

+#define __clear_cache(start, end) do { \

+		struct arm_sync_icache_args ua; 		\

+								\

+		ua.addr = (uintptr_t)(start);			\

+		ua.len = (char *)(end) - (char *)start;		\

+		sysarch(ARM_SYNC_ICACHE, &ua);			\

+	} while (0);

+#endif

+

 #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX)				\

 ({ unsigned char *__tramp = (unsigned char*)(TRAMP);			\

    unsigned int  __fun = (unsigned int)(FUN);				\

# Fix build with LibreSSL (does not have RAND_egd)

# PR192511, http://bugs.python.org/issue21356

# Submitted by: spil.oss@gmail.org

--- Modules/_ssl.c.orig	2014-12-10 15:59:53 UTC

+++ Modules/_ssl.c

@@ -3301,6 +3301,7 @@ Returns 1 if the OpenSSL PRNG has been s

 It is necessary to seed the PRNG with RAND_add() on some platforms before\n\

 using the ssl() function.");

+#ifdef HAVE_RAND_EGD

 static PyObject *

 PySSL_RAND_egd(PyObject *self, PyObject *arg)

 {

@@ -3326,6 +3327,7 @@ PyDoc_STRVAR(PySSL_RAND_egd_doc,

 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 */

 #endif /* HAVE_OPENSSL_RAND */

@@ -3720,8 +3722,10 @@ static PyMethodDef PySSL_methods[] = {

 #ifdef HAVE_OPENSSL_RAND

     {"RAND_add",            PySSL_RAND_add, METH_VARARGS,

      PySSL_RAND_add_doc},

+#ifdef HAVE_RAND_EGD

     {"RAND_egd",            PySSL_RAND_egd, METH_VARARGS,

      PySSL_RAND_egd_doc},

+#endif /* HAVE_RAND_EGD */

     {"RAND_status",         (PyCFunction)PySSL_RAND_status, METH_NOARGS,

      PySSL_RAND_status_doc},

 #endif

--- Modules/fcntlmodule.c.orig	2014-12-10 15:59:54 UTC

+++ Modules/fcntlmodule.c

@@ -98,20 +98,15 @@ fcntl_ioctl(PyObject *self, PyObject *ar

 {

 #define IOCTL_BUFSZ 1024

     int fd;

-    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I'

+    /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k'

        format for the 'code' parameter because Python turns 0x8000000

        into either a large positive number (PyLong or PyInt on 64-bit

        platforms) or a negative number on others (32-bit PyInt)

        whereas the system expects it to be a 32bit bit field value

        regardless of it being passed as an int or unsigned long on

-       various platforms.  See the termios.TIOCSWINSZ constant across

-       platforms for an example of this.

-

-       If any of the 64bit platforms ever decide to use more than 32bits

-       in their unsigned long ioctl codes this will break and need

-       special casing based on the platform being built on.

+       various platforms.

      */

-    unsigned int code;

+    unsigned long code;

     int arg;

     int ret;

     char *str;

@@ -119,7 +114,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar

     int mutate_arg = 1;

     char buf[IOCTL_BUFSZ+1];  /* argument plus NUL byte */

-    if (PyArg_ParseTuple(args, "O&Iw#|i:ioctl",

+    if (PyArg_ParseTuple(args, "O&kw#|i:ioctl",

                          conv_descriptor, &fd, &code,

                          &str, &len, &mutate_arg)) {

         char *arg;

@@ -170,7 +165,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar

     }

     PyErr_Clear();

-    if (PyArg_ParseTuple(args, "O&Is#:ioctl",

+    if (PyArg_ParseTuple(args, "O&ks#:ioctl",

                          conv_descriptor, &fd, &code, &str, &len)) {

         if (len > IOCTL_BUFSZ) {

             PyErr_SetString(PyExc_ValueError,

@@ -192,7 +187,7 @@ fcntl_ioctl(PyObject *self, PyObject *ar

     PyErr_Clear();

     arg = 0;

     if (!PyArg_ParseTuple(args,

-         "O&I|i;ioctl requires a file or file descriptor,"

+         "O&k|i;ioctl requires a file or file descriptor,"

          " an integer and optionally an integer or buffer argument",

                           conv_descriptor, &fd, &code, &arg)) {

       return NULL;

# Description: do not define __BSD_VISIBLE/_XOPEN_SOURCE/_POSIX_C_SOURCE

# in include/python2.7/pyconfig.h

# Submitted by: antoine

# Fix build with LibreSSL (does not have RAND_egd)

# PR192511, http://bugs.python.org/issue21356

# Submitted by: spil.oss@gmail.org

--- configure.orig	2015-03-13 12:32:09 UTC

+++ configure

@@ -2919,13 +2919,6 @@

 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables

-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable

-# them.

-

-$as_echo "#define __BSD_VISIBLE 1" >>confdefs.h

-

-

-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables

 # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.

 $as_echo "#define _BSD_TYPES 1" >>confdefs.h

@@ -3293,9 +3286,8 @@

   # but used in struct sockaddr.sa_family. Reported by Tim Rice.

   SCO_SV/3.2)

     define_xopen_source=no;;

-  # On FreeBSD 4, the math functions C89 does not cover are never defined

-  # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.

-  FreeBSD/4.*)

+  # On FreeBSD,  defining _XOPEN_SOURCE to 600 requests a strict environment.

+  FreeBSD/*)

     define_xopen_source=no;;

   # On MacOS X 10.2, a bug in ncurses.h means that it craps out if

   # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which

@@ -8534,6 +8534,48 @@ _ACEOF

 fi

 	# Dynamic linking for HP-UX

+{ $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

+

 # 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

# Description: do not define __BSD_VISIBLE/_XOPEN_SOURCE/_POSIX_C_SOURCE

# in include/python2.7/pyconfig.h

# Submitted by: antoine

# Fix build with LibreSSL (does not have RAND_egd)

# PR192511, http://bugs.python.org/issue21356

# Submitted by: spil.oss@gmail.org

--- configure.ac.orig	2015-03-13 12:32:09 UTC

+++ configure.ac

@@ -88,11 +88,6 @@

 AC_DEFINE(_NETBSD_SOURCE, 1, [Define on NetBSD to activate all library features])

 # The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables

-# certain features on FreeBSD, so we need __BSD_VISIBLE to re-enable

-# them.

-AC_DEFINE(__BSD_VISIBLE, 1, [Define on FreeBSD to activate all library features])

-

-# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables

 # u_int on Irix 5.3. Defining _BSD_TYPES brings it back.

 AC_DEFINE(_BSD_TYPES, 1, [Define on Irix to enable u_int])

@@ -426,9 +421,8 @@

   # but used in struct sockaddr.sa_family. Reported by Tim Rice.

   SCO_SV/3.2)

     define_xopen_source=no;;

-  # On FreeBSD 4, the math functions C89 does not cover are never defined

-  # with _XOPEN_SOURCE and __BSD_VISIBLE does not re-enable them.

-  FreeBSD/4.*)

+  # On FreeBSD,  defining _XOPEN_SOURCE to 600 requests a strict environment.

+  FreeBSD/*)

     define_xopen_source=no;;

   # On MacOS X 10.2, a bug in ncurses.h means that it craps out if

   # _XOPEN_EXTENDED_SOURCE is defined. Apparently, this is fixed in 10.3, which

@@ -2216,6 +2216,10 @@ AC_MSG_RESULT($SHLIBS)

 AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV

 AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX

+AC_CHECK_LIB(crypto, RAND_egd,

+             AC_DEFINE(HAVE_RAND_EGD, 1,

+             [Define if the libcrypto has RAND_egd]))

+

 # 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

# Fix build with LibreSSL (does not have RAND_egd)

# PR192511, http://bugs.python.org/issue21356

# Submitted by: spil.oss@gmail.org

--- pyconfig.h.in.orig	2014-12-10 16:00:01 UTC

+++ pyconfig.h.in

@@ -544,6 +544,9 @@

 /* Define to 1 if you have the `putenv' function. */

 #undef HAVE_PUTENV

+/* Define if the libcrypto has RAND_egd */

+#undef HAVE_RAND_EGD

+

 /* Define to 1 if you have the `readlink' function. */

 #undef HAVE_READLINK