* [PATCH 1/2] sslh: Removal of sslh addon
@ 2024-04-09 14:07 Adolf Belka
2024-04-09 14:07 ` [PATCH 2/2] initscripts: Removal of references to sslh Adolf Belka
0 siblings, 1 reply; 2+ messages in thread
From: Adolf Belka @ 2024-04-09 14:07 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 13954 bytes --]
- 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 <adolf.belka(a)ipfire.org>
---
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 <info(a)ipfire.org> #
-# #
-# 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
-
-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 <info(a)ipfire.org> #
-# #
-# 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/>. #
-# #
-###############################################################################
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-case "$1" in
- start)
- boot_mesg "Starting SSLH Deamon..."
-
- LOCAL_IP_ADDRESS="$(</var/ipfire/red/local-ipaddress)"
- if [ -z "${LOCAL_IP_ADDRESS}" ]; then
- echo_failure
- boot_mesg -n "FAILURE:\n\nCould not determine" ${FAILURE}
- boot_mesg -n " your external IP address."
- boot_mesg "" ${NORMAL}
- exit 1
- fi
-
- loadproc /usr/sbin/sslh -u nobody \
- -p "${LOCAL_IP_ADDRESS}:443" -s localhost:222 -l localhost:444
- evaluate_retval
- ;;
-
- stop)
- boot_mesg "Stopping SSLH Deamon..."
- killproc /usr/sbin/sslh
- evaluate_retval
- ;;
-
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
-
- status)
- statusproc /usr/sbin/sslh
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
- ;;
-esac
diff --git a/src/paks/sslh/install.sh b/src/paks/sslh/install.sh
deleted file mode 100644
index 626884bdd..000000000
--- a/src/paks/sslh/install.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 <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /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 <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /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 <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-extract_backup_includes
-./uninstall.sh
-./install.sh
--
2.44.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] initscripts: Removal of references to sslh
2024-04-09 14:07 [PATCH 1/2] sslh: Removal of sslh addon Adolf Belka
@ 2024-04-09 14:07 ` Adolf Belka
0 siblings, 0 replies; 2+ messages in thread
From: Adolf Belka @ 2024-04-09 14:07 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4728 bytes --]
- sslh is listed in the initscripts lfs and rootfiles.
- Removal of these references with the bremoval of sslh
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/aarch64/initscripts | 3 ---
config/rootfiles/common/riscv64/initscripts | 3 ---
config/rootfiles/common/x86_64/initscripts | 3 ---
lfs/initscripts | 3 ---
4 files changed, 12 deletions(-)
diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts
index 293e0496b..187361eeb 100644
--- a/config/rootfiles/common/aarch64/initscripts
+++ b/config/rootfiles/common/aarch64/initscripts
@@ -98,7 +98,6 @@ etc/rc.d/rc0.d/K01grub-btrfsd
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
#etc/rc.d/rc0.d/K01vdradmin
-#etc/rc.d/rc0.d/K02sslh
etc/rc.d/rc0.d/K08fcron
etc/rc.d/rc0.d/K28apache
etc/rc.d/rc0.d/K30sshd
@@ -137,7 +136,6 @@ etc/rc.d/rc3.d/S30sshd
etc/rc.d/rc3.d/S32apache
etc/rc.d/rc3.d/S40fcron
etc/rc.d/rc3.d/S98rc.local
-#etc/rc.d/rc3.d/S98sslh
etc/rc.d/rc3.d/S99grub-btrfsd
#etc/rc.d/rc3.d/S99imspetor
#etc/rc.d/rc3.d/S99motion
@@ -147,7 +145,6 @@ etc/rc.d/rc6.d/K01grub-btrfsd
#etc/rc.d/rc6.d/K01imspetor
#etc/rc.d/rc6.d/K01motion
#etc/rc.d/rc6.d/K01vdradmin
-#etc/rc.d/rc6.d/K02sslh
etc/rc.d/rc6.d/K08fcron
etc/rc.d/rc6.d/K28apache
etc/rc.d/rc6.d/K30sshd
diff --git a/config/rootfiles/common/riscv64/initscripts b/config/rootfiles/common/riscv64/initscripts
index 2d6fa85dc..e23ee54de 100644
--- a/config/rootfiles/common/riscv64/initscripts
+++ b/config/rootfiles/common/riscv64/initscripts
@@ -97,7 +97,6 @@ etc/rc.d/rc0.d/K01grub-btrfsd
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
#etc/rc.d/rc0.d/K01vdradmin
-#etc/rc.d/rc0.d/K02sslh
etc/rc.d/rc0.d/K08fcron
etc/rc.d/rc0.d/K28apache
etc/rc.d/rc0.d/K30sshd
@@ -136,7 +135,6 @@ etc/rc.d/rc3.d/S30sshd
etc/rc.d/rc3.d/S32apache
etc/rc.d/rc3.d/S40fcron
etc/rc.d/rc3.d/S98rc.local
-#etc/rc.d/rc3.d/S98sslh
etc/rc.d/rc3.d/S99grub-btrfsd
#etc/rc.d/rc3.d/S99imspetor
#etc/rc.d/rc3.d/S99motion
@@ -146,7 +144,6 @@ etc/rc.d/rc6.d/K01grub-btrfsd
#etc/rc.d/rc6.d/K01imspetor
#etc/rc.d/rc6.d/K01motion
#etc/rc.d/rc6.d/K01vdradmin
-#etc/rc.d/rc6.d/K02sslh
etc/rc.d/rc6.d/K08fcron
etc/rc.d/rc6.d/K28apache
etc/rc.d/rc6.d/K30sshd
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 2d6fa85dc..e23ee54de 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -97,7 +97,6 @@ etc/rc.d/rc0.d/K01grub-btrfsd
#etc/rc.d/rc0.d/K01imspetor
#etc/rc.d/rc0.d/K01motion
#etc/rc.d/rc0.d/K01vdradmin
-#etc/rc.d/rc0.d/K02sslh
etc/rc.d/rc0.d/K08fcron
etc/rc.d/rc0.d/K28apache
etc/rc.d/rc0.d/K30sshd
@@ -136,7 +135,6 @@ etc/rc.d/rc3.d/S30sshd
etc/rc.d/rc3.d/S32apache
etc/rc.d/rc3.d/S40fcron
etc/rc.d/rc3.d/S98rc.local
-#etc/rc.d/rc3.d/S98sslh
etc/rc.d/rc3.d/S99grub-btrfsd
#etc/rc.d/rc3.d/S99imspetor
#etc/rc.d/rc3.d/S99motion
@@ -146,7 +144,6 @@ etc/rc.d/rc6.d/K01grub-btrfsd
#etc/rc.d/rc6.d/K01imspetor
#etc/rc.d/rc6.d/K01motion
#etc/rc.d/rc6.d/K01vdradmin
-#etc/rc.d/rc6.d/K02sslh
etc/rc.d/rc6.d/K08fcron
etc/rc.d/rc6.d/K28apache
etc/rc.d/rc6.d/K30sshd
diff --git a/lfs/initscripts b/lfs/initscripts
index 4d67ee0c4..f4fdb17fa 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -95,7 +95,6 @@ $(TARGET) :
ln -sf ../init.d/imspetor /etc/rc.d/rc0.d/K01imspetor
ln -sf ../init.d/motion /etc/rc.d/rc0.d/K01motion
ln -sf ../init.d/vdradmin /etc/rc.d/rc0.d/K01vdradmin
- ln -sf ../init.d/sslh /etc/rc.d/rc0.d/K02sslh
ln -sf ../init.d/fcron /etc/rc.d/rc0.d/K08fcron
ln -sf ../init.d/apache /etc/rc.d/rc0.d/K28apache
ln -sf ../init.d/sshd /etc/rc.d/rc0.d/K30sshd
@@ -132,7 +131,6 @@ $(TARGET) :
ln -sf ../init.d/apache /etc/rc.d/rc3.d/S32apache
ln -sf ../init.d/fcron /etc/rc.d/rc3.d/S40fcron
ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local
- ln -sf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh
ln -sf ../init.d/grub-btrfsd /etc/rc.d/rc3.d/S99grub-btrfsd
ln -sf ../init.d/imspetor /etc/rc.d/rc3.d/S99imspetor
ln -sf ../init.d/motion /etc/rc.d/rc3.d/S99motion
@@ -142,7 +140,6 @@ $(TARGET) :
ln -sf ../init.d/imspetor /etc/rc.d/rc6.d/K01imspetor
ln -sf ../init.d/motion /etc/rc.d/rc6.d/K01motion
ln -sf ../init.d/vdradmin /etc/rc.d/rc6.d/K01vdradmin
- ln -sf ../init.d/sslh /etc/rc.d/rc6.d/K02sslh
ln -sf ../init.d/fcron /etc/rc.d/rc6.d/K08fcron
ln -sf ../init.d/apache /etc/rc.d/rc6.d/K28apache
ln -sf ../init.d/sshd /etc/rc.d/rc6.d/K30sshd
--
2.44.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-09 14:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-09 14:07 [PATCH 1/2] sslh: Removal of sslh addon Adolf Belka
2024-04-09 14:07 ` [PATCH 2/2] initscripts: Removal of references to sslh Adolf Belka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox