From patchwork Tue Apr 9 14:07:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7721 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 (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4VDST46v0Kz3wtY for ; Tue, 9 Apr 2024 14:07:20 +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 (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4VDST25gS1znC; Tue, 9 Apr 2024 14:07:18 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4VDST22wqXz2ysP; Tue, 9 Apr 2024 14:07:18 +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 (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4VDSSz5KT5z2xQR for ; Tue, 9 Apr 2024 14:07:15 +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 (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4VDSSy6RX0zmw; Tue, 9 Apr 2024 14:07:14 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1712671635; 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; bh=c9T3yxbvFK/tTerBmUfCX5L6fW8rmkvNmL0Qaywzayo=; b=LfjgriHDWXIzFQIvKXTP21ZQpF7J4KaW5f1yYowX+Re/3GpHCZr+NfP7jMdd2N2EOVJCxM kYbSL/SxYYrEzRAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1712671635; 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; bh=c9T3yxbvFK/tTerBmUfCX5L6fW8rmkvNmL0Qaywzayo=; b=rRCBLAs5hJZ8lpHX1XL7lKGaeRgcxZbXwyzM7D5J0tpYYcLdYal4Daui9odvQZKFqF9LNz hmw5o/fZ0POz/6LlSRumPWjNfkEWWLjmO4b3Z9q/nxFuElnKu8FGrlb01ORoAIOzaZ1Pp0 B2GO0mOW21DULYph0Xrwd57gnDIX8xhDFi0X1zqcqpWGf32Xd6+Qm+EpFXg/pUr3bVvzMe kUu0RHeNV4pYerrMrhBNhYvLuBVy07ikN1+ABpgWWCK3+JgSoIePbmNWfX5/h5TfKG89l7 V5O6xHxpXnMfslwBAbh1mtLeK6jWlUabeLLdvvuXlH/vzYZQ9Pf0Wa1yqN1OZA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] sslh: Removal of sslh addon Date: Tue, 9 Apr 2024 16:07:08 +0200 Message-ID: <20240409140709.3431774-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: TXSYAPQG6VPZIRKNPKXLLKQ7ZLNJQSRK X-Message-ID-Hash: TXSYAPQG6VPZIRKNPKXLLKQ7ZLNJQSRK X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - As discussed in the Dev conf call on 2024-Apr-08 - sslh has not been functioning since last update ion Sep 2021. Configuration syntax was radically changed somewhere in the update from 1.7a(2013) to 1.22c in Sep 2021 - removal of sslh from make file - removal of lfs file - removal of rootfile - removal of paks files - removal of initscript Signed-off-by: Adolf Belka --- config/rootfiles/packages/sslh | 3 -- lfs/sslh | 91 ---------------------------------- make.sh | 1 - src/initscripts/packages/sslh | 63 ----------------------- src/paks/sslh/install.sh | 27 ---------- src/paks/sslh/uninstall.sh | 27 ---------- src/paks/sslh/update.sh | 27 ---------- 7 files changed, 239 deletions(-) delete mode 100644 config/rootfiles/packages/sslh delete mode 100644 lfs/sslh delete mode 100644 src/initscripts/packages/sslh delete mode 100644 src/paks/sslh/install.sh delete mode 100644 src/paks/sslh/uninstall.sh delete mode 100644 src/paks/sslh/update.sh diff --git a/config/rootfiles/packages/sslh b/config/rootfiles/packages/sslh deleted file mode 100644 index 21a1b155b..000000000 --- a/config/rootfiles/packages/sslh +++ /dev/null @@ -1,3 +0,0 @@ -etc/rc.d/init.d/sslh -usr/sbin/sslh -#usr/share/man/man8/sslh.8.gz diff --git a/lfs/sslh b/lfs/sslh deleted file mode 100644 index daad4bc83..000000000 --- a/lfs/sslh +++ /dev/null @@ -1,91 +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 - -SUMMARY = SSL/SSH multiplexer - -VER = 1.22c - -THISAPP = sslh-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = sslh -PAK_VER = 7 - -DEPS = - -SERVICES = sslh - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 1870623634b625bb98787be27444403555262f8a9782573c9ed116e65df9e4518c062ef2e2a40fe7bb550f811518ccc2149a23c36deef6c156911b4c42e27473 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# 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) && make CFLAGS="$(CFLAGS)" $(MAKETUNING) USELIBWRAP= - cd $(DIR_APP) && make install - - #install initscripts - $(call INSTALL_INITSCRIPTS,$(SERVICES)) - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index f15e93acb..e80b08cf9 100755 --- a/make.sh +++ b/make.sh @@ -1542,7 +1542,6 @@ buildipfire() { lfsmake2 lynis lfsmake2 sshfs lfsmake2 taglib - lfsmake2 sslh lfsmake2 perl-gettext lfsmake2 perl-Sort-Naturally lfsmake2 vdradmin diff --git a/src/initscripts/packages/sslh b/src/initscripts/packages/sslh deleted file mode 100644 index e7d21f234..000000000 --- a/src/initscripts/packages/sslh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 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 . # -# # -############################################################################### - -. /etc/sysconfig/rc -. $rc_functions - -case "$1" in - start) - boot_mesg "Starting SSLH Deamon..." - - LOCAL_IP_ADDRESS="$(. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -ln -s /etc/init.d/sslh /etc/rc.d/init.d/networking/red.up/50-sslh -start_service --background ${NAME} diff --git a/src/paks/sslh/uninstall.sh b/src/paks/sslh/uninstall.sh deleted file mode 100644 index dca34ccbd..000000000 --- a/src/paks/sslh/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2009 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -remove_files -rm -f /etc/rc.d/init.d/networking/red.up/50-sslh diff --git a/src/paks/sslh/update.sh b/src/paks/sslh/update.sh deleted file mode 100644 index 99776659c..000000000 --- a/src/paks/sslh/update.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007-2020 IPFire-Team . # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_backup_includes -./uninstall.sh -./install.sh