From nobody Wed Feb 21 15:25:10 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tg0T32ZShz59hNQ; Wed, 21 Feb 2024 15:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg0T30NPQz4Ddj; Wed, 21 Feb 2024 15:25:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708529111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tqdax9nk9f9k6zRY1468K2yzGqi4AcVfa1OhNANHWfM=; b=rA+b9y/osYZ/6aTdi6dJ2ayU9iK9TDZb3Gur+3jsTgIevuolDdUg6crfkrfxS2/4uWVU0j xpkl8sFAlCQWT1BJOoSih1lsHXk4TOdoPbSGWHO4FeYOQRmbUk/LBW2N4KfA0Ui3tNk4HV XlaKY7YqyLXc6afgl9HfyPRPmnMO6JljVhJbBGQXmUsqB2k7FerAy8q7tDf3IZTLYaoaEt OZa8Hxk6BaAE54cFnmnBrDW7UVSgLF5XNv0cD03s6z92Rn+LV2byImYvFKi5YlBac5Ur1g VGZKFSWU0p/+PY8+wNh4cU0q/hjC3XrDcwxv38oFt/RHn+NhSgpL1AIFpJh5pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708529111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tqdax9nk9f9k6zRY1468K2yzGqi4AcVfa1OhNANHWfM=; b=UCXi2iBHW7TT3Zz9/q0MHeTmVGVf/YjowtE4vyrQnkCp0odMFuEv7/MlrgfjJtHIMV/M0m Np+SGtgPRhrZn/VmQpzs9Bebch7PmHD+WuUO2Fy32jYnzOxHIOG7QjmoDDDaWYWqSxp5lo 1mjzyrk5KJRxM8jybBDEfKKNdPfKCkvlzmeXD4qWaEdsjO+7kBn2Kf/czCN55e3H/8qDmt tAG+MWI6BK3hdj/5z4gSipacG+QDSLgNGmwrp5ONRe4IzEOQzkoII7qnBrbSs7LsH8KmBt 4P7pjSjfhh2Bob6qvzRuBd/n+u4Lwo5E1JlaSuCiQKe+6NrODKTcIQjlmycrZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708529111; a=rsa-sha256; cv=none; b=t5+ldX57hHBu8W/lsLbytoRhnzPsmKki9aJG7kGi42b3n5IbW+Abg7fNFnQQ4dtNK3EyjJ Af5ysj6R8KDfVUqztIsPpZJY1X+YyD+31UtLc232V0ZXJo2edwtOy9WUoULBwFqA3d40/u HoYT7mQ7c6yG38DkKnk7gomeEDCYKSe5dj+RhDFsR4LWQyEUzhi0TLKhJAsJIqWn+hELT2 i/2KVEwFmML57bEX/bOmbtrUwy7pa9RURFRpG4+PUeUnC5SPVyuWsRVh/Bofh1qR57/d20 upg8BiimD+d6OcRYF7W9VJ5Pwk920b5HJmsAEPowdRYyTeKcCLpEFQtmfLXTNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tg0T26cDGz17GJ; Wed, 21 Feb 2024 15:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LFPA8F045174; Wed, 21 Feb 2024 15:25:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFPAKZ045171; Wed, 21 Feb 2024 15:25:10 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:25:10 GMT Message-Id: <202402211525.41LFPAKZ045171@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 05c9b04e5533 - main - security/py-m2crypto: Update to 0.41.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05c9b04e5533beba5f57c5335349fdf4df3b81c4 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=05c9b04e5533beba5f57c5335349fdf4df3b81c4 commit 05c9b04e5533beba5f57c5335349fdf4df3b81c4 Author: Po-Chuan Hsieh AuthorDate: 2024-02-21 14:45:18 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-02-21 15:08:00 +0000 security/py-m2crypto: Update to 0.41.0 - Convert to USE_PYTHON=pep517 Changes: https://gitlab.com/m2crypto/m2crypto/-/blob/master/CHANGES --- security/py-m2crypto/Makefile | 10 +++++----- security/py-m2crypto/distinfo | 6 +++--- security/py-m2crypto/files/patch-setup.cfg | 9 +++++++++ security/py-m2crypto/files/patch-setup.py | 14 +++++++------- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/security/py-m2crypto/Makefile b/security/py-m2crypto/Makefile index f21fb44403fb..c84cb450c451 100644 --- a/security/py-m2crypto/Makefile +++ b/security/py-m2crypto/Makefile @@ -1,5 +1,5 @@ PORTNAME= m2crypto -PORTVERSION= 0.40.1 +PORTVERSION= 0.41.0 CATEGORIES= security python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,12 +12,12 @@ WWW= https://gitlab.com/m2crypto/m2crypto LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE -BUILD_DEPENDS= swig>=4.0:devel/swig +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ + swig>=4.0:devel/swig USES= cpe python ssl -USE_PYTHON= autoplist concurrent distutils - -PYDISTUTILS_BUILDARGS= build_ext --openssl=${OPENSSLBASE} --swig=${LOCALBASE}/bin/swig +USE_PYTHON= autoplist concurrent pep517 CPE_VENDOR= m2crypto_project diff --git a/security/py-m2crypto/distinfo b/security/py-m2crypto/distinfo index 54e4916ef991..25c7e970d115 100644 --- a/security/py-m2crypto/distinfo +++ b/security/py-m2crypto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1698341079 -SHA256 (M2Crypto-0.40.1.tar.gz) = bbfd113ec55708c05816252a4f09e4237df4f3bbfc8171cbbc33057d257bbb30 -SIZE (M2Crypto-0.40.1.tar.gz) = 1266138 +TIMESTAMP = 1708449446 +SHA256 (M2Crypto-0.41.0.tar.gz) = 3a1358c7ee849046d91782a777f1786bf027a1c1d51b5faf8f19435bfc3f1495 +SIZE (M2Crypto-0.41.0.tar.gz) = 1151680 diff --git a/security/py-m2crypto/files/patch-setup.cfg b/security/py-m2crypto/files/patch-setup.cfg new file mode 100644 index 000000000000..640129e18417 --- /dev/null +++ b/security/py-m2crypto/files/patch-setup.cfg @@ -0,0 +1,9 @@ +--- setup.cfg.orig 2024-02-13 22:13:53 UTC ++++ setup.cfg +@@ -1,5 +1,5 @@ + [metadata] +-name = M2Crypto ++name = m2crypto + version = 0.41.0 + author = Ng Pheng Siong + author_email = ngps@sandbox.rulemaker.net diff --git a/security/py-m2crypto/files/patch-setup.py b/security/py-m2crypto/files/patch-setup.py index c1bab3f7ee14..f2cd2f6482d3 100644 --- a/security/py-m2crypto/files/patch-setup.py +++ b/security/py-m2crypto/files/patch-setup.py @@ -1,8 +1,8 @@ ---- setup.py.orig 2020-12-08 18:29:38 UTC +--- setup.py.orig 2024-01-29 18:20:51 UTC +++ setup.py -@@ -151,9 +151,6 @@ class _M2CryptoBuildExt(build_ext.build_ext): - if sys.version_info[:1] >= (3,): - self.swig_opts.append('-py3') +@@ -132,9 +132,6 @@ class _M2CryptoBuildExt(build_ext.build_ext): + log.debug('self.openssl_path = %s', self.openssl_path) + log.debug('self.bundledlls = %s', self.bundledlls) - # swig seems to need the default header file directories - self.swig_opts.extend(['-I%s' % i for i in _get_additional_includes()]) @@ -10,7 +10,7 @@ log.debug('self.include_dirs = %s', self.include_dirs) log.debug('self.library_dirs = %s', self.library_dirs) -@@ -186,6 +183,9 @@ class _M2CryptoBuildExt(build_ext.build_ext): +@@ -169,6 +166,9 @@ class _M2CryptoBuildExt(build_ext.build_ext): self.swig_opts.extend(['-I%s' % i for i in self.include_dirs]) @@ -20,12 +20,12 @@ # Some Linux distributor has added the following line in # /usr/include/openssl/opensslconf.h: # -@@ -204,7 +204,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): +@@ -187,7 +187,7 @@ class _M2CryptoBuildExt(build_ext.build_ext): self.swig_opts.append( '-I' + os.path.join(openssl_include_dir, 'openssl')) - self.swig_opts.append('-includeall') + #self.swig_opts.append('-includeall') - self.swig_opts.append('-modern') self.swig_opts.append('-builtin') + build_dir = os.path.join(self.build_lib, 'M2Crypto')