Browse Source

Merge pull request #12963 from neheb/ttyd

ttyd: update to 1.6.1
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
58b10674db
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
  1. +3
    -3
      utils/ttyd/Makefile
  2. +12
    -12
      utils/ttyd/patches/100-log-to-syslog.patch

+ 3
- 3
utils/ttyd/Makefile View 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


+ 12
- 12
utils/ttyd/patches/100-log-to-syslog.patch View 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] = "";

Loading…
Cancel
Save