Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Sep 2018 11:14:18 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r480594 - in head/security/py-m2crypto: . files
Message-ID:  <201809241114.w8OBEIRH028935@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Mon Sep 24 11:14:18 2018
New Revision: 480594
URL: https://svnweb.freebsd.org/changeset/ports/480594

Log:
  Fix build with OpenSSL 1.1.*
  
  PR:		229019
  Reported by:	brnrd
  Obtained by:	Viktor Dukhovni <ietf-dane at dukhovni.org>
  Reference:	https://lists.freebsd.org/pipermail/freebsd-python/2018-September/015429.html

Added:
  head/security/py-m2crypto/files/
  head/security/py-m2crypto/files/patch-SWIG-_m2crypto.i   (contents, props changed)
  head/security/py-m2crypto/files/patch-setup.py   (contents, props changed)
Modified:
  head/security/py-m2crypto/Makefile

Modified: head/security/py-m2crypto/Makefile
==============================================================================
--- head/security/py-m2crypto/Makefile	Mon Sep 24 11:14:13 2018	(r480593)
+++ head/security/py-m2crypto/Makefile	Mon Sep 24 11:14:18 2018	(r480594)
@@ -14,9 +14,6 @@ COMMENT=	Crypto and SSL toolkit for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-BROKEN_SSL=	openssl-devel
-BROKEN_SSL_REASON_openssl-devel=	Error: Syntax error in input(1).
-
 BUILD_DEPENDS=	swig3.0:devel/swig30
 
 PYDISTUTILS_BUILDARGS=	build_ext --include=${OPENSSLINC} --openssl=${OPENSSLBASE} --swig=${LOCALBASE}/bin/swig3.0

Added: head/security/py-m2crypto/files/patch-SWIG-_m2crypto.i
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/py-m2crypto/files/patch-SWIG-_m2crypto.i	Mon Sep 24 11:14:18 2018	(r480594)
@@ -0,0 +1,11 @@
+--- SWIG/_m2crypto.i.orig	2018-02-24 13:54:59 UTC
++++ SWIG/_m2crypto.i
+@@ -57,7 +57,8 @@ static PyObject *x509_store_verify_cb_fu
+ #ifdef _WIN32
+ %include <windows.i>
+ #endif
++%include <openssl/e_os2.h>
+ %include <openssl/safestack.h>
+ 
+ /* Bring in LHASH_OF macro definition */
+ /* XXX Can't include lhash.h where LHASH_OF is defined, because it includes

Added: head/security/py-m2crypto/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/py-m2crypto/files/patch-setup.py	Mon Sep 24 11:14:18 2018	(r480594)
@@ -0,0 +1,11 @@
+--- setup.py.orig	2018-04-29 18:47:25 UTC
++++ setup.py
+@@ -196,7 +196,7 @@ class _M2CryptoBuildExt(build_ext.build_
+ 
+         # swig seems to need the default header file directories
+         self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()])
+-        self.swig_opts.append('-includeall')
++        #self.swig_opts.append('-includeall')
+         self.swig_opts.append('-modern')
+         self.swig_opts.append('-builtin')
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809241114.w8OBEIRH028935>