From e56a89828630a6726ce2a653f8653eb1406c3b6a Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Fri, 10 May 2024 20:09:16 +0200
Subject: [PATCH] Remove pemtrans

---
 README.md              |  5 +----
 cryptlib/info-v3.sh    |  3 ---
 cryptlib/install-v3.sh | 32 +-------------------------------
 install-next.sh        |  5 -----
 mystic/install-v3.sh   |  8 ++++----
 5 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/README.md b/README.md
index 8d8e55a..1a6e9c5 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,10 @@
 
 Installscript / Systemd Files / Themes German&English
 
-
 bash -c "$(wget -qLO - https://gitea.disconnected-by-peer.at/geos_one/mystic/raw/branch/main/install.sh)"
 
-
 Thankyou
 
 https://vswitchzero.com/mystic-systemd/ for the initial systemd scripts for mis and mrc
 https://tteck.github.io/Proxmox/ for the layout of the install script and the cool error tracker.
-https://www.youtube.com/@MysticGuyBBS for the inspiration for creating the script.
-
+https://www.youtube.com/@MysticGuyBBS for the inspiration for creating the script.
\ No newline at end of file
diff --git a/cryptlib/info-v3.sh b/cryptlib/info-v3.sh
index 7779c5a..c233e88 100644
--- a/cryptlib/info-v3.sh
+++ b/cryptlib/info-v3.sh
@@ -2,9 +2,6 @@ if [ $CRYPT = "Yes" ]; then
 echo "" >> ${DBP_INFO}
 echo "Mystic SSL Support" >> ${DBP_INFO}
 echo "with the libcl support you can now activate ssl in the Mystic system" >> ${DBP_INFO}
-echo "also with the Cryptlib support a tool called pemtrans has been istalled" >> ${DBP_INFO}
-echo "with it you can import your ssl certs like LetsEncrypt into the Mystic system" >> ${DBP_INFO}
-echo "./pemtrans <key> <cert> <out> <label> <secret>" >> ${DBP_INFO}
 echo "" >> ${DBP_INFO}
 echo "==============================================================================================================" >> ${DBP_INFO}
 fi
diff --git a/cryptlib/install-v3.sh b/cryptlib/install-v3.sh
index 165d5e9..ae7f7e9 100644
--- a/cryptlib/install-v3.sh
+++ b/cryptlib/install-v3.sh
@@ -22,40 +22,10 @@ ln -sf libcl.so.3.4.5 ${LIBDIR}/libcl.so.3.4 &>/dev/null
 ln -sf libcl.so.3.4 ${LIBDIR}/libcl.so.3 &>/dev/null
 ln -sf libcl.so.3 ${LIBDIR}/libcl.so &>/dev/null
 popd &>/dev/null
-msg_ok "Setting up ${APP} cryptlib for ssh/ssl (be patient compiling cryptlib)"
-
-msg_info "Setting up ${APP} pemtrans (be patient compiling pemtrans)"
-SSLDEV=$(apt-cache madison libssl-dev | grep 1.0.1 | awk '{print $3}')
-apt install -y --allow-downgrades libssl1.0.0 libssl-dev=${SSLDEV} &>/dev/null
-wget -N https://github.com/amenonsen/pemtrans/archive/refs/heads/master.zip -O $MSTEMPDIR/pemtrans.zip &>/dev/null
-rm -rf $MSTEMPDIR/pemtrans-master &>/dev/null
-pushd $MSTEMPDIR/ &>/dev/null
-unzip pemtrans.zip &>/dev/null
-popd &>/dev/null
-cat << 'EOF' > $MSTEMPDIR/pemtrans-master/Makefile
-## Tell the compiler where to find <openssl/pem.h> and <cryptlib.h>
-## Cryptlib is usually linked with these libraries:
-EXTRA_LIBS = -lresolv -lpthread
-
-## Remember to change theese to suit your environment!!
-INCLUDES = -I../cryptlib-3.4.5
-
-pemtrans: pemtrans.c
-	gcc $(INCLUDES) $(LIBS) -o pemtrans pemtrans.c $(CRYPTLIB) \
-	-lcrypto -lssl -lcl $(EXTRA_LIBS)
-
-EOF
-
-pushd $MSTEMPDIR/pemtrans-master &>/dev/null
-make &>/dev/null
-cp pemtrans ${MYSTIC_DIR}/
-cp pemtrans.1 ${MYSTIC_DIR}/docs/
-cp README ${MYSTIC_DIR}/docs/pemtrans_README
-popd &>/dev/null
 
 apt purge -y gcc g++ cpp &>/dev/null
 apt install -y gcc g++ cpp &>/dev/null
-msg_ok "Setting up ${APP} pemtrans (be patient compiling pemtrans)"
+msg_ok "Setting up ${APP} cryptlib for ssh/ssl (be patient compiling cryptlib)"
 
 fi
 
diff --git a/install-next.sh b/install-next.sh
index 4c84a2e..f65e013 100644
--- a/install-next.sh
+++ b/install-next.sh
@@ -119,11 +119,6 @@ echo "deb http://security.debian.org bullseye-security contrib non-free main" >>
 msg_ok "adding bullseye repository to bookworm for python2"
 fi
 
-msg_info "adding jessie lts repository for openssl 1.0"
-wget https://deb.freexian.com/extended-lts/archive-key.gpg -O /etc/apt/trusted.gpg.d/freexian-archive-extended-lts.gpg &>/dev/null
-echo "deb http://deb.freexian.com/extended-lts jessie main contrib non-free" > /etc/apt/sources.list.d/jessie-extended-lts.list
-msg_ok "adding jessie lts repository for openssl 1.0"
-
 msg_info "Setting up ${APP} Repository"
 apt install -y software-properties-common &>/dev/null
 if [ "${DIST}" = "Debian" ]; then
diff --git a/mystic/install-v3.sh b/mystic/install-v3.sh
index 9742885..d562b25 100644
--- a/mystic/install-v3.sh
+++ b/mystic/install-v3.sh
@@ -1,13 +1,13 @@
-#UPSTREAM="downloads"
-UPSTREAM="downloads/prealpha"
-MYSTIC_VER="112a49"
+UPSTREAM="downloads"
+#UPSTREAM="downloads/prealpha"
+MYSTIC_VER="112a48"
 
 echo -e "Plz set the install dir the same as bevor"
 echo -e "${DGN}Install Mystic to: ${BGN}$MYSTIC_DIR${CL}"
 read -p "Press enter to continue"
 
 msg_info "Starting ${APP} Installation"
-apt install -y python3 python2 libpython2.7 arj zip rar unrar &>/dev/null
+apt install -y python3 python2 libpython2.7 arj zip rar unrar dos2unix &>/dev/null
 wget -N http://www.mysticbbs.com/${UPSTREAM}/mys${MYSTIC_VER}_${MYSTIC_ARCH}.${MYSTIC_EXT} -O $MSTEMPDIR/mys${MYSTIC_VER}_${MYSTIC_ARCH}.${MYSTIC_EXT} &>/dev/null
 rm -rf $MSTEMPDIR/mystic-${MYSTIC_VER} &>/dev/null
 mkdir -p $MSTEMPDIR/mystic-${MYSTIC_VER} &>/dev/null