From patchwork Fri Jun 26 12:30:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Van Dijck X-Patchwork-Id: 1317620 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vandijck-laurijssen.be Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tbpj5qL2z9sRN for ; Fri, 26 Jun 2020 22:31:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5CD7288564; Fri, 26 Jun 2020 12:31:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f12Q+vyX4LZn; Fri, 26 Jun 2020 12:31:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 670038874A; Fri, 26 Jun 2020 12:31:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 277A81BF339 for ; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1C897204B6 for ; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8jeuvaFjgTBR for ; Fri, 26 Jun 2020 12:31:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay-b01.edpnet.be (relay-b01.edpnet.be [212.71.1.221]) by silver.osuosl.org (Postfix) with ESMTPS id C5B9520117 for ; Fri, 26 Jun 2020 12:31:11 +0000 (UTC) X-ASG-Debug-ID: 1593174668-0a7ff53cab3eb810001-rUBnyj Received: from zotac.vandijck-laurijssen.be (77.109.122.82.adsl.dyn.edpnet.net [77.109.122.82]) by relay-b01.edpnet.be with ESMTP id nHbBqlhulazOm6yA for ; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) X-Barracuda-Envelope-From: dev.kurt@vandijck-laurijssen.be X-Barracuda-Effective-Source-IP: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Apparent-Source-IP: 77.109.122.82 Received: from x1.vandijck-laurijssen.be (x1.vandijck-laurijssen.be [192.168.0.36]) by zotac.vandijck-laurijssen.be (Postfix) with ESMTPSA id 87308F71F9A; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) From: Kurt Van Dijck To: buildroot@buildroot.org Date: Fri, 26 Jun 2020 14:30:49 +0200 X-ASG-Orig-Subj: [PATCH 2/6] python-m2crypto: bump version Message-Id: <20200626123053.30626-3-dev.kurt@vandijck-laurijssen.be> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> References: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> MIME-Version: 1.0 X-Barracuda-Connect: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Start-Time: 1593174668 X-Barracuda-URL: https://212.71.1.221:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at edpnet.be X-Barracuda-Scan-Msg-Size: 2621 X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.5373 1.0000 0.7500 X-Barracuda-Spam-Score: 1.25 X-Barracuda-Spam-Status: No, SCORE=1.25 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=7.0 tests=BSF_RULE7568M X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82819 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M Subject: [Buildroot] [PATCH 2/6] python-m2crypto: bump version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kurt Van Dijck Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Kurt Van Dijck --- package/python-m2crypto/python-m2crypto.hash | 5 ++--- package/python-m2crypto/python-m2crypto.mk | 16 +++------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/package/python-m2crypto/python-m2crypto.hash b/package/python-m2crypto/python-m2crypto.hash index 4ac180f870..91a6f722ca 100644 --- a/package/python-m2crypto/python-m2crypto.hash +++ b/package/python-m2crypto/python-m2crypto.hash @@ -1,3 +1,2 @@ -# md5 from https://pypi.python.org/pypi/M2Crypto/, sha256 locally computed -md5 8e87235942c76d1ba9f999ee33764fdb M2Crypto-0.24.0.tar.gz -sha256 80a56441a1d2c0cf27e725be7554c92598b938fc8767ee2c71fdbc2fdc055ee8 M2Crypto-0.24.0.tar.gz +# sha256 locally computed +sha256 4c6ad45ffb88670c590233683074f2440d96aaccb05b831371869fc387cbd127 M2Crypto-0.35.2.tar.gz diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 3d0e54eb4e..b98a2f4040 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_M2CRYPTO_VERSION = 0.24.0 -PYTHON_M2CRYPTO_SITE = http://pypi.python.org/packages/source/M/M2Crypto +PYTHON_M2CRYPTO_VERSION = 0.35.2 +PYTHON_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/74/18/3beedd4ac48b52d1a4d12f2a8c5cf0ae342ce974859fba838cbbc1580249 PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz PYTHON_M2CRYPTO_SETUP_TYPE = setuptools HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig @@ -13,19 +13,9 @@ HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig PYTHON_M2CRYPTO_LICENSE = MIT PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE -# We need to use python2 because m2crypto is not python3 compliant. HOST_PYTHON_M2CRYPTO_NEEDS_HOST_PYTHON = python2 -# The --openssl option that allows to specify a custom path to OpenSSL -# can only be used with the non-default build_ext setup.py command, -# and calling this command directly fails. To work around this, simply -# hardcode the path to OpenSSL in setup.py. -# Bug reported at https://gitlab.com/m2crypto/m2crypto/issues/89 -define HOST_PYTHON_M2CRYPTO_SET_OPENSSL_PATH - $(SED) "s%self.openssl = '/usr'%self.openssl = '$(HOST_DIR)/usr'%" \ - $(@D)/setup.py -endef -HOST_PYTHON_M2CRYPTO_POST_PATCH_HOOKS += HOST_PYTHON_M2CRYPTO_SET_OPENSSL_PATH +HOST_PYTHON_M2CRYPTO_BUILD_OPTS = --openssl $(HOST_DIR) $(eval $(host-python-package))