From patchwork Thu Aug 5 10:21:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4595 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4GgPmZ1hMNz3xGN for ; Thu, 5 Aug 2021 10:22:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4GgPmY69jXz6Xw; Thu, 5 Aug 2021 10:22:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4GgPmY5bmLz2y1k; Thu, 5 Aug 2021 10:22:05 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4GgPmX6lyNz2xPQ for ; Thu, 5 Aug 2021 10:22:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4GgPmW6HV5z6Xw; Thu, 5 Aug 2021 10:22:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1628158923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uMiDkuy5tD1y6r8XDmxxgf4TskU22ka24Lu7p3Xieb4=; b=TxAaqA+jbYn2hxX8WNmpZeXVNyWOtchXA5KxCPXHonjGifucLNiflIYh61vJ0GLjsegRux d4Pla+I6a47luz4rHxbBy2WzKRaZ/eFLA4pNqobcahODlQ0LvMjmWsAAuYU6rQdo1zn79N y7SyWDVugVlXVp8raoEiqc7S8+d5svyxRFG3avH5PgyHm5K0m9ei49ShdcGBiNrkJ5BWNS HlpTW5flS2wOAjIH6+ssqwZnrWxhHAH5Pv6pUkNEG/ASfjOmnowcx6O2DCJJyQYGP14c4n ObfH1c4fSB+ABkWcBTKrFI4Fkzw2ZdEcn3Ok1oKkq1KFWaRDsnV2hqcMam4ccQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1628158923; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uMiDkuy5tD1y6r8XDmxxgf4TskU22ka24Lu7p3Xieb4=; b=bfXggUBZNbMsK2W8nEHZvvMSHNjyDp98kWP3XjnbKTFpBNBG88xsWb1OCqfNeuRY6xAs1O 66sfgVD7rBmQY0AQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH v3 3/8] python-m2crypto: removal of python2 module Date: Thu, 5 Aug 2021 12:21:17 +0200 Message-Id: <20210805102122.3484023-3-adolf.belka@ipfire.org> In-Reply-To: <20210805102122.3484023-1-adolf.belka@ipfire.org> References: <20210805102122.3484023-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - A python3 version of this module is not required as python-m2crypto is only used for the build of crda. Signed-off-by: Adolf Belka --- config/rootfiles/common/python-m2crypto | 98 ------------------------- lfs/python-m2crypto | 83 --------------------- 2 files changed, 181 deletions(-) delete mode 100644 config/rootfiles/common/python-m2crypto delete mode 100644 lfs/python-m2crypto diff --git a/config/rootfiles/common/python-m2crypto b/config/rootfiles/common/python-m2crypto deleted file mode 100644 index c5477cda3..000000000 --- a/config/rootfiles/common/python-m2crypto +++ /dev/null @@ -1,98 +0,0 @@ -#usr/lib/python2.7/site-packages/M2Crypto -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/PKG-INFO -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/SOURCES.txt -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/dependency_links.txt -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/requires.txt -#usr/lib/python2.7/site-packages/M2Crypto-0.27.0-py2.7.egg-info/top_level.txt -#usr/lib/python2.7/site-packages/M2Crypto/ASN1.py -#usr/lib/python2.7/site-packages/M2Crypto/ASN1.pyc -#usr/lib/python2.7/site-packages/M2Crypto/AuthCookie.py -#usr/lib/python2.7/site-packages/M2Crypto/AuthCookie.pyc -#usr/lib/python2.7/site-packages/M2Crypto/BIO.py -#usr/lib/python2.7/site-packages/M2Crypto/BIO.pyc -#usr/lib/python2.7/site-packages/M2Crypto/BN.py -#usr/lib/python2.7/site-packages/M2Crypto/BN.pyc -#usr/lib/python2.7/site-packages/M2Crypto/DH.py -#usr/lib/python2.7/site-packages/M2Crypto/DH.pyc -#usr/lib/python2.7/site-packages/M2Crypto/DSA.py -#usr/lib/python2.7/site-packages/M2Crypto/DSA.pyc -#usr/lib/python2.7/site-packages/M2Crypto/EC.py -#usr/lib/python2.7/site-packages/M2Crypto/EC.pyc -#usr/lib/python2.7/site-packages/M2Crypto/EVP.py -#usr/lib/python2.7/site-packages/M2Crypto/EVP.pyc -#usr/lib/python2.7/site-packages/M2Crypto/Engine.py -#usr/lib/python2.7/site-packages/M2Crypto/Engine.pyc -#usr/lib/python2.7/site-packages/M2Crypto/Err.py -#usr/lib/python2.7/site-packages/M2Crypto/Err.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP -#usr/lib/python2.7/site-packages/M2Crypto/PGP/PublicKey.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/PublicKey.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/PublicKeyRing.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/PublicKeyRing.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/RSA.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/RSA.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/__init__.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/__init__.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/constants.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/constants.pyc -#usr/lib/python2.7/site-packages/M2Crypto/PGP/packet.py -#usr/lib/python2.7/site-packages/M2Crypto/PGP/packet.pyc -#usr/lib/python2.7/site-packages/M2Crypto/RC4.py -#usr/lib/python2.7/site-packages/M2Crypto/RC4.pyc -#usr/lib/python2.7/site-packages/M2Crypto/RSA.py -#usr/lib/python2.7/site-packages/M2Crypto/RSA.pyc -#usr/lib/python2.7/site-packages/M2Crypto/Rand.py -#usr/lib/python2.7/site-packages/M2Crypto/Rand.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SMIME.py -#usr/lib/python2.7/site-packages/M2Crypto/SMIME.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Checker.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Checker.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Cipher.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Cipher.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Connection.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Connection.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Context.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Context.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/SSLServer.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/SSLServer.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Session.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/Session.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/TwistedProtocolWrapper.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/TwistedProtocolWrapper.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/__init__.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/__init__.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/cb.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/cb.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/ssl_dispatcher.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/ssl_dispatcher.pyc -#usr/lib/python2.7/site-packages/M2Crypto/SSL/timeout.py -#usr/lib/python2.7/site-packages/M2Crypto/SSL/timeout.pyc -#usr/lib/python2.7/site-packages/M2Crypto/X509.py -#usr/lib/python2.7/site-packages/M2Crypto/X509.pyc -#usr/lib/python2.7/site-packages/M2Crypto/__init__.py -#usr/lib/python2.7/site-packages/M2Crypto/__init__.pyc -#usr/lib/python2.7/site-packages/M2Crypto/_m2crypto.so -#usr/lib/python2.7/site-packages/M2Crypto/callback.py -#usr/lib/python2.7/site-packages/M2Crypto/callback.pyc -#usr/lib/python2.7/site-packages/M2Crypto/ftpslib.py -#usr/lib/python2.7/site-packages/M2Crypto/ftpslib.pyc -#usr/lib/python2.7/site-packages/M2Crypto/httpslib.py -#usr/lib/python2.7/site-packages/M2Crypto/httpslib.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2.py -#usr/lib/python2.7/site-packages/M2Crypto/m2.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2crypto.py -#usr/lib/python2.7/site-packages/M2Crypto/m2crypto.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2urllib.py -#usr/lib/python2.7/site-packages/M2Crypto/m2urllib.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2urllib2.py -#usr/lib/python2.7/site-packages/M2Crypto/m2urllib2.pyc -#usr/lib/python2.7/site-packages/M2Crypto/m2xmlrpclib.py -#usr/lib/python2.7/site-packages/M2Crypto/m2xmlrpclib.pyc -#usr/lib/python2.7/site-packages/M2Crypto/six.py -#usr/lib/python2.7/site-packages/M2Crypto/six.pyc -#usr/lib/python2.7/site-packages/M2Crypto/threading.py -#usr/lib/python2.7/site-packages/M2Crypto/threading.pyc -#usr/lib/python2.7/site-packages/M2Crypto/util.py -#usr/lib/python2.7/site-packages/M2Crypto/util.pyc diff --git a/lfs/python-m2crypto b/lfs/python-m2crypto deleted file mode 100644 index de004bfd9..000000000 --- a/lfs/python-m2crypto +++ /dev/null @@ -1,83 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.27.0 - -THISAPP = M2Crypto-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -#PROG = python-m2crypto -#PAK_VER = 1 - -#DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 4477bd6b2835560c73982476dba5e515 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -#dist: -# @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python setup.py build - cd $(DIR_APP) && python setup.py install --root=/ - @rm -rf $(DIR_APP) - @$(POSTBUILD)