ttyd: update to 1.6.1
authorRosen Penev <redacted>
Tue, 28 Jul 2020 21:33:50 +0000 (14:33 -0700)
committerRosen Penev <redacted>
Tue, 28 Jul 2020 22:45:47 +0000 (15:45 -0700)
Refresh patch.

Signed-off-by: Rosen Penev <redacted>
utils/ttyd/Makefile
utils/ttyd/patches/100-log-to-syslog.patch

index 71e6f122cbed813a9a9d1ae1396474ab97971127..2e195f8216519ff23c1475bf30ffc26b492afa32 100644 (file)
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ttyd
-PKG_VERSION:=1.6.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.6.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/tsl0922/ttyd/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=d14740bc82be0d0760dd0a3c97acbcbde490412a4edc61edabe46d311b068f83
+PKG_HASH:=d72dcca3dec00cda87b80a0a25ae4fee2f8b9098c1cdb558508dcb14fbb6fafc
 
 PKG_MAINTAINER:=Shuanglei Tao <tsl0922@gmail.com>
 PKG_LICENSE:=MIT
index 392673270f82afce0f4e0d3e70d7e562a2bf30d4..04a3027c2a40e73b3ebc2a58b03e4f345e29ad0b 100644 (file)
@@ -1,20 +1,20 @@
 --- a/src/server.c
 +++ b/src/server.c
-@@ -6,6 +6,7 @@
- #include <getopt.h>
- #include <signal.h>
+@@ -10,6 +10,7 @@
+ #include <stdlib.h>
+ #include <string.h>
  #include <sys/stat.h>
 +#include <syslog.h>
  
- #include <libwebsockets.h>
- #include <json.h>
-@@ -418,7 +419,8 @@ main(int argc, char **argv) {
-         return -1;
-     }
+ #include "utils.h"
  
--    lws_set_log_level(debug_level, NULL);
-+    openlog("ttyd", LOG_NDELAY | LOG_PID, LOG_DAEMON);
-+    lws_set_log_level(debug_level, lwsl_emit_syslog);
+@@ -441,7 +442,8 @@ int main(int argc, char **argv) {
+     return -1;
+   }
+-  lws_set_log_level(debug_level, NULL);
++  openlog("ttyd", LOG_NDELAY | LOG_PID, LOG_DAEMON);
++  lws_set_log_level(debug_level, lwsl_emit_syslog);
  
  #if LWS_LIBRARY_VERSION_MAJOR >= 2
-     char server_hdr[128] = "";
+   char server_hdr[128] = "";
git clone https://git.99rst.org/PROJECT