From 267b49087864adb295834764cb1a04bc64dd9b4a Mon Sep 17 00:00:00 2001
From: Gabor Seljan <sgabe@users.noreply.github.com>
Date: Sun, 24 May 2020 17:44:25 +0200
Subject: [PATCH] sslh: use tls option instead of deprecated ssl

Upstream will drop support for the ssl option in the next future version.

Signed-off-by: Gabor Seljan <sgabe@users.noreply.github.com>
(cherry picked from commit 46c253dfcaba4ee9cb8299d3c895e399bf282bb8)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[package bump]
---
 net/sslh/Makefile          | 2 +-
 net/sslh/files/sslh.config | 9 ++++++---
 net/sslh/files/sslh.init   | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index fbf097be7..8ce761b38 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sslh
 PKG_VERSION:=v1.20
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://rutschle.net/tech/sslh/
diff --git a/net/sslh/files/sslh.config b/net/sslh/files/sslh.config
index b9e047dc6..e4df37bd5 100644
--- a/net/sslh/files/sslh.config
+++ b/net/sslh/files/sslh.config
@@ -10,9 +10,12 @@ config 'sslh' 'default'
 	# ssh defaults to 'localhost:22'
 	# --ssh <sshhost>:<sshport>
 	option 'ssh' ''
-	# ssl defaults to 'localhost:443'
-	# --ssl <sslhost>:<sslport>
-	option 'ssl' ''
+	# http defaults to 'localhost:80'
+	# --http <httphost>:<httpport>
+	option 'http' ''
+	# tls defaults to 'localhost:443'
+	# --tls <tlshost>:<tlsport>
+	option 'tls' ''
 	# openvpn defaults to 'localhost:1194'
 	# --openvpn <openvpnhost>:<openvpnport>
 	option 'openvpn' ''
diff --git a/net/sslh/files/sslh.init b/net/sslh/files/sslh.init
index 248ff0d37..b8859c955 100644
--- a/net/sslh/files/sslh.init
+++ b/net/sslh/files/sslh.init
@@ -22,9 +22,9 @@ start_instance() {
 	# B) ssh parameter
 	config_get val "${section}" ssh
 	[ -n "${val}" ] && append args "--ssh ${val}"
-	# C) ssl parameter
-	config_get val "${section}" ssl
-	[ -n "${val}" ] && append args "--ssl ${val}"
+	# C) tls parameter
+	config_get val "${section}" tls
+	[ -n "${val}" ] && append args "--tls ${val}"
 	# D) openvpn parameter
 	config_get val "${section}" openvpn
 	 [ -n "${val}" ] && append args "--openvpn ${val}"