From 35f1987b1494e709832ab2932291ff69c823774a Mon Sep 17 00:00:00 2001
From: Vincent Li <vincent.mc.li@gmail.com>
Date: Sun, 7 Apr 2024 15:22:00 +0000
Subject: [PATCH] Revert "Add ecapture add-on"

This reverts commit 0864b3a5bac19fb4eec9ee4402a75af043ac9126.

User might be concerned firewall admin user capture SSL clear
text, so remove ecapture.

Signed-off-by: Vincent Li <vincent.mc.li@gmail.com>
---
 config/rootfiles/common/ecapture |  1 -
 lfs/ecapture                     | 78 --------------------------------
 make.sh                          |  1 -
 3 files changed, 80 deletions(-)
 delete mode 100644 config/rootfiles/common/ecapture
 delete mode 100644 lfs/ecapture

diff --git a/config/rootfiles/common/ecapture b/config/rootfiles/common/ecapture
deleted file mode 100644
index a9caa445a..000000000
--- a/config/rootfiles/common/ecapture
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/ecapture
diff --git a/lfs/ecapture b/lfs/ecapture
deleted file mode 100644
index d07163b42..000000000
--- a/lfs/ecapture
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2023  IPFire Team  <info@ipfire.org>                     #
-# Copyright (C) 2024  FireBeeOS                                               #
-#                                                                             #
-# 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 <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER        = 0.7.4
-
-THISAPP    = ecapture-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_BLAKE2 = 0c92ce429685903b2b5374e58a22dca06fd7e842036518ec08c1cefcb8c0d4dd1ec6caf24397245021a02d25778c7ad8027a21acf7d17f1129d5dc94e7570675
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-b2 : $(subst %,%_BLAKE2,$(objects))
-
-###############################################################################
-# Downloading, checking, b2sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-	@$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-	@$(LOAD)
-
-$(subst %,%_BLAKE2,$(objects)) :
-	@$(B2SUM)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-
-	cd $(DIR_APP) && cp -av ecapture /usr/bin/ecapture
-
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 488ccf09a..bd6731c61 100755
--- a/make.sh
+++ b/make.sh
@@ -1686,7 +1686,6 @@ buildipfire() {
   lfsmake2 bpftool
   lfsmake2 llvm-project
   lfsmake2 xdp-tools
-  lfsmake2 ecapture
   lfsmake2 knot
   lfsmake2 spectre-meltdown-checker
   lfsmake2 zabbix_agentd