Changeset 42286


Ignore:
Timestamp:
2014-08-25T14:46:35+02:00 (3 years ago)
Author:
jow
Message:

BB: 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 <jow@…>

Backport of r42284

Location:
branches/barrier_breaker/package/network/services/uhttpd
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/barrier_breaker/package/network/services/uhttpd/Makefile

    r41114 r42286  
    11# 
    2 # Copyright (C) 2010-2013 Jo-Philipp Wich <jow@openwrt.org> 
     2# Copyright (C) 2010-2014 Jo-Philipp Wich <jow@openwrt.org> 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
    … …  
    99 
    1010PKG_NAME:=uhttpd 
    11 PKG_VERSION:=2014-06-11 
     11PKG_VERSION:=2014-08-25 
    1212PKG_RELEASE=$(PKG_SOURCE_VERSION) 
    1313 

  • branches/barrier_breaker/package/network/services/uhttpd/files/uhttpd.init

    r40457 r42286  
    110110        config_get UHTTPD_CERT "$cfg" cert /etc/uhttpd.crt 
    111111 
    112         [ -n "$https" ] && { 
     112        [ -f /lib/libustream-ssl.so ] && [ -n "$https" ] && { 
    113113                [ -f "$UHTTPD_CERT" -a -f "$UHTTPD_KEY" ] || { 
    114114                        config_foreach generate_keys cert 
Note: See TracChangeset for help on using the changeset viewer.