Merge pull request #20358 from hnyman/rtty2102

Rtty2102
This commit is contained in:
Hannu Nyman 2023-01-21 22:09:37 +02:00 committed by GitHub
commit a3e312f7ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions

View File

@ -8,13 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=rtty
PKG_VERSION:=7.3.2
PKG_RELEASE:=2
PKG_VERSION:=8.0.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL=https://github.com/zhaojh329/rtty/releases/download/v$(PKG_VERSION)
PKG_HASH:=4c60eacd7a653988a1907284de2ecf360c74f55ef9e21c40b9ebd87af6570908
CMAKE_INSTALL:=1
PKG_HASH:=b1a21819c2256b3364b8c64dfcc56583b9647409ab8b39ff54e00e242e44028e
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
@ -49,13 +48,13 @@ Package/rtty-mbedtls/conffiles = $(Package/rtty-openssl/conffiles)
Package/rtty-nossl/conffiles = $(Package/rtty-openssl/conffiles)
ifeq ($(BUILD_VARIANT),openssl)
CMAKE_OPTIONS += -DRTTY_USE_OPENSSL=ON
CMAKE_OPTIONS += -DUSE_OPENSSL=ON
else ifeq ($(BUILD_VARIANT),wolfssl)
CMAKE_OPTIONS += -DRTTY_USE_WOLFSSL=ON
CMAKE_OPTIONS += -DUSE_WOLFSSL=ON
else ifeq ($(BUILD_VARIANT),mbedtls)
CMAKE_OPTIONS += -DRTTY_USE_MBEDTLS=ON
CMAKE_OPTIONS += -DUSE_MBEDTLS=ON
else
CMAKE_OPTIONS += -DRTTY_SSL_SUPPORT=OFF
CMAKE_OPTIONS += -DSSL_SUPPORT=OFF
endif
define Package/rtty-$(BUILD_VARIANT)/install

View File

@ -10,5 +10,7 @@
# option host 'your-server-host' # Server host
# option port '5912' # Server Port
# option ssl 1 # Whether to use ssl
# option insecure '1' # Allow insecure server connections when using SSL
# option token 'your-token' # generated by rttys
# option username 'root' # Skip a second login authentication. See man login(1) about the details
# option verbose '1' # verbose log

View File

@ -13,7 +13,9 @@ validate_rtty_section() {
'host:host' \
'port:port' \
'ssl:bool:0' \
'insecure:bool:0' \
'token:maxlength(32)' \
'username:string' \
'verbose:bool:0'
}
@ -48,7 +50,9 @@ start_rtty() {
[ -n "$port" ] && procd_append_param command -p "$port"
[ -n "$description" ] && procd_append_param command -d "$description"
[ "$ssl" = "1" ] && procd_append_param command -s
[ "$insecure" = "1" ] && procd_append_param command -x
[ -n "$token" ] && procd_append_param command -t "$token"
[ -n "$username" ] && procd_append_param command -f "$username"
[ "$verbose" = "1" ] && procd_append_param command -v
procd_set_param respawn
procd_close_instance