diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-27 17:14:51 -0700 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2020-08-27 17:32:06 -0700 |
| commit | 432f954bbe20d1931be75704677de1ccefc06c2a (patch) | |
| tree | 3220e7f42c51e5eaa85076e0dd1fd14186688365 /net/sslh/patches | |
| parent | ede20c7768acf5277cd7a114d6290434c4c7d549 (diff) | |
sslh: update to 1.21c
Refresh patches. Remove now pointless format patch.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'net/sslh/patches')
| -rw-r--r-- | net/sslh/patches/001-no_sslh_select.patch | 8 | ||||
| -rw-r--r-- | net/sslh/patches/002-configfile-fix.patch | 2 | ||||
| -rw-r--r-- | net/sslh/patches/010-format.patch | 11 |
3 files changed, 5 insertions, 16 deletions
diff --git a/net/sslh/patches/001-no_sslh_select.patch b/net/sslh/patches/001-no_sslh_select.patch index 3f547d2cb..1d3b3feff 100644 --- a/net/sslh/patches/001-no_sslh_select.patch +++ b/net/sslh/patches/001-no_sslh_select.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -68,7 +68,7 @@ all: sslh $(MAN) echosrv $(CONDITIONAL_T +@@ -76,7 +76,7 @@ all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS) version.h: ./genver.sh >version.h @@ -9,7 +9,7 @@ $(OBJS): version.h -@@ -76,10 +76,6 @@ sslh-fork: version.h $(OBJS) sslh-fork.o +@@ -87,10 +87,6 @@ sslh-fork: version.h $(OBJS) sslh-fork.o Makefile common.h $(CC) $(CFLAGS) $(LDFLAGS) -o sslh-fork sslh-fork.o $(OBJS) $(LIBS) #strip sslh-fork @@ -20,8 +20,8 @@ systemd-sslh-generator: systemd-sslh-generator.o $(CC) $(CFLAGS) $(LDFLAGS) -o systemd-sslh-generator systemd-sslh-generator.o -lconfig -@@ -115,7 +111,7 @@ distclean: clean - rm -f tags cscope.* +@@ -127,7 +123,7 @@ distclean: clean + rm -f tags sslh-conf.c sslh-conf.h cscope.* clean: - rm -f sslh-fork sslh-select echosrv version.h $(MAN) systemd-sslh-generator *.o *.gcov *.gcno *.gcda *.png *.html *.css *.info diff --git a/net/sslh/patches/002-configfile-fix.patch b/net/sslh/patches/002-configfile-fix.patch index 0c88cc6a6..d9344cdaa 100644 --- a/net/sslh/patches/002-configfile-fix.patch +++ b/net/sslh/patches/002-configfile-fix.patch @@ -25,6 +25,6 @@ - { 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: "tls"; host: "localhost"; port: "443"; log_level: 0; }, { name: "anyprot"; host: "localhost"; port: "443"; } ); diff --git a/net/sslh/patches/010-format.patch b/net/sslh/patches/010-format.patch deleted file mode 100644 index a25290544..000000000 --- a/net/sslh/patches/010-format.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sslh-main.c -+++ b/sslh-main.c -@@ -167,7 +167,7 @@ void cmd_ssl_to_tls(int argc, char* argv[]) - strcpy(argv[i], "--tls"); - /* foreground option not parsed yet, syslog not open, just print on - * stderr and hope for the best */ -- fprintf(stderr, ssl_err_msg); -+ fprintf(stderr, "%s", ssl_err_msg); - } - } - } |