From a17e90591ccafde29e13acf0b8b5fd2c200b6824 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 8 Jul 2019 08:18:01 +0200 Subject: [PATCH 1/2] stunnel: update version to 5.55 Update version to 5.55 Signed-off-by: Florian Eckert --- net/stunnel/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/stunnel/Makefile b/net/stunnel/Makefile index 77771dda6..b1984e042 100644 --- a/net/stunnel/Makefile +++ b/net/stunnel/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=stunnel -PKG_VERSION:=5.54 +PKG_VERSION:=5.55 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0+ @@ -23,7 +23,7 @@ PKG_SOURCE_URL:= \ https://www.usenix.org.uk/mirrors/stunnel/archive/$(word 1, $(subst .,$(space),$(PKG_VERSION))).x/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=5e8588a6c274b46b1d63e1b50f0725f4908dec736f6588eb48d1eb3d20c87902 +PKG_HASH:=90de69f41c58342549e74c82503555a6426961b29af3ed92f878192727074c62 PKG_FIXUP:=autoreconf PKG_FIXUP:=patch-libtool From 6713d1d771dbf29f640cc08271e01dfc97a6389f Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Mon, 29 Jul 2019 15:20:43 +0200 Subject: [PATCH 2/2] stunnel: fix some shellcheck warnings Signed-off-by: Florian Eckert --- net/stunnel/files/stunnel.init | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/net/stunnel/files/stunnel.init b/net/stunnel/files/stunnel.init index bc46bd011..c04282657 100644 --- a/net/stunnel/files/stunnel.init +++ b/net/stunnel/files/stunnel.init @@ -124,7 +124,7 @@ validate_service_section_service_options() { print_options() { local _opt local _value - for _opt in $*; do + for _opt in "$@"; do eval "_value=\$$_opt" [ -z "$_value" ] || echo "$_opt = $_value" >> "$CONF_FILE" done @@ -134,7 +134,7 @@ print_bool_options() { local _opt local _bool local _value - for _opt in $*; do + for _opt in "$@"; do eval "_bool=\$$_opt" [ -z "$_bool" ] || { _value=no @@ -148,7 +148,7 @@ print_lists_map() { local _opt local _values local _value - for _opt in $*; do + for _opt in "$@"; do eval "_values=\$$_opt" for _value in $_values; do echo "$_opt = $_value" >> "$CONF_FILE" @@ -163,7 +163,7 @@ print_lists_reduce() { local _values local _v shift - for _opt in $*; do + for _opt in "$@"; do _value= eval "_values=\$$_opt" for _v in $_values; do @@ -178,7 +178,7 @@ print_host_port() { local _opt local _host local _port - for _opt in $*; do + for _opt in "$@"; do eval "_host=\${${_opt}_host}" eval "_port=\${${_opt}_port}" [ -z "$_host" ] || [ -z "$_port" ] || echo "$_opt = $_host:$_port" >> "$CONF_FILE" @@ -190,7 +190,7 @@ print_optional_host_port() { local _host local _port local _value - for _opt in $*; do + for _opt in "$@"; do eval "_host=\${${_opt}_host}" eval "_port=\${${_opt}_port}" [ -z "$_port" ] || { @@ -376,10 +376,10 @@ service_triggers() { procd_add_reload_trigger stunnel procd_open_validate - validate_globals_section - validate_globals_section_service_options - validate_service_section - validate_service_section_service_options + validate_globals_section "$@" + validate_globals_section_service_options "$@" + validate_service_section "$@" + validate_service_section_service_options "$@" procd_close_validate }