mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 07:28:39 +01:00
sslh: update to 1.21c
Refresh patches. Remove now pointless format patch. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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"; }
|
||||
);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user