diff options
Diffstat (limited to 'package/network/services/uhttpd')
| -rw-r--r-- | package/network/services/uhttpd/Makefile | 6 | ||||
| -rwxr-xr-x | package/network/services/uhttpd/files/uhttpd.init | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index ba2ca55..5276a99 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2013 Jo-Philipp Wich <jow@openwrt.org> +# Copyright (C) 2010-2014 Jo-Philipp Wich <jow@openwrt.org> # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_VERSION:=2014-06-11 +PKG_VERSION:=2014-10-27 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://nbd.name/uhttpd2.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=dabd7dea6445aaa0e5b8d9add1872fa7393b3a85 +PKG_SOURCE_VERSION:=fd8e5e379c23c5fbcec3e76894b839233df09067 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org> diff --git a/package/network/services/uhttpd/files/uhttpd.init b/package/network/services/uhttpd/files/uhttpd.init index 608aa9d..2e94609 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 } |