From patchwork Wed Feb 12 09:34:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2776 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHm5F8dz3xyQ for ; Wed, 12 Feb 2020 09:35:16 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHm1qzvzQ1; Wed, 12 Feb 2020 09:35:16 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHl4bpqz2yXw; Wed, 12 Feb 2020 09:35:15 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHg6vpNz2ySS for ; Wed, 12 Feb 2020 09:35:11 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHg3xshz11k; Wed, 12 Feb 2020 09:35:11 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500111; 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=jEPnWrztj4vdntwZ0mJs8TBZVqX8iZ4acWNHRD01ZKU=; b=79GGkNc5AR0IoFxEAjhEv38LqPwy43S85wAgWSjQFXQbZes34clhKqpMS7s6jgKgQ/7HaC M5JBr5IKQyiL4wDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500111; 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=jEPnWrztj4vdntwZ0mJs8TBZVqX8iZ4acWNHRD01ZKU=; b=l4J5QiDOYj2HwkDmpTcI5DLWRvdO6QQYLVOavpsIWjFA1S1wH3s3ITuC5PyCoKLELuOVk8 ITvE4NwDEOH9PL7TLNuknwypVRgJ4Cb+eR5N1/PtWCtvXRbjoNH24otx0ad1dtAol3jQ8n Dob7wpJ4o4Msw052HEpcU5wSrcbLTdepAPJpaDtmlipG1CKCyLJcS6/Rr21sJYVOjFqXMl rfwZTMGjcZOtbSi7Hs3/7Pn00+SiO3wtsv4lzcsW74r2SBKw7alM1Ih0veOhOdcJV305SR jrFGRrmy4zwb+zVokRW3qzdED+nNeN7FtJNZZW87VFmqaDuZVKNIGzDGxXnZbA== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 01/14] Drop arm Date: Wed, 12 Feb 2020 09:34:40 +0000 Message-Id: <20200212093453.5732-2-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is a CLI tool for Tor which is no longer maintained upstream. Signed-off-by: Michael Tremer --- config/rootfiles/packages/arm | 166 ---------------------------------- lfs/arm | 83 ----------------- make.sh | 1 - 3 files changed, 250 deletions(-) delete mode 100644 config/rootfiles/packages/arm delete mode 100644 lfs/arm diff --git a/config/rootfiles/packages/arm b/config/rootfiles/packages/arm deleted file mode 100644 index eb9d128d4..000000000 --- a/config/rootfiles/packages/arm +++ /dev/null @@ -1,166 +0,0 @@ -usr/bin/arm -#usr/share/arm -#usr/share/arm-1.4.5.0-py2.7.egg-info -usr/share/arm/TorCtl -usr/share/arm/TorCtl/GeoIPSupport.py -usr/share/arm/TorCtl/GeoIPSupport.pyc -usr/share/arm/TorCtl/PathSupport.py -usr/share/arm/TorCtl/PathSupport.pyc -usr/share/arm/TorCtl/SQLSupport.py -usr/share/arm/TorCtl/SQLSupport.pyc -usr/share/arm/TorCtl/ScanSupport.py -usr/share/arm/TorCtl/ScanSupport.pyc -usr/share/arm/TorCtl/StatsSupport.py -usr/share/arm/TorCtl/StatsSupport.pyc -usr/share/arm/TorCtl/TorCtl.py -usr/share/arm/TorCtl/TorCtl.pyc -usr/share/arm/TorCtl/TorUtil.py -usr/share/arm/TorCtl/TorUtil.pyc -usr/share/arm/TorCtl/__init__.py -usr/share/arm/TorCtl/__init__.pyc -usr/share/arm/TorCtl/example.py -usr/share/arm/TorCtl/example.pyc -usr/share/arm/__init__.py -usr/share/arm/__init__.pyc -usr/share/arm/cli -usr/share/arm/cli/__init__.py -usr/share/arm/cli/__init__.pyc -usr/share/arm/cli/configPanel.py -usr/share/arm/cli/configPanel.pyc -usr/share/arm/cli/connections -usr/share/arm/cli/connections/__init__.py -usr/share/arm/cli/connections/__init__.pyc -usr/share/arm/cli/connections/circEntry.py -usr/share/arm/cli/connections/circEntry.pyc -usr/share/arm/cli/connections/connEntry.py -usr/share/arm/cli/connections/connEntry.pyc -usr/share/arm/cli/connections/connPanel.py -usr/share/arm/cli/connections/connPanel.pyc -usr/share/arm/cli/connections/countPopup.py -usr/share/arm/cli/connections/countPopup.pyc -usr/share/arm/cli/connections/descriptorPopup.py -usr/share/arm/cli/connections/descriptorPopup.pyc -usr/share/arm/cli/connections/entries.py -usr/share/arm/cli/connections/entries.pyc -usr/share/arm/cli/controller.py -usr/share/arm/cli/controller.pyc -usr/share/arm/cli/graphing -usr/share/arm/cli/graphing/__init__.py -usr/share/arm/cli/graphing/__init__.pyc -usr/share/arm/cli/graphing/bandwidthStats.py -usr/share/arm/cli/graphing/bandwidthStats.pyc -usr/share/arm/cli/graphing/connStats.py -usr/share/arm/cli/graphing/connStats.pyc -usr/share/arm/cli/graphing/graphPanel.py -usr/share/arm/cli/graphing/graphPanel.pyc -usr/share/arm/cli/graphing/resourceStats.py -usr/share/arm/cli/graphing/resourceStats.pyc -usr/share/arm/cli/headerPanel.py -usr/share/arm/cli/headerPanel.pyc -usr/share/arm/cli/interpretorPanel.py -usr/share/arm/cli/interpretorPanel.pyc -usr/share/arm/cli/logPanel.py -usr/share/arm/cli/logPanel.pyc -usr/share/arm/cli/menu -usr/share/arm/cli/menu/__init__.py -usr/share/arm/cli/menu/__init__.pyc -usr/share/arm/cli/menu/actions.py -usr/share/arm/cli/menu/actions.pyc -usr/share/arm/cli/menu/item.py -usr/share/arm/cli/menu/item.pyc -usr/share/arm/cli/menu/menu.py -usr/share/arm/cli/menu/menu.pyc -usr/share/arm/cli/popups.py -usr/share/arm/cli/popups.pyc -usr/share/arm/cli/torrcPanel.py -usr/share/arm/cli/torrcPanel.pyc -usr/share/arm/cli/wizard.py -usr/share/arm/cli/wizard.pyc -usr/share/arm/gui -usr/share/arm/gui/__init__.py -usr/share/arm/gui/__init__.pyc -usr/share/arm/gui/arm.xml -usr/share/arm/gui/configPanel.py -usr/share/arm/gui/configPanel.pyc -usr/share/arm/gui/connections -usr/share/arm/gui/connections/__init__.py -usr/share/arm/gui/connections/__init__.pyc -usr/share/arm/gui/connections/circEntry.py -usr/share/arm/gui/connections/circEntry.pyc -usr/share/arm/gui/connections/connEntry.py -usr/share/arm/gui/connections/connEntry.pyc -usr/share/arm/gui/connections/connPanel.py -usr/share/arm/gui/connections/connPanel.pyc -usr/share/arm/gui/controller.py -usr/share/arm/gui/controller.pyc -usr/share/arm/gui/generalPanel.py -usr/share/arm/gui/generalPanel.pyc -usr/share/arm/gui/graphing -usr/share/arm/gui/graphing/__init__.py -usr/share/arm/gui/graphing/__init__.pyc -usr/share/arm/gui/graphing/bandwidthStats.py -usr/share/arm/gui/graphing/bandwidthStats.pyc -usr/share/arm/gui/graphing/graphPanel.py -usr/share/arm/gui/graphing/graphPanel.pyc -usr/share/arm/gui/logPanel.py -usr/share/arm/gui/logPanel.pyc -usr/share/arm/prereq.py -usr/share/arm/prereq.pyc -#usr/share/arm/resources -#usr/share/arm/resources/arm.1 -#usr/share/arm/resources/exitNotice -#usr/share/arm/resources/exitNotice/how_tor_works_thumb.png -#usr/share/arm/resources/exitNotice/index.html -#usr/share/arm/resources/startTor -#usr/share/arm/resources/tor-arm.desktop -#usr/share/arm/resources/tor-arm.svg -#usr/share/arm/resources/torConfigDesc.txt -#usr/share/arm/resources/torrcOverride -#usr/share/arm/resources/torrcOverride/override.c -#usr/share/arm/resources/torrcOverride/override.h -#usr/share/arm/resources/torrcOverride/override.py -#usr/share/arm/resources/torrcTemplate.txt -usr/share/arm/settings.cfg -usr/share/arm/starter.py -usr/share/arm/starter.pyc -usr/share/arm/test.py -usr/share/arm/test.pyc -#usr/share/arm/uninstall -usr/share/arm/util -usr/share/arm/util/__init__.py -usr/share/arm/util/__init__.pyc -usr/share/arm/util/conf.py -usr/share/arm/util/conf.pyc -usr/share/arm/util/connections.py -usr/share/arm/util/connections.pyc -usr/share/arm/util/enum.py -usr/share/arm/util/enum.pyc -usr/share/arm/util/gtkTools.py -usr/share/arm/util/gtkTools.pyc -usr/share/arm/util/hostnames.py -usr/share/arm/util/hostnames.pyc -usr/share/arm/util/log.py -usr/share/arm/util/log.pyc -usr/share/arm/util/panel.py -usr/share/arm/util/panel.pyc -usr/share/arm/util/procName.py -usr/share/arm/util/procName.pyc -usr/share/arm/util/procTools.py -usr/share/arm/util/procTools.pyc -usr/share/arm/util/sysTools.py -usr/share/arm/util/sysTools.pyc -usr/share/arm/util/textInput.py -usr/share/arm/util/textInput.pyc -usr/share/arm/util/torConfig.py -usr/share/arm/util/torConfig.pyc -usr/share/arm/util/torInterpretor.py -usr/share/arm/util/torInterpretor.pyc -usr/share/arm/util/torTools.py -usr/share/arm/util/torTools.pyc -usr/share/arm/util/uiTools.py -usr/share/arm/util/uiTools.pyc -usr/share/arm/version.py -usr/share/arm/version.pyc -#usr/share/doc/arm -#usr/share/doc/arm/armrc.sample -#usr/share/man/man1/arm.1.gz diff --git a/lfs/arm b/lfs/arm deleted file mode 100644 index a8fae41df..000000000 --- a/lfs/arm +++ /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 = 1.4.5.0 - -THISAPP = arm-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/arm -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = arm -PAK_VER = 1 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = f85f306e50b90796ab7097d948e8fcf2 - -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 axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/arm-dont-require-distutils.patch - cd $(DIR_APP) && ./install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 34cc35f02..6adb3829c 100755 --- a/make.sh +++ b/make.sh @@ -1584,7 +1584,6 @@ buildipfire() { lfsmake2 perl-TimeDate lfsmake2 swatch lfsmake2 tor - lfsmake2 arm lfsmake2 wavemon lfsmake2 iptraf-ng lfsmake2 iotop