restrict openssl header file search path.

3 files changed, 38 insertions, 13 deletions

diff --git a/lang/python34/Makefile b/lang/python34/Makefile
index 8fe8012d736..ae7e6850c67 100644
--- a/lang/python34/Makefile
+++ b/lang/python34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/05/09 02:27:14 wen Exp $
+# $NetBSD: Makefile,v 1.2 2014/05/09 05:59:09 obache Exp $
 
 .include "dist.mk"
 
@@ -121,6 +121,12 @@ SUBST_STAGE.findlib=	pre-configure
 SUBST_FILES.findlib=	Lib/distutils/unixccompiler.py
 SUBST_SED.findlib=	-e 's,/usr/local,${PREFIX},'
 
+SUBST_CLASSES+=		sslbase
+SUBST_MESSAGE.sslbase=	Fixing OpenSSL base directory to find header file.
+SUBST_STAGE.sslbase=	pre-configure
+SUBST_FILES.sslbase=	setup.py
+SUBST_VARS.sslbase=	SSLBASE
+
 CHECK_INTERPRETER_SKIP=	lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc
 
 .if ${OPSYS} == "HPUX"
diff --git a/lang/python34/distinfo b/lang/python34/distinfo
index 815fe350148..00842a9e82a 100644
--- a/lang/python34/distinfo
+++ b/lang/python34/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2014/05/09 02:27:14 wen Exp $
+$NetBSD: distinfo,v 1.2 2014/05/09 05:59:09 obache Exp $
 
 SHA1 (Python-3.4.0.tar.xz) = f54d7cf6af5dbd9bddbe31cf4772f39711381dbe
 RMD160 (Python-3.4.0.tar.xz) = f6b4664a4333a2010f8e168e252de7c22013e4a8
@@ -8,7 +8,7 @@ SHA1 (patch-aa) = 99ebcbbfc53b855a32b424dec27012e1e969c3d0
 SHA1 (patch-ab) = 1c0a25bf7ec6ee76e84c799619ec7cd8910f16e1
 SHA1 (patch-ah) = 92d7a38001e1976ee7123d74818559ec5afb0a73
 SHA1 (patch-al) = e5438d1bbc20cc85521b3570710846cf4a070ae1
-SHA1 (patch-am) = bbda8b07af6faf63138c4cabb3c7e93766efd12c
+SHA1 (patch-am) = 9ac74eed5a01b2c8f959f0f32131ae763ae3f2e1
 SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba
 SHA1 (patch-ao) = dc524b08634c23c25227bd03e221dab0ff2a03f3
 SHA1 (patch-au) = 6e10e6fc484317447bdeaa833db5df073df98c5b
diff --git a/lang/python34/patches/patch-am b/lang/python34/patches/patch-am
index 98e065a10a0..9e3c4804517 100644
--- a/lang/python34/patches/patch-am
+++ b/lang/python34/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.1 2014/05/09 02:27:14 wen Exp $
+$NetBSD: patch-am,v 1.2 2014/05/09 05:59:09 obache Exp $
 
---- setup.py.orig	2013-05-15 16:33:00.000000000 +0000
+--- setup.py.orig	2014-03-17 02:31:31.000000000 +0000
 +++ setup.py
-@@ -31,7 +31,8 @@ host_platform = get_platform()
+@@ -33,7 +33,8 @@ host_platform = get_platform()
  COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
  
  # This global variable is used to hold the list of modules to be disabled.
@@ -12,7 +12,7 @@ $NetBSD: patch-am,v 1.1 2014/05/09 02:27:14 wen Exp $
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (after any relative
-@@ -435,15 +436,15 @@ class PyBuildExt(build_ext):
+@@ -441,15 +442,15 @@ class PyBuildExt(build_ext):
              os.unlink(tmpfile)
  
      def detect_modules(self):
@@ -37,7 +37,17 @@ $NetBSD: patch-am,v 1.1 2014/05/09 02:27:14 wen Exp $
          self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
-@@ -753,9 +754,7 @@ class PyBuildExt(build_ext):
+@@ -751,8 +752,7 @@ class PyBuildExt(build_ext):
+                                depends = ['socketmodule.h']) )
+         # Detect SSL support for the socket module (via _ssl)
+         search_for_ssl_incs_in = [
+-                              '/usr/local/ssl/include',
+-                              '/usr/contrib/ssl/include/'
++                              '@SSLBASE@/include'
+                              ]
+         ssl_incs = find_file('openssl/ssl.h', inc_dirs,
+                              search_for_ssl_incs_in
+@@ -763,9 +763,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -48,7 +58,16 @@ $NetBSD: patch-am,v 1.1 2014/05/09 02:27:14 wen Exp $
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -1138,6 +1137,30 @@ class PyBuildExt(build_ext):
+@@ -784,7 +782,7 @@ class PyBuildExt(build_ext):
+ 
+         # look for the openssl version header on the compiler search path.
+         opensslv_h = find_file('openssl/opensslv.h', [],
+-                inc_dirs + search_for_ssl_incs_in)
++                search_for_ssl_incs_in)
+         if opensslv_h:
+             name = os.path.join(opensslv_h[0], 'openssl/opensslv.h')
+             if host_platform == 'darwin' and is_macosx_sdk_path(name):
+@@ -1148,6 +1146,30 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if host_platform not in ['cygwin']:
@@ -79,7 +98,7 @@ $NetBSD: patch-am,v 1.1 2014/05/09 02:27:14 wen Exp $
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1149,7 +1172,7 @@ class PyBuildExt(build_ext):
+@@ -1159,7 +1181,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -88,7 +107,7 @@ $NetBSD: patch-am,v 1.1 2014/05/09 02:27:14 wen Exp $
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(lib_dirs,
-@@ -1475,6 +1498,14 @@ class PyBuildExt(build_ext):
+@@ -1487,6 +1509,14 @@ class PyBuildExt(build_ext):
              macros = dict()
              libraries = []
  
@@ -103,7 +122,7 @@ $NetBSD: patch-am,v 1.1 2014/05/09 02:27:14 wen Exp $
          else:                                   # Linux and other unices
              macros = dict()
              libraries = ['rt']
-@@ -1906,10 +1937,7 @@ class PyBuildExt(build_ext):
+@@ -1956,10 +1986,7 @@ class PyBuildExt(build_ext):
              depends = ['_decimal/docstrings.h']
          else:
              srcdir = sysconfig.get_config_var('srcdir')
@@ -115,7 +134,7 @@ $NetBSD: patch-am,v 1.1 2014/05/09 02:27:14 wen Exp $
              libraries = []
              sources = [
                '_decimal/_decimal.c',
-@@ -2155,7 +2183,7 @@ def main():
+@@ -2205,7 +2232,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in