From: Jo-Philipp Wich Date: Mon, 25 Aug 2014 12:39:34 +0000 (+0000) Subject: uhttpd: do not configure TLS parameters if libustream-ssl is not present X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=730589281ee8940016bacf856d566e7ceab719af;p=librecmc%2Flibrecmc.git uhttpd: do not configure TLS parameters if libustream-ssl is not present A quite frequent problem after sysupgrading from an older, SSL enabled build is that ustream-ssl is not installed so uhttpd fails to come up again due to https listening directives in the preserved configuration. Skip key/cert and ssl listen options when libustream-ssl.so is not present. Signed-off-by: Jo-Philipp Wich SVN-Revision: 42284 --- diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index ba2ca55b04..a93b40a085 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2013 Jo-Philipp Wich +# Copyright (C) 2010-2014 Jo-Philipp Wich # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_VERSION:=2014-06-11 +PKG_VERSION:=2014-08-25 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 608aa9d36b..2e94609606 100755 --- a/package/network/services/uhttpd/files/uhttpd.init +++ b/package/network/services/uhttpd/files/uhttpd.init @@ -109,7 +109,7 @@ start_instance() config_get UHTTPD_KEY "$cfg" key /etc/uhttpd.key config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt - [ -n "$https" ] && { + [ -f /lib/libustream-ssl.so ] && [ -n "$https" ] && { [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || { config_foreach generate_keys cert }