From owner-svn-ports-all@freebsd.org Mon Sep 24 11:14:21 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F070210A97D7; Mon, 24 Sep 2018 11:14:20 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D95237B3F4; Mon, 24 Sep 2018 11:14:19 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 58A9E18A11; Mon, 24 Sep 2018 11:14:19 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8OBEJRT028938; Mon, 24 Sep 2018 11:14:19 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8OBEIRH028935; Mon, 24 Sep 2018 11:14:18 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201809241114.w8OBEIRH028935@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 24 Sep 2018 11:14:18 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/security/py-m2crypto: . files X-SVN-Commit-Revision: 480594 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Sep 2018 11:14:21 -0000 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 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 + #endif ++%include + %include + + /* 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') +