sslh: Update to v1.19b

Refresh patches
Update upstream URLs

Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com>
This commit is contained in:
Jonathan McCrohan
2018-02-10 13:15:01 +00:00
parent c66296b283
commit d305f1144d
3 changed files with 14 additions and 16 deletions
+5 -5
View File
@@ -1,15 +1,15 @@
diff --git a/Makefile b/Makefile
index b1cf9ce..28f90c3 100644
--- a/Makefile
+++ b/Makefile
@@ -65,16 +65,12 @@ all: sslh $(MAN) echosrv
@@ -68,7 +68,7 @@ all: sslh $(MAN) echosrv $(CONDITIONAL_T
version.h:
./genver.sh >version.h
-sslh: sslh-fork sslh-select
+sslh: sslh-fork
sslh-fork: version.h $(OBJS) sslh-fork.o Makefile common.h
$(OBJS): version.h
@@ -76,10 +76,6 @@ sslh-fork: version.h $(OBJS) sslh-fork.o
$(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS)
#strip sslh-fork
@@ -20,7 +20,7 @@ index b1cf9ce..28f90c3 100644
systemd-sslh-generator: systemd-sslh-generator.o
$(CC) $(CFLAGS) $(LDFLAGS) -o systemd-sslh-generator systemd-sslh-generator.o -lconfig
@@ -110,7 +106,7 @@ distclean: clean
@@ -115,7 +111,7 @@ distclean: clean
rm -f tags cscope.*
clean:
+4 -6
View File
@@ -1,5 +1,3 @@
diff --git a/basic.cfg b/basic.cfg
index 54a799c..d938767 100644
--- a/basic.cfg
+++ b/basic.cfg
@@ -1,3 +1,7 @@
@@ -10,7 +8,7 @@ index 54a799c..d938767 100644
# This is a basic configuration file that should provide
# sensible values for "standard" setup.
@@ -14,15 +18,16 @@ pidfile: "/var/run/sslh.pid";
@@ -15,15 +19,16 @@ chroot: "/var/empty";
# Change hostname with your external address name.
listen:
(
@@ -21,12 +19,12 @@ index 54a799c..d938767 100644
protocols:
(
{ name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; },
{ name: "ssh"; service: "ssh"; host: "localhost"; port: "22"; fork: true; },
{ name: "openvpn"; host: "localhost"; port: "1194"; },
- { name: "xmpp"; host: "localhost"; port: "5222"; },
- { name: "http"; host: "localhost"; port: "80"; },
+# { name: "xmpp"; host: "localhost"; port: "5222"; },
+# { name: "http"; host: "localhost"; port: "80"; },
+# { name: "xmpp"; host: "localhost"; port: "5222"; },
+# { name: "http"; host: "localhost"; port: "80"; },
{ name: "ssl"; host: "localhost"; port: "443"; log_level: 0; },
{ name: "anyprot"; host: "localhost"; port: "443"; }
);