lighttpd:

 * drop support for cyassl as it lacks support for the following functions required by the latest (1.4.34) lighttpd version: BIO_s_file, BIO_read_filename, PEM_read_bio_X509, X509_check_private_key


git-svn-id: file:///var/svn/freetz/trunk@11596 149334a1-2f27-0410-a3b9-fc62619ac1e6

make/lighttpd/Config.in

@@ -23,21 +23,12 @@ config FREETZ_PACKAGE_LIGHTTPD
 config FREETZ_PACKAGE_LIGHTTPD_WITH_SSL
 	bool "build with SSL support"
 	depends on FREETZ_PACKAGE_LIGHTTPD
-	select FREETZ_LIB_libcrypto if ! FREETZ_PACKAGE_LIGHTTPD_USE_CYASSL
-	select FREETZ_LIB_libssl if ! FREETZ_PACKAGE_LIGHTTPD_USE_CYASSL
+	select FREETZ_LIB_libcrypto
+	select FREETZ_LIB_libssl
 	default n
 	help
 		This option enables SSL support for lighttpd.
 
-config FREETZ_PACKAGE_LIGHTTPD_USE_CYASSL
-	bool
-#	bool "Use cyassl instead of openssl"
-	depends on FREETZ_PACKAGE_LIGHTTPD_WITH_SSL
-	select FREETZ_LIB_libcyassl
-	default n
-	help
-		Use lightweight cyassl as SSL library.
-
 config FREETZ_PACKAGE_LIGHTTPD_LDD
 	bool "Include LDD support"
 	depends on FREETZ_PACKAGE_LIGHTTPD

make/lighttpd/lighttpd.mk

@@ -28,7 +28,6 @@ $(PKG)_MODULES_TARGET_DIR := $($(PKG)_MODULES:%=$($(PKG)_DEST_DIR)$($(PKG)_MODUL
 $(PKG)_NOT_INCLUDED := $(patsubst %,$($(PKG)_DEST_DIR)$($(PKG)_MODULES_DIR)/mod_%.so,$(filter-out $($(PKG)_MODULES),$($(PKG)_MODULES_ALL)))
 
 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_LIGHTTPD_WITH_SSL
-$(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_LIGHTTPD_USE_CYASSL
 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_LIGHTTPD_WITH_LUA
 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_LIGHTTPD_MOD_COMPRESS
 $(PKG)_REBUILD_SUBOPTS += FREETZ_PACKAGE_LIGHTTPD_MOD_WEBDAV_WITH_PROPS
@@ -39,20 +38,12 @@ $(PKG)_REBUILD_SUBOPTS += FREETZ_TARGET_IPV6_SUPPORT
 $(PKG)_DEPENDS_ON := pcre
 
 ifeq ($(strip $(FREETZ_PACKAGE_LIGHTTPD_WITH_SSL)),y)
-$(PKG)_CONFIGURE_OPTIONS += --with-openssl=yes
-$(PKG)_CONFIGURE_OPTIONS += --with-openssl-libs="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib"
-ifeq ($(strip $(FREETZ_PACKAGE_LIGHTTPD_USE_CYASSL)),y)
-$(PKG)_DEPENDS_ON += cyassl
-$(PKG)_CONFIGURE_OPTIONS += --with-openssl-includes="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include/cyassl"
-$(PKG)_CONFIGURE_ENV += OPENSSL_ALTERNATIVE=cyassl
-$(PKG)_CONFIGURE_ENV += OPENSSL_ALTERNATIVE_FCT_PREFIX=Cya
-$(PKG)_CONFIGURE_ENV += OPENSSL_ALTERNATIVE_EXTRALIBS="-lm -lz"
-else
 $(PKG)_REBUILD_SUBOPTS += FREETZ_OPENSSL_SHLIB_VERSION
 $(PKG)_DEPENDS_ON += openssl
+$(PKG)_CONFIGURE_OPTIONS += --with-openssl=yes
+$(PKG)_CONFIGURE_OPTIONS += --with-openssl-libs="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/lib"
 $(PKG)_CONFIGURE_OPTIONS += --with-openssl-includes="$(TARGET_TOOLCHAIN_STAGING_DIR)/usr/include"
 endif
-endif
 
 ifeq ($(strip $(FREETZ_PACKAGE_LIGHTTPD_MOD_COMPRESS)),y)
 $(PKG)_DEPENDS_ON += zlib