From 4237c9d899a7e5dfb9d62644601bcbfa1574ab82 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 28 Sep 2016 19:04:37 +0200 Subject: remove OpenSSL support I thought some time about this, we have it in parallel some time and it have issues for allmodconfig builds. Anyway I have no fun doing openssl updates twice a week. We just can not support stunnel/ssltunnel anymore. For nodejs we use bundled openssl. I am an old OpenBSD geek anyway, so get rid of OpenSSL. --- package/tntnet/Makefile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'package/tntnet') diff --git a/package/tntnet/Makefile b/package/tntnet/Makefile index c48a070d3..03d3b558e 100644 --- a/package/tntnet/Makefile +++ b/package/tntnet/Makefile @@ -17,17 +17,14 @@ PKG_SITES:= http://www.tntnet.org/download/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_TNTNET:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL WITH_LIBRESSL -PKGCD_WITHOUT_SSL:= use no ssl -PKGCD_WITH_OPENSSL:= use openssl for crypto -PKGCS_WITH_OPENSSL:= libopenssl -PKGCB_WITH_OPENSSL:= openssl -PKGCD_WITH_OPENSSL:= use libressl for crypto -PKGCS_WITH_OPENSSL:= libressl -PKGCB_WITH_OPENSSL:= libressl +PKG_CHOICES_TNTNET:= WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCS_WITH_LIBRESSL:= libressl +PKGCB_WITH_LIBRESSL:= libressl PKGCD_WITH_GNUTLS:= use gnutls for crypto PKGCS_WITH_GNUTLS:= libgnutls PKGCB_WITH_GNUTLS:= gnutls +PKGCD_WITHOUT_SSL:= use no ssl include ${ADK_TOPDIR}/mk/package.mk @@ -36,9 +33,6 @@ $(eval $(call PKG_template,TNTNET,tntnet,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEP ifeq (${ADK_PACKAGE_TNTNET_WITHOUT_SSL},y) CONFIGURE_ARGS+= --with-ssl=no endif -ifeq (${ADK_PACKAGE_TNTNET_WITH_OPENSSL},y) -CONFIGURE_ARGS+= --with-ssl=openssl -endif ifeq (${ADK_PACKAGE_TNTNET_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-ssl=openssl endif -- cgit v1.2.3